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/allGlassScreenVice.html | 17 +
gmms/WebContent/bigScreen/allGlassScreen.jsp | 459 ++++++++++++++++++++++++++++-----------------------------
gmms/WebContent/img/新二期大屏.png | 0
3 files changed, 236 insertions(+), 240 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassScreen.jsp b/gmms/WebContent/bigScreen/allGlassScreen.jsp
index 1a720ee..86f7abe 100644
--- a/gmms/WebContent/bigScreen/allGlassScreen.jsp
+++ b/gmms/WebContent/bigScreen/allGlassScreen.jsp
@@ -8,182 +8,182 @@
<style>
#warn-734,#warn-743{
- top: 555px !important;
- left: 1421px !important;
- width: 64px !important;
+ top: 481px !important;
+ left: 1454px !important;
+ width: 53px !important;
height: 22px !important;
position: Absolute;
}
#warn-735,#warn-744{
- top: 555px !important;
- left: 1406px !important;
- width: 12px !important;
- height: 22px !important;
+ top: 423px !important;
+ left: 1419px !important;
+ width: 16px !important;
+ height: 17px !important;
position: Absolute;
}
#warn-736,#warn-745{
- top: 555px !important;
+ top: 423px !important;
left: 1376px !important;
- width: 15px !important;
- height: 22px !important;
+ width: 16px !important;
+ height: 17px !important;
position: Absolute;
}
#warn-737,#warn-746{
- top: 523px !important;
- left: 1401px !important;
+ top: 462px !important;
+ left: 1413px !important;
width: 18px !important;
height: 14px !important;
position: Absolute;
}
#warn-738,#warn-747{
- top: 523px !important;
- left: 1373px !important;
+ top: 462px !important;
+ left: 1386px !important;
width: 18px !important;
height: 14px !important;
position: Absolute;
}
#warn-740,#warn-749{
- top: 510px !important;
+ top: 425px !important;
left: 1385px !important;
width: 18px !important;
height: 13px !important;
position: Absolute;
}
#warn-739,#warn-748{
- top: 510px !important;
+ top: 425px !important;
left: 1405px !important;
width: 18px !important;
height: 13px !important;
position: Absolute;
}
#warn-741,#warn-750{
- top: 510px !important;
+ top: 425px !important;
left: 1366px !important;
width: 18px !important;
height: 13px !important;
position: Absolute;
}
#warn-742,#warn-751{
- top: 510px !important;
+ top: 425px !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;
+top: 427px !important;
+ left: 1269px !important;
width: 20px !important;
height: 15px !important;
position: Absolute;
}
#warn-813{
- top: 570px !important; /* 鍘焧op=636px 脳 0.8966鈮�570px */
- left: 1262px !important;
+ top: 458px !important;
+ left: 1267px !important;
width: 24px !important;
height: 20px !important;
position: Absolute;
}
#warn-1062{
- top: 521px !important; /* 鍘焧op=581px 脳 0.8966鈮�521px */
+ top: 431px !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 */
+ top: 431px !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 */
+ top: 480px !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 */
+ top: 481px !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;
+ top: 485px !important;
+ left: 1266px !important;
width: 22px !important;
height: 14px !important;
position: Absolute;
}
#warn-1154{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
+ top: 480px !important; /* 鍘�679px 脳 0.8966鈮�535px */
left: 1264px !important;
width: 23px !important;
height: 15px !important;
position: Absolute;
}
#warn-1155{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
+ top: 535px !important; /* 鍘�679px 脳 0.8966鈮�535px */
left: 1247px !important;
width: 17px !important;
height: 15px !important;
position: Absolute;
}
#warn-1156{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
+ top: 535px !important; /* 鍘�679px 脳 0.8966鈮�535px */
left: 1230px !important;
width: 17px !important;
height: 15px !important;
position: Absolute;
}
#warn-1157{
- top: 610px !important; /* 鍘�681px 脳 0.8966鈮�610px */
+ top: 536px !important; /* 鍘�681px 脳 0.8966鈮�536px */
left: 1209px !important;
width: 20px !important;
height: 12px !important;
position: Absolute;
}
#warn-1158{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
+ top: 535px !important; /* 鍘�680px 脳 0.8966鈮�535px */
left: 1174px !important;
width: 34px !important;
height: 13px !important;
position: Absolute;
}
#warn-1159{
- top: 610px !important; /* 鍘�681px 脳 0.8966鈮�610px */
+ top: 536px !important; /* 鍘�681px 脳 0.8966鈮�536px */
left: 1153px !important;
width: 20px !important;
height: 12px !important;
position: Absolute;
}
#warn-1160{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
+ top: 535px !important; /* 鍘�680px 脳 0.8966鈮�535px */
left: 1137px !important;
width: 16px !important;
height: 13px !important;
position: Absolute;
}
#warn-1161{
- top: 587px !important; /* 鍘�655px 脳 0.8966鈮�587px */
+ top: 510px !important; /* 鍘�655px 脳 0.8966鈮�510px */
left: 1212px !important;
width: 16px !important;
height: 21px !important;
position: Absolute;
}
#warn-1162{
- top: 575px !important; /* 鍘�641px 脳 0.8966鈮�575px */
+ top: 496px !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 */
+ top: 472px !important; /* 鍘�616px 脳 0.8966鈮�472px */
left: 1212px !important;
width: 16px !important;
height: 21px !important;
@@ -204,21 +204,21 @@
position: Absolute;
}
#warn-1166{
- top: 552px !important; /* 鍘�616px 脳 0.8966鈮�552px */
+ top: 472px !important; /* 鍘�616px 脳 0.8966鈮�472px */
left: 1156px !important;
width: 16px !important;
height: 21px !important;
position: Absolute;
}
#warn-1167{
- top: 575px !important; /* 鍘�641px 脳 0.8966鈮�575px */
+ top: 496px !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 */
+ top: 510px !important; /* 鍘�655px 脳 0.8966鈮�510px */
left: 1156px !important;
width: 16px !important;
height: 21px !important;
@@ -229,92 +229,92 @@
position: Absolute;
}
#warn-1343{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1042px !important;
+ top: 534px !important;
+ left: 1030px !important;
width: 16px !important;
height: 14px !important;
position: Absolute;
}
#warn-1344{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 1018px !important;
+ top: 535px !important;
+ left: 1006px !important;
width: 22px !important;
height: 13px !important;
position: Absolute;
}
#warn-1345{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 999px !important;
+top: 537px !important;
+ left: 987px !important;
width: 17px !important;
height: 13px !important;
position: Absolute;
}
#warn-1346{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 982px !important;
+top: 535px !important;
+ left: 969px !important;
width: 16px !important;
height: 13px !important;
position: Absolute;
}
#warn-1347{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 780px !important;
+ top: 537px !important;
+ left: 766px !important;
width: 202px !important;
height: 13px !important;
position: Absolute;
}
#warn-1348{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 760px !important;
+ top: 536px !important;
+ left: 746px !important;
width: 20px !important;
height: 13px !important;
position: Absolute;
}
#warn-1349{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 746px !important;
+ top: 535px !important;
+ left: 716px !important;
width: 15px !important;
height: 13px !important;
position: Absolute;
}
#warn-1350{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 710px !important;
+ top: 535px !important;
+ left: 682px !important;
width: 15px !important;
height: 13px !important;
position: Absolute;
}
#warn-1351{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 715px !important;
+ top: 536px !important;
+ left: 700px !important;
width: 15px !important;
height: 13px !important;
position: Absolute;
}
#warn-1352{
- top: 603px !important; /* 鍘�680px 脳 0.8966鈮�603px */
- left: 697px !important;
+ top: 536px !important;
+ left: 663px !important;
width: 18px !important;
height: 13px !important;
position: Absolute;
}
#warn-1353{
- top: 589px !important; /* 鍘�657px 脳 0.8966鈮�589px */
- left: 1000px !important;
+ top: 515px !important;
+ left: 986px !important;
width: 13px !important;
height: 16px !important;
position: Absolute;
}
#warn-1354{
- top: 570px !important; /* 鍘�636px 脳 0.8966鈮�570px */
- left: 1000px !important;
+top: 491px !important;
+ left: 987px !important;
width: 13px !important;
height: 18px !important;
position: Absolute;
}
#warn-1355{
- top: 553px !important; /* 鍘�617px 脳 0.8966鈮�553px */
- left: 999px !important;
+ top: 475px !important;
+ left: 986px !important;
width: 16px !important;
height: 12px !important;
position: Absolute;
@@ -324,8 +324,8 @@
position: Absolute;
}
#warn-1723{
- top: 600px !important; /* 鍘�675px 脳 0.8966鈮�605px */
- left: 1096px !important;
+ top: 529px !important;
+ left: 1090px !important;
width: 23px !important;
height: 22px !important;
position: Absolute;
@@ -335,407 +335,407 @@
}
#warn-2110{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 494px !important;
+ top: 535px !important;
+ left: 466px !important;
width: 38px !important;
height: 21px !important;
position: Absolute;
}
#warn-2111{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 467px !important;
- width: 26px !important;
+ top: 536px !important;
+ left: 447px !important;
+ width: 18px !important;
height: 15px !important;
position: Absolute;
}
#warn-2112{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 425px !important;
+top: 535px !important;
+ left: 373px !important;
width: 40px !important;
height: 19px !important;
position: Absolute;
}
#warn-2113{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 425px !important;
+ top: 535px !important;
+ left: 373px !important;
width: 40px !important;
height: 19px !important;
position: Absolute;
}
#warn-2114{
- top: 603px !important; /* 鍘�679px 脳 0.8966鈮�603px */
- left: 392px !important;
+ top: 538px !important;
+ left: 414px !important;
width: 31px !important;
height: 15px !important;
position: Absolute;
}
#warn-2214{
- top: 592px !important; /* 鍘�660px 脳 0.8966鈮�592px */
- left: 323px !important;
+ top: 537px !important;
+ left: 339px !important;
width: 31px !important;
height: 15px !important;
position: Absolute;
}
#warn-2215{
- top: 567px !important; /* 鍘�632px 脳 0.8966鈮�567px */
- left: 325px !important;
+top: 517px !important;
+ left: 270px !important;
width: 21px !important;
height: 18px !important;
position: Absolute;
}
#warn-2216{
- top: 549px !important; /* 鍘�612px 脳 0.8966鈮�549px */
- left: 325px !important;
+ top: 505px !important;
+ left: 268px !important;
width: 21px !important;
height: 18px !important;
position: Absolute;
}
#warn-2217{
- top: 504px !important; /* 鍘�562px 脳 0.8966鈮�504px */
- left: 325px !important;
+ top: 462px !important;
+ left: 268px !important;
width: 21px !important;
height: 43px !important;
position: Absolute;
}
#warn-2218{
- top: 504px !important; /* 鍘�562px 脳 0.8966鈮�504px */
- left: 325px !important;
+ top: 418px !important;
+ left: 268px !important;
width: 21px !important;
height: 43px !important;
position: Absolute;
}
#warn-2219{
- top: 485px !important; /* 鍘�541px 脳 0.8966鈮�485px */
- left: 320px !important;
+top: 405px !important;
+ left: 263px !important;
width: 32px !important;
height: 13px !important;
position: Absolute;
}
#warn-2310{
- top: 596px !important; /* 鍘�677px 脳 0.8966鈮�607px */
- left: 322px !important;
+ top: 531px !important;
+ left: 263px !important;
width: 36px !important;
height: 22px !important;
position: Absolute;
}
#warn-2311{
- top: 476px !important; /* 鍘�519px 脳 0.8966鈮�476px */
- left: 317px !important;
+ top: 382px !important;
+ left: 259px !important;
width: 36px !important;
height: 22px !important;
position: Absolute;
}
#warn-2314{
- top: 476px !important; /* 鍘�519px 脳 0.8966鈮�476px */
- left: 108px !important;
+ top: 382px !important;
+ left: 38px !important;
width: 36px !important;
height: 22px !important;
position: Absolute;
}
#warn-2312{
- top: 477px !important; /* 鍘�522px 脳 0.8966鈮�477px */
- left: 253px !important;
+ top: 383px !important;
+ left: 190px !important;
width: 26px !important;
height: 16px !important;
position: Absolute;
}
#warn-2313{
- top: 477px !important; /* 鍘�522px 脳 0.8966鈮�477px */
- left: 182px !important;
+top: 385px !important;
+ left: 113px !important;
width: 27px !important;
height: 16px !important;
position: Absolute;
}
#warn-2421{
- top: 506px !important; /* 鍘�564px 脳 0.8966鈮�506px */
- left: 113px !important;
+top: 415px !important;
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2422{
- top: 524px !important; /* 鍘�585px 脳 0.8966鈮�524px */
- left: 113px !important;
+ top: 501px !important; /* 鍘�585px 脳 0.8966鈮�524px */
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2423{
- top: 543px !important; /* 鍘�606px 脳 0.8966鈮�543px */
- left: 113px !important;
+ top: 437px !important;
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2424{
- top: 562px !important; /* 鍘�627px 脳 0.8966鈮�562px */
- left: 113px !important;
+ top: 459px !important;
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2425{
- top: 581px !important; /* 鍘�648px 脳 0.8966鈮�581px */
- left: 113px !important;
+ top: 481px !important; /* 鍘�648px 脳 0.8966鈮�581px */
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2426{
- top: 599px !important; /* 鍘�669px 脳 0.8966鈮�599px */
- left: 113px !important;
+ top: 523px !important; /* 鍘�669px 脳 0.8966鈮�599px */
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2427{
- top: 619px !important; /* 鍘�690px 脳 0.8966鈮�619px */
- left: 113px !important;
+ top: 547px !important; /* 鍘�690px 脳 0.8966鈮�619px */
+ left: 42px !important;
width: 22px !important;
height: 21px !important;
position: Absolute;
}
#warn-2428{
- top: 638px !important; /* 鍘�712px 脳 0.8966鈮�638px */
- left: 113px !important;
+ top: 571px !important; /* 鍘�712px 脳 0.8966鈮�638px */
+ left: 42px !important;
width: 22px !important;
height: 23px !important;
position: Absolute;
}
#warn-2429{
- top: 660px !important; /* 鍘�736px 脳 0.8966鈮�660px */
- left: 113px !important;
+ top: 595px !important; /* 鍘�736px 脳 0.8966鈮�660px */
+ left: 42px !important;
width: 22px !important;
height: 31px !important;
position: Absolute;
}
#warn-2510{
- top: 707px !important; /* 鍘�814px 脳 0.8966鈮�707px */
- left: 892px !important;
+ top: 663px !important;
+ left: 874px !important;
width: 33px !important;
height: 19px !important;
position: Absolute;
}
#warn-2511{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 927px !important;
+ top: 667px !important;
+ left: 910px !important;
width: 28px !important;
height: 15px !important;
position: Absolute;
}
#warn-2512,#warn-2513{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 958px !important;
+ top: 666px !important;
+ left: 940px !important;
width: 39px !important;
height: 18px !important;
position: Absolute;
}
#warn-2514{
- top: 709px !important; /* 鍘�816px 脳 0.8966鈮�693px */
- left: 998px !important;
+ top: 669px !important;
+ left: 983px !important;
width: 26px !important;
height: 14px !important;
position: Absolute;
}
#warn-2614{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
- left: 1127px !important;
- width: 28px !important;
+ top: 638px !important;
+ left: 1117px !important;
+ width: 33px !important;
height: 14px !important;
position: Absolute;
}
#warn-2615{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
left: 1155px !important;
width: 30px !important;
height: 14px !important;
position: Absolute;
}
#warn-2616{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
left: 1186px !important;
width: 30px !important;
height: 14px !important;
position: Absolute;
}
#warn-2617{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
left: 1216px !important;
width: 30px !important;
height: 14px !important;
position: Absolute;
}
#warn-2618{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
left: 1246px !important;
width: 30px !important;
height: 14px !important;
position: Absolute;
}
#warn-2619{
- top: 693px !important; /* 鍘�795px 脳 0.8966鈮�693px */
+ top: 638px !important; /* 鍘�795px 脳 0.8966鈮�638px */
left: 1276px !important;
width: 30px !important;
height: 14px !important;
position: Absolute;
}
#warn-2710{
- top: 707px !important; /* 鍘�811px 脳 0.8966鈮�727px */
+ top: 660px !important; /* 鍘�811px 脳 0.8966鈮�727px */
left: 1372px !important;
- width: 38px !important;
+ width: 38px !important;
height: 21px !important;
position: Absolute;
}
#warn-2711{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
+ top: 661px !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;
+ top: 662px !important;
+ left: 1440px !important;
+ width: 88px !important;
+ height: 22px !important;
position: Absolute;
}
#warn-2713{
- top: 710px !important; /* 鍘�815px 脳 0.8966鈮�710px */
- left: 1480px !important;
- width: 26px !important;
- height: 16px !important;
+top: 660px !important;
+ left: 1533px !important;
+ width: 33px !important;
+ height: 21px !important;
position: Absolute;
}
#warn-2714{
- top: 707px !important; /* 鍘�814px 脳 0.8966鈮�707px */
- left: 1512px !important;
- width: 32px !important;
+ top: 663px !important;
+ left: 1571px !important;
+ width: 35px !important;
height: 18px !important;
position: Absolute;
}
#warn-2814{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1606px !important;
- width: 45px !important;
+ top: 641px !important;
+ left: 1581px !important;
+ width: 40px !important;
height: 23px !important;
position: Absolute;
}
#warn-2815{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1651px !important;
- width: 45px !important;
- height: 23px !important;
+ top: 622px !important;
+ left: 1633px !important;
+ width: 46px !important;
+ height: 27px !important;
position: Absolute;
}
#warn-2816{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1651px !important;
- width: 45px !important;
- height: 23px !important;
+ top: 622px !important;
+ left: 1633px !important;
+ width: 46px !important;
+ height: 27px !important;
position: Absolute;
}
#warn-2817{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1711px !important;
+ top: 628px !important;
+ left: 1741px !important;
width: 45px !important;
height: 23px !important;
position: Absolute;
}
#warn-2818{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1756px !important;
+ top: 628px !important;
+ left: 1790px !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;
+ top: 623px !important;
+ left: 1680px !important;
+ width: 48px !important;
+ height: 26px !important;
position: Absolute;
}
#warn-2961{
- top: 688px !important; /* 鍘�788px 脳 0.8966鈮�707px */
- left: 1711px !important;
- width: 45px !important;
- height: 23px !important;
+top: 623px !important;
+ left: 1680px !important;
+ width: 48px !important;
+ height: 26px !important;
position: Absolute;
}
#warn-3037{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1836px !important;
+ top: 690px !important;
+ left: 1857px !important;
width: 19px !important;
height: 12px !important;
position: Absolute;
}
#warn-3038{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1803px !important;
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1825px !important;
width: 32px !important;
height: 12px !important;
position: Absolute;
}
#warn-3039{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1771px !important;
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1793px !important;
width: 32px !important;
height: 12px !important;
position: Absolute;
}
#warn-3040{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1719px !important;
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1741px !important;
width: 52px !important;
height: 12px !important;
position: Absolute;
}
#warn-3041{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1667px !important;
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1689px !important;
width: 52px !important;
height: 12px !important;
position: Absolute;
}
#warn-3042{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1615px !important;
+ top: 690px !important; /* 鍘�840px 脳 0.8966鈮�690px */
+ left: 1637px !important;
width: 52px !important;
height: 12px !important;
position: Absolute;
}
#warn-3043{
- top: 729px !important; /* 鍘�840px 脳 0.8966鈮�729px */
- left: 1595px !important;
- width: 20px !important;
+ top: 690px !important;
+ left: 1619px !important;
+ width: 18px !important;
height: 12px !important;
position: Absolute;
}
#warn-3044{
- top: 764px !important; /* 鍘�860px 脳 0.8966鈮�771px */
- left: 1598px !important;
+ top: 721px !important; /* 鍘�860px 脳 0.8966鈮�771px */
+ left: 1623px !important;
width: 14px !important;
height: 18px !important;
position: Absolute;
}
#warn-3045{
- top: 790px !important; /* 鍘�881px 脳 0.8966鈮�790px */
- left: 1598px !important;
+ top: 762px !important; /* 鍘�881px 脳 0.8966鈮�790px */
+ left: 1623px !important;
width: 14px !important;
height: 18px !important;
position: Absolute;
}
#warn-3046{
- top: 743 !important; /* 鍘�860px 脳 0.8966鈮�771px */
- left: 1598px !important;
+ top: 706px !important; /* 鍘�860px 脳 0.8966鈮�771px */
+ left: 1623px !important;
width: 14px !important;
height: 18px !important;
position: Absolute;
}
#warn-3047{
- top: 782px !important; /* 鍘�881px 脳 0.8966鈮�790px */
- left: 1598px !important;
+ top: 744px !important; /* 鍘�881px 脳 0.8966鈮�790px */
+ left: 1623px !important;
width: 14px !important;
height: 18px !important;
position: Absolute;
@@ -747,7 +747,7 @@
padding: 0;
margin: 0;
overflow: hidden;
-
+
}
#header1 {
width: 100%;
@@ -765,16 +765,20 @@
}
#center {
width: 100%;
- height: 60%;
+ height: 55%;
overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
}
- #footer {
- width: 100%;
- height: 20%;
- 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%;
@@ -880,16 +884,7 @@
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 {
@@ -909,13 +904,14 @@
#production-chart-container {
width: 100%;
height: calc(100% - 30px); /* 鍑忓幓鏍囬楂樺害 */
-}
+ top:-20px;
+}
#staff-container {
width: 30%;
height: 100%;
box-sizing: border-box;
- padding: 10px;
+ padding: 0px;
background-color: white;
}
@@ -923,7 +919,7 @@
font-size: 16px;
font-weight: bold;
color: #333;
- margin-bottom: 5px;
+ margin-bottom: 2px;
text-align: center;
}
@@ -977,7 +973,7 @@
.staff-subtable input {
width: 100%;
height: 20px;
- padding: 0 3px;
+ padding: 0 0px;
font-size: 13px;
text-align: center;
box-sizing: border-box;
@@ -1031,7 +1027,7 @@
<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'"
@@ -1039,7 +1035,7 @@
style="
position: absolute;
top: 450px;
- background: rgba(255, 0, 0, 0.4);
+ background: rgba(255, 0, 0, 0.4);
color: white;
z-index: 10;
cursor: pointer;" >
@@ -1294,9 +1290,9 @@
//鎻愪氦鏁版嵁搴�
/* console.log("濮撳悕锛�", updateData); */
let sql = "{call bigScreen_operatorUpdate(?,?,?)}~" + JSON.stringify(updateData);
- this.connects("鍊肩彮浜哄憳淇℃伅淇敼", sql,1,1);
- document.activeElement.blur();
- },
+ this.connects("鍊肩彮浜哄憳淇℃伅淇敼", sql,1,0);
+ document.activeElement.blur();
+ },
echarsInit() {
// 1. 鐢熸垚杩�7澶╂棩鏈燂紙鍜屾按鑰楄〃閫昏緫涓�鑷达級
@@ -1442,9 +1438,9 @@
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涓級
+ "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. 寮哄埗璁剧疆鍥捐〃瀹瑰櫒楂樺害锛堥伩鍏嶆覆鏌撲笉鍙锛�
@@ -1468,11 +1464,7 @@
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鐗団��
@@ -1502,7 +1494,8 @@
/* name: "鐗�", */
min: 0, // 寮哄埗y杞翠粠0寮�濮�
splitLine: { lineStyle: { color: "#f5f5f5" } },
- axisLabel: { color: "#333", fontSize: 11 }
+ axisLabel: { color: "#333", fontSize: 11 },
+ axisLabel: { show: false }, // 闅愯棌鏁板瓧
}
],
series: [
@@ -1532,7 +1525,7 @@
this.productionChartInstance.setOption(chartOption, { animation: false });
// 绐楀彛 resize 鏃惰嚜鍔ㄩ噸缁�
- window.addEventListener('resize', () => productionChart.resize());
+ //window.addEventListener('resize', () => initProductionChart.resize());
}
,
diff --git a/gmms/WebContent/bigScreen/allGlassScreenVice.html b/gmms/WebContent/bigScreen/allGlassScreenVice.html
index a6f68a5..7687dd0 100644
--- a/gmms/WebContent/bigScreen/allGlassScreenVice.html
+++ b/gmms/WebContent/bigScreen/allGlassScreenVice.html
@@ -36,6 +36,8 @@
margin-bottom: 10vh;
margin-left: 2vh;
width: 12vw; /* 鍥哄畾鍝佺墝鍚嶅尯鍩熷搴︼紝閬垮厤鎸ゅ帇涓绘爣棰� */
+ display:none;
+
}
.main-title {
font-size: 5vh; /* 涓绘爣棰樺瓧浣撳ぇ灏忔寜灞忓箷姣斾緥锛屼笌鍘熷浘鍖归厤 */
@@ -45,7 +47,7 @@
white-space: nowrap; /* 绂佹鎹㈣锛屼繚鎸佷竴琛屾樉绀� */
overflow: hidden;
text-overflow: ellipsis;
- margin-left: -21vh;
+ /* margin-left: -21vh; */
}
.content {
width: 100%;
@@ -84,19 +86,20 @@
}
/* 浜х嚎鍥剧墖锛堜綅浜庢爣棰樹笅鏂癸級 */
.production-image {
- width: 103%;
+ width: 112%;
height: calc(100% - 8vh);
object-fit: contain;
margin-top: -10%;
}
.intro-text {
height: calc(100% - 8vh);
- font-size: 2.5vh;
+ font-size: 2.5vh;
line-height: 2.5;
overflow: auto;
/* 鏍稿績璋冩暣锛氭枃瀛楄寖鍥村悜鍙冲亸绉� */
margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
- max-width: 80%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ max-width: 100%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ margin-top: -44px;
}
.section-title2 {
height: 6vh; /* 鏍囬楂樺害缁熶竴锛屼笌鍘熷浘瀵归綈 */
@@ -106,7 +109,7 @@
text-align: center;
margin-bottom: 9vh;
margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
- max-width: 85%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ max-width: 100%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
}
</style>
</head>
@@ -123,8 +126,8 @@
<div class="right-section">
<div class="section-title2"><P style="margin-top: 5%;">浜屾湡椤圭洰绠�浠�</p></div>
<div class="intro-text">
- <p> 娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶浜屾湡鍏ㄨ嚜鍔ㄧ幓鐠冩櫤鑳界敓浜х嚎鏄捣灏旈泦鍥㈠叏璧勬姇璧勫缓璁俱�傜郴鍥藉唴锛堝巶鍐咃級绗簩鏉″叏鑷姩鍘ㄧ數鐜荤拑鏅鸿兘鐢熶骇绾裤�傝鍒掍骇鑳�150涓囩墖/骞淬��</p>
- <p> 鐢熶骇绾夸富瑕佺敱30澶氬彴濂楀叏鑷姩鍖栬澶囩粍鎴愶紝閫氳繃MES鐢熶骇绠＄悊绯荤粺璋冨害鐢熶骇绾胯澶囪繘琛屽叏鑷姩鐢熶骇锛屽皢鍘熺墖鐜荤拑浠庝粨鍌�-鑷姩涓婄嚎寮�濮嬶紝缁忚繃鍐峰姞宸ョ殑鍒�-纾�-閽�-娲楃瓑娴佺▼鍔犲伐锛屽啀杈呬互婵�鍏夊唴鍒�-楂樻俯涓濆嵃-閽㈠寲-浣庢俯浜屾涓濆嵃-瑕嗚啘-鍫嗗灈涓嬬嚎绛夊伐搴忎竴娆℃垚鍨嬶紝瀹炵幇鍏ㄦ祦绋嬫櫤鑳芥棤浜哄寲鐢熶骇銆�</p>
+ <p> 娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶浜屾湡鍏ㄨ嚜鍔ㄧ幓鐠冩櫤鑳界敓浜х嚎鏄捣灏旈泦鍥㈠叏璧勬姇璧勫缓璁俱�傜郴鍥藉唴锛堝巶鍐咃級绗簩鏉″叏鑷姩鍘ㄧ數鐜荤拑鏅鸿兘鐢熶骇绾裤�傝鍒掍骇鑳�150涓囩墖/骞淬��</p>
+ <p> 鐢熶骇绾夸富瑕佺敱30澶氬彴濂楀叏鑷姩鍖栬澶囩粍鎴愶紝閫氳繃MES鐢熶骇绠＄悊绯荤粺璋冨害鐢熶骇绾胯澶囪繘琛屽叏鑷姩鐢熶骇锛屽皢鍘熺墖鐜荤拑浠庝粨鍌�-鑷姩涓婄嚎寮�濮嬶紝缁忚繃鍐峰姞宸ョ殑鍒�-纾�-閽�-娲楃瓑娴佺▼鍔犲伐锛屽啀杈呬互婵�鍏夊唴鍒�-楂樻俯涓濆嵃-閽㈠寲-浣庢俯浜屾涓濆嵃-瑕嗚啘-鍫嗗灈涓嬬嚎绛夊伐搴忎竴娆℃垚鍨嬶紝瀹炵幇鍏ㄦ祦绋嬫櫤鑳芥棤浜哄寲鐢熶骇銆�</p>
</div>
</div>
</div>
diff --git "a/gmms/WebContent/img/\346\226\260\344\272\214\346\234\237\345\244\247\345\261\217.png" "b/gmms/WebContent/img/\346\226\260\344\272\214\346\234\237\345\244\247\345\261\217.png"
index 09b2e81..83f4966 100644
--- "a/gmms/WebContent/img/\346\226\260\344\272\214\346\234\237\345\244\247\345\261\217.png"
+++ "b/gmms/WebContent/img/\346\226\260\344\272\214\346\234\237\345\244\247\345\261\217.png"
Binary files differ
--
Gitblit v1.8.0