|
|
@@ -496,13 +496,15 @@
|
|
|
var obj = []
|
|
|
if (res.at_ah_info.length != 0) {
|
|
|
var aharr = []
|
|
|
- var atarr = []
|
|
|
+ var atHigharr = [] //高温
|
|
|
+ var atLowarr = [] //低温
|
|
|
var pestArr = []
|
|
|
let indentText = 0;
|
|
|
for (var i = 0; i < res.at_ah_info.length; i++) {
|
|
|
var times = new Date(res.at_ah_info[i].addtime * 1000)
|
|
|
xtitle.push(times.getMonth() + 1 + "/" + times.getDate())
|
|
|
- atarr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].at)
|
|
|
+ atHigharr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].height)
|
|
|
+ atLowarr.push(res.at_ah_info[i].at == "" ? "0" : res.at_ah_info[i].low)
|
|
|
aharr.push(res.at_ah_info[i].ah == "" ? "0" : res.at_ah_info[i].ah)
|
|
|
if (this.checkObj(res.char_data) && res.char_data[this.wormvalue]) {
|
|
|
if (res.char_data[this.wormvalue][i - indentText] && (res.char_data[this.wormvalue][i -
|
|
|
@@ -529,11 +531,16 @@
|
|
|
// obj.push(wormobj)
|
|
|
// }
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
// }
|
|
|
- var atobj = {
|
|
|
- name: '温度',
|
|
|
- data: atarr,
|
|
|
+ var atHighobj = {
|
|
|
+ name: '高温',
|
|
|
+ data: atHigharr,
|
|
|
+ color: '#ff0000'
|
|
|
+ }
|
|
|
+ var atlowobj = {
|
|
|
+ name: '低温',
|
|
|
+ data: atLowarr,
|
|
|
color: '#00E29D'
|
|
|
}
|
|
|
var ahobj = {
|
|
|
@@ -545,9 +552,11 @@
|
|
|
name: this.wormvalue,
|
|
|
data: pestArr,
|
|
|
}
|
|
|
- obj.push(atobj)
|
|
|
+ obj.push(atHighobj)
|
|
|
+ obj.push(atlowobj)
|
|
|
obj.push(ahobj)
|
|
|
obj.push(pestObj)
|
|
|
+ console.log(obj)
|
|
|
}
|
|
|
this.showColumn("canvasColumnA", xtitle, obj)
|
|
|
},
|