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

Compare commits

base: xiaomeng:ae1e8725ea961b7eef026e5865abe04f0529bec5
Branches Tags
xiaomeng:main
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:0.0.1
..
compare: xiaomeng:e08a9b2adba4ff600c4f3a2b40f7bf43a3031801
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

No commits in common. "ae1e8725ea961b7eef026e5865abe04f0529bec5" and "e08a9b2adba4ff600c4f3a2b40f7bf43a3031801" have entirely different histories.
ae1e8725ea ... e08a9b2adb

3 changed files with 2 additions and 63 deletions
Show Stats Expand all files Collapse all files

2
src/views/page/dataAnalysis.vue
View File

@ -151,8 +151,6 @@ export default {
});
realTimeLine1('realTime-line', chartsData)
} else {
var chartsData=[]
realTimeLine1('realTime-line', chartsData)
this.$message.error(res.data.msg);
}
})

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

@ -1367,60 +1367,7 @@ export default {
// })
}
} else if (this.deviceName == 30) {
this.api.getControlRtDatastation(formData).then(res => {
this.controlList = []
this.list = []
this.updateTime=res.data.data[0].updateTime
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 = 0
var name = ''
if (el.equipmentStart == 0) {
num = '故障'
} else {
num = el.environmentData + el1.unit
}
if(el.equipmentName==30){
if (el.targetValue == 1) {
if (el.equipmentNumber == 0) {
name = '目标' + el.environmentDataId
} else {
name = '目标' + el.equipmentNumber + '#' + el.environmentDataId
}
} else {
if (el.equipmentNumber == 0) {
name = '1#平均' + el.environmentDataId
} else if (el.equipmentNumber == 15) {
name = '2#平均' + el.environmentDataId
} else {
name = el.equipmentNumber + '#' + el.environmentDataId
}
}
}else{
name=el.environmentDataId
}
this.list.push({
...el,
name: name,
num: num,
img: require(`../../assets/image/real-time-${el.formula}.png`)
})
this.controlList.push({
...el,
num: num,
img: require(`../../assets/image/real-time-${el.formula}.png`)
})
}
})
})
}
// console.log(this.controlList);
})
this.getControlRtDatastation(formData)
this.api.getControlChartdata(equipmentId).then(res => {
if (res.data.code == 200) {
res.data.data.forEach((el, index) => {
@ -1518,9 +1465,6 @@ export default {
})
},
getControlRtDatastation(formData){
var store = this.$store.state
var list = store.typeList
this.api.getControlRtDatastation(formData).then(res => {
this.controlList = []
if (res.data.code == 200) {
@ -1547,9 +1491,6 @@ export default {
})
},
getFi_rtdata(formData){
var store = this.$store.state
var list = store.typeList
this.api.getFi_rtdata(formData).then(res=>{
if (res.data.code == 200) {
this.inputData = res.data.data;