设备更新时间 设备列表整体修改

pages/cb/thxydetail/thxydetail.vue

@@ -13,7 +13,7 @@
 				设备类型：性诱3.0
 			</view>
 			<view class="">
-				最新上报时间：{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
+				最新上报时间：{{equipInfo.uptime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
 				设备地址：{{equipInfo.address}}

pages/cb/xylps/detail/detail.vue

@@ -10,7 +10,7 @@
 						</image>
 					</p>
 					<p>设备名称：{{equipInfo.device_name==""?"无":equipInfo.device_name}}</p>
-					<p>最新上报时间：{{equipInfo.uptime | timeFormat}}</p>
+					<p>最新上报时间：{{equipInfo.addtime | timeFormat}}</p>
 					<p>最新地址：{{equipInfo.address}}</p>
 					<p class="fillin">诱芯名称：{{equipInfo.decoy}}</p>
 					<!-- <p @click="glass_show=true">诱芯更换时间：<span style="margin:0 20rpx;">{{yxchangetime}}</span><u-icon
@@ -94,11 +94,11 @@
 							</view>
 							<view class="pest">
 								<text>处理意见</text>
-								<text class="name">当前害虫情况正常，请继续监测。</text>
+								<text class="name">{{analyInfo.advice}}</text>
 							</view>
 						</view>
 						<view class="pestStatus">
-							<view class="block active">
+							<view :class="['block', analyInfo.count < 30 ? 'active' : '']">
 								<view class="iconBox green">
 									<text class="yficonfont icon-small"></text>
 								</view>
@@ -107,7 +107,7 @@
 									<view>0-30</view>
 								</view>
 							</view>
-							<view class="block">
+							<view :class="['block', analyInfo.count >= 30 &&  analyInfo.count < 60? 'active' : '']">
 								<view class="iconBox yellow">
 									<text class="yficonfont icon-middle"></text>
 								</view>
@@ -116,7 +116,7 @@
 									<view>30-60</view>
 								</view>
 							</view>
-							<view class="block">
+							<view :class="['block', analyInfo.count >= 60 ? 'active' : '']">
 								<view class="iconBox danger">
 									<text class="yficonfont icon-most"></text>
 								</view>

pages/equipList/search.vue

@@ -1,7 +1,8 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;top: 44px; z-index: 100;height: 80rpx;background-color: #FFFFFF;padding-top: 10px;">
+		<view
+			style="position: fixed;top: 44px; z-index: 100;height: 80rpx;background-color: #FFFFFF;padding-top: 10px;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回"></uni-nav-bar>
 			<view class="search_bot_input">
 				<input type="text" value="" placeholder="请输入设备ID" v-model="imports" @input="searchinput" />
@@ -70,7 +71,7 @@
 				indexs: 2, //设备id
 				page: 1,
 				size: 10,
-				infoalter:false
+				infoalter: false
 			}
 		},
 		methods: {
@@ -84,12 +85,22 @@
 						page_size: this.size,
 					}
 				})
+				var newtime = +new Date() / 1000
+				res.data.forEach(item => {
+					let {
+						uptime,
+						addtime
+					} = item;
+					item.uptime = addtime;
+					item.addtime = uptime;
+					var days = (newtime - item.addtime) / 60 / 60 / 24;
+					item.days = Math.round(days);
+				})
 				this.eqlistdata = this.eqlistdata.concat(res.data)
-				var newtime = +new Date()/1000
-				for(var i=0;i<this.eqlistdata.length;i++){
-					var days = (newtime-this.eqlistdata[i].uptime)/60/60/24
-					this.eqlistdata[i].days = Math.round(days)
-				} 
+				// for(var i=0;i<this.eqlistdata.length;i++){
+				// 	var days = (newtime-this.eqlistdata[i].uptime)/60/60/24
+				// 	this.eqlistdata[i].days = Math.round(days)
+				// } 
 				console.log(this.eqlistdata)
 				if (this.eqlistdata.length == 0) {
 					this.eqlistdatatf = true
@@ -119,117 +130,227 @@
 					url: "./modification?data=" + JSON.stringify(item) + "&id=" + (this.indexs)
 				})
 			},
