首页添加水肥设备的列表入口

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.7.8",
-    "versionCode" : 178,
+    "versionName" : "1.8.2",
+    "versionCode" : 182,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/irrigate/index.vue

@@ -93,7 +93,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="" v-if="side_type == 13">
+					<view class="" v-if="side_type == 13 || side_type=='xph'">
 						<image src="http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png" mode=""
 							class="prevents_item_img"></image>
 						<view class="prevents_item_top">
@@ -161,6 +161,12 @@
 					list: [],
 					pageIndex: 1,
 					tf: false,
+				}, {
+					name: '水肥一体化',
+					type: 'xph', //5 环境监测 15 管式墒情
+					list: [],
+					pageIndex: 1,
+					tf: false,
 				}],
 				active: 0, //tab选中的下标
 				side_type: 17, //当前选中的设备类型
@@ -173,6 +179,20 @@
 			}
 		},
 		methods: {
+			async xphlist() {
+				this.loadingtf = true
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=xphsp.views.all_devices',
+					data: {
+						page: this.page,
+						page_size: "10",
+						device_id: this.imports,
+					}
+				})
+				this.loadingtf = false
+				this.eqlistdata = this.eqlistdata.concat(res.data)
+				console.log(this.eqlistdata)
+			},
 			async eqlist() { //设备列表 水肥一体化 L
 				this.loadingtf = true
 				const res = await this.$myRequest({
@@ -235,6 +255,10 @@
 					uni.navigateTo({
 						url: "../waterandfer/datails?shebei=" + JSON.stringify(data)
 					})
+				} else if(this.side_type == 'xph') {
+					uni.navigateTo({
+						url: "../waterandfernew/details?shebei=" + JSON.stringify(data)
+					})
 				}
 			},
 			top() {
@@ -256,6 +280,8 @@
 						this.tubulareqlist()
 					} else if (this.side_type == 13) {
 						this.sfeqlist()
+					} else if (this.side_type == 'xph') {
+						this.xphlist()
 					}
 				}, 1000)()
 			},
@@ -272,6 +298,9 @@
 				} else if (type == 13) {
 					this.eqlistdata = []
 					this.sfeqlist()
+				} else if (type == 'xph') {
+					this.eqlistdata = []
+					this.xphlist()
 				}
 			},
 			timezhuan(time) {
@@ -457,6 +486,9 @@
 							case 195:
 								this.equipArr[2].tf = true
 								break;
+							case 288: 
+								this.equipArr[3].tf = true
+								break;
 						}
 					}
 					for (var i = 0; i < this.equipArr.length; i++) {
@@ -465,8 +497,10 @@
 								this.tubulareqlist();
 							} else if (i == 1) {
 								this.eqlist();
-							} else {
+							} else if (i == 2) {
 								this.sfeqlist();
+							} else {
+								this.xphlist();
 							}
 							this.active = i
 							this.side_type = this.equipArr[i].type
@@ -485,6 +519,8 @@
 				this.tubulareqlist()
 			} else if (this.side_type == 13) {
 				this.sfeqlist()
+			} else if (this.side_type == 'xph') {
+				this.xphlist()
 			}
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听，可用bindingx代替
@@ -558,7 +594,7 @@
 		top: 170px;
 		display: flex;
 		justify-content: space-around;
-		font-size: 30rpx;
+		font-size: 24rpx;
 		line-height: 80rpx;
 		background-color: #FFFFFF;
 		width: 100%;

pages/waterandfernew/details.vue

@@ -94,7 +94,7 @@
 					<view class="colList" v-if="pickBtnList.length > 0">
 						<view class="preClo" v-for="(item, index) in pickBtnList"  :key="`fei${index}`">
 							<view>
-								肥料{{ index + 1}}
+								{{resultBan[index].e_name}}
 							</view>
 							<image src="../../static/images/waterandfernew/colNew.png" v-if="pickBtnList.length == 1">
 							</image>
@@ -168,13 +168,13 @@
 							<image class="status" v-else src="../../static/images/waterandfernew/close.png"></image>
 						</view> -->
 						<view class="preBen" v-for="item, index in faList"
-							@click="switchchange(!item.off, item.number, item, index)">
+							@click="switchchange(!item.e_status, item.number, item, index)">
 							<image class="daoguan" src="../../static/images/waterandfernew/bottomNew.png"
 								v-if="index < 5"></image>
 							<view class="info">
-								{{item.name}}
+								{{item.e_name}}
 							</view>
-							<image class="status" v-if="item.off" src="../../static/images/waterandfernew/open.png">
+							<image class="status" v-if="item.e_status" src="../../static/images/waterandfernew/open.png">
 							</image>
 							<image class="status" v-else src="../../static/images/waterandfernew/close.png"></image>
 						</view>
@@ -520,8 +520,8 @@
 				let pickBtnList = []; // 肥料开关
 				let pickBanList = []; // 肥料搅拌机开关
 				let faList = []; // 管道阀开关
-				this.facilityvalve.forEach(item => {
-					res.forEach((pick, index) => {
+				res.forEach((pick, index) => {
+					this.facilityvalve.forEach(item => {
 						if(pick.e_key == item.type ) {
 							// 获取当前灌溉泵位置
 							let pickObj = Object.assign(pick,item);

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/6f7f9fe0-03b3-11ef-aefd-25b65b5d70ef
+https://app.liuyingyong.cn/build/download/f5d0fc10-0b87-11ef-9cf2-2545b78b5ad2

util/neutral.js

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