From 513dfe25747ad739314b758f072ff4466794bfbf Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 24 十一月 2025 09:17:27 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II

---
 gmms/WebContent/bigScreen/allGlassScreen.jsp |  649 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 500 insertions(+), 149 deletions(-)

diff --git a/gmms/WebContent/bigScreen/allGlassScreen.jsp b/gmms/WebContent/bigScreen/allGlassScreen.jsp
index 0caf365..1a720ee 100644
--- a/gmms/WebContent/bigScreen/allGlassScreen.jsp
+++ b/gmms/WebContent/bigScreen/allGlassScreen.jsp
@@ -6,142 +6,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
 <style>
-      html,body{
-        width: 100%;
-        height: 100%;
-        padding: 0;
-        margin: 0;
-        overflow: hidden;  
-      }
-      #header1 {
-            width: 100%;
-            height: 5%;
-            background-color: white;
-            display: inline-block;
-   			text-align: center;
-            font-size: 40px;
-        }
-        #header {
-            width: 100%;
-            height: 25%;
-            background-color: white;
-            display: flex;
-        }  
-        #footer {
-            width: 100%;
-            height: 70%;
-            overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
-            
-        }
-        #main1 {
-            margin-left:1%;
-            width: 14%;
-            height: 100%;
-        }
-        #main2 {
-            width: 20%;
-            height: 100%;
-        }
-        #main4 {
-            width: 20%;
-            height: 100%;
-        }
-        #main3 {
-            width: 45%;
-            height: 100%;
-            display: flex;
-        }
-        #main1-1 {
-            width: 100%;
-            height: 25%;
-        }
-        #main1-2 {
-            width: 100%;
-            height: 25%;
-        }
-        #main3-1 {
-            width: 50%;
-            height: 100%;
-        }
-        #main3-2 {
-            width: 50%;
-            height: 100%;
-
-        }
-        #main4-1 {
-            width: 100%;
-            height: 30%;
-
-        }
-        #main4-2 {
-            width: 100%;
-            height: 30%;
-
-        }
-        #main4-3 {
-            width: 100%;
-            height: 30%;
-
-        }
-        #main1-1-1 {
-            font-size: 25px;
-            margin-top: 2%;
-        }
-        #main1-2-1 {
-            font-size: 25px;
-            margin-top: 2%;
-        }
-        #main3-1-1 {
-            width: 100%;
-            height: 20%;
-        }
-        #main3-1-2 {
-            width: 100%;
-            height: 80%;
-        }
-        #main3-2-1 {
-            width: 100%;
-            height: 20%;
-        }
-        #main3-2-2 {
-            width: 100%;
-            height: 80%;
-        }
-
-
-        .boli {
-          opacity:0.5;
-          
-        }
-     
-       
     
- 
-        .divGrenn{
-       		 background-color:green;
-       		 display:block
-        }
-        .divRed{
-       		 background-color:red;
-       		 display:block
-        }
-        .divYellow{
-       		 background-color:yellow;
-       		 display:block
-        }
-        .divnull{
-       		display:none
-        }
-         /* -45 
-        -50
-        */
-        #A4 {
-            width: 65px;
-            height: 55px;
-            position: Absolute;
-            top: 775px;
-            left: 1250px
-        }
 	#warn-734,#warn-743{
  		 top: 555px !important;   
   		left: 1421px !important;
@@ -875,6 +740,258 @@
   height: 18px !important;
   position: Absolute;
 }
