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

Reviewed-on: #245

src/views/manage/deviceSet.vue

@@ -126,6 +126,7 @@ export default {
             }
           })
           setTimeout(() => {
+            if(this.topList.length)
             this.getData(this.topList[0])
           }, 0);
         }

src/views/manage/deviceStatusSet.vue

@@ -108,6 +108,7 @@ export default {
             }
           })
           setTimeout(() => {
+            if(this.topList.length)
             this.getData(this.topList[0])
           }, 0);
         }

src/views/manage/mobileControl.vue

@@ -112,6 +112,7 @@ export default {
             }
           })
           setTimeout(() => {
+            if(this.topList.length)
             this.getData(this.topList[0])
           }, 0);
         }

src/views/manage/userInfoControl.vue

@@ -228,7 +228,8 @@ export default {
      deviceSel: [{ label: '控制器', value: 10, },
        { label: '施肥机', value: 1, }, 
        { label: '气象站', value:30, }, 
-       { label: '智能灌溉控制器', value:20, }],
+       { label: '智能灌溉控制器', value:20, }, 
+       { label: '数据采集器', value:40, }],
     }
   },
   mounted() { this.dataInit() },
@@ -298,7 +299,9 @@ export default {
         return '气象站'
       } else if (e == '20') {
         return '智能灌溉控制器'
-      } else {
+      } else if (e == '40') {
+        return '数据采集器'
+      }else {
         return ''
       }
     },
@@ -391,6 +394,8 @@ export default {
         return 30
       }else if(e == '智能灌溉控制器'){
         return 20
+      }else if(e == '数据采集器'){
+        return 40
       }
     },
     handleCommand1(e) {
@@ -413,17 +418,23 @@ export default {
       })
     },
     openaddDeviceModel(){
-      this.addDeviceModel = true
+   
+      this.deviceType=''
       this.openData={}
+         this.addDeviceModel = true
+      this.$forceUpdate()
     },
     openModel(item, type) {
       if (type == 0) {
         this.modelName = '添加'
-        this.addModel = true
+   
         this.nowData = {
           equipments: [],
         }
+
         this.role = ''
+             this.addModel = true
+        this.$forceUpdate()
       } else {
         this.modelName = '编辑'
         this.addModel = true

src/views/page/status.vue

@@ -288,12 +288,12 @@ export default {
         const that = this;
         if (localStorage.getItem('token')) {
             that.getEqbyid();
-           
+              that.getReg()
             setTimeout(() => {
                 that.pageTimer && clearInterval(that.pageTimer)
                 that.pageTimer = setInterval(() => {
                     that.getEqbyid();
-                     that.getReg()
+                  
                 }, 5000);
             }, 0);
         } else {