解决一些问题

pages/disease/cmb.vue

@@ -15,9 +15,8 @@
 					</p>
 					<p>设备名称：{{ eqinfo.device_name || "无" }}</p>
 					<p>
-						最近上报时间：<span v-if="eqinfo.uptime">{{
-              eqinfo.uptime | timeFormat()
-            }}</span><span v-else>{{ eqinfo.addtime | timeFormat() }}</span>
+						最近上报时间：<span v-if="eqinfo.uptime">{{ eqinfo.uptime == 0 ? '无' : eqinfo.uptime | timeFormat()
+            }}</span><span v-else>{{eqinfo.uptime == 0 ? '无' : eqinfo.uptime | timeFormat() }}</span>
 					</p>
 					<p>地址：{{ eqinfo.location || "暂无地址" }}</p>
 				</view>
@@ -72,39 +71,38 @@
 				</view>
 				<view class="condition">
 					<scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
-						<table class="table">
-							<tr class="tr">
-								<th class="th" v-for="(item, index) in tableHead" :key="'a' + index">
+						<view class="table">
+							<view class="tr" style="width:6000rpx">
+								<view class="th" v-for="(item, index) in tableHead" :key="'a' + index">
 									{{ item }}
-								</th>
-							</tr>
-							<tr class="tr" v-for="(items, indexs) in historylistdata" :key="'b' + indexs"
-								v-if="!forbidden">
-								<td class="td">{{ items.uploadTime | timeFormat() }}</td>
-								<td class="td">{{ items.dianChiDianYa }}</td>
-								<td class="td">{{ items.fiftyTuRangHanShuiLiang }}</td>
-								<td class="td">{{ items.fiftyTuRangWenDu }}</td>
-								<td class="td">{{ items.fiveTuRangHanShuiLiang }}</td>
-								<td class="td">{{ items.fiveTuRangWenDu }}</td>
-								<td class="td">{{ items.kongQiWenDu }}</td>
-								<td class="td">{{ items.luDianWenDu }}</td>
-								<td class="td">{{ items.riZhaoShiShu }}</td>
-								<td class="td">{{ items.shiRunShiJian }}</td>
-								<td class="td">{{ items.tenTuRangHanShuiLiang }}</td>
-								<td class="td">{{ items.tenTuRangWenDu }}</td>
-								<td class="td">{{ items.tianJiangYuLiang }}</td>
-								<td class="td">{{ items.tuRangDaoDianLv }}</td>
-								<td class="td">{{ items.twentyFiveTuRangHanShuiLiang }}</td>
-								<td class="td">{{ items.twentyFiveTuRangWenDu }}</td>
-								<td class="td">{{ items.twentyTuRangHanShuiLiang }}</td>
-								<td class="td">{{ items.twentyTuRangWenDu }}</td>
-								<td class="td">{{ items.xiangDuiShiDu }}</td>
-								<td class="td">{{ items.xiaoShiJiangYuLiang }}</td>
-							</tr>
-							<tr class="tr" v-if="forbidden">
-								<td class="td" v-for="item in 13">暂无数据</td>
-							</tr>
-						</table>
+								</view>
+							</view>
+							<view class="tr" style="width:6000rpx" v-for="(items, indexs) in historylistdata" :key="'b' + indexs">
+								<view class="td">{{ items.uploadTime | timeFormat() }}</view>
+								<view class="td">{{ items.dianChiDianYa }}</view>
+								<view class="td">{{ items.fiftyTuRangHanShuiLiang }}</view>
+								<view class="td">{{ items.fiftyTuRangWenDu }}</view>
+								<view class="td">{{ items.fiveTuRangHanShuiLiang }}</view>
+								<view class="td">{{ items.fiveTuRangWenDu }}</view>
+								<view class="td">{{ items.kongQiWenDu }}</view>
+								<view class="td">{{ items.luDianWenDu }}</view>
+								<view class="td">{{ items.riZhaoShiShu }}</view>
+								<view class="td">{{ items.shiRunShiJian }}</view>
+								<view class="td">{{ items.tenTuRangHanShuiLiang }}</view>
+								<view class="td">{{ items.tenTuRangWenDu }}</view>
+								<view class="td">{{ items.tianJiangYuLiang }}</view>
+								<view class="td">{{ items.tuRangDaoDianLv }}</view>
+								<view class="td">{{ items.twentyFiveTuRangHanShuiLiang }}</view>
+								<view class="td">{{ items.twentyFiveTuRangWenDu }}</view>
+								<view class="td">{{ items.twentyTuRangHanShuiLiang }}</view>
+								<view class="td">{{ items.twentyTuRangWenDu }}</view>
+								<view class="td">{{ items.xiangDuiShiDu }}</view>
+								<view class="td">{{ items.xiaoShiJiangYuLiang }}</view>
+							</view>
+							<view class="tr" v-if="historylistdata.length == 0">
+								<view class="td" v-for="item in 13">暂无数据</view>
+							</view>
+						</view>
 					</scroll-view>
 					<view class="pagenumber">
 						<button @click="prev">上一页</button>
