添加水稻稻瘟病

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.9.9",
-    "versionCode" : 199,
+    "versionName" : "1.10.0",
+    "versionCode" : 1100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/disease/cmb.vue

@@ -305,8 +305,8 @@
 					var time = [];
 					var xtitle = [];
 					for (var i = 0; i < dat.length; i++) {
-            var item = eval("(" + dat[i] + ")");
-            console.log(item)
+						var item = eval("(" + dat[i] + ")");
+						console.log(item)
 						var tim = parseInt(item["uploadTime"]) * 1000;
 						var times = new Date(tim);
 						xtitle.unshift(
@@ -507,10 +507,14 @@
 			} else if (this.basetype == 20) {
 				this.kongtf = this.$QueryPermission(253)
 				this.datatf = this.$QueryPermission(223)
-      } else if (this.basetype == 21) {
+			} 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>
@@ -714,4 +718,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/equipList/index.vue

@@ -425,11 +425,26 @@ export default {
           obj.equip_name = item.device_name;
           obj.uptime = item.uptime;
           obj.location = item.address;
-          obj.type = 20;
+          obj.type = 21;
           uni.navigateTo({
             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({

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	// isneutral:true//云飞智控
-	isneutral:false//智控
+	isneutral:true//云飞智控
+	// isneutral:false//智控
 }