-			historys(item) {
+			historys(itemOld) {
+				let item = JSON.parse(JSON.stringify(itemOld))
+				console.log("item", item);
 				switch (this.type_id) {
+					// 水肥新设备
+					case 22:
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
+						uni.navigateTo({
+							url: "../waterandfernew/details?shebei=" + JSON.stringify(obj),
+						});
+						break
+						// 病虫害可视监测
+					case 14:
+						item.addtime = item.uptime;
+						uni.navigateTo({
+							url: "../cb/sy/detail?detail=" + JSON.stringify(item),
+						});
+						break
 					case 2:
+						item.addtime = item.uptime;
 						uni.navigateTo({
-							url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item)
-						})
+							url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item),
+						});
 						break;
 					case 5:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.equip_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
+						console.log(item);
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.equip_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
 						uni.navigateTo({
-							url: "../environment/equipment?shebei=" + JSON.stringify(obj)
-						})
+							url: "../environment/equipment?shebei=" + JSON.stringify(obj),
+						});
 						break;
 					case 6:
 						uni.navigateTo({
-							url: "/pages/webview?device_id=" + item.imei + "&accessToken=" + this.accessToken
-						})
+							url: "/pages/webview?device_id=" +
+								item.imei +
+								"&accessToken=" +
+								this.accessToken,
+						});
 						break;
 					case 3:
-						item.type = this.type_id
+						item.addtime = item.uptime;
+						item.type = this.type_id;
 						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
+							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+						});
 						break;
 					case 4:
-						item.type = this.type_id
+						item.addtime = item.uptime;
+						item.type = this.type_id;
 						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
+							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+						});
 						break;
 					case 7:
-						item.type = this.type_id
+						item.addtime = item.uptime;
+						item.type = this.type_id;
 						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
+							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+						});
 						break;
 					case 8:
-					  // item.type = this.type_id;
-					  uni.navigateTo({
-					    url: "../cb/thxydetail/thxydetail?imei=" + item.imei
-					  });
-					  break;
+						// item.type = this.type_id;
+						uni.navigateTo({
+							url: "../cb/thxydetail/thxydetail?imei=" + item.imei
+						});
+						break;
+					case 24:
+						// item.type = this.type_id;
+						uni.navigateTo({
+							url: "../cb/zjxydetail/thxydetail?imei=" + item.imei
+						});
+						break;
 					case 12:
-					  console.log(item);
-					  uni.navigateTo({
-					    url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
-					  });
-					  break;
+						console.log(item);
+						item.addtime = item.uptime;
+						uni.navigateTo({
+							url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
+						});
+						break;
 					case 13:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.device_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
+						console.log(item);
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
 						uni.navigateTo({
-							url: "../waterandfer/datails?shebei=" + JSON.stringify(obj)
-						})
+							url: "../waterandfer/datails?shebei=" + JSON.stringify(obj),
+						});
 						break;
 					case 15:
-						console.log(item)
-						var obj = {}
-						obj.d_id = item.d_id
-						obj.device_id = item.imei
-						obj.is_online = item.is_online
-						obj.lat = item.lat
-						obj.lng = item.lng
-						obj.equip_name = item.device_name
-						obj.uptime = item.addtime
+						console.log(item);
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
 						uni.navigateTo({
-							url: "../environment/gsequipment?shebei=" + JSON.stringify(obj)
-						})
+							url: "../environment/gsequipment?shebei=" + JSON.stringify(obj),
+						});
 						break;
 					case 17:
 						break;
 					case 18:
+						var obj = {};
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						uni.navigateTo({
+							url: "../cb/shuifeiL/shuifeiL?detail=" + JSON.stringify(obj),
+						});
+						break;
+					case 11:
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
+						obj.location = item.address;
+						obj.type = 11;
+						uni.navigateTo({
+							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+						});
+						break;
+					case 19:
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
+						obj.location = item.address;
+						obj.type = 19;
+						uni.navigateTo({
+							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+						});
+						break;
+					case 20:
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
+						obj.location = item.address;
+						obj.type = 20;
+						uni.navigateTo({
+							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+						});
+						break;
+					case 21:
+						var obj = {};
+						obj.d_id = item.d_id;
+						obj.device_id = item.imei;
+						obj.is_online = item.is_online;
+						obj.lat = item.lat;
+						obj.lng = item.lng;
+						obj.equip_name = item.device_name;
+						obj.uptime = item.uptime;
+						obj.location = item.address;
+						obj.type = 20;
+						uni.navigateTo({
+							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+						});
+						break;
+					case 25:
+						item.addtime = item.uptime;
+						uni.navigateTo({
+							url: "../cb/xylps/detail?detail=" + JSON.stringify(item),
+						});
 						break;
 					default:
