diff --git a/src/assets/image/real-time-49.png b/src/assets/image/real-time-49.png index 4340f3c..6359ceb 100644 Binary files a/src/assets/image/real-time-49.png and b/src/assets/image/real-time-49.png differ diff --git a/src/views/login.vue b/src/views/login.vue index bf9274b..f1145ef 100644 --- a/src/views/login.vue +++ b/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' }) diff --git a/src/views/page/realTime.vue b/src/views/page/realTime.vue index 1393538..c34cdc2 100644 --- a/src/views/page/realTime.vue +++ b/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) => { - list.forEach((el1, index1) => { - if (el.formula == el1.value) { - // console.log(el1); - var num = el.environmentData + el1.unit - this.controlList.push({ - ...el, - num: num, - img: require(`../../assets/image/real-time-${el.formula}.png`) - }) - } + if (res.data.code == 200) { + res.data.data.forEach((el, index) => { + list.forEach((el1, index1) => { + if (el.formula == el1.value) { + // console.log(el1); + var num = el.environmentData + el1.unit + this.controlList.push({ + ...el, + 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); } })