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

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