xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Reviewed-on: #57
pull/69/head^2
xiaomeng 2023-11-24 08:16:36 +00:00
parent f68728c789 d7141d4ad4
commit f045c2e14f
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/image/real-time-49.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

3
src/views/login.vue
View File

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

33
src/views/page/realTime.vue
View File

@ -249,7 +249,7 @@ export default {
deviceName: 1, deviceName: 1,
controlList: [], controlList: [],
statusInterval: null,//status状态的Interval statusInterval: null,//status状态的Interval
statusTime: 3,//status状态的秒数 statusTime: 2,//status状态的秒数
} }
}, },
watch: { watch: {
@ -551,19 +551,21 @@ export default {
}); });
this.api.getControlRtDatastation(formData).then(res => { this.api.getControlRtDatastation(formData).then(res => {
this.controlList = [] 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); // console.log(this.controlList);
}) })
@ -638,6 +640,11 @@ export default {
}, 10); }, 10);
} else { } else {
this.statusList = []
this.fanStatus = {
name: '风机', open: 0, status: []
}
this.$forceUpdate();
// this.$message.error(res.data.msg); // this.$message.error(res.data.msg);
} }
}) })