-						item.type = this.type_id
+						item.addtime = item.uptime;
+						item.type = this.type_id;
 						uni.navigateTo({
-							url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item)
-						})
+							url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item),
+						});
 						break;
 				}
-			}
+			},
 		},
 		onLoad(option) {
 			this.indexs = option.id
 			console.log(this.indexs)
 			uni.getStorage({
-				key:"jurisdiction",
-				success:(res)=>{
+				key: "jurisdiction",
+				success: (res) => {
 					console.log(JSON.parse(res.data))
-					let items = JSON.parse(res.data).filter((item)=>{
+					let items = JSON.parse(res.data).filter((item) => {
 						return item.purview_name == "设备管理"
 					})
-					let items2 = items[0].children.filter((item)=>{
+					let items2 = items[0].children.filter((item) => {
 						return item.purview_name == "分配设备"
 					})
-					this.infoalter = items2[0].children.some((item)=>{
+					this.infoalter = items2[0].children.some((item) => {
 						return item.purview_name == "修改名称" || item.purview_name == "添加位置"
 					})
 				},
@@ -383,4 +504,4 @@
 			text-align: center;
 		}
 	}
-</style>
+</style>

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -47906,8 +47906,8 @@ exports.myRequest = void 0;
 // const BASE_URL='http://8.136.98.49:8002'
 // let BASE_URL = 'http://192.168.0.36:8003'
 // let BASE_URL = 'https://wx.hnyfwlw.com'
-// let BASE_URL = 'https://wx.hnyfwlw.com'
-var BASE_URL = 'http://192.168.0.117:8003';
+var BASE_URL = 'https://wx.hnyfwlw.com';
+// let BASE_URL = 'http://192.168.0.117:8003'
 var myRequest = function myRequest(options) {
   // BASE_URL=uni.getStorageSync('http')
   // if(BASE_URL==''){

unpackage/dist/dev/mp-weixin/pages/cb/thxydetail/thxydetail.js

@@ -137,7 +137,7 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var f0 = _vm._f("timeFormat")(_vm.equipInfo.addtime || _vm.equipInfo.uptime)
+  var f0 = _vm._f("timeFormat")(_vm.equipInfo.uptime || _vm.equipInfo.uptime)
   var m0 = _vm.$QueryPermission(200)
   var m1 = _vm.$QueryPermission(248)
   var m2 = _vm.$QueryPermission(247)

unpackage/dist/dev/mp-weixin/pages/equipList/index.js

@@ -130,8 +130,8 @@ var render = function () {
     ![13, 17, 18, 11, 19, 20, 14, 25].includes(_vm.type_id)
   var l0 = _vm.__map(_vm.eqlistdata, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var f0 = _vm._f("timeFormat")(item.addtime)
-    var f1 = _vm._f("timeFormat")(item.uptime)
+    var f0 = _vm._f("timeFormat")(item.uptime)
+    var f1 = _vm._f("timeFormat")(item.addtime)
     return {
       $orig: $orig,
       f0: f0,
@@ -260,6 +260,10 @@ var _anitthro = __webpack_require__(/*! ../../util/anitthro.js */ 257);
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -287,7 +291,7 @@ var _default = {
     eqlist: function eqlist(tf) {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res, newtime, i, days;
+        var res, newtime;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -309,15 +313,23 @@ var _default = {
                 res = _context.sent;
                 _this.loadingtf = false;
                 newtime = +new Date() / 1000;
+                res.data.forEach(function (item) {
+                  var uptime = item.uptime,
+                    addtime = item.addtime;
+                  item.uptime = addtime;
+                  item.addtime = uptime;
+                  var days = (newtime - item.addtime) / 60 / 60 / 24;
+                  item.days = Math.round(days);
+                });
                 if (tf) {
                   _this.eqlistdata = _this.eqlistdata.concat(res.data);
                 } else {
                   _this.eqlistdata = res.data;
                 }
-                for (i = 0; i < _this.eqlistdata.length; i++) {
-                  days = (newtime - _this.eqlistdata[i].uptime) / 60 / 60 / 24;
-                  _this.eqlistdata[i].days = Math.round(days);
-                }
+                // for (var i = 0; i < this.eqlistdata.length; i++) {
+                //   var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24
+                //   this.eqlistdata[i].days = Math.round(days)
+                // }
                 console.log(res);
               case 9:
               case "end":
@@ -483,7 +495,9 @@ var _default = {
         duration: 500
       });
     },
-    historys: function historys(item) {
+    historys: function historys(itemOld) {
+      var item = JSON.parse(JSON.stringify(itemOld));
+      console.log("item", item);
       switch (this.type_id) {
         // 水肥新设备
         case 22:
@@ -494,18 +508,20 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../waterandfernew/details?shebei=" + JSON.stringify(obj)
           });
           break;
         // 病虫害可视监测
         case 14:
+          item.addtime = item.uptime;
           uni.navigateTo({
             url: "../cb/sy/detail?detail=" + JSON.stringify(item)
           });
           break;
         case 2:
+          item.addtime = item.uptime;
           uni.navigateTo({
             url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item)
           });
@@ -519,7 +535,7 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../environment/equipment?shebei=" + JSON.stringify(obj)
           });
@@ -530,18 +546,21 @@ var _default = {
           });
           break;
         case 3:
+          item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
           });
           break;
         case 4:
+          item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
           });
           break;
         case 7:
+          item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
@@ -561,6 +580,7 @@ var _default = {
           break;
         case 12:
           console.log(item);
+          item.addtime = item.uptime;
           uni.navigateTo({
             url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item)
           });
@@ -574,7 +594,7 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../waterandfer/datails?shebei=" + JSON.stringify(obj)
           });
@@ -588,11 +608,21 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           uni.navigateTo({
             url: "../environment/gsequipment?shebei=" + JSON.stringify(obj)
           });
           break;
+        case 17:
+          break;
+        case 18:
+          var obj = {};
+          obj.device_id = item.imei;
+          obj.is_online = item.is_online;
+          uni.navigateTo({
+            url: "../cb/shuifeiL/shuifeiL?detail=" + JSON.stringify(obj)
+          });
+          break;
         case 11:
           var obj = {};
           obj.d_id = item.d_id;
@@ -601,7 +631,7 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 11;
           uni.navigateTo({
@@ -616,7 +646,7 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 19;
           uni.navigateTo({
@@ -631,7 +661,7 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 20;
           uni.navigateTo({
@@ -646,29 +676,21 @@ var _default = {
           obj.lat = item.lat;
           obj.lng = item.lng;
           obj.equip_name = item.device_name;
-          obj.uptime = item.addtime;
+          obj.uptime = item.uptime;
           obj.location = item.address;
           obj.type = 20;
           uni.navigateTo({
             url: "../disease/cmb?shebei=" + JSON.stringify(obj)
           });
           break;
-        case 17:
-          break;
-        case 18:
-          var obj = {};
-          obj.device_id = item.imei;
-          obj.is_online = item.is_online;
-          uni.navigateTo({
-            url: "../cb/shuifeiL/shuifeiL?detail=" + JSON.stringify(obj)
-          });
-          break;
         case 25:
+          item.addtime = item.uptime;
           uni.navigateTo({
-            url: "../cb/xylps/detail/detail?detail=" + JSON.stringify(item)
+            url: "../cb/xylps/detail?detail=" + JSON.stringify(item)
           });
           break;
         default:
+          item.addtime = item.uptime;
           item.type = this.type_id;
           uni.navigateTo({
             url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item)

util/api.js

@@ -2,8 +2,8 @@
 // const BASE_URL='http://8.136.98.49:8002'
 // let BASE_URL = 'http://192.168.0.36:8003'
 // let BASE_URL = 'https://wx.hnyfwlw.com'
-// let BASE_URL = 'https://wx.hnyfwlw.com'
-let BASE_URL = 'http://192.168.0.117:8003'
+let BASE_URL = 'https://wx.hnyfwlw.com'
+// let BASE_URL = 'http://192.168.0.117:8003'
 export const myRequest=(options)=>{
 	// BASE_URL=uni.getStorageSync('http')
 	// if(BASE_URL==''){