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

Reviewed-on: #139

src/views/index.vue

@@ -415,10 +415,18 @@ export default {
                                 return
                             }
                             this.$router.push({ path: `/control?change=${item.index}` })
-                        } else if (item.deviceName == 1 && this.routerNow != 'irrigateSet') {
-                            this.$store.state.equipmentIndex = item.index
-                            this.routerIndex = item.index
-                            this.$router.push({ path: `/irrigateSet?change=${item.index}` })
+                        } else if (item.deviceName == 1 ) {
+                            if(this.routerNow == 'irrigateSet'){
+                                this.$store.state.equipmentIndex = item.index
+                                this.routerIndex = item.index
+                            }else{
+                                this.$store.state.equipmentIndex = item.index
+                                this.routerIndex = item.index
+                                this.$router.push({ path: `/irrigateSet?change=${item.index}` })
+                            }
+                           
+                          
+                            
                         } else if (item.deviceName == 30) {
                             this.$message('气象站无该页面');
                         }

src/views/page/sensorSet-con.vue

@@ -141,14 +141,13 @@ export default {
         'active'(newVal, oldVal) {
             this.getSensorType()
         },
+        '$store.state.equipmentIndex'(newVal, oldVal) {
+     
+      this.dataInit();
+    },
     },
     mounted() {
-        this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
+      
         this.dataInit()
         //input获取焦点后全选
         let inputList = document.querySelectorAll('input');
@@ -409,6 +408,12 @@ return num
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
 
             };
+            this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
             this.api.getReadControlSensorChannel(data).then((res) => {
                 this.loading.close()
                 if (res.data.code == 200) {