@@ -268,11 +266,14 @@
 					},
 				});
 				this.pagesum = Math.ceil(res.nums / 10) || 1;
-				if (this.pagesum > 0) {
+        if (this.pagesum > 0) {
+          this.forbidden = false;
 					var dat = res.sta;
 					this.historylistdata = [];
 					for (var i = 0; i < dat.length; i++) {
-						var item = eval("(" + dat[i] + ")");
+						dat[i] = dat[i].replace(/'/g, '"')
+						// console.log(dat[i])
+						var item = JSON.parse(`${dat[i]}`);
 						var obj = {};
 						for (var i1 in item) {
 							// if (i1 == "uploadTime") {
@@ -283,7 +284,8 @@
 						}
 						this.historylistdata.push(obj);
 					}
-				} else {
+        } else {
+          this.forbidden = true;
 					this.historylistdata = [];
 				}
 			},
@@ -306,7 +308,9 @@
 					var time = [];
 					var xtitle = [];
 					for (var i = 0; i < dat.length; i++) {
-						var item = eval("(" + dat[i] + ")");
+						// console.log(dat[i])
+						dat[i] = dat[i].replace(/'/g, '"')
+						var item = JSON.parse(`${dat[i]}`);
 						var tim = parseInt(item["uploadTime"]) * 1000;
 						var times = new Date(tim);
 						xtitle.unshift(
@@ -490,8 +494,7 @@
 		},
 		onLoad(option) {
 			this.eqinfo = JSON.parse(option.shebei);
-			this.basetype = option.type
-			console.log(this.eqinfo);
+			this.basetype = this.eqinfo.type
 			this.cWidth = uni.upx2px(650);
 			this.cHeight = uni.upx2px(500);
 			this.device_id = option.id;

pages/equipList/index.vue

@@ -297,6 +297,66 @@
 							url: "../environment/gsequipment?shebei=" + 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.addtime;
+						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.addtime;
+						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.addtime;
+						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.addtime;
+						obj.location = item.address;
+						obj.type = 20;
+						uni.navigateTo({
+							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+						});
+						break;
 					case 17:
 						break;
 					case 18:
@@ -462,7 +522,7 @@
 			background-color: #fff;
 			padding: 20rpx;
 			width: 140rpx;
-			overflow-x: auto;
+			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)
+				// 	}
 			}
 		}
 	}

unpackage/dist/dev/mp-weixin/pages/disease/cmb.js

