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/allGlassScreen.jsp | 1834 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 1,089 insertions(+), 745 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassScreen.jsp b/gmms/WebContent/bigScreen/allGlassScreen.jsp
index 0caf365..86f7abe 100644
--- a/gmms/WebContent/bigScreen/allGlassScreen.jsp
+++ b/gmms/WebContent/bigScreen/allGlassScreen.jsp
@@ -6,15 +6,751 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style>
- html,body{
+
+ #warn-734,#warn-743{
+ top: 481px !important;
+ left: 1454px !important;
+ width: 53px !important;
+ height: 22px !important;
+ position: Absolute;
+ }
+ #warn-735,#warn-744{
+ top: 423px !important;
+ left: 1419px !important;
+ width: 16px !important;
+ height: 17px !important;
+ position: Absolute;
+ }
+ #warn-736,#warn-745{
+ top: 423px !important;
+ left: 1376px !important;
+ width: 16px !important;
+ height: 17px !important;
+ position: Absolute;
+ }
+ #warn-737,#warn-746{
+ top: 462px !important;
+ left: 1413px !important;
+ width: 18px !important;
+ height: 14px !important;
+ position: Absolute;
+ }
+ #warn-738,#warn-747{
+ top: 462px !important;
+ left: 1386px !important;
+ width: 18px !important;
+ height: 14px !important;
+ position: Absolute;
+ }
+ #warn-740,#warn-749{
+ top: 425px !important;
+ left: 1385px !important;
+ width: 18px !important;
+ height: 13px !important;
+ position: Absolute;
+ }
+ #warn-739,#warn-748{
+ top: 425px !important;
+ left: 1405px !important;
+ width: 18px !important;
+ height: 13px !important;
+ position: Absolute;
+ }
+ #warn-741,#warn-750{
+ top: 425px !important;
+ left: 1366px !important;
+ width: 18px !important;
+ height: 13px !important;
+ position: Absolute;
+ }
+ #warn-742,#warn-751{
+ top: 425px !important;
+ left: 1348px !important;
+ width: 18px !important;
+ height: 13px !important;
+ position: Absolute;
+ }
+ #warn-812{
+top: 427px !important;
+ left: 1269px !important;
+ width: 20px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-813{
+ top: 458px !important;
+ left: 1267px !important;
+ width: 24px !important;
+ height: 20px !important;
+ position: Absolute;
+}
+#warn-1062{
+ top: 431px !important; /* 鍘焧op=581px 脳 0.8966鈮�521px */
+ left: 1180px !important;
+ width: 25px !important;
+ height: 20px !important;
+ position: Absolute;
+}
+#warn-1063{
+ top: 431px !important; /* 鍘焧op=581px 脳 0.8966鈮�521px */
+ left: 1180px !important;
+ width: 25px !important;
+ height: 20px !important;
+ position: Absolute;
+}
+ #warn-3162{
+ top: 480px !important; /* 鍘�621px 脳 0.8966鈮�557px */
+ left: 1180px !important;
+ width: 25px !important;
+ height: 20px !important;
+ position: Absolute;
+}
+#warn-3163{
+ top: 481px !important; /* 鍘�621px 脳 0.8966鈮�557px */
+ left: 1180px !important;
+ width: 25px !important;
+ height: 20px !important;
+ position: Absolute;
+}
+#warn-1153{
+ top: 485px !important;
+ left: 1266px !important;
+ width: 22px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-1154{
+ top: 480px !important; /* 鍘�679px 脳 0.8966鈮�535px */
+ left: 1264px !important;
+ width: 23px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-1155{
+ top: 535px !important; /* 鍘�679px 脳 0.8966鈮�535px */
+ left: 1247px !important;
+ width: 17px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-1156{
+ top: 535px !important; /* 鍘�679px 脳 0.8966鈮�535px */
+ left: 1230px !important;
+ width: 17px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-1157{
+ top: 536px !important; /* 鍘�681px 脳 0.8966鈮�536px */
+ left: 1209px !important;
+ width: 20px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1158{
+ top: 535px !important; /* 鍘�680px 脳 0.8966鈮�535px */
+ left: 1174px !important;
+ width: 34px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1159{
+ top: 536px !important; /* 鍘�681px 脳 0.8966鈮�536px */
+ left: 1153px !important;
+ width: 20px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1160{
+ top: 535px !important; /* 鍘�680px 脳 0.8966鈮�535px */
+ left: 1137px !important;
+ width: 16px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1161{
+ top: 510px !important; /* 鍘�655px 脳 0.8966鈮�510px */
+ left: 1212px !important;
+ width: 16px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-1162{
+ top: 496px !important; /* 鍘�641px 脳 0.8966鈮�575px */
+ left: 1212px !important;
+ width: 16px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1163{
+ top: 472px !important; /* 鍘�616px 脳 0.8966鈮�472px */
+ left: 1212px !important;
+ width: 16px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-1164{
+ top: 541px !important; /* 鍘�603px 脳 0.8966鈮�541px */
+ left: 1212px !important;
+ width: 16px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1165{
+ top: 541px !important; /* 鍘�603px 脳 0.8966鈮�541px */
+ left: 1156px !important;
+ width: 16px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1166{
+ top: 472px !important; /* 鍘�616px 脳 0.8966鈮�472px */
+ left: 1156px !important;
+ width: 16px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-1167{
+ top: 496px !important; /* 鍘�641px 脳 0.8966鈮�575px */
+ left: 1156px !important;
+ width: 16px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1168{
+ top: 510px !important; /* 鍘�655px 脳 0.8966鈮�510px */
+ left: 1156px !important;
+ width: 16px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-1254{
+ display:None;
+ position: Absolute;
+}
+#warn-1343{
+ top: 534px !important;
+ left: 1030px !important;
+ width: 16px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-1344{
+ top: 535px !important;
+ left: 1006px !important;
+ width: 22px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+ #warn-1345{
+top: 537px !important;
+ left: 987px !important;
+ width: 17px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1346{
+top: 535px !important;
+ left: 969px !important;
+ width: 16px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1347{
+ top: 537px !important;
+ left: 766px !important;
+ width: 202px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1348{
+ top: 536px !important;
+ left: 746px !important;
+ width: 20px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1349{
+ top: 535px !important;
+ left: 716px !important;
+ width: 15px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1350{
+ top: 535px !important;
+ left: 682px !important;
+ width: 15px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1351{
+ top: 536px !important;
+ left: 700px !important;
+ width: 15px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1352{
+ top: 536px !important;
+ left: 663px !important;
+ width: 18px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-1353{
+ top: 515px !important;
+ left: 986px !important;
+ width: 13px !important;
+ height: 16px !important;
+ position: Absolute;
+}
+#warn-1354{
+top: 491px !important;
+ left: 987px !important;
+ width: 13px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-1355{
+ top: 475px !important;
+ left: 986px !important;
+ width: 16px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-1661{
+ display:none;
+ position: Absolute;
+}
+#warn-1723{
+ top: 529px !important;
+ left: 1090px !important;
+ width: 23px !important;
+ height: 22px !important;
+ position: Absolute;
+}
+#warn-1923{
+ display:none !important;
+}
+
+#warn-2110{
+ top: 535px !important;
+ left: 466px !important;
+ width: 38px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2111{
+ top: 536px !important;
+ left: 447px !important;
+ width: 18px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-2112{
+top: 535px !important;
+ left: 373px !important;
+ width: 40px !important;
+ height: 19px !important;
+ position: Absolute;
+}
+#warn-2113{
+ top: 535px !important;
+ left: 373px !important;
+ width: 40px !important;
+ height: 19px !important;
+ position: Absolute;
+}
+#warn-2114{
+ top: 538px !important;
+ left: 414px !important;
+ width: 31px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-2214{
+ top: 537px !important;
+ left: 339px !important;
+ width: 31px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-2215{
+top: 517px !important;
+ left: 270px !important;
+ width: 21px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-2216{
+ top: 505px !important;
+ left: 268px !important;
+ width: 21px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-2217{
+ top: 462px !important;
+ left: 268px !important;
+ width: 21px !important;
+ height: 43px !important;
+ position: Absolute;
+}
+#warn-2218{
+ top: 418px !important;
+ left: 268px !important;
+ width: 21px !important;
+ height: 43px !important;
+ position: Absolute;
+}
+#warn-2219{
+top: 405px !important;
+ left: 263px !important;
+ width: 32px !important;
+ height: 13px !important;
+ position: Absolute;
+}
+#warn-2310{
+ top: 531px !important;
+ left: 263px !important;
+ width: 36px !important;
+ height: 22px !important;
+ position: Absolute;
+}
+#warn-2311{
+ top: 382px !important;
+ left: 259px !important;
+ width: 36px !important;
+ height: 22px !important;
+ position: Absolute;
+}
+#warn-2314{
+ top: 382px !important;
+ left: 38px !important;
+ width: 36px !important;
+ height: 22px !important;
+ position: Absolute;
+}
+#warn-2312{
+ top: 383px !important;
+ left: 190px !important;
+ width: 26px !important;
+ height: 16px !important;
+ position: Absolute;
+}
+#warn-2313{
+top: 385px !important;
+ left: 113px !important;
+ width: 27px !important;
+ height: 16px !important;
+ position: Absolute;
+}
+#warn-2421{
+top: 415px !important;
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2422{
+ top: 501px !important; /* 鍘�585px 脳 0.8966鈮�524px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2423{
+ top: 437px !important;
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2424{
+ top: 459px !important;
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2425{
+ top: 481px !important; /* 鍘�648px 脳 0.8966鈮�581px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2426{
+ top: 523px !important; /* 鍘�669px 脳 0.8966鈮�599px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2427{
+ top: 547px !important; /* 鍘�690px 脳 0.8966鈮�619px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2428{
+ top: 571px !important; /* 鍘�712px 脳 0.8966鈮�638px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 23px !important;
+ position: Absolute;
+}
+#warn-2429{
+ top: 595px !important; /* 鍘�736px 脳 0.8966鈮�660px */
+ left: 42px !important;
+ width: 22px !important;
+ height: 31px !important;
+ position: Absolute;
+}
+#warn-2510{
+ top: 663px !important;
+ left: 874px !important;
+ width: 33px !important;
+ height: 19px !important;
+ position: Absolute;
+}
+#warn-2511{
+ top: 667px !important;
+ left: 910px !important;
+ width: 28px !important;
+ height: 15px !important;
+ position: Absolute;
+}
+#warn-2512,#warn-2513{
+ top: 666px !important;
+ left: 940px !important;
+ width: 39px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-2514{
+ top: 669px !important;
+ left: 983px !important;
+ width: 26px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2614{
+ top: 638px !important;
+ left: 1117px !important;
+ width: 33px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2615{
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
+ left: 1155px !important;
+ width: 30px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2616{
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
+ left: 1186px !important;
+ width: 30px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2617{
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
+ left: 1216px !important;
+ width: 30px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2618{
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
+ left: 1246px !important;
+ width: 30px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2619{
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
+ left: 1276px !important;
+ width: 30px !important;
+ height: 14px !important;
+ position: Absolute;
+}
+#warn-2710{
+ top: 660px !important; /* 鍘�811px 脳 0.8966鈮�727px */
+ left: 1372px !important;
+ width: 38px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2711{
+ top: 661px !important; /* 鍘�815px 脳 0.8966鈮�710px */
+ left: 1411px !important;
+ width: 26px !important;
+ height: 16px !important;
+ position: Absolute;
+}
+#warn-2712{
+ top: 662px !important;
+ left: 1440px !important;
+ width: 88px !important;
+ height: 22px !important;
+ position: Absolute;
+}
+#warn-2713{
+top: 660px !important;
+ left: 1533px !important;
+ width: 33px !important;
+ height: 21px !important;
+ position: Absolute;
+}
+#warn-2714{
+ top: 663px !important;
+ left: 1571px !important;
+ width: 35px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-2814{
+ top: 641px !important;
+ left: 1581px !important;
+ width: 40px !important;
+ height: 23px !important;
+ position: Absolute;
+}
+#warn-2815{
+ top: 622px !important;
+ left: 1633px !important;
+ width: 46px !important;
+ height: 27px !important;
+ position: Absolute;
+}
+#warn-2816{
+ top: 622px !important;
+ left: 1633px !important;
+ width: 46px !important;
+ height: 27px !important;
+ position: Absolute;
+}
+#warn-2817{
+ top: 628px !important;
+ left: 1741px !important;
+ width: 45px !important;
+ height: 23px !important;
+ position: Absolute;
+}
+#warn-2818{
+ top: 628px !important;
+ left: 1790px !important;
+ width: 45px !important;
+ height: 23px !important;
+ position: Absolute;
+}
+#warn-2819{
+ top: 623px !important;
+ left: 1680px !important;
+ width: 48px !important;
+ height: 26px !important;
+ position: Absolute;
+}
+#warn-2961{
+top: 623px !important;
+ left: 1680px !important;
+ width: 48px !important;
+ height: 26px !important;
+ position: Absolute;
+}
+#warn-3037{
+ top: 690px !important;
+ left: 1857px !important;
+ width: 19px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3038{
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1825px !important;
+ width: 32px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3039{
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1793px !important;
+ width: 32px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3040{
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1741px !important;
+ width: 52px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3041{
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1689px !important;
+ width: 52px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3042{
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1637px !important;
+ width: 52px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3043{
+ top: 690px !important;
+ left: 1619px !important;
+ width: 18px !important;
+ height: 12px !important;
+ position: Absolute;
+}
+#warn-3044{
+ top: 721px !important; /* 鍘�860px 脳 0.8966鈮�771px */
+ left: 1623px !important;
+ width: 14px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-3045{
+ top: 762px !important; /* 鍘�881px 脳 0.8966鈮�790px */
+ left: 1623px !important;
+ width: 14px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-3046{
+ top: 706px !important; /* 鍘�860px 脳 0.8966鈮�771px */
+ left: 1623px !important;
+ width: 14px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+#warn-3047{
+ top: 744px !important; /* 鍘�881px 脳 0.8966鈮�790px */
+ left: 1623px !important;
+ width: 14px !important;
+ height: 18px !important;
+ position: Absolute;
+}
+
+ html,body{
width: 100%;
height: 100%;
padding: 0;
margin: 0;
overflow: hidden;
+
}
#header1 {
- width: 100%;
+ width: 100%;
height: 5%;
background-color: white;
display: inline-block;
@@ -22,17 +758,27 @@
font-size: 40px;
}
#header {
- width: 100%;
- height: 25%;
+ width: 100%;
+ height: 20%;
background-color: white;
display: flex;
}
- #footer {
+ #center {
width: 100%;
- height: 70%;
+ height: 55%;
overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
}
+ /* 搴曢儴 */
+ #footer {
+ width: 100%;
+ height: 25%;
+ overflow: visible;
+ display: flex; /* 妯悜甯冨眬 */
+ background-color: white; /* 涓巋eader鑳屾櫙缁熶竴 */
+ box-sizing: border-box;
+ padding: 10px;
+}
#main1 {
margin-left:1%;
width: 14%;
@@ -112,11 +858,7 @@
.boli {
opacity:0.5;
- }
-
-
-
-
+ }
.divGrenn{
background-color:green;
display:block
@@ -142,739 +884,110 @@
top: 775px;
left: 1250px
}
- #warn-734,#warn-743{
- top: 555px !important;
- left: 1421px !important;
- width: 64px !important;
- height: 22px !important;
- position: Absolute;
- }
- #warn-735,#warn-744{
- top: 555px !important;
- left: 1406px !important;
- width: 12px !important;
- height: 22px !important;
- position: Absolute;
- }
- #warn-736,#warn-745{
- top: 555px !important;
- left: 1376px !important;
- width: 15px !important;
- height: 22px !important;
- position: Absolute;
- }
- #warn-737,#warn-746{
- top: 523px !important;
- left: 1401px !important;
- width: 18px !important;
- height: 14px !important;
- position: Absolute;
- }
- #warn-738,#warn-747{
- top: 523px !important;
- left: 1373px !important;
- width: 18px !important;
- height: 14px !important;
- position: Absolute;
- }
- #warn-740,#warn-749{
- top: 510px !important;
- left: 1385px !important;
- width: 18px !important;
- height: 13px !important;
- position: Absolute;
- }
- #warn-739,#warn-748{
- top: 510px !important;
- left: 1405px !important;
- width: 18px !important;
- height: 13px !important;
- position: Absolute;
- }
- #warn-741,#warn-750{
- top: 510px !important;
- left: 1366px !important;
- width: 18px !important;
- height: 13px !important;
- position: Absolute;
- }
- #warn-742,#warn-751{
- top: 510px !important;
- left: 1348px !important;
- width: 18px !important;
- height: 13px !important;
- position: Absolute;
- }
- #warn-812{
- top: 509px !important; /* 鍘焧op=562px 脳 0.8966鈮�504px */
- left: 1266px !important;
- width: 20px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-813{
- top: 570px !important; /* 鍘焧op=636px 脳 0.8966鈮�570px */
- left: 1262px !important;
- width: 24px !important;
- height: 20px !important;
- position: Absolute;
-}
-#warn-1062{
- top: 521px !important; /* 鍘焧op=581px 脳 0.8966鈮�521px */
- left: 1180px !important;
- width: 25px !important;
- height: 20px !important;
- position: Absolute;
-}
-#warn-1063{
- top: 521px !important; /* 鍘焧op=581px 脳 0.8966鈮�521px */
- left: 1180px !important;
- width: 25px !important;
- height: 20px !important;
- position: Absolute;
-}
- #warn-3162{
- top: 557px !important; /* 鍘�621px 脳 0.8966鈮�557px */
- left: 1180px !important;
- width: 25px !important;
- height: 20px !important;
- position: Absolute;
-}
-#warn-3163{
- top: 557px !important; /* 鍘�621px 脳 0.8966鈮�557px */
- left: 1180px !important;
- width: 25px !important;
- height: 20px !important;
- position: Absolute;
-}
-#warn-1153{
- top: 595px !important; /* 鍘�663px 脳 0.8966鈮�595px */
- left: 1263px !important;
- width: 22px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-1154{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 1264px !important;
- width: 23px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-1155{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 1247px !important;
- width: 17px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-1156{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 1230px !important;
- width: 17px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-1157{
- top: 610px !important; /* 鍘�681px 脳 0.8966鈮�610px */
- left: 1209px !important;
- width: 20px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1158{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1174px !important;
- width: 34px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1159{
- top: 610px !important; /* 鍘�681px 脳 0.8966鈮�610px */
- left: 1153px !important;
- width: 20px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1160{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1137px !important;
- width: 16px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1161{
- top: 587px !important; /* 鍘�655px 脳 0.8966鈮�587px */
- left: 1212px !important;
- width: 16px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-1162{
- top: 575px !important; /* 鍘�641px 脳 0.8966鈮�575px */
- left: 1212px !important;
- width: 16px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1163{
- top: 552px !important; /* 鍘�616px 脳 0.8966鈮�552px */
- left: 1212px !important;
- width: 16px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-1164{
- top: 541px !important; /* 鍘�603px 脳 0.8966鈮�541px */
- left: 1212px !important;
- width: 16px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1165{
- top: 541px !important; /* 鍘�603px 脳 0.8966鈮�541px */
- left: 1156px !important;
- width: 16px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1166{
- top: 552px !important; /* 鍘�616px 脳 0.8966鈮�552px */
- left: 1156px !important;
- width: 16px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-1167{
- top: 575px !important; /* 鍘�641px 脳 0.8966鈮�575px */
- left: 1156px !important;
- width: 16px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1168{
- top: 587px !important; /* 鍘�655px 脳 0.8966鈮�587px */
- left: 1156px !important;
- width: 16px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-1254{
- display:None;
- position: Absolute;
-}
-#warn-1343{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1042px !important;
- width: 16px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-1344{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1018px !important;
- width: 22px !important;
- height: 13px !important;
- position: Absolute;
-}
- #warn-1345{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 999px !important;
- width: 17px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1346{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 982px !important;
- width: 16px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1347{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 780px !important;
- width: 202px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1348{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 760px !important;
- width: 20px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1349{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 746px !important;
- width: 15px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1350{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 710px !important;
- width: 15px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1351{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 715px !important;
- width: 15px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1352{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 697px !important;
- width: 18px !important;
- height: 13px !important;
- position: Absolute;
-}
-#warn-1353{
- top: 589px !important; /* 鍘�657px 脳 0.8966鈮�589px */
- left: 1000px !important;
- width: 13px !important;
- height: 16px !important;
- position: Absolute;
-}
-#warn-1354{
- top: 570px !important; /* 鍘�636px 脳 0.8966鈮�570px */
- left: 1000px !important;
- width: 13px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-1355{
- top: 553px !important; /* 鍘�617px 脳 0.8966鈮�553px */
- left: 999px !important;
- width: 16px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-1661{
- display:none;
- position: Absolute;
-}
-#warn-1723{
- top: 600px !important; /* 鍘�675px 脳 0.8966鈮�605px */
- left: 1096px !important;
- width: 23px !important;
- height: 22px !important;
- position: Absolute;
-}
-#warn-1923{
- display:none !important;
+
+
+/* 浜ч噺鏌辩姸鍥惧鍣ㄦ牱寮� */
+#production-chart-wrap {
+ height: 100%;
+ box-sizing: border-box;
+ padding: 10px;
}
-#warn-2110{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 494px !important;
- width: 38px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2111{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 467px !important;
- width: 26px !important;
- height: 15px !important;
- position: Absolute;
+#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); /* 鍑忓幓鏍囬楂樺害 */
+ top:-20px;
}
-#warn-2112{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 425px !important;
- width: 40px !important;
- height: 19px !important;
- position: Absolute;
-}
-#warn-2113{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 425px !important;
- width: 40px !important;
- height: 19px !important;
- position: Absolute;
-}
-#warn-2114{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 392px !important;
- width: 31px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-2214{
- top: 592px !important; /* 鍘�660px 脳 0.8966鈮�592px */
- left: 323px !important;
- width: 31px !important;
- height: 15px !important;
- position: Absolute;
+
+#staff-container {
+ width: 30%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 0px;
+ background-color: white;
}
-#warn-2215{
- top: 567px !important; /* 鍘�632px 脳 0.8966鈮�567px */
- left: 325px !important;
- width: 21px !important;
- height: 18px !important;
- position: Absolute;
+
+#staff-title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 2px;
+ text-align: center;
}
-#warn-2216{
- top: 549px !important; /* 鍘�612px 脳 0.8966鈮�549px */
- left: 325px !important;
- width: 21px !important;
- height: 18px !important;
- position: Absolute;
+
+/* 婊氬姩瀹瑰櫒锛氳鏁拌秴鍑烘椂鏄剧ず婊氬姩鏉� */
+#staff-scroll-wrapper {
+ padding-right: 5px; /* 棰勭暀婊氬姩鏉″搴︼紝閬垮厤鍐呭琚伄鎸� */
}
-#warn-2217{
- top: 504px !important; /* 鍘�562px 脳 0.8966鈮�504px */
- left: 325px !important;
- width: 21px !important;
- height: 43px !important;
- position: Absolute;
+
+#staff-table-wrapper {
+ gap: 0px; /* 涓ょ粍琛ㄦ牸闂磋窛 */
+ width: 100%; /* 鍗犳弧婊氬姩瀹瑰櫒瀹藉害 */
}
-#warn-2218{
- top: 504px !important; /* 鍘�562px 脳 0.8966鈮�504px */
- left: 325px !important;
- width: 21px !important;
- height: 43px !important;
- position: Absolute;
+
+/* 瀛愯〃鏍兼牱寮忥紙姣忕粍涓ゅ垪锛屽叡鍥涘垪锛� */
+.staff-subtable {
+ width: 50%; /* 姣忕粍鍗�50%瀹藉害锛屽洓鍒楁�诲崰婊�30%瀹瑰櫒 */
+ border-collapse: collapse;
+ text-align: center;
+ font-size: 14px;
}
-#warn-2219{
- top: 485px !important; /* 鍘�541px 脳 0.8966鈮�485px */
- left: 320px !important;
- width: 32px !important;
- height: 13px !important;
- position: Absolute;
+
+.staff-subtable th, .staff-subtable td {
+ border: 1px solid #ddd;
+ padding: 6px 3px;
+ width: 50%; /* 缁勫唴涓ゅ垪绛夊 */
}
-#warn-2310{
- top: 596px !important; /* 鍘�677px 脳 0.8966鈮�607px */
- left: 322px !important;
- width: 36px !important;
- height: 22px !important;
- position: Absolute;
+
+.staff-subtable th {
+ background-color: #f0f0f0;
+ font-size: 13px;
}
-#warn-2311{
- top: 476px !important; /* 鍘�519px 脳 0.8966鈮�476px */
- left: 317px !important;
- width: 36px !important;
- height: 22px !important;
- position: Absolute;
+
+.staff-subtable input {
+ width: 100%;
+ height: 20px;
+ padding: 0 3px;
+ font-size: 13px;
+ text-align: center;
+ box-sizing: border-box;
}
-#warn-2314{
- top: 476px !important; /* 鍘�519px 脳 0.8966鈮�476px */
- left: 108px !important;
- width: 36px !important;
- height: 22px !important;
- position: Absolute;
+
+/* 婊氬姩鏉℃牱寮忎紭鍖栵紙鍙�夛級 */
+#staff-scroll-wrapper::-webkit-scrollbar {
+ width: 6px;
}
-#warn-2312{
- top: 477px !important; /* 鍘�522px 脳 0.8966鈮�477px */
- left: 253px !important;
- width: 26px !important;
- height: 16px !important;
- position: Absolute;
+#staff-scroll-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ddd;
+ border-radius: 3px;
}
-#warn-2313{
- top: 477px !important; /* 鍘�522px 脳 0.8966鈮�477px */
- left: 182px !important;
- width: 27px !important;
- height: 16px !important;
- position: Absolute;
-}
-#warn-2421{
- top: 506px !important; /* 鍘�564px 脳 0.8966鈮�506px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
+/* 鍘婚櫎杈撳叆妗嗚竟妗嗗強鑱氱劍杞粨 */
+.staff-subtable input {
+ width: 100%;
+ height: 20px;
+ padding: 0 0px;
+ font-size: 13px;
+ text-align: center;
+ box-sizing: border-box;
+ border: none;
+ /* 鍘婚櫎鑱氱劍鏃剁殑榛樿杞粨锛堟祻瑙堝櫒鑷甫锛� */
+ outline: none;
+ /* 鍙�夛細娣诲姞鑳屾櫙鑹查�忔槑锛岃杈撳叆妗嗘洿铻嶅叆琛ㄦ牸 */
+ background: transparent;
}
-#warn-2422{
- top: 524px !important; /* 鍘�585px 脳 0.8966鈮�524px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2423{
- top: 543px !important; /* 鍘�606px 脳 0.8966鈮�543px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
+.staff-subtable input:hover {
+ background-color: #f5f5f5; /* 娴呯伆鑹茶儗鏅� */
}
-#warn-2424{
- top: 562px !important; /* 鍘�627px 脳 0.8966鈮�562px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2425{
- top: 581px !important; /* 鍘�648px 脳 0.8966鈮�581px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2426{
- top: 599px !important; /* 鍘�669px 脳 0.8966鈮�599px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2427{
- top: 619px !important; /* 鍘�690px 脳 0.8966鈮�619px */
- left: 113px !important;
- width: 22px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2428{
- top: 638px !important; /* 鍘�712px 脳 0.8966鈮�638px */
- left: 113px !important;
- width: 22px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2429{
- top: 660px !important; /* 鍘�736px 脳 0.8966鈮�660px */
- left: 113px !important;
- width: 22px !important;
- height: 31px !important;
- position: Absolute;
-}
-#warn-2510{
- top: 707px !important; /* 鍘�814px 脳 0.8966鈮�707px */
- left: 892px !important;
- width: 33px !important;
- height: 19px !important;
- position: Absolute;
-}
-#warn-2511{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 927px !important;
- width: 28px !important;
- height: 15px !important;
- position: Absolute;
-}
-#warn-2512,#warn-2513{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 958px !important;
- width: 39px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-2514{
- top: 709px !important; /* 鍘�816px 脳 0.8966鈮�693px */
- left: 998px !important;
- width: 26px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2614{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1127px !important;
- width: 28px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2615{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1155px !important;
- width: 30px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2616{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1186px !important;
- width: 30px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2617{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1216px !important;
- width: 30px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2618{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1246px !important;
- width: 30px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2619{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1276px !important;
- width: 30px !important;
- height: 14px !important;
- position: Absolute;
-}
-#warn-2710{
- top: 707px !important; /* 鍘�811px 脳 0.8966鈮�727px */
- left: 1372px !important;
- width: 38px !important;
- height: 21px !important;
- position: Absolute;
-}
-#warn-2711{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 1411px !important;
- width: 26px !important;
- height: 16px !important;
- position: Absolute;
-}
-#warn-2712{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 1440px !important;
- width: 39px !important;
- height: 16px !important;
- position: Absolute;
-}
-#warn-2713{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 1480px !important;
- width: 26px !important;
- height: 16px !important;
- position: Absolute;
-}
-#warn-2714{
- top: 707px !important; /* 鍘�814px 脳 0.8966鈮�707px */
- left: 1512px !important;
- width: 32px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-2814{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1606px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2815{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1651px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2816{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1651px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2817{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1711px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2818{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1756px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2819{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1711px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-2961{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1711px !important;
- width: 45px !important;
- height: 23px !important;
- position: Absolute;
-}
-#warn-3037{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1836px !important;
- width: 19px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3038{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1803px !important;
- width: 32px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3039{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1771px !important;
- width: 32px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3040{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1719px !important;
- width: 52px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3041{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1667px !important;
- width: 52px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3042{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1615px !important;
- width: 52px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3043{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1595px !important;
- width: 20px !important;
- height: 12px !important;
- position: Absolute;
-}
-#warn-3044{
- top: 764px !important; /* 鍘�860px 脳 0.8966鈮�771px */
- left: 1598px !important;
- width: 14px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-3045{
- top: 790px !important; /* 鍘�881px 脳 0.8966鈮�790px */
- left: 1598px !important;
- width: 14px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-3046{
- top: 743 !important; /* 鍘�860px 脳 0.8966鈮�771px */
- left: 1598px !important;
- width: 14px !important;
- height: 18px !important;
- position: Absolute;
-}
-#warn-3047{
- top: 782px !important; /* 鍘�881px 脳 0.8966鈮�790px */
- left: 1598px !important;
- width: 14px !important;
- height: 18px !important;
- position: Absolute;
-}
+.staff-subtable input.saving {
+ background-color: #fff3cd; /* 娴呴粍鑹茶儗鏅彁绀� */
</style>
<title>澶у睆鏄剧ず</title>
</head>
@@ -909,31 +1022,69 @@
</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"
- :key="warnItem['0_id']"
+ :key="warnItem['0_id']"
class="warn-item"
: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;
+ background: rgba(255, 0, 0, 0.4);
+ 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 +1105,10 @@
shuzu1:[{}],
shuzu2:[{}],
warning:[],
+ Hour24:[],
machineElectric:[{}],
- machineWater:[{}],
+ machineWater:[{}],
+ operator:[{}],
val: {
title:{
@@ -1088,11 +1241,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,0);
+ document.activeElement.blur();
+ },
+
echarsInit() {
// 1. 鐢熸垚杩�7澶╂棩鏈燂紙鍜屾按鑰楄〃閫昏緫涓�鑷达級
var datashijian = [];
@@ -1129,13 +1330,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 +1407,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 +1433,99 @@
// 5. 搴旂敤閰嶇疆骞舵覆鏌�
HisArr.setOption(this.val);
this.loading = false;
+ }
+ ,
+ initProductionChart() {
+ // 1. 鍥哄畾x杞存爣绛撅紙鏄ㄥぉ8鐐光啋浠婂ぉ7鐐癸紝鍏�24涓椂娈碉紝鏃犵浜屽ぉ8鐐癸級
+ const hourLabels = [
+ "20", "21", "22", "23", "00", "01", "02", "03", "04", "05", "06", "07", // 鏄ㄥぉ8-19鐐�
+ "08", "09", "10", "11", // 鏄ㄥぉ20-23鐐�
+ "12", "13", "14", "15", "16", "17", "18", "19" // 浠婂ぉ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锛屽彲璋冩暣锛�
+
+ 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 },
+ axisLabel: { show: false }, // 闅愯棌鏁板瓧
+ }
+ ],
+ 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', () => initProductionChart.resize());
}
,
@@ -1262,6 +1591,9 @@
machineWater(){
this.echarsInit1()
},
+ Hour24(){
+ this.initProductionChart();
+ },
shuzu1(){
this.dingdanxiangqing(),
this.dingdanxiangqing1()
@@ -1281,6 +1613,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 +1639,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