Merge pull request 'pc-master' (#204) from pc-master into portal

Reviewed-on: #204

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({
+                        this.routerList[0].list[index]={
-                            name: '配方' + (index + 1),
+                            name: store.equipmentName['fertilization' + store.nameList[index]],
                             status: -1,
                             index: index + 1,
                             router: 'formula'
-                        })
+                        }
                     }
                 }
-                // if (store.equipmentName['solenoid' + store.nameList[index]]) {
+                if (store.equipmentName['solenoid' + store.nameList[index]]) {
-                //         // store.equipmentName['fertilization'+store.nameList[index]]
+                        // store.equipmentName['fertilization'+store.nameList[index]]
-                //         this.routerList[1].list.push({
+                        this.routerList[1].list[index]={
-                //             name: store.equipmentName['solenoid' + store.nameList[index]],
+                            name: store.equipmentName['solenoid' + store.nameList[index]],
-                //             status: -1,
+                            status: -1,
-                //             index: index + 1,
+                            index: index + 1,
-                //             router: 'irrigateSet'
+                            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);

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: [] },
             ],

src/views/page/realTime.vue

@@ -97,6 +97,11 @@
                 </div>
                 <div class="title-text" v-if="sunset"><img src="../../assets/img/sunset.png" alt="">日落:{{ sunset }}
                 </div>
+                <div class="input-btn ">
+                    <div class="btn blue" @click="openVolt">
+                        无线电池电压
+                    </div>
+                </div>
             </div>
             <div class="flex-view border-none">
                 <div class="status-view" v-for="item, index in statusList" :key="index">
@@ -439,6 +444,71 @@
 
             </div>
         </el-dialog>
+
+        <el-dialog :close-on-click-modal="false" title="提示" top="15vh" :visible.sync="voltModel" width="564px"
+      class="vrcode-model manage-model" :append-to-body="true">
+      <div class="vrcode-model-title">
+        编辑
+      </div>
+      <div class="vrcode-content">
+        <div class="manage-left">
+          <div class="manage-input">
+            <div class="input-title">1#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1208']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">2#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1210']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">3#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1212']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">4#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1214']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">5#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1216']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">6#无线传感器电池电压</div>
+            <input type="text" disabled v-model="voltData['1218']"  placeholder="">
+          </div>
+        </div>
+        <div class="manage-right">
+          <div class="manage-input">
+            <div class="input-title">1#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1209']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">2#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1211']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">3#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1213']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">4#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1215']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">5#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1217']"  placeholder="">
+          </div>
+          <div class="manage-input">
+            <div class="input-title">6#无线传感器信号质量</div>
+            <input type="text" disabled v-model="voltData['1219']"  placeholder="">
+          </div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <div class="vrcode-btn blue-btn w-100" @click="voltModel=false">确定</div>
+        <div class="vrcode-btn cancle-btn w-100" @click="voltModel = false">取消</div>
+      </span>
+    </el-dialog>
     </div>
 </template>
 
@@ -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"])