Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II

严智鑫

2025-11-11 1955bf498b250482cca4f87ed31e2c9508ab74e4

 gmms/WebContent/bigScreen/allGlassScreen.jsp

@@ -18,8 +18,8 @@
            height: 5%;
            background-color: white;
            display: inline-block;
             text-align: center;
               font-size: 40px;
            text-align: center;
            font-size: 40px;
        }
        #header {
            width: 100%;
@@ -29,12 +29,13 @@
        }  
        #footer {
            width: 100%;
            height: 55%;
            height: 70%;
            overflow: visible; /* 确保设备图上移后不被自身容器裁剪 */
            
        }
        #main1 {
            width: 15%;
            margin-left:1%;
            width: 14%;
            height: 100%;
        }
        #main2 {
@@ -1113,8 +1114,28 @@
             dianhao.push(this.machineElectric[i]["0_jiqidianliang"]);
           }

           // 4. 复用val配置，统一样式（和水耗表保持一致）
           this.val.yAxis[0].name = "电耗"; // 仅修改名称为“电耗”
           // 4. 复用val配置，统一样式（和水耗表保持一致）  
           this.val.yAxis[0] = {
              ...this.val.yAxis[0],
              name: "电耗",
             show: true,
              nameShow: true,
              nameWidth: 80, 
              nameLocation: "end", // 保持在端
              nameGap: 20, 
              nameTextStyle: {
              fontSize: 14,
              color: "#333", 
             align: "center", 
                verticalAlign: "middle" 
           },
              padding: [0, 20, 0, 0], 
              axisLine: {
             lineStyle: {
               width: 0 
                }
              }
            };
           this.val.series[0].name = '电耗(kw.h)'; // 电耗单位
           this.val.title.text = "总耗电(kw.h)"; // 标题
           this.val.series[0].itemStyle.color = '#5470c6'; // 电耗表颜色（可自定义，与水耗区分）
@@ -1146,7 +1167,27 @@
             dianhao.push(this.machineWater[i]["0_jiqidianliang"]);
           }
           // 4. 复用val配置，统一样式（和水耗表保持一致）
           this.val.yAxis[0].name = "水耗";
            this.val.yAxis[0] = {
              ...this.val.yAxis[0],
              name: "水耗",   
             show: true,
              nameShow: true,
              nameWidth: 80, 
              nameLocation: "end", // 保持在端
              nameGap: 20,   
              nameTextStyle: {
              fontSize: 14,
              color: "#333", 
             align: "center", 
                verticalAlign: "middle" 
           },
              padding: [0, 20, 0, 0], 
              axisLine: {
             lineStyle: {
               width: 0 
                }
              }
            };
           this.val.series[0].name = '水耗(kw.h)'; 
           this.val.title.text = "总耗水(kw.h)"; 
           this.val.series[0].itemStyle.color = '#5470c6'; // 电耗表颜色（可自定义，与水耗区分）