@@ -131,20 +131,25 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var f0 = _vm.eqinfo.uptime ? _vm._f("timeFormat")(_vm.eqinfo.uptime) : null
-  var f1 = !_vm.eqinfo.uptime ? _vm._f("timeFormat")(_vm.eqinfo.addtime) : null
+  var f0 = _vm.eqinfo.uptime
+    ? _vm._f("timeFormat")(_vm.eqinfo.uptime == 0 ? "无" : _vm.eqinfo.uptime)
+    : null
+  var f1 = !_vm.eqinfo.uptime
+    ? _vm._f("timeFormat")(_vm.eqinfo.uptime == 0 ? "无" : _vm.eqinfo.uptime)
+    : null
   var m0 = _vm.datatf ? _vm.timetab(_vm.begintime) : null
   var m1 = _vm.datatf ? _vm.timetab(_vm.end) : null
   var l0 = _vm.datatf
     ? _vm.__map(_vm.historylistdata, function (items, indexs) {
         var $orig = _vm.__get_orig(items)
-        var f2 = !_vm.forbidden ? _vm._f("timeFormat")(items.uploadTime) : null
+        var f2 = _vm._f("timeFormat")(items.uploadTime)
         return {
           $orig: $orig,
           f2: f2,
         }
       })
     : null
+  var g0 = _vm.datatf ? _vm.historylistdata.length : null
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       _vm.tiemshow = !_vm.tiemshow
@@ -159,6 +164,7 @@ var render = function () {
         m0: m0,
         m1: m1,
         l0: l0,
+        g0: g0,
       },
     }
   )