+
+  html,body{
+        width: 100%;
+        height: 100%;
+        padding: 0;
+        margin: 0;
+        overflow: hidden;  
+        
+      }
+      #header1 {
+            width: 100%;  
+            height: 5%;
+            background-color: white;
+            display: inline-block;
+   			text-align: center;
+            font-size: 40px;
+        }
+        #header {
+            width: 100%;   
+            height: 20%;
+            background-color: white;
+            display: flex;
+        }  
+        #center {
+            width: 100%;
+            height: 60%;
+            overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
+            
+        }
+  	 #footer {
+            width: 100%;
+            height: 20%;
+            overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
+            
+        }        
+        #main1 {
+            margin-left:1%;
+            width: 14%;
+            height: 100%;
+        }
+        #main2 {
+            width: 20%;
+            height: 100%;
+        }
+        #main4 {
+            width: 20%;
+            height: 100%;
+        }
+        #main3 {
+            width: 45%;
+            height: 100%;
+            display: flex;
+        }
+        #main1-1 {
+            width: 100%;
+            height: 25%;
+        }
+        #main1-2 {
+            width: 100%;
+            height: 25%;
+        }
+        #main3-1 {
+            width: 50%;
+            height: 100%;
+        }
+        #main3-2 {
+            width: 50%;
+            height: 100%;
+
+        }
+        #main4-1 {
+            width: 100%;
+            height: 30%;
+
+        }
+        #main4-2 {
+            width: 100%;
+            height: 30%;
+
+        }
+        #main4-3 {
+            width: 100%;
+            height: 30%;
+
+        }
+        #main1-1-1 {
+            font-size: 25px;
+            margin-top: 2%;
+        }
+        #main1-2-1 {
+            font-size: 25px;
+            margin-top: 2%;
+        }
+        #main3-1-1 {
+            width: 100%;
+            height: 20%;
+        }
+        #main3-1-2 {
+            width: 100%;
+            height: 80%;
+        }
+        #main3-2-1 {
+            width: 100%;
+            height: 20%;
+        }
+        #main3-2-2 {
+            width: 100%;
+            height: 80%;
+        }
+
+
+        .boli {
+          opacity:0.5;
+          
+        }           
+        .divGrenn{
+       		 background-color:green;
+       		 display:block
+        }
+        .divRed{
+       		 background-color:red;
+       		 display:block
+        }
+        .divYellow{
+       		 background-color:yellow;
+       		 display:block
+        }
+        .divnull{
+       		display:none
+        }
+         /* -45 
+        -50
+        */
+        #A4 {
+            width: 65px;
+            height: 55px;
+            position: Absolute;
+            top: 775px;
+            left: 1250px
+        }
+        /* 搴曢儴 */
+        #footer {
+  width: 100%;
+  height: 20%;
+  overflow: visible;
+  display: flex; /* 妯悜甯冨眬 */
+  background-color: white; /* 涓巋eader鑳屾櫙缁熶竴 */
+  box-sizing: border-box;
+  padding: 10px;
+}
+
+/* 浜ч噺鏌辩姸鍥惧鍣ㄦ牱寮� */
+#production-chart-wrap {
+  height: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+}
+
+#production-chart-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5px;
+  text-align: center;
+}
+
+#production-chart-container {
+  width: 100%;
+  height: calc(100% - 30px); /* 鍑忓幓鏍囬楂樺害 */
+}
+
+#staff-container {
+  width: 30%;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 10px;
+  background-color: white;
+}
+
+#staff-title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 5px;
+  text-align: center;
+}
+
+/* 婊氬姩瀹瑰櫒锛氳鏁拌秴鍑烘椂鏄剧ず婊氬姩鏉� */
+#staff-scroll-wrapper {
+  padding-right: 5px; /* 棰勭暀婊氬姩鏉″搴︼紝閬垮厤鍐呭琚伄鎸� */
+}
+
+#staff-table-wrapper {
+  gap: 0px; /* 涓ょ粍琛ㄦ牸闂磋窛 */
+  width: 100%; /* 鍗犳弧婊氬姩瀹瑰櫒瀹藉害 */
+}
+
+/* 瀛愯〃鏍兼牱寮忥紙姣忕粍涓ゅ垪锛屽叡鍥涘垪锛� */
+.staff-subtable {
+  width: 50%; /* 姣忕粍鍗�50%瀹藉害锛屽洓鍒楁�诲崰婊�30%瀹瑰櫒 */
+  border-collapse: collapse;
+  text-align: center;
+  font-size: 14px;
+}
+
+.staff-subtable th, .staff-subtable td {
+  border: 1px solid #ddd;
+  padding: 6px 3px;
+  width: 50%; /* 缁勫唴涓ゅ垪绛夊 */
+}
+
+.staff-subtable th {
+  background-color: #f0f0f0;
+  font-size: 13px;
+}
+
+.staff-subtable input {
+  width: 100%;
+  height: 20px;
+  padding: 0 3px;
+  font-size: 13px;
+  text-align: center;
+  box-sizing: border-box;
+}
+
+/* 婊氬姩鏉℃牱寮忎紭鍖栵紙鍙�夛級 */
+#staff-scroll-wrapper::-webkit-scrollbar {
+  width: 6px;
+}
+#staff-scroll-wrapper::-webkit-scrollbar-thumb {
+  background-color: #ddd;
+  border-radius: 3px;
+}
+/* 鍘婚櫎杈撳叆妗嗚竟妗嗗強鑱氱劍杞粨 */
+.staff-subtable input {
+  width: 100%;
+  height: 20px;
+  padding: 0 3px;
+  font-size: 13px;
+  text-align: center;
+  box-sizing: border-box;
+  border: none; 
+  /* 鍘婚櫎鑱氱劍鏃剁殑榛樿杞粨锛堟祻瑙堝櫒鑷甫锛� */
+  outline: none; 
+  /* 鍙�夛細娣诲姞鑳屾櫙鑹查�忔槑锛岃杈撳叆妗嗘洿铻嶅叆琛ㄦ牸 */
+  background: transparent; 
+}
+.staff-subtable input:hover {
+  background-color: #f5f5f5; /* 娴呯伆鑹茶儗鏅� */
+}
+.staff-subtable input.saving {
+  background-color: #fff3cd; /* 娴呴粍鑹茶儗鏅彁绀� */
  </style>  
 <title>澶у睆鏄剧ず</title>
 </head>
@@ -909,8 +1026,8 @@
                 </div>
             </div>
         </div>
-        <div id="footer">
-            <img style="width: 100%;height: 100%;" src="../img/浜屾湡澶у睆.png">
+        <div id="center">
+            <img style="width: 100%;height: 100%;" src="../img/鏂颁簩鏈熷ぇ灞�.png">
     <div v-if="warning && warning.length > 0">
     <div 
       v-for="warnItem in warning" 
@@ -919,21 +1036,59 @@
        :id="'warn-' + warnItem['0_id']" 
        v-show="warnItem['4_state'] === '1'"
        :title="warnItem['3_content_value'] || '鏃犺缁嗕俊鎭�'"
-      style="
+      style="   
         position: absolute; 
         top: 450px; 
         background: rgba(255, 0, 0, 0.4);
-        color: white;
+        color: white;  
         z-index: 10;
-        cursor: pointer;	
-      "
-    >
-    
+        cursor: pointer;" >	     
     </div> 
   </div>
 
 </div>
+   <div id="footer">
+  <div id="production-chart-wrap" style="width: 70%; height: 100%;">
+    <div id="production-chart-title"></div>
+    <div id="production-chart-container"></div> 
     
+  </div>
+  
+ <div id="staff-container" style="width: 30%; height: 111%;">
+  <div id="staff-title">褰撶彮浜哄憳淇℃伅</div>
+  <!-- 婊氬姩瀹瑰櫒锛氳鏁拌繃澶氭椂鍑虹幇婊氬姩鏉� -->
+  <div id="staff-scroll-wrapper" style="height: calc(100% - 30px); overflow-y: auto;">
+    <!-- 鍥涘垪甯冨眬瀹瑰櫒锛坒lex妯悜鎺掑垪涓ょ粍琛ㄦ牸锛� -->
+    <div id="staff-table-wrapper" style="display: flex;">
+      <!-- 宸︾粍锛氬墠鍗婇儴鍒嗘暟鎹紙璁惧1+濮撳悕1锛� -->
+      <table class="staff-subtable">
+<!--         <thead>
+          <tr><th>璁惧</th><th>濮撳悕</th></tr>
+        </thead> -->
+        <tbody>
+          <tr v-for="(item, index) in leftGroup" :key="'left-' + index">
+            <td><input type="text" readonly v-model="item['0_machine']" @keydown.enter="saveStaff(leftGroupIndex[index])" placeholder="璁惧"></td>
+            <td><input type="text" v-model="item['1_operator_name']" @keydown.enter="saveStaff(leftGroupIndex[index])" placeholder="濮撳悕"></td>
+          </tr>
+        </tbody>
+      </table>
+
+      <!-- 鍙崇粍锛氬悗鍗婇儴鍒嗘暟鎹紙璁惧2+濮撳悕2锛� -->
+      <table class="staff-subtable">
+     <!--    <thead>
+          <tr><th>璁惧</th><th>濮撳悕</th></tr>
+        </thead> -->
+        <tbody>
+          <tr v-for="(item, index) in rightGroup" :key="'right-' + index">
+            <td><input type="text" readonly v-model="item['0_machine']" @keydown.enter="saveStaff(rightGroupIndex[index])" placeholder="璁惧"></td>
+            <td><input type="text" v-model="item['1_operator_name']" @keydown.enter="saveStaff(rightGroupIndex[index])" placeholder="濮撳悕"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+</div>
 
 
 <script src="../js/jquery-3.4.1.min.js"></script>
@@ -954,8 +1109,10 @@
 		  shuzu1:[{}],
           shuzu2:[{}],
           warning:[],
+          Hour24:[],
 		  machineElectric:[{}],
-		machineWater:[{}],
+		  machineWater:[{}],
+		  operator:[{}],
 		
     val: {
 				title:{
@@ -1088,11 +1245,59 @@
         }
 
     }
-  ]
+  ],
+
     },
 		  
