水肥详情

.hbuilderx/launch.json

@@ -1,24 +1,26 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
-    "configurations": [{
-     	"app-plus" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"default" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"h5" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"mp-weixin" : 
-     	{
-     		"launchtype" : "local"
-     	},
-     	"type" : "uniCloud"
-     }
+{
+    // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+    // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version" : "0.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "mp-weixin" : {
+                "launchtype" : "local"
+            },
+            "type" : "uniCloud"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-android"
+        }
     ]
 }

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.7.5",
-    "versionCode" : 175,
+    "versionName" : "1.7.7",
+    "versionCode" : 177,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/cb/index/index.vue

@@ -102,6 +102,7 @@
 						type: 4, //3虫情测报灯 7孢子仪 4智能性诱
 						list: [],
 						pageIndex: 1,
+						device_model: 1,
 						tf: false,
 					},
 					{
@@ -252,6 +253,7 @@
 						page_size: 10,
 						device_status: this.device_status,
 						device_id: this.imports,
+						device_model: this.equipArr[act].device_model ? this.equipArr[act].device_model:0
 					}
 				})
 				this.loadingtf = false

pages/environment/equipment.vue

@@ -138,7 +138,7 @@
 						if (res.conf[key].indexOf("#") != -1) {
 							// let lable = res.conf[key].replace("#", "(") + ")"
 							console.log(res.conf[key])
-							if(res.dat[key].split('#')[0] == -99.99) return
+							// if(res.dat[key].split('#')[0] == -99.99) return
 							this.olddata.push({
 								lable:res.conf[key].replace("#", "(") + ")",
 								value:res.dat[key].split('#')

pages/equipList/index.vue

@@ -90,6 +90,7 @@ export default {
       size: 10,
       eqlistdata: [],
       isTop: false,
+	  device_model: 0,
       infoalter: false, // 权限设置,
       type_id: 0, //设备类型,
       imgpath: [],
@@ -109,6 +110,7 @@ export default {
           page: this.page,
           page_size: this.size,
           device_id: this.imports,
+		  device_model: this.device_model
         },
       });
       this.loadingtf = false;
@@ -180,6 +182,7 @@ export default {
         var obj = {
           name: res[i].type_name,
           id: res[i].id,
+		  device_model: res[i].device_model
         };
         this.list.push(obj);
       }
@@ -202,6 +205,7 @@ export default {
       this.page = 1;
       this.eqlistdata = [];
       this.type_id = this.list[index].id;
+	  this.device_model = this.list[index].device_model;
       console.log(this.type_id);
       if (this.list[index].id == 10) {
         this.xyeqlist();

pages/waterandfernew/details.vue

@@ -91,8 +91,8 @@
 						</view>
 					</view> -->
 					<!-- 桶 -->
-					<view class="colList">
-						<view class="preClo" v-for="item, index in pickBtnList"  :key="`fei${index}`">
+					<view class="colList" v-if="pickBtnList.length > 0">
+						<view class="preClo" v-for="(item, index) in pickBtnList"  :key="`fei${index}`">
 							<view>
 								肥料{{ index + 1}}
 							</view>
@@ -104,9 +104,8 @@
 								v-else-if="pickBtnList.length > 1 && index == pickBtnList.length - 1"></image>
 							<image src="../../static/images/waterandfernew/colCenter.png" v-else></image>
 							<view class="jiaoBtn" v-if="resultBan.length > 0">
-								<u-switch v-model="resultBan[index]['off']"
-									active-color="#14A478" inactive-color="#AEB4C2"
-									:loading="resultBan[index]['disabled']"
+								<u-switch v-model="resultBan[index]['off']" active-color="#14A478"
+									inactive-color="#AEB4C2" :loading="resultBan[index]['disabled']"
 									@change="switchchange($event, resultBan[index]['number'], resultBan[index], index)"></u-switch>
 							</view>
 							<view class="shanBox" v-if="resultBan.length > 0">
@@ -156,7 +155,7 @@
 						</view>
 					</view> -->
 					<!-- 水管控制阀 -->
-					<view class="benList">
+					<view class="benList" v-if="faList.length > 0">
 						<!-- <view class="preBen" v-for="item, index in buttonList" v-if="(index + 1) % 2 == 1"
 							@click="switchchange(!item.off, item.number, item, index, true)">
 							<image class="daoguan" src="../../static/images/waterandfernew/bottomNew.png"
@@ -523,9 +522,9 @@
 				let faList = []; // 管道阀开关
 				this.facilityvalve.forEach(item => {
 					res.forEach((pick, index) => {
-						if(pick.e_key == item.type) {
-							let pickObj = Object.assign(item, pick);
+						if(pick.e_key == item.type ) {
 							// 获取当前灌溉泵位置
+							let pickObj = Object.assign(pick,item);
 							if(pick.e_type == 2) {
 								this.mainBengIndex = pickList.length;
 								this.mainBeng = pickObj.off;

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/ecee5ed0-ece7-11ee-8362-690eeac6828d
+https://app.liuyingyong.cn/build/download/40e2c5f0-eff9-11ee-a397-85d619c5acc6

util/neutral.js

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