From e45d0852eff0e494e232ffcc60e0c190acb28801 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 22 四月 2025 08:47:37 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
gmms/WebContent/bigScreen/allGlassflash.jsp | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassflash.jsp b/gmms/WebContent/bigScreen/allGlassflash.jsp
index 93639d5..6e57eac 100644
--- a/gmms/WebContent/bigScreen/allGlassflash.jsp
+++ b/gmms/WebContent/bigScreen/allGlassflash.jsp
@@ -1277,7 +1277,15 @@
itemStyle: {
color: 'rgb(180, 180, 180)'
}
- },
+ },{
+ name: '鐢佃��2',
+ type: 'bar',
+ barWidth: '40%',
+ data: [220, 152, 200, 334, 390, 330, 220],
+ itemStyle: {
+ color: 'rgb(30, 144, 255)'
+ }
+ },
]
},
@@ -1382,6 +1390,7 @@
this.val.yAxis[0].name="鐢佃��";
this.val.series[0].name='鐢佃��(kw.h)'
+ this.val.series[1].name='鐢佃��(kw.h)1'
for(let i in this.machineElectric){
dianhao.push(this.machineElectric[i]["0_jiqidianliang"]);
shijian.push(this.machineElectric[i]["1_date"]);
@@ -1391,9 +1400,10 @@
this.val.series[0].itemStyle.color='rgb(84,112,198)'
this.val.xAxis[0].data=datashijian;
this.val.series[0].data=dianhao;
+ this.val.series[1].data=dianhao;
HisArr.setOption(this.val);
this.loading=false
- },
+ },
echarsInit1(){
var datashijian=[];
var s=7;
--
Gitblit v1.8.0