-	  },
+	  },/*data缁撳熬  */
+	  computed: {
+		    // 璁$畻宸︾粍鏁版嵁锛堝墠鍗婇儴鍒嗭級
+		    leftGroup() {
+		      const mid = Math.ceil(this.operator.length / 2);
+		      return this.operator.slice(0, mid);
+		    },
+		    // 璁$畻鍙崇粍鏁版嵁锛堝悗鍗婇儴鍒嗭級
+		    rightGroup() {
+		      const mid = Math.ceil(this.operator.length / 2);
+		      return this.operator.slice(mid);
+		    },
+		    // 宸︾粍鍘熷绱㈠紩
+		    leftGroupIndex() {
+		      const mid = Math.ceil(this.operator.length / 2);
+		      return Array.from({ length: mid }, (_, i) => i);
+		    },
+		    // 鍙崇粍鍘熷绱㈠紩
+		    rightGroupIndex() {
+		      const mid = Math.ceil(this.operator.length / 2);
+		      return Array.from({ length: this.operator.length - mid }, (_, i) => mid + i);
+		    }
+		  },
 	  methods:{
+		  // 鍥炶溅鎻愪氦淇敼锛坕ndex锛氬師濮媜perator鏁扮粍涓殑绱㈠紩锛�
+		  saveStaff(index) {
+		    // 1. 鑾峰彇褰撳墠琛屾暟鎹紙璁惧鍚嶇О+淇敼鍚庣殑濮撳悕锛�
+		    const currentItem = this.operator[index];
+		    if (!currentItem) {
+		        alert("鏁版嵁寮傚父锛屾棤娉曚繚瀛�");
+		        return;
+		      }
+		    const machine = currentItem["0_machine"]; // 璁惧鍚�
+		    const operatorName = currentItem["1_operator_name"]; // 濮撳悕
+		    if (!machine || !operatorName.trim()) {
+		        alert("璁惧鍚嶄笉鑳戒负绌猴紝涓斿鍚嶄笉鍙负绌猴紒");
+		        return;
+		      }
+		    let updateData = {
+		    	    machine: machine, // 瀵瑰簲IN machine
+		    	    operatorName: operatorName // 瀵瑰簲IN operatorName
+		    	  }; 
+		    //鎻愪氦鏁版嵁搴�
+		    /*  console.log("濮撳悕锛�", updateData); */
+		    let sql = "{call bigScreen_operatorUpdate(?,?,?)}~" + JSON.stringify(updateData);
+		    this.connects("鍊肩彮浜哄憳淇℃伅淇敼", sql,1,1);
+		    document.activeElement.blur();
+		  },
+		  
 		  echarsInit() {
 			  // 1. 鐢熸垚杩�7澶╂棩鏈燂紙鍜屾按鑰楄〃閫昏緫涓�鑷达級
 			  var datashijian = [];
@@ -1129,13 +1334,31 @@
     			align: "center", 
    				 verticalAlign: "middle" 
   			},
+  			
   				padding: [0, 20, 0, 0], 
   				axisLine: {
     			lineStyle: {
 	   			width: 0 
 	   			 }
  				 }
-				};
+				};  
+			  this.val.series[0] = {
+					    ...this.val.series[0],
+					    name: '鐢佃��(kw.h)', // 鐢佃�楀崟浣�
+					    itemStyle: {
+					      color: '#5470c6' // 鐢佃�楄〃棰滆壊
+					    },
+					    // 鏂板锛氭樉绀烘煴鐘跺浘鏁板��
+					    label: {
+					      show: true, // 寮�鍚樉绀�
+					      position: 'top', // 鏁板�兼樉绀哄湪鏌卞瓙椤堕儴
+					      textStyle: {
+					        color: '#333', // 鏂囧瓧棰滆壊
+					        fontSize: 12 // 鏂囧瓧澶у皬
+					      },
+					      formatter: '{c}' // 鏍煎紡鍖栨樉绀猴紝{c}琛ㄧず褰撳墠鏁版嵁鍊�
+					    }
+					  };
 			  this.val.series[0].name = '鐢佃��(kw.h)'; // 鐢佃�楀崟浣�
 			  this.val.title.text = "鎬昏�楃數(kw.h)"; // 鏍囬
 			  this.val.series[0].itemStyle.color = '#5470c6'; // 鐢佃�楄〃棰滆壊锛堝彲鑷畾涔夛紝涓庢按鑰楀尯鍒嗭級
