src/components/setParamsControl.vue

@@ -54,7 +54,12 @@ export default {
       var store = this.$store.state;
       var item = store.equipmentList[store.equipmentIndex - 1]
       if(item.deviceName == 10 || item.deviceName == 30){
-     
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         this.dataInit();
       }
     },
@@ -81,12 +86,6 @@ export default {
       }
     },
     dataInit() {
-      this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
       var store = this.$store.state;
       var data = store.equipmentList[store.equipmentIndex - 1].deviceId;
       this.api.getcontrol_cpermission(data).then((res) => {
@@ -339,9 +338,6 @@ export default {
         if (router.token && router.userid) {
           return
         }
-        if(this.$route.name==this.routerList[0].router){
-          return
-        }
         this.$router.push({ path: `/${this.routerList[0].router}` });
 
 

src/views/page/LED.vue

@@ -306,14 +306,16 @@ export default {
             that.getActive1();
         }, 0);
         },
-'$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() { 
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -563,12 +565,6 @@ export default {
             this.changeBtn(21400, dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/alarmSettings.vue

@@ -319,14 +319,14 @@ export default {
       loading:null,
         }
     },
-    watch:{
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
-    },
     mounted() {
         const that = this;
-    
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -489,12 +489,6 @@ export default {
             this.changeBtn(code, dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/circulationCan.vue

@@ -154,14 +154,16 @@ export default {
                 that.getActive1();
             }, 0);
         },
-'$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-   
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -278,12 +280,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/coercionMist.vue

@@ -93,14 +93,16 @@ export default {
                 that.getActive1();
             }, 0);
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-  
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -217,12 +219,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/electromagneticControl.vue

@@ -186,19 +186,26 @@ export default {
         $route(newVal, oldVal) {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-  
+            this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
             setTimeout(() => {
                 that.dataInit();
             }, 0);
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-  
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -289,12 +296,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/forceOutput.vue

@@ -38,14 +38,13 @@
       loading:null,
         }
     },
-    watch: {
-   
-        '$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()
     },
     methods:{
@@ -74,12 +73,6 @@
             return list
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/insizeSunshade.vue

@@ -173,14 +173,16 @@ export default {
                 that.getActive1();
             }, 0);
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-    
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -297,12 +299,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/internalInsulation.vue

@@ -120,15 +120,17 @@ export default {
                 that.getActive1();
             }, 0);
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
         setTimeout(() => {
-        
+            this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
             that.dataInit();
         }, 0);
         //input获取焦点后全选
@@ -244,12 +246,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/intrinsicParameter.vue

@@ -514,7 +514,7 @@
                  type="text" placeholder="0">
             </div>
         </div>
-     <el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :close-on-click-modal="false" :append-to-body="true" :visible.sync="warnModel"
+     <el-dialog title="请输入密码" class="vrcode-model confirm-psw" top="30vh" :append-to-body="true" :visible.sync="warnModel"
             width="700px">
             <div class="vrcode-model-title vrcode-model-title-282">请输入密码</div>
             <div class="warning-model" style="padding: 0 30px;">
@@ -567,14 +567,13 @@ export default {
       loading:null,
         }
     },
-    watch: {
-   
-   '$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');
@@ -656,12 +655,6 @@ modelConfirm(){
             return name
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/outsizeSunshade.vue

@@ -143,14 +143,16 @@ export default {
             that.getActive1();
         }, 0);
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() { 
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-     
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -267,12 +269,6 @@ export default {
             this.changeBtn(this.startList[this.indexs - 1], dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/parameterSet.vue

@@ -686,14 +686,13 @@ export default {
       loading:null,
         }
     },
-    watch: {
-   
-   '$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');
@@ -740,12 +739,6 @@ this.dataInit();
             return name
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/sunroofControl.vue

@@ -214,14 +214,16 @@ export default {
             that.getActive1();
         }, 0);
         },
-'$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-     
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -339,12 +341,6 @@ export default {
         },
         dataInit() {
             var store = this.$store.state
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
             };

src/views/page/synthesis-con.vue

@@ -53,13 +53,13 @@ export default {
 
         }
     },
-    watch:{
-        '$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()
     },
     methods: {
@@ -81,12 +81,6 @@ export default {
             return list
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/systemSet-con.vue

@@ -98,14 +98,13 @@ export default {
       loading:null,
         }
     },
-    watch: {
-   
-   '$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');
@@ -133,12 +132,6 @@ this.dataInit();
             return data
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/targetTemperature.vue

@@ -205,16 +205,14 @@ export default {
       loading:null,
     }
   },
-  watch: {
-
-    '$store.state.equipmentIndex'(newVal, oldVal) {
-      this.dataInit();
-    },
-  },
-
   mounted() {
     const that = this;
-  
+    this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
     setTimeout(() => {
       that.dataInit();
     }, 0);
@@ -294,12 +292,6 @@ export default {
       this.change(code, sendData)
     },
     dataInit() {
-      this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
       var store = this.$store.state
       var data = {
         deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,

src/views/page/upload-con.vue

@@ -193,13 +193,13 @@ export default {
 
         }
     },
-    watch:{
-        '$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');
@@ -279,12 +279,6 @@ export default {
             })
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             this.actList1New = []
             this.list1.forEach((el, index) => {
                 this.actList1New.push('0')

src/views/page/wetFan.vue

@@ -219,9 +219,6 @@
                 <span>湿帘水泵1:</span>
             </div>
             <div class="input-btn ">
-                <div class="btn" @click="changeOpen(0,21970)" :class="inputData[21970] == 0 ? 'blue' : 'green'">
-                   无效
-                </div>
                 <div class="btn" @click="changeOpen(1,21970)" :class="inputData[21970] == 1 ? 'blue' : 'green'">
                     <img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
                 </div>
@@ -231,7 +228,6 @@
                 <div class="btn" @click="changeOpen(3,21970)" :class="inputData[21970] == 3 ? 'blue' : 'green'">
                     <img src="../../assets/image/irrigateSet1.png" alt="" />手动关闭
                 </div>
-
             </div>
         </div>
         <div class="flex-view shrink-none">
@@ -248,9 +244,6 @@
                 <span>湿帘水泵2:</span>
             </div>
             <div class="input-btn ">
-                <div class="btn" @click="changeOpen(0,21972)" :class="inputData[21972] == 0 ? 'blue' : 'green'">
-                   无效
-                </div>
                 <div class="btn" @click="changeOpen(1,21972)" :class="inputData[21972] == 1 ? 'blue' : 'green'">
                     <img src="../../assets/image/irrigateSet2.png" alt="" />自动运行
                 </div>
@@ -395,14 +388,16 @@ export default {
             const that = this;
             this.indexs = this.$route.query.id ? this.$route.query.id : 1;
         },
-        '$store.state.equipmentIndex'(newVal, oldVal) {
-  this.dataInit();
-},
     },
     mounted() {
         const that = this;
         this.indexs = this.$route.query.id ? this.$route.query.id : 1;
-  
+        this.loading = this.$loading({
+    lock: true,
+    text: '加载中',
+    spinner: 'el-icon-loading',
+    background: 'rgba(0, 0, 0, 0.7)'
+  });
         setTimeout(() => {
             that.dataInit();
         }, 0);
@@ -633,12 +628,6 @@ export default {
             this.changeBtn(code, dataNum);
         },
         dataInit() {
-            this.loading = this.$loading({
-    lock: true,
-    text: '加载中',
-    spinner: 'el-icon-loading',
-    background: 'rgba(0, 0, 0, 0.7)'
-  });
             var store = this.$store.state
             var data = {
                 deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,