添加水稻稻瘟病

pages/disease/cmb.vue

@@ -77,7 +77,8 @@
 									{{ item }}
 								</view>
 							</view>
-							<view class="tr" style="width:6000rpx" v-for="(items, indexs) in historylistdata" :key="'b' + indexs">
+							<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>
@@ -266,8 +267,8 @@
 					},
 				});
 				this.pagesum = Math.ceil(res.nums / 10) || 1;
-        if (this.pagesum > 0) {
-          this.forbidden = false;
+				if (this.pagesum > 0) {
+					this.forbidden = false;
 					var dat = res.sta;
 					this.historylistdata = [];
 					for (var i = 0; i < dat.length; i++) {
@@ -284,8 +285,8 @@
 						}
 						this.historylistdata.push(obj);
 					}
-        } else {
-          this.forbidden = true;
+				} else {
+					this.forbidden = true;
 					this.historylistdata = [];
 				}
 			},
@@ -514,7 +515,10 @@
 			} else if (this.basetype == 21) {
 				this.kongtf = this.$QueryPermission(280)
 				this.datatf = this.$QueryPermission(279)
-      }
+			} else if (this.basetype == 26) {
+				this.kongtf = this.$QueryPermission(344)
+				this.datatf = this.$QueryPermission(343)
+			}
 		},
 	};
 </script>
@@ -718,4 +722,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/equipList/index.vue

@@ -415,6 +415,21 @@
 							url: "../disease/cmb?shebei=" + JSON.stringify(obj),
 						});
 						break;
+						case 26:
+							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 = 26;
+							uni.navigateTo({
+								url: "../disease/cmb?shebei=" + JSON.stringify(obj),
+							});
+							break;
 					case 25:
 						item.addtime = item.uptime;
 						uni.navigateTo({

pages/prevention/sim.vue

@@ -22,7 +22,7 @@
 						<p  v-if="myuser_type == 1">厂商名称：{{siminfo['data'].company}}</p>
 						<p class="infoDeclear">
 							<span>已使用：<span :class="[siminfo['data'].used/siminfo['data'].total < 1 ?'green':'red']">{{siminfo['data'].used.toFixed(2)}}M</span>/{{siminfo['data'].total}}M</span>
-							<span>剩余：<span :class="[siminfo['data'].used/siminfo['data'].total < 1 ?'green':'red']">{{siminfo['data'].total - siminfo['data'].used.toFixed(2)}}M</span></span>
+							<span>剩余：<span :class="[siminfo['data'].used/siminfo['data'].total < 1 ?'green':'red']">{{(siminfo['data'].total - siminfo['data'].used).toFixed(2)}}M</span></span>
 						</p>
 						<u-line-progress :percent="(siminfo['data'].used/siminfo['data'].total) * 100" height="12" :show-percent="false" :active-color="(siminfo['data'].used/siminfo['data'].total) < 1 ? '#14A478' : '#f56c6c'"></u-line-progress>
 					</view>
@@ -53,7 +53,7 @@
 							<p v-if="myuser_type == 1">厂商名称：{{siminfo['photo'].company}}</p>
 							<p class="infoDeclear">
 								<span>已使用：<span :class="[siminfo['photo'].used/siminfo['photo'].total < 1 ?'green':'red']">{{siminfo['photo'].used.toFixed(2)}}M</span>/{{siminfo['photo'].total}}M</span>
-								<span>剩余：<span :class="[siminfo['photo'].used/siminfo['photo'].total < 1 ?'green':'red']">{{siminfo['photo'].total - siminfo['photo'].used.toFixed(2)}}M</span></span>
+								<span>剩余：<span :class="[siminfo['photo'].used/siminfo['photo'].total < 1 ?'green':'red']">{{(siminfo['photo'].total - siminfo['photo'].used).toFixed(2)}}M</span></span>
 							</p>
 							<u-line-progress :percent="(siminfo['photo'].used/siminfo['photo'].total) * 100" height="12" :show-percent="false" :active-color="(siminfo['photo'].used/siminfo['photo'].total) < 1 ? '#14A478' : '#f56c6c'"></u-line-progress>
 						</view>

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

@@ -329,6 +329,7 @@ var _uCharts = _interopRequireDefault(__webpack_require__(/*! ../../components/j
 //
 //
 //
+//
 
 var canvaColumnA = null;
 var canvaColumnB = null;
@@ -736,6 +737,9 @@ var _default = {
     } else if (this.basetype == 21) {
       this.kongtf = this.$QueryPermission(280);
       this.datatf = this.$QueryPermission(279);
+    } else if (this.basetype == 26) {
+      this.kongtf = this.$QueryPermission(344);
+      this.datatf = this.$QueryPermission(343);
     }
   }
 };

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

@@ -683,6 +683,21 @@ var _default = {
             url: "../disease/cmb?shebei=" + JSON.stringify(obj)
           });
           break;
+        case 26:
+          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 = 26;
+          uni.navigateTo({
+            url: "../disease/cmb?shebei=" + JSON.stringify(obj)
+          });
+          break;
         case 25:
           item.addtime = item.uptime;
           uni.navigateTo({

unpackage/dist/dev/mp-weixin/pages/prevention/sim.js

@@ -81,7 +81,7 @@ var render = function () {
       : null
   var g1 =
     _vm.iccidObj.data_iccid && !_vm.isDataFault
-      ? _vm.siminfo["data"].used.toFixed(2)
+      ? (_vm.siminfo["data"].total - _vm.siminfo["data"].used).toFixed(2)
       : null
   var g2 =
     _vm.iccidObj.photo_iccid && !_vm.isPhotoFault
@@ -89,7 +89,7 @@ var render = function () {
       : null
   var g3 =
     _vm.iccidObj.photo_iccid && !_vm.isPhotoFault
-      ? _vm.siminfo["photo"].used.toFixed(2)
+      ? (_vm.siminfo["photo"].total - _vm.siminfo["photo"].used).toFixed(2)
       : null
   _vm.$mp.data = Object.assign(
     {},