@@ -1188,8 +1411,25 @@
 	   			 }
  				 }
 				};
-			  this.val.series[0].name = '姘磋��(kw.h)'; 
-			  this.val.title.text = "鎬昏�楁按(kw.h)"; 
+			   this.val.series[0] = {
+					    ...this.val.series[0],
+					    name: '姘磋��(L.h)',
+					    itemStyle: {
+					      color: '#5470c6' 
+					    },
+					    // 鏂板锛氭樉绀烘煴鐘跺浘鏁板��
+					    label: {
+					      show: true, 
+					      position: 'top',
+					      textStyle: {
+					        color: '#333',
+					        fontSize: 12
+					      },
+					      formatter: '{c}' 
+					    }
+					  };
+			  this.val.series[0].name = '姘磋��(L.h)'; 
+			  this.val.title.text = "鎬昏�楁按(L.h)"; 
 			  this.val.series[0].itemStyle.color = '#5470c6'; // 鐢佃�楄〃棰滆壊锛堝彲鑷畾涔夛紝涓庢按鑰楀尯鍒嗭級
 			  this.val.xAxis[0].data = datashijian; // x杞存棩鏈燂紙鍜屾按鑰椾竴鑷达級
 			  this.val.series[0].data = dianhao; // 缁戝畾鐢佃�楁暟鎹�
