From 605f1c2c5aecf334861020d45caa12b68d2ce59e Mon Sep 17 00:00:00 2001 From: sunmeng <1162067978@qq.com> Date: Thu, 19 Dec 2024 09:00:31 +0800 Subject: [PATCH 1/2] 1 --- src/components/setParams.vue | 26 +++++++++++++------------- src/views/index.vue | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/setParams.vue b/src/components/setParams.vue index 339aa87..6739272 100644 --- a/src/components/setParams.vue +++ b/src/components/setParams.vue @@ -109,23 +109,23 @@ export default { if (index < 8) { if (store.equipmentName['fertilization' + store.nameList[index]]) { // store.equipmentName['fertilization'+store.nameList[index]] - this.routerList[0].list.push({ - name: '配方' + (index + 1), + this.routerList[0].list[index]={ + name: store.equipmentName['fertilization' + store.nameList[index]], status: -1, index: index + 1, router: 'formula' - }) + } } } - // if (store.equipmentName['solenoid' + store.nameList[index]]) { - // // store.equipmentName['fertilization'+store.nameList[index]] - // this.routerList[1].list.push({ - // name: store.equipmentName['solenoid' + store.nameList[index]], - // status: -1, - // index: index + 1, - // router: 'irrigateSet' - // }) - // } + if (store.equipmentName['solenoid' + store.nameList[index]]) { + // store.equipmentName['fertilization'+store.nameList[index]] + this.routerList[1].list[index]={ + name: store.equipmentName['solenoid' + store.nameList[index]], + status: -1, + index: index + 1, + router: 'irrigateSet' + } + } }) }, //去首页 @@ -205,7 +205,7 @@ export default { cursor: pointer; >div { - width: 220px; + width: 100%; height: 40px; // background: rgba(255, 255, 255, 0.1); // border: 1px solid rgba(255, 255, 255, 0.3); diff --git a/src/views/index.vue b/src/views/index.vue index 46c50c6..9f7fd74 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -114,7 +114,7 @@ export default { { name: '首页', img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, }, { name: '温室', routerList: ['realTime', 'dataAnalysis', 'historyData', 'exitSettings', 'videoMonitoring','imageData', 'skylight', 'control', 'systemSet-con', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img0.png'), list: [] }, // { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] }, - { name: '施肥机', routerList: ['formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] }, + { name: '施肥机', routerList: ['status-soil','formula', 'dataAnalysis', 'historyData', 'irrigateSet', 'videoMonitoring','imageData', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/left-img2.png'), list: [] }, { name: '智能灌溉', routerList: ['realTime', 'dataAnalysis', 'historyData','irrigateSet-soil', 'videoMonitoring','imageData','PIDSet-soil', 'systemSet-soil', 'upload-soil', 'sensorSet-soil', 'realTime', 'history', 'dataAnalysis'], img: require('../assets/image/irrigateSet-icon1-act.png'), list: [] }, { name: '生态气象站', routerList: ['realTime', 'historyData', 'exitSettings', 'skylight', 'control', 'systemSet-con','imageData', 'fan', 'upload-con', 'sensorSet-con', 'synthesis-con', 'alarmSettings', 'waterPump', 'geothermalFan', 'uptake', 'downtake', 'rollByRoll', 'snowRemoval', "targetTemperature", "targetHumidity", "targetCo2", "sunroofControl", "outsizeSunshade", "insizeSunshade", "wetFan", "LED", 'electromagneticControl', "coercionMist", "circulationCan", "internalInsulation", "forceOutput", "intrinsicParameter", "parameterSet"], img: require('../assets/image/left-img3.png'), list: [] }, ], -- 2.40.1 From 277a0610d220f0961f5cae84004eff1839b4c0a7 Mon Sep 17 00:00:00 2001 From: sunmeng <1162067978@qq.com> Date: Thu, 19 Dec 2024 09:38:54 +0800 Subject: [PATCH 2/2] 1 --- src/views/page/realTime.vue | 89 +++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 389dcc0..e2c4349 100644 --- a/src/views/page/realTime.vue +++ b/src/views/page/realTime.vue @@ -97,6 +97,11 @@
日落:{{ sunset }}
+
+
+ 无线电池电压 +
+
@@ -439,6 +444,71 @@
+ + +
+ 编辑 +
+
+
+
+
1#无线传感器电池电压
+ +
+
+
2#无线传感器电池电压
+ +
+
+
3#无线传感器电池电压
+ +
+
+
4#无线传感器电池电压
+ +
+
+
5#无线传感器电池电压
+ +
+
+
6#无线传感器电池电压
+ +
+
+
+
+
1#无线传感器信号质量
+ +
+
+
2#无线传感器信号质量
+ +
+
+
3#无线传感器信号质量
+ +
+
+
4#无线传感器信号质量
+ +
+
+
5#无线传感器信号质量
+ +
+
+
6#无线传感器信号质量
+ +
+
+
+ +
确定
+
取消
+ +
@@ -525,6 +595,9 @@ export default { { name: '小于(<)', value: 2, }, { name: '大于等于(>=)', value: 3, }, { name: '小于等于(<=)', value: 4, },], + + voltModel:false,//无线电池电压弹窗 + voltData:{}, } }, watch: { @@ -580,6 +653,9 @@ export default { this.$bus.$off('refreshTime') }, methods: { + openVolt(){ + this.voltModel=true + }, openDataModel() { this.dataModel = true }, @@ -1400,6 +1476,19 @@ export default { } this.api.getControlGetState(TargetValue).then(res => { if (res.data.code == 200) { + this.voltData=res.data.data + this.voltData['1208']=this.countType2(res.data.data['1208']) + this.voltData['1209']=this.countType1(res.data.data['1209']) + this.voltData['1210']=this.countType2(res.data.data['1210']) + this.voltData['1211']=this.countType1(res.data.data['1211']) + this.voltData['1212']=this.countType2(res.data.data['1212']) + this.voltData['1213']=this.countType1(res.data.data['1213']) + this.voltData['1214']=this.countType2(res.data.data['1214']) + this.voltData['1215']=this.countType1(res.data.data['1215']) + this.voltData['1216']=this.countType2(res.data.data['1216']) + this.voltData['1217']=this.countType1(res.data.data['1217']) + this.voltData['1218']=this.countType2(res.data.data['1218']) + this.voltData['1219']=this.countType1(res.data.data['1219']) if (res.data.data["1119"]) { this.sunrise = this.insertColonEveryTwoDigits( this.convertToTimeMinutes(res.data.data["1119"]) -- 2.40.1