From 3d3e4173c301fd36c16b9a25cd1f8c9f27257ed0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 十一月 2025 16:50:18 +0800
Subject: [PATCH] 新增当月总耗电、电视机样式调整、字体更换、副屏设备图裁剪放大、24小时柱状图更换为昨天晚上8点到今天晚上8点、报警色块位置调整

---
 gmms/WebContent/bigScreen/allGlassflash.jsp |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gmms/WebContent/bigScreen/allGlassflash.jsp b/gmms/WebContent/bigScreen/allGlassflash.jsp
index 93639d5..5462163 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;
@@ -1466,7 +1476,7 @@
                     itemStyle: { color: 'darkseagreen' }
 
                 }
-                this.val1.title.text="璁㈠崟鍔犲伐"
+                this.val1.title.text="褰撴棩鍔犲伐"
                 this.val1.title.top="45%"
                 this.val1.title.left="40%"
                 this.val1.series[0].data[0]=a

--
Gitblit v1.8.0