@@ -323,8 +329,6 @@ var _uCharts = _interopRequireDefault(__webpack_require__(/*! ../../components/j
 //
 //
 //
-//
-//
 
 var canvaColumnA = null;
 var canvaColumnB = null;
@@ -436,10 +440,13 @@ var _default = {
                 res = _context.sent;
                 _this.pagesum = Math.ceil(res.nums / 10) || 1;
                 if (_this.pagesum > 0) {
+                  _this.forbidden = false;
                   dat = res.sta;
                   _this.historylistdata = [];
                   for (i = 0; i < dat.length; i++) {
-                    item = eval("(" + dat[i] + ")");
+                    dat[i] = dat[i].replace(/'/g, '"');
+                    // console.log(dat[i])
+                    item = JSON.parse("".concat(dat[i]));
                     obj = {};
                     for (i1 in item) {
                       // if (i1 == "uploadTime") {
@@ -452,6 +459,7 @@ var _default = {
                     _this.historylistdata.push(obj);
                   }
                 } else {
+                  _this.forbidden = true;
                   _this.historylistdata = [];
                 }
               case 5:
@@ -486,7 +494,7 @@ var _default = {
                 _this2.dataloadingtf = false;
                 dat = res;
                 if (!dat.length) {
-                  _context2.next = 41;
+                  _context2.next = 42;
                   break;
                 }
                 regroupData = []; //重组数据
@@ -496,28 +504,30 @@ var _default = {
                 i = 0;
               case 11:
                 if (!(i < dat.length)) {
-                  _context2.next = 31;
+                  _context2.next = 32;
                   break;
                 }
-                item = eval("(" + dat[i] + ")");
+                // console.log(dat[i])
+                dat[i] = dat[i].replace(/'/g, '"');
+                item = JSON.parse("".concat(dat[i]));
                 tim = parseInt(item["uploadTime"]) * 1000;
                 times = new Date(tim);
                 xtitle.unshift(times.getMonth() + 1 + "/" + times.getDate() + "-" + times.getHours() + ":" + times.getMinutes());
                 time.unshift(tim);
                 _context2.t0 = _regenerator.default.keys(item);
-              case 18:
+              case 19:
                 if ((_context2.t1 = _context2.t0()).done) {
-                  _context2.next = 28;
+                  _context2.next = 29;
                   break;
                 }
                 j = _context2.t1.value;
                 arr = "";
                 if (!(j == "id" || j == "uploadTime")) {
-                  _context2.next = 25;
+                  _context2.next = 26;
                   break;
                 }
-                return _context2.abrupt("continue", 18);
-              case 25:
+                return _context2.abrupt("continue", 19);
+              case 26:
                 if (kindArr.indexOf(j) == "-1") {
                   kindArr.push(j);
                   regroupData.push({
@@ -534,14 +544,14 @@ var _default = {
                   arr = parseFloat(item[j]);
                   regroupData[kindArr.indexOf(j)].data.unshift(arr);
                 }
-              case 26:
-                _context2.next = 18;
+              case 27:
+                _context2.next = 19;
                 break;
-              case 28:
+              case 29:
                 i++;
                 _context2.next = 11;
                 break;
-              case 31:
+              case 32:
                 console.log(regroupData);
                 // 分割折线图
                 regroupDataNum = Math.ceil(regroupData.length / 2);
@@ -555,13 +565,13 @@ var _default = {
                 _this2.showColumn("canvasColumnA", xtitle, options1);
                 _this2.showColumn("canvasColumnB", xtitle, options2);
                 _this2.canvastishiTF = true;
-                _context2.next = 44;
+                _context2.next = 45;
                 break;
-              case 41:
+              case 42:
                 _this2.canvastishiTF = false;
                 _this2.showColumn("canvasColumnA", xtitle, []);
                 _this2.showColumn("canvasColumnB", xtitle, []);
-              case 44:
+              case 45:
               case "end":
                 return _context2.stop();
             }
@@ -706,8 +716,7 @@ var _default = {
   },
   onLoad: function onLoad(option) {
     this.eqinfo = JSON.parse(option.shebei);
-    this.basetype = option.type;
-    console.log(this.eqinfo);
+    this.basetype = this.eqinfo.type;
     this.cWidth = uni.upx2px(650);
     this.cHeight = uni.upx2px(500);
     this.device_id = option.id;

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

@@ -570,6 +570,66 @@ var _default = {
             url: "../environment/gsequipment?shebei=" + 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.addtime;
+          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.addtime;
+          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.addtime;
+          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.addtime;
+          obj.location = item.address;
+          obj.type = 20;
+          uni.navigateTo({
+            url: "../disease/cmb?shebei=" + JSON.stringify(obj)
+          });
+          break;
         case 17:
           break;
         case 18:

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

@@ -80,7 +80,7 @@ page {
   background-color: #fff;
   padding: 20rpx;
   width: 140rpx;
-  overflow-x: auto;
+  overflow: auto;
 }
 .listbox .listbox_left .listbox_left_item {
   height: 50rpx;

unpackage/dist/dev/mp-weixin/pages/waterandfer/waterhis.js

@@ -131,16 +131,6 @@ var render = function () {
   var m0 = _vm.timetab(_vm.oldtime)
   var m1 = _vm.timetab(_vm.newtime)
   var g0 = _vm.hisdatalist.length
-  var l0 = _vm.__map(_vm.hisdatalist, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var g1 = item.txt.slice(0, 2)
-    var f0 = _vm._f("timeFormat")(item.uptime)
-    return {
-      $orig: $orig,
-      g1: g1,
-      f0: f0,
-    }
-  })
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
       _vm.tiemshow = !_vm.tiemshow
@@ -153,7 +143,6 @@ var render = function () {
         m0: m0,
         m1: m1,
         g0: g0,
-        l0: l0,
       },
     }
   )
@@ -292,7 +281,7 @@ var _default = {
     sf_control: function sf_control() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res, i, name, state, obj;
+        var res;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -309,18 +298,19 @@ var _default = {
                 });
               case 2:
                 res = _context.sent;
-                console.log(res.dat);
-                for (i = 0; i < res.dat.length; i++) {
-                  name = res.dat[i].relayName.split("/")[Number(res.dat[i].relayNum)];
-                  state = res.dat[i].relayState == 1 ? "开启" : "关闭";
-                  obj = {
-                    txt: state + name,
-                    uptime: res.dat[i].uptime,
-                    user: res.dat[i].user
-                  };
-                  _this.hisdatalist.push(obj);
-                }
-              case 5:
+                _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)
+                // 	}
+              case 4:
               case "end":
                 return _context.stop();
             }