|
|
@@ -168,14 +168,15 @@
|
|
|
</image>
|
|
|
<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)">
|
|
|
+ <view class="preBen" v-for="(item, index) in faList"
|
|
|
+ :key="item.svl_id"
|
|
|
+ @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}}
|
|
|
</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>
|
|
|
@@ -517,42 +518,66 @@
|
|
|
sf_device_id: this.device_id,
|
|
|
},
|
|
|
});
|
|
|
- console.log(res,'resresres')
|
|
|
- let pickList = [];
|
|
|
+ res.forEach(item => {
|
|
|
+ item.number = item.e_num
|
|
|
+ })
|
|
|
+ this.devicelist = res
|
|
|
let pickBtnList = []; // 肥料开关
|
|
|
let pickBanList = []; // 肥料搅拌机开关
|
|
|
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_type == 2) {
|
|
|
- this.mainBengIndex = pickList.length;
|
|
|
- this.mainBeng = pickObj.off;
|
|
|
- }
|
|
|
- // 获取当前施肥泵位置
|
|
|
- if(pick.e_type == 4) {
|
|
|
- this.feiBengIndex = pickList.length;
|
|
|
- this.feiBeng = pickObj.off;
|
|
|
- }
|
|
|
- // 获取肥料开关列表
|
|
|
- if(pick.e_type == 6) {
|
|
|
- pickBtnList.push(pickObj)
|
|
|
- }
|
|
|
- // 获取搅拌机开关列表
|
|
|
- if(pick.e_type == 3) {
|
|
|
- pickBanList.push(pickObj)
|
|
|
- }
|
|
|
- // 获取管道阀开关列表
|
|
|
- if (pick.e_type == 1 || pick.e_type == 5) {
|
|
|
- faList.push(pickObj)
|
|
|
- }
|
|
|
- pickList.push(pickObj)
|
|
|
+ res.forEach(pick => {
|
|
|
+ let pickObj = Object.assign(pick);
|
|
|
+ if(pick.e_type == 2) {
|
|
|
+ this.mainBeng = pickObj.off;
|
|
|
+ }else
|
|
|
+ // 获取当前施肥泵位置
|
|
|
+ if(pick.e_type == 4) {
|
|
|
+ this.feiBeng = pickObj.off;
|
|
|
+ }else
|
|
|
+ // 获取肥料开关列表
|
|
|
+ if(pick.e_type == 6) {
|
|
|
+ pickBtnList.push(pickObj)
|
|
|
+ }else
|
|
|
+ // 获取搅拌机开关列表
|
|
|
+ if(pick.e_type == 3) {
|
|
|
+ pickBanList.push(pickObj)
|
|
|
+ }else
|
|
|
+ // 获取管道阀开关列表
|
|
|
+ if (pick.e_type == 1 || pick.e_type == 5) {
|
|
|
+ faList.push(pickObj)
|
|
|
}
|
|
|
- })
|
|
|
})
|
|
|
- console.log(pickBtnList,faList,'faListfaListfaList')
|
|
|
+ console.log(faList,'faListfaListfaListfaList')
|
|
|
+ // this.facilityvalve.forEach(item => {
|
|
|
+ // res.forEach((pick, index) => {
|
|
|
+ // if (pick.e_key == item.type) {
|
|
|
+ // let pickObj = Object.assign(item, pick);
|
|
|
+ // // 获取当前灌溉泵位置
|
|
|
+ // if(pick.e_type == 2) {
|
|
|
+ // this.mainBengIndex = pickList.length;
|
|
|
+ // this.mainBeng = pickObj.off;
|
|
|
+ // }
|
|
|
+ // // 获取当前施肥泵位置
|
|
|
+ // if(pick.e_type == 4) {
|
|
|
+ // this.feiBengIndex = pickList.length;
|
|
|
+ // this.feiBeng = pickObj.off;
|
|
|
+ // }
|
|
|
+ // // 获取肥料开关列表
|
|
|
+ // if(pick.e_type == 6) {
|
|
|
+ // pickBtnList.push(pickObj)
|
|
|
+ // }
|
|
|
+ // // 获取搅拌机开关列表
|
|
|
+ // if(pick.e_type == 3) {
|
|
|
+ // pickBanList.push(pickObj)
|
|
|
+ // }
|
|
|
+ // // 获取管道阀开关列表
|
|
|
+ // if (pick.e_type == 1 || pick.e_type == 5) {
|
|
|
+ // faList.push(pickObj)
|
|
|
+ // }
|
|
|
+ // pickList.push(pickObj)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
// 把肥料和搅拌机位置对应起来（根据创建时间）
|
|
|
let resultBan = [];
|
|
|
pickBtnList.forEach(fei => {
|
|
|
@@ -702,6 +727,7 @@
|
|
|
duration: 2000,
|
|
|
icon: 'none'
|
|
|
});
|
|
|
+ this.getPickList()
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
title: res.msg,
|
|
|
@@ -764,34 +790,43 @@
|
|
|
},
|
|
|
switchchange(e, state, item, index, isfeiButton) {
|
|
|
// 是否是肥料开关，是的话 两个合并为一个
|
|
|
- item.disabled = true;
|
|
|
- if (isfeiButton) {
|
|
|
- item.off = e;
|
|
|
- this.changeTimeStatus(item, index);
|
|
|
- // 当前是打开
|
|
|
- if (e) {
|
|
|
- // 打开通道传1，关闭通道传0
|
|
|
- this.getEquipcontrol(state, 1, 1);
|
|
|
- // this.getEquipcontrol(state + 1, 0);
|
|
|
- } else {
|
|
|
- // this.getEquipcontrol(state + 1, 0);
|
|
|
- this.getEquipcontrol(state, 0, 1);
|
|
|
- }
|
|
|
- return
|
|
|
- }
|
|
|
- item.off = e;
|
|
|
- if (item.type == 'j10') {
|
|
|
- // 判断注水泵是否打开
|
|
|
- this.mainBeng = e;
|
|
|
- }
|
|
|
- if (item.type == 'j9') {
|
|
|
- // 判断施肥阀是否打开
|
|
|
- this.feiBeng = e;
|
|
|
+ // item.disabled = true;
|
|
|
+ // if (isfeiButton) {
|
|
|
+ // item.off = e;
|
|
|
+ // this.changeTimeStatus(item, index);
|
|
|
+ // // 当前是打开
|
|
|
+ // if (e) {
|
|
|
+ // // 打开通道传1，关闭通道传0
|
|
|
+ // this.getEquipcontrol(state, 1, 1);
|
|
|
+ // // this.getEquipcontrol(state + 1, 0);
|
|
|
+ // } else {
|
|
|
+ // // this.getEquipcontrol(state + 1, 0);
|
|
|
+ // this.getEquipcontrol(state, 0, 1);
|
|
|
+ // }
|
|
|
+ // return
|
|
|
+ // }
|
|
|
+ // item.off = e;
|
|
|
+ // if (item.type == 'j10') {
|
|
|
+ // // 判断注水泵是否打开
|
|
|
+ // this.mainBeng = e;
|
|
|
+ // }
|
|
|
+ // if (item.type == 'j9') {
|
|
|
+ // // 判断施肥阀是否打开
|
|
|
+ // this.feiBeng = e;
|
|
|
+ // }
|
|
|
+ // item.disabled = true;
|
|
|
+ // this.changeTimeStatus(item, index);
|
|
|
+ // //console.log(Number(e), state);
|
|
|
+ // this.getEquipcontrol(state, Number(e));
|
|
|
+ let type
|
|
|
+ if (item.e_type === 1) {
|
|
|
+ type = 3
|
|
|
+ } else if (item.e_type === 5) {
|
|
|
+ type = 1
|
|
|
+ } else {
|
|
|
+ type = 0
|
|
|
}
|
|
|
- item.disabled = true;
|
|
|
- this.changeTimeStatus(item, index);
|
|
|
- //console.log(Number(e), state);
|
|
|
- this.getEquipcontrol(state, Number(e));
|
|
|
+ return this.getEquipcontrol(state, Number(e), type);
|
|
|
},
|
|
|
currentchange(e) {
|
|
|
//页码
|