@@ -1197,6 +1437,102 @@
 			  // 5. 搴旂敤閰嶇疆骞舵覆鏌�
 			  HisArr.setOption(this.val);
 			  this.loading = false;
+			}
+		  ,
+		  initProductionChart() {
+			  // 1. 鍥哄畾x杞存爣绛撅紙鏄ㄥぉ8鐐光啋浠婂ぉ7鐐癸紝鍏�24涓椂娈碉紝鏃犵浜屽ぉ8鐐癸級
+			  const hourLabels = [
+			    "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", // 鏄ㄥぉ8-19鐐�
+			    "20", "21", "22", "23", // 鏄ㄥぉ20-23鐐�
+			    "00", "01", "02", "03", "04", "05", "06", "07" // 浠婂ぉ0-7鐐癸紙鍏�24涓級
+			  ];
+
+			  // 2. 寮哄埗璁剧疆鍥捐〃瀹瑰櫒楂樺害锛堥伩鍏嶆覆鏌撲笉鍙锛�
+			  const chartDom = document.getElementById('production-chart-container');
+			  if (!chartDom) {
+			    console.error("鍥捐〃瀹瑰櫒涓嶅瓨鍦紒璇锋鏌d锛歱roduction-chart-container");
+			    return;
+			  }
+			  chartDom.style.width = '100%';
+			  chartDom.style.height = '100%';
+
+			  // 3. 鎸夋暟鎹簮椤哄簭鎻愬彇浜ч噺锛�1:1瀵瑰簲鏍囩锛屾瀬绠�鏄犲皠锛�
+			  const outputData = this.Hour24.map(item => {
+			    // 鍏煎绌哄�笺�佸瓧绗︿覆鏍煎紡锛岃浆鏁板瓧澶辫触璁句负0
+			    return item["1_hourly_production"] 
+			      ? parseInt(item["1_hourly_production"].toString().trim(), 10) || 0 
+			      : 0;
+			  });
+
+			  // 4. 鏋佺畝鍥捐〃閰嶇疆锛堟竻鏅扮洿瑙傦級
+			  const chartOption = {
+			      animation: true, // 棣栨娓叉煋鏃舵挱鏀惧姩鐢伙紙鍙�夛紝榛樿true锛�
+				  animationDuration: 500, // 棣栨鍔ㄧ敾鏃堕暱锛�500ms锛屽彲璋冩暣锛�			   
+			  /*  title: {
+			      text: "24灏忔椂浜ч噺(鐗�)锛堟槰鏃�8鐐�-浠婃棩7鐐癸級",
+			      left: "center",
+			      textStyle: { fontSize: 15, color: "#333" }
+			    }, */
+			    tooltip: {
+			      trigger: "axis",
+			      formatter: "{b}鏃讹細{c}鐗�" // 鎻愮ず妗嗘樉绀衡�淴X鏃讹細XX鐗団��
+			    },
+			    grid: {
+			      left: "5%",
+			      right: "5%",
+			      bottom: "15%",
+			      top: "12%",
+			      containLabel: true
+			    },
+			    xAxis: [
+			      {
+			        type: "category",
+			        data: hourLabels,
+			        axisLine: { lineStyle: { color: "#ddd" } },
+			        axisLabel: {
+			          fontSize: 12,
+			          color: "#333",
+			          interval: 0 // 寮哄埗鏄剧ず鎵�鏈�24涓爣绛�
+			        }
+			      }
+			    ],
+			    yAxis: [
+			      {
+			        type: "value",  
+			        /* name: "鐗�", */
+			        min: 0, // 寮哄埗y杞翠粠0寮�濮�
+			        splitLine: { lineStyle: { color: "#f5f5f5" } },
+			        axisLabel: { color: "#333", fontSize: 11 }
+			      }
+			    ],
+			    series: [
+			      {
+			        name: "浜ч噺",
+			        type: "bar",
+			        data: outputData,
+			        barWidth: "60%",
+			        itemStyle: { color: "#fac858", borderRadius: 3 },
+			        label: {
+			          show: true,
+			          position: "top",
+			          fontSize: 12,
+			          color: "#333",
+			          formatter: "{c}" // 鏌卞瓙椤堕儴鏄剧ず浜ч噺鏁板��
+			        }
+			      }
+			    ]
+			  };
+
+			  // 鍒濆鍖栧浘琛紙鍏ㄥ眬鍙垵濮嬪寲1娆★紝閬垮厤閲嶅鍒涘缓锛�
+			  if (!this.productionChartInstance) {
+			    this.productionChartInstance = this.$echarts.init(chartDom);
+			  }
+
+			  // 鍏抽敭锛氱2涓弬鏁� { animation: false } 绂佺敤鏇存柊鍔ㄧ敾
+			  this.productionChartInstance.setOption(chartOption, { animation: false });
+
+			  // 绐楀彛 resize 鏃惰嚜鍔ㄩ噸缁�
+			  window.addEventListener('resize', () => productionChart.resize());
 			}
 		  ,
 	
