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

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.vue

@@ -9,7 +9,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
@@ -93,11 +93,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>
@@ -106,7 +106,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>
@@ -115,7 +115,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/index.vue

@@ -45,9 +45,9 @@
               <p>
                 适配用户：{{ item.real_name == "" ? "无" : item.real_name }}
               </p>
-              <p>最新上报时间：{{ (item.addtime) | timeFormat() }}</p>
-              <p v-if="item.uptime === 0">添加设备时间：- -</p>
-              <p v-else>添加设备时间：{{ item.uptime | timeFormat() }}</p>
+              <p>最新上报时间：{{ (item.uptime) | timeFormat() }}</p>
+              <p v-if="item.addtime === 0">添加设备时间：- -</p>
+              <p v-else>添加设备时间：{{ item.addtime | timeFormat() }}</p>
               <p>设备已运行：{{ item.days }}天</p>
             </view>
             <view class="list_item_btn" v-if="$QueryPermission(108) && ![13, 17, 18, 11, 19, 20, 14, 22, 25].includes(type_id)"
@@ -119,16 +119,23 @@ export default {
       } else {
         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);
+	  })
       if (tf) {
         this.eqlistdata = this.eqlistdata.concat(res.data);
       } else {
         this.eqlistdata = res.data;
       }
       console.log(this.eqlistdata);
-      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].addtime) / 60 / 60 / 24;
+      //   this.eqlistdata[i].days = Math.round(days);
+      // }
     },
     async xyeqlist(tf) {
       //设备列表
@@ -150,7 +157,7 @@ export default {
         this.eqlistdata = res.data;
       }
       for (var i = 0; i < this.eqlistdata.length; i++) {
-        var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24;
+        var days = (newtime - this.eqlistdata[i].addtime) / 60 / 60 / 24;
         this.eqlistdata[i].days = Math.round(days);
       }
       console.log(res);
@@ -230,8 +237,9 @@ export default {
         duration: 500,
       });
     },
-    historys(item) {
-      console.log("item", item);
+    historys(itemOld) {
+    	let item = JSON.parse(JSON.stringify(itemOld))
+    	console.log("item", item);
       switch (this.type_id) {
 		// 水肥新设备
 		case 22:
@@ -242,18 +250,20 @@ export 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),
@@ -268,7 +278,7 @@ export 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),
           });
@@ -283,18 +293,21 @@ export 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),
@@ -314,6 +327,7 @@ export default {
 		    break;
         case 12:
           console.log(item);
+		  item.addtime = item.uptime;
           uni.navigateTo({
             url: "../cb/xctdetail/xctdetail?info=" + JSON.stringify(item),
           });
@@ -327,7 +341,7 @@ export 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),
           });
@@ -341,7 +355,7 @@ export 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),
           });
@@ -364,7 +378,7 @@ export 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({
@@ -379,7 +393,7 @@ export 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({
@@ -394,7 +408,7 @@ export 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({
@@ -409,7 +423,7 @@ export 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({
@@ -417,11 +431,13 @@ export default {
           });
           break;
 		  case 25:
+			item.addtime = item.uptime;
 		    uni.navigateTo({
 		      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),

pages/equipList/search.vue

@@ -20,8 +20,8 @@
 				<view class="list_item_text">
 					<p>设备ID：{{item.imei}}</p>
 					<p>适配用户：{{item.device_user==''?"无":item.device_user}}</p>
-					<p>添加设备时间：{{item.addtime|timeFormat()}}</p>
 					<p>添加设备时间：{{item.uptime|timeFormat()}}</p>
+					<p>添加设备时间：{{item.addtime|timeFormat()}}</p>
 					<p>设备已运行：{{item.days}}天</p>
 				</view>
 				<view class="list_item_btn" v-if="infoalter" @click.stop="modification(item)">
@@ -96,12 +96,22 @@
 						page_size: this.size,
 					}
 				})
-				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)
-				} 
+				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)
+				// 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)
+				// 	let { uptime, addtime } = this.eqlistdata[i];
+				// 	this.eqlistdata[i].uptime = addtime;
+				// 	this.eqlistdata[i].addtime = uptime;
+				// } 
 				console.log(this.eqlistdata)
 				if (this.eqlistdata.length == 0) {
 					this.eqlistdatatf = true
@@ -131,102 +141,206 @@
 					url: "./modification?data=" + JSON.stringify(item) + "&id=" + (this.indexs)
 				})
 			},
-			historys(item) {
-				switch (this.type_id) {
-					case 2:
-						uni.navigateTo({
-							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
-						uni.navigateTo({
-							url: "../environment/equipment?shebei=" + JSON.stringify(obj)
-						})
-						break;
-					case 6:
-						uni.navigateTo({
-							url: "/pages/webview?device_id=" + item.imei + "&accessToken=" + this.accessToken
-						})
-						break;
-					case 3:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
-						break;
-					case 4:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
-						})
-						break;
-					case 7:
-						item.type = this.type_id
-						uni.navigateTo({
-							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;
-					case 12:
-					  console.log(item);
-					  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
-						uni.navigateTo({
-							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
-						uni.navigateTo({
-							url: "../environment/gsequipment?shebei=" + JSON.stringify(obj)
-						})
-						break;
-					case 17:
-						break;
-					case 18:
-						break;
-					default:
-						item.type = this.type_id
-						uni.navigateTo({
-							url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item)
-						})
-						break;
-				}
-			}
+			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:
+			      uni.navigateTo({
+			        url: "../cb/sy/detail?detail=" + JSON.stringify(item),
+			      });
+			      break
+			    case 2:
+			      uni.navigateTo({
+			        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.uptime;
+			      uni.navigateTo({
+			        url: "../environment/equipment?shebei=" + JSON.stringify(obj),
+			      });
+			      break;
+			    case 6:
+			      uni.navigateTo({
+			        url:
+			          "/pages/webview?device_id=" +
+			          item.imei +
+			          "&accessToken=" +
+			          this.accessToken,
+			      });
+			      break;
+			    case 3:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 4:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item),
+			      });
+			      break;
+			    case 7:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        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;
+				  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;
+			    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.uptime;
+			      uni.navigateTo({
+			        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.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;
+			      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:
+				    uni.navigateTo({
+				      url:  "../cb/xylps/detail?detail=" + JSON.stringify(item),
+				    });
+				    break;
+			    default:
+			      item.type = this.type_id;
+			      uni.navigateTo({
+			        url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item),
+			      });
+			      break;
+			  }
+			},
 		},
 		onLoad(option) {
 			this.indexs = option.id