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

Reviewed-on: #57

src/views/login.vue

@@ -54,6 +54,8 @@
     },
     methods:{
         login(){
+            var store=this.$store.state
+
             // "username": "xiaomeng",
             //     "password": "lihe12345"
             if(!this.username){
@@ -86,6 +88,7 @@
                         message: '登陆成功',
                         type: "success",
                     });
+                    store.equipmentIndex=1
                     localStorage.setItem('token',res.data.data.token)
                     localStorage.setItem('userInfo',JSON.stringify(res.data.data))
                     this.$router.push({ name: 'index' })

src/views/page/realTime.vue

@@ -249,7 +249,7 @@ export default {
             deviceName: 1,
             controlList: [],
             statusInterval: null,//status状态的Interval
-            statusTime: 3,//status状态的秒数
+            statusTime: 2,//status状态的秒数
         }
     },
     watch: {
@@ -551,19 +551,21 @@ export default {
                 });
                 this.api.getControlRtDatastation(formData).then(res => {
                     this.controlList = []
-                    res.data.data.forEach((el, index) => {
+                    if (res.data.code == 200) {
-                        list.forEach((el1, index1) => {
+                        res.data.data.forEach((el, index) => {
-                            if (el.formula == el1.value) {
+                            list.forEach((el1, index1) => {
-                                // console.log(el1);
+                                if (el.formula == el1.value) {
-                                var num = el.environmentData + el1.unit
+                                    // console.log(el1);
-                                this.controlList.push({
+                                    var num = el.environmentData + el1.unit
-                                    ...el,
+                                    this.controlList.push({
-                                    num: num,
+                                        ...el,
-                                    img: require(`../../assets/image/real-time-${el.formula}.png`)
+                                        num: num,
-                                })
+                                        img: require(`../../assets/image/real-time-${el.formula}.png`)
-                            }
+                                    })
+                                }
+                            })
                         })
-                    })
+                    }
                     // console.log(this.controlList);
                 })
 
@@ -638,6 +640,11 @@ export default {
                     }, 10);
 
                 } else {
+                    this.statusList = []
+                    this.fanStatus = {
+                        name: '风机', open: 0, status: []
+                    }
+                    this.$forceUpdate();
                     // this.$message.error(res.data.msg);
                 }
             })