@@ -1262,6 +1598,9 @@
 			machineWater(){
 				this.echarsInit1()
 			},
+			Hour24(){
+				this.initProductionChart();
+			},
             shuzu1(){
 				this.dingdanxiangqing(),
                 this.dingdanxiangqing1()
@@ -1281,6 +1620,10 @@
 		this.loadAjxss('澶у睆鎬荤數鑰楁暟鎹�',sql,flag,"machineElectric")
         sql="{call machine_warningScreen()}"
 		this.loadAjxss('澶у睆璁惧璀﹀憡鏁版嵁',sql,flag,"warning")
+		sql="{call bigScreen_24Hour()}"
+		this.loadAjxss('澶у睆24灏忔椂浜ч噺鏁版嵁',sql,flag,"Hour24")
+		sql="{call bigScreen_operatorQuery()}"
+		this.loadAjxss('澶у睆宸ヨ壓鍊肩彮琛�',sql,flag,"operator")
         sql="{call bigScreen_water()}"
 		this.loadAjxss('澶у睆鎬绘按鑰楁暟鎹�',sql,flag,"machineWater")
         
@@ -1303,6 +1646,14 @@
 				sql="{call machine_warningScreen()}"
 				this.interValLoadAjxs('澶у睆璁惧璀﹀憡鏁版嵁',sql,flag,"warning")
 			},5000)    
+        await setInterval(()=>{
+			sql="{call bigScreen_24Hour()}"
+			this.interValLoadAjxs('澶у睆24灏忔椂浜ч噺鏁版嵁',sql,flag,"Hour24")
+		},5000)  
+        await setInterval(()=>{
+			sql="{call bigScreen_operatorQuery()}"
+			this.interValLoadAjxs('澶у睆鍊肩彮浜哄憳琛�',sql,flag,"operator")
+		},50000)
 		 await setInterval(()=>{
 				sql="{call bigScreen_water()}"
 				this.interValLoadAjxs('澶у睆鎬绘按鑰楁暟鎹�',sql,flag,"machineWater")

--
Gitblit v1.8.0