From 4349620dc92943af3ef444fb1a412c5491f542c4 Mon Sep 17 00:00:00 2001 From: Celeste Date: Wed, 1 Mar 2023 10:48:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20WSP=20=E8=A8=AD=E5=82=99?= =?UTF-8?q?=E8=B3=87=E6=96=99=E5=8C=AF=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Backend/appsettings.Development.json | 4 +- Backend/wwwroot/forgeDemo.html | 7 ++- Frontend/_alert.html | 50 ++++++++++++++++----- Frontend/_dashboard.html | 14 +++--- Frontend/gif/B_white.gif | Bin 0 -> 10540 bytes Frontend/gif/B_white.png | Bin 0 -> 9376 bytes Frontend/gif/CA_white.gif | Bin 0 -> 18582 bytes Frontend/gif/CA_white.png | Bin 0 -> 13661 bytes Frontend/gif/C_white.gif | Bin 0 -> 16370 bytes Frontend/gif/C_white.png | Bin 0 -> 23108 bytes Frontend/gif/E1_white.gif | Bin 0 -> 16638 bytes Frontend/gif/E1_white.png | Bin 0 -> 13259 bytes Frontend/gif/E2_white.gif | Bin 0 -> 16920 bytes Frontend/gif/E2_white.png | Bin 0 -> 10116 bytes Frontend/gif/E3_white.gif | Bin 0 -> 16628 bytes Frontend/gif/E3_white.png | Bin 0 -> 16842 bytes Frontend/gif/E4-1_white.gif | Bin 0 -> 25998 bytes Frontend/gif/E4-1_white.png | Bin 0 -> 32064 bytes Frontend/gif/E4-2_white.gif | Bin 0 -> 20632 bytes Frontend/gif/E4-2_white.png | Bin 0 -> 25682 bytes Frontend/gif/E5_white.gif | Bin 0 -> 10162 bytes Frontend/gif/E5_white.png | Bin 0 -> 5637 bytes Frontend/gif/EL_white.gif | Bin 0 -> 22925 bytes Frontend/gif/EL_white.png | Bin 0 -> 17509 bytes Frontend/gif/ES_white.gif | Bin 0 -> 12717 bytes Frontend/gif/ES_white.png | Bin 0 -> 10019 bytes Frontend/gif/F1_white.gif | Bin 0 -> 12147 bytes Frontend/gif/F1_white.png | Bin 0 -> 8609 bytes Frontend/gif/F3_white.gif | Bin 0 -> 32849 bytes Frontend/gif/F3_white.png | Bin 0 -> 36311 bytes Frontend/gif/F4_white.gif | Bin 0 -> 15762 bytes Frontend/gif/F4_white.png | Bin 0 -> 15409 bytes Frontend/gif/IC_white.gif | Bin 0 -> 29717 bytes Frontend/gif/IC_white.png | Bin 0 -> 17116 bytes Frontend/gif/IR_white.gif | Bin 0 -> 13500 bytes Frontend/gif/IR_white.png | Bin 0 -> 14188 bytes Frontend/gif/L1_white.gif | Bin 0 -> 11537 bytes Frontend/gif/L1_white.png | Bin 0 -> 15080 bytes Frontend/gif/L2_white.gif | Bin 0 -> 11987 bytes Frontend/gif/L2_white.png | Bin 0 -> 11253 bytes Frontend/gif/M10_white.gif | Bin 0 -> 18381 bytes Frontend/gif/M10_white.png | Bin 0 -> 18246 bytes Frontend/gif/M11_white.gif | Bin 0 -> 12762 bytes Frontend/gif/M11_white.png | Bin 0 -> 11298 bytes Frontend/gif/M12_white.gif | Bin 0 -> 11553 bytes Frontend/gif/M12_white.png | Bin 0 -> 16377 bytes Frontend/gif/M13_white.gif | Bin 0 -> 24880 bytes Frontend/gif/M13_white.png | Bin 0 -> 24829 bytes Frontend/gif/M1_White.gif | Bin 0 -> 24152 bytes Frontend/gif/M1_White.png | Bin 0 -> 24861 bytes Frontend/gif/M2_white.gif | Bin 0 -> 17350 bytes Frontend/gif/M2_white.png | Bin 0 -> 21839 bytes Frontend/gif/M5-1_white.gif | Bin 0 -> 17926 bytes Frontend/gif/M5-1_white.png | Bin 0 -> 21089 bytes Frontend/gif/M5-2_white.gif | Bin 0 -> 26182 bytes Frontend/gif/M5-2_white.png | Bin 0 -> 31422 bytes Frontend/gif/M8_white.gif | Bin 0 -> 11789 bytes Frontend/gif/M8_white.png | Bin 0 -> 5975 bytes Frontend/gif/P1_white.gif | Bin 0 -> 16862 bytes Frontend/gif/P1_white.png | Bin 0 -> 20976 bytes Frontend/gif/PF_white.png | Bin 0 -> 18351 bytes Frontend/gif/PIC_white.png | Bin 0 -> 18842 bytes Frontend/gif/PSC_gray.gif | Bin 0 -> 14701 bytes Frontend/gif/PSC_white.gif | Bin 0 -> 14221 bytes Frontend/gif/PSC_white.png | Bin 0 -> 13334 bytes Frontend/gif/P_white.gif | Bin 0 -> 23681 bytes Frontend/gif/P_white.png | Bin 0 -> 30837 bytes Frontend/gif/R_white.png | Bin 0 -> 14123 bytes Frontend/gif/Red_gif/B_white.gif | Bin 0 -> 10540 bytes Frontend/gif/Red_gif/CA_white.gif | Bin 0 -> 18582 bytes Frontend/gif/Red_gif/C_white.gif | Bin 0 -> 16370 bytes Frontend/gif/Red_gif/E1_white.gif | Bin 0 -> 16638 bytes Frontend/gif/Red_gif/E2_white.gif | Bin 0 -> 16920 bytes Frontend/gif/Red_gif/E3_white.gif | Bin 0 -> 16628 bytes Frontend/gif/Red_gif/E4-1_white.gif | Bin 0 -> 25998 bytes Frontend/gif/Red_gif/E4-2_white.gif | Bin 0 -> 20632 bytes Frontend/gif/Red_gif/E5_white.gif | Bin 0 -> 10162 bytes Frontend/gif/Red_gif/EL_white.gif | Bin 0 -> 22925 bytes Frontend/gif/Red_gif/ES_white.gif | Bin 0 -> 12717 bytes Frontend/gif/Red_gif/F1_white.gif | Bin 0 -> 12147 bytes Frontend/gif/Red_gif/F3_white.gif | Bin 0 -> 32849 bytes Frontend/gif/Red_gif/F4_white.gif | Bin 0 -> 15762 bytes Frontend/gif/Red_gif/IC_white.gif | Bin 0 -> 29717 bytes Frontend/gif/Red_gif/IR_white.gif | Bin 0 -> 13500 bytes Frontend/gif/Red_gif/L1_white.gif | Bin 0 -> 11537 bytes Frontend/gif/Red_gif/L2_white.gif | Bin 0 -> 11987 bytes Frontend/gif/Red_gif/M10_white.gif | Bin 0 -> 18381 bytes Frontend/gif/Red_gif/M11_white.gif | Bin 0 -> 12762 bytes Frontend/gif/Red_gif/M12_white.gif | Bin 0 -> 11553 bytes Frontend/gif/Red_gif/M13_white.gif | Bin 0 -> 24880 bytes Frontend/gif/Red_gif/M1_White.gif | Bin 0 -> 24152 bytes Frontend/gif/Red_gif/M2_white.gif | Bin 0 -> 17350 bytes Frontend/gif/Red_gif/M5-1_white.gif | Bin 0 -> 17926 bytes Frontend/gif/Red_gif/M5-2_white.gif | Bin 0 -> 26182 bytes Frontend/gif/Red_gif/M8_white.gif | Bin 0 -> 11789 bytes Frontend/gif/Red_gif/P1_white.gif | Bin 0 -> 16862 bytes Frontend/gif/Red_gif/PSC_gray.gif | Bin 0 -> 14701 bytes Frontend/gif/Red_gif/PSC_white.gif | Bin 0 -> 14221 bytes Frontend/gif/Red_gif/P_white.gif | Bin 0 -> 23681 bytes Frontend/gif/Red_gif/W2.gif | Bin 0 -> 26560 bytes Frontend/gif/Red_gif/key-card_white.gif | Bin 0 -> 19431 bytes Frontend/gif/Red_gif/solar-panel_white.gif | Bin 0 -> 19259 bytes Frontend/gif/Red_gif/sos_white.gif | Bin 0 -> 21780 bytes Frontend/gif/SE_white.png | Bin 0 -> 24737 bytes Frontend/gif/W1_white.png | Bin 0 -> 13242 bytes Frontend/gif/W2.gif | Bin 0 -> 26560 bytes Frontend/gif/W2_white.png | Bin 0 -> 37677 bytes Frontend/gif/W3_white.png | Bin 0 -> 11773 bytes Frontend/gif/W4_white.png | Bin 0 -> 22113 bytes Frontend/gif/W5_white.png | Bin 0 -> 37684 bytes Frontend/gif/key-card_white.gif | Bin 0 -> 19431 bytes Frontend/gif/solar-panel_white.gif | Bin 0 -> 19259 bytes Frontend/gif/solar-panel_white.png | Bin 0 -> 23292 bytes Frontend/gif/sos_white.gif | Bin 0 -> 21780 bytes Frontend/index.html | 4 +- Frontend/js/init.js | 2 +- Frontend/js/n4js/alarmbaja.js | 20 ++++----- 117 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 Frontend/gif/B_white.gif create mode 100644 Frontend/gif/B_white.png create mode 100644 Frontend/gif/CA_white.gif create mode 100644 Frontend/gif/CA_white.png create mode 100644 Frontend/gif/C_white.gif create mode 100644 Frontend/gif/C_white.png create mode 100644 Frontend/gif/E1_white.gif create mode 100644 Frontend/gif/E1_white.png create mode 100644 Frontend/gif/E2_white.gif create mode 100644 Frontend/gif/E2_white.png create mode 100644 Frontend/gif/E3_white.gif create mode 100644 Frontend/gif/E3_white.png create mode 100644 Frontend/gif/E4-1_white.gif create mode 100644 Frontend/gif/E4-1_white.png create mode 100644 Frontend/gif/E4-2_white.gif create mode 100644 Frontend/gif/E4-2_white.png create mode 100644 Frontend/gif/E5_white.gif create mode 100644 Frontend/gif/E5_white.png create mode 100644 Frontend/gif/EL_white.gif create mode 100644 Frontend/gif/EL_white.png create mode 100644 Frontend/gif/ES_white.gif create mode 100644 Frontend/gif/ES_white.png create mode 100644 Frontend/gif/F1_white.gif create mode 100644 Frontend/gif/F1_white.png create mode 100644 Frontend/gif/F3_white.gif create mode 100644 Frontend/gif/F3_white.png create mode 100644 Frontend/gif/F4_white.gif create mode 100644 Frontend/gif/F4_white.png create mode 100644 Frontend/gif/IC_white.gif create mode 100644 Frontend/gif/IC_white.png create mode 100644 Frontend/gif/IR_white.gif create mode 100644 Frontend/gif/IR_white.png create mode 100644 Frontend/gif/L1_white.gif create mode 100644 Frontend/gif/L1_white.png create mode 100644 Frontend/gif/L2_white.gif create mode 100644 Frontend/gif/L2_white.png create mode 100644 Frontend/gif/M10_white.gif create mode 100644 Frontend/gif/M10_white.png create mode 100644 Frontend/gif/M11_white.gif create mode 100644 Frontend/gif/M11_white.png create mode 100644 Frontend/gif/M12_white.gif create mode 100644 Frontend/gif/M12_white.png create mode 100644 Frontend/gif/M13_white.gif create mode 100644 Frontend/gif/M13_white.png create mode 100644 Frontend/gif/M1_White.gif create mode 100644 Frontend/gif/M1_White.png create mode 100644 Frontend/gif/M2_white.gif create mode 100644 Frontend/gif/M2_white.png create mode 100644 Frontend/gif/M5-1_white.gif create mode 100644 Frontend/gif/M5-1_white.png create mode 100644 Frontend/gif/M5-2_white.gif create mode 100644 Frontend/gif/M5-2_white.png create mode 100644 Frontend/gif/M8_white.gif create mode 100644 Frontend/gif/M8_white.png create mode 100644 Frontend/gif/P1_white.gif create mode 100644 Frontend/gif/P1_white.png create mode 100644 Frontend/gif/PF_white.png create mode 100644 Frontend/gif/PIC_white.png create mode 100644 Frontend/gif/PSC_gray.gif create mode 100644 Frontend/gif/PSC_white.gif create mode 100644 Frontend/gif/PSC_white.png create mode 100644 Frontend/gif/P_white.gif create mode 100644 Frontend/gif/P_white.png create mode 100644 Frontend/gif/R_white.png create mode 100644 Frontend/gif/Red_gif/B_white.gif create mode 100644 Frontend/gif/Red_gif/CA_white.gif create mode 100644 Frontend/gif/Red_gif/C_white.gif create mode 100644 Frontend/gif/Red_gif/E1_white.gif create mode 100644 Frontend/gif/Red_gif/E2_white.gif create mode 100644 Frontend/gif/Red_gif/E3_white.gif create mode 100644 Frontend/gif/Red_gif/E4-1_white.gif create mode 100644 Frontend/gif/Red_gif/E4-2_white.gif create mode 100644 Frontend/gif/Red_gif/E5_white.gif create mode 100644 Frontend/gif/Red_gif/EL_white.gif create mode 100644 Frontend/gif/Red_gif/ES_white.gif create mode 100644 Frontend/gif/Red_gif/F1_white.gif create mode 100644 Frontend/gif/Red_gif/F3_white.gif create mode 100644 Frontend/gif/Red_gif/F4_white.gif create mode 100644 Frontend/gif/Red_gif/IC_white.gif create mode 100644 Frontend/gif/Red_gif/IR_white.gif create mode 100644 Frontend/gif/Red_gif/L1_white.gif create mode 100644 Frontend/gif/Red_gif/L2_white.gif create mode 100644 Frontend/gif/Red_gif/M10_white.gif create mode 100644 Frontend/gif/Red_gif/M11_white.gif create mode 100644 Frontend/gif/Red_gif/M12_white.gif create mode 100644 Frontend/gif/Red_gif/M13_white.gif create mode 100644 Frontend/gif/Red_gif/M1_White.gif create mode 100644 Frontend/gif/Red_gif/M2_white.gif create mode 100644 Frontend/gif/Red_gif/M5-1_white.gif create mode 100644 Frontend/gif/Red_gif/M5-2_white.gif create mode 100644 Frontend/gif/Red_gif/M8_white.gif create mode 100644 Frontend/gif/Red_gif/P1_white.gif create mode 100644 Frontend/gif/Red_gif/PSC_gray.gif create mode 100644 Frontend/gif/Red_gif/PSC_white.gif create mode 100644 Frontend/gif/Red_gif/P_white.gif create mode 100644 Frontend/gif/Red_gif/W2.gif create mode 100644 Frontend/gif/Red_gif/key-card_white.gif create mode 100644 Frontend/gif/Red_gif/solar-panel_white.gif create mode 100644 Frontend/gif/Red_gif/sos_white.gif create mode 100644 Frontend/gif/SE_white.png create mode 100644 Frontend/gif/W1_white.png create mode 100644 Frontend/gif/W2.gif create mode 100644 Frontend/gif/W2_white.png create mode 100644 Frontend/gif/W3_white.png create mode 100644 Frontend/gif/W4_white.png create mode 100644 Frontend/gif/W5_white.png create mode 100644 Frontend/gif/key-card_white.gif create mode 100644 Frontend/gif/solar-panel_white.gif create mode 100644 Frontend/gif/solar-panel_white.png create mode 100644 Frontend/gif/sos_white.gif diff --git a/Backend/appsettings.Development.json b/Backend/appsettings.Development.json index e02e024..4dca5d7 100644 --- a/Backend/appsettings.Development.json +++ b/Backend/appsettings.Development.json @@ -16,8 +16,8 @@ "MySqlDBConfig": { "Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201 "Port": "js2LutKe+rdjzdxMPQUrvQ==", - "Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 - //"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp + //"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30 + "Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp "Root": "SzdxEgaJJ7tcTCrUl2zKsA==", "Password": "FVAPxztxpY4gJJKQ/se4bQ==" } diff --git a/Backend/wwwroot/forgeDemo.html b/Backend/wwwroot/forgeDemo.html index e9ee919..cf42e23 100644 --- a/Backend/wwwroot/forgeDemo.html +++ b/Backend/wwwroot/forgeDemo.html @@ -273,10 +273,10 @@ //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyMi5ud2Q") // 0224 電梯 30 - launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyNC5ud2Q") + //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDJUU5JTlCJTk5JUU2JUE4JUExJUU1JUJDJThGK01FUCVFNiU4QiU4NiVFNyVCMyVCQiVFNyVCNSVCMV8lRTklOUIlQkIlRTYlQTIlQUYlRTclQjQlQjAlRTclQUYlODAlRTclODklODhfMDIyNC5ud2Q") // 0221 WSP - //launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMXzAyMjEubndk") + launchViewer("dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dmVnb29nemNhdmNia2l0aHl2bHJzdnJjdGg2dHR3eWgtMjAyMzAyX2libXMvQmFucWlhbyUyMFRhaXBlaSUyME1haW4lMjBPZmZpY2UtQUxMXzAyMjEubndk") }); function move1Floor() { @@ -408,8 +408,7 @@ } function importDevCor() { - - //console.log(tagIdDevList) + console.log("所有設備資料",tagIdDevList) ImportDevForCor(); ImportForgeRoom(); } diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 934a073..a67c353 100644 --- a/Frontend/_alert.html +++ b/Frontend/_alert.html @@ -5,14 +5,26 @@
- - + +
- - + +
@@ -20,12 +32,14 @@
- +
- +

@@ -48,9 +62,9 @@
+ +
+
-->
@@ -63,7 +77,8 @@ -