优化解决一些问题

pages/cb/xy2.0/particulars.vue

@@ -166,8 +166,8 @@
 					month = month<10?"0"+month:month
 					var date = times.getDate()<10?"0"+times.getDate():times.getDate()
 					this.yxchangetime = times.getFullYear() + "-" + month + "-" + date
-				}
-				this.Chistory(this.equipInfo.device_id)
+        }
+				// this.Chistory(this.equipInfo.device_id)
 			},
 			async getSim(d_id) {
 				const res = await this.$myRequest({
@@ -270,8 +270,6 @@
 						status: "pest"
 					}
 				})
-				console.log(res)
-				console.log(this.newState.decoy)
 				if(res.data[0]){
 					//***********************************************************
 					// if(this.newState.decoy=="草地贪夜蛾"){
@@ -283,10 +281,15 @@
 			}
 		},
 		onLoad(option) {
-			this.equipInfo = JSON.parse(option.info)
+      this.equipInfo = JSON.parse(option.info)
+      if (!this.equipInfo.device_id) {
+        this.equipInfo.device_id = this.equipInfo.imei
+      }
 			console.log(this.equipInfo)
-			this.getState(this.equipInfo.d_id)
-			this.getSim(this.equipInfo.d_id)
+      this.getState(this.equipInfo.d_id)
+      if (this.equipInfo.type != 21) {
+        this.getSim(this.equipInfo.d_id)
+      }
 			var times = new Date()
 			this.date = times.getFullYear()+1 + "-" + Number(times.getMonth()+1) + "-" + times.getDate()
 			console.log(this.date)

pages/disease/cmb.vue

@@ -305,7 +305,8 @@
 					var time = [];
 					var xtitle = [];
 					for (var i = 0; i < dat.length; i++) {
-						var item = eval("(" + dat[i] + ")");
+            var item = eval("(" + dat[i] + ")");
+            console.log(item)
 						var tim = parseInt(item["uploadTime"]) * 1000;
 						var times = new Date(tim);
 						xtitle.unshift(

pages/equipList/index.vue

@@ -370,6 +370,21 @@ export default {
             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.addtime;
+          obj.location = item.address;
+          obj.type = 20;
+          uni.navigateTo({
+            url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+          });
+          break;
         default:
           item.type = this.type_id;
           uni.navigateTo({
@@ -509,6 +524,7 @@ page {
     background-color: #fff;
     padding: 20rpx;
     width: 140rpx;
+    overflow: auto;
 
     .listbox_left_item {
       height: 50rpx;

pages/waterandfer/waterhis.vue

@@ -24,8 +24,8 @@
 					<view class="">
 						操作内容
 					</view>
-					<view class="" :style="{'color':item.txt.slice(0,2)=='开启'?'#3EB984 ':'#f64a4a'}">
-						{{item.txt}}
+					<view class="">
+						{{item.relayState}}
 					</view>
 				</view>
 				<view class="item">
@@ -33,7 +33,7 @@
 						操作时间
 					</view>
 					<view class="">
-						{{item.uptime|timeFormat()}}
+						{{item.uptime}}
 					</view>
 				</view>
 				<view class="item">
@@ -98,18 +98,19 @@
 						end: Math.floor(this.newtime),
 						page: this.page,
 					}
-				})
-				console.log(res.dat)
-					for(var i=0;i<res.dat.length;i++){
-						var name = res.dat[i].relayName.split("/")[Number(res.dat[i].relayNum)]
-						var state = res.dat[i].relayState == 1?"开启":"关闭"
-						var obj = {
-							txt:state + name,
-							uptime:res.dat[i].uptime,
-							user:res.dat[i].user
-						}
-						this.hisdatalist.push(obj)
-					}
+        })
+        this.hisdatalist = res.dat;
+				// console.log(res.dat)
+				// 	for(var i=0;i<res.dat.length;i++){
+				// 		var name = res.dat[i].relayName.split("/")[Number(res.dat[i].relayNum)]
+				// 		var state = res.dat[i].relayState == 1?"开启":"关闭"
+				// 		var obj = {
+				// 			txt:state + name,
+				// 			uptime:res.dat[i].uptime,
+				// 			user:res.dat[i].user
+				// 		}
+				// 		this.hisdatalist.push(obj)
+				// 	}
 			}
 		}
 	}

util/api.js

@@ -5,7 +5,7 @@ export const myRequest = (options) => {
 	console.log(BASE_URL,'my request',process.env.NODE_ENV)
 	if (BASE_URL == '') {
 		// BASE_URL = 'http://114.55.0.7:8002'//测试
-		BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.0.214:8003" : "http://8.136.98.49:8002"
+		BASE_URL = process.env.NODE_ENV === 'development' ? "http://114.55.0.7:8002" : "http://8.136.98.49:8002"
 		// BASE_URL = 'http://192.168.1.77:8002'
 	}
 	// BASE_URL = 'http://192.168.1.52:8003'