Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

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=="
     }

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();
         }

Frontend/_alert.html

@@ -5,14 +5,26 @@
 			<div class="row bg-dark p-2">
 				<div class="col-auto">
 					<div class="btn-group">
-						<button id="returnFalse" onclick="setReturn(false)" type="button" class="btn btn-secondary waves-effect waves-themed">未復歸</button>
-						<button id="returnTrue" onclick="setReturn(true)" type="button" class="btn btn-secondary waves-effect waves-themed">已復歸</button>
+						<button id="returnFalse" onclick="setReturn(false)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							未復歸
+						</button>
+						<button id="returnTrue" onclick="setReturn(true)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							已復歸
+						</button>
 					</div>
 				</div>
 				<div class="col-auto">
 					<div class="btn-group">
-						<button id="unconfirmed" onclick="setConfirm(false)" type="button" class="btn btn-secondary waves-effect waves-themed">未確認</button>
-						<button id="confirmed" onclick="setConfirm(true)" type="button" class="btn btn-secondary waves-effect waves-themed">已確認</button>
+						<button id="unconfirmed" onclick="setConfirm(false)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							未確認
+						</button>
+						<button id="confirmed" onclick="setConfirm(true)" type="button"
+								class="btn btn-secondary waves-effect waves-themed">
+							已確認
+						</button>
 					</div>
 				</div>
 				<div class="col-auto">
@@ -20,12 +32,14 @@
 				</div>
 				<div class="col-auto">
 					<div class="form-group">
-						<input class="form-control" id="alr_startdate" data-val="" type="date" name="alr_startdate" value="" style="cursor: pointer">
+						<input class="form-control" id="alr_startdate" data-val="" type="date" name="alr_startdate" value=""
+							   style="cursor: pointer">
 					</div>
 				</div>
 				<div class="col-auto">
 					<div class="form-group">
-						<input class="form-control" id="alr_enddate" data-val="" type="date" name="alr_enddate" value="" style="cursor: pointer">
+						<input class="form-control" id="alr_enddate" data-val="" type="date" name="alr_enddate" value=""
+							   style="cursor: pointer">
 					</div>
 				</div>
 				<hr>
@@ -63,7 +77,8 @@
 </main>
 
 <!-- Modal center 保養/維修 -->
-<div class="modal fade" id="alr_opeRecModal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" data-keyboard="false">
+<div class="modal fade" id="alr_opeRecModal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static"
+	 data-keyboard="false">
 	<div class="modal-dialog modal-dialog-centered" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
@@ -156,7 +171,8 @@
 						<div class="col-md-12">
 							<div class="form-group">
 								<label class="form-label" for="inpDescription">結果描述</label>
-								<textarea class="form-control" type="text" id="inpDescription" name="inpDescription" rows="7"></textarea>
+								<textarea class="form-control" type="text" id="inpDescription" name="inpDescription"
+										  rows="7"></textarea>
 							</div>
 						</div>
 						<div class="col-md-12">
@@ -226,11 +242,12 @@
 			pageAct.SysType = null;
 		});
 
-		$('input[type=checkbox][data-type=sub]').on('click', function () {
+		$('input[type=checkbox][data-type=sub]').on('click', function (e) {
 			if (!pageAct.selAllSysSub) {
 				// console.log(this);
 				pageAct.selAllSysSub = true;
 
+
 				$.each($('input[type=checkbox][data-type=sub]:checked'), function (i, v) {
 					$(v).click();
 				});
@@ -559,6 +576,10 @@
 					}
 				});
 			});
+			subStrHtml += `<div class="custom-control custom-checkbox custom-control-inline" data-main="other">
+									<input type="checkbox" class="custom-control-input" data-type="sub" id="other">
+									<label class="custom-control-label" for="other">其他</label>
+								</div>`
 			if (pageAct.mainStatus) {
 				$('#alr_mainList').html(mainStrHtml);
 				$('#alr_subList').html(subStrHtml);
@@ -616,6 +637,11 @@
 		}
 		else {
 			let elem = $('input[type=checkbox][data-type=sub]:checked');
+			if (elem[0]?.id === "other") {
+				console.log(elem[0]?.id)
+				getOtherAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, callBackFromAllDeviceAlert);
+				return
+			}
 			pageAct.selSysMain = $(elem).parent().data('main');
 			pageAct.selSysSub = $(elem).prop('id');
 			getAlarmByBaja(new Date(pageAct.alr_startdate).getTime(), enddate, pageAct.return, pageAct.confirm, pageAct.selSysMain + "_" + pageAct.selSysSub + "_AlarmClass", callBackFromOneDeviceAlert);

Frontend/_dashboard.html

@@ -2,10 +2,10 @@
     <div class="row">
         <div class="col-sm-12 col-xl-4 poisition-relative">
             <!-- <img src="img/clouds.png" class="img-fluid" style="min-height: 520px;"> -->
-            <!-- <div id="forgeViewer" class="position-absolute" style="width:96%;height:96%;"></div> -->
-            <video playsInline autoPlay muted>
+            <div id="forgeViewer" class="position-absolute" style="width:96%;height:96%;"></div>
+            <!-- <video playsInline autoPlay muted>
                 <source src="./media/video/TEST_RENDER.mp4" type="video/mp4" />
-            </video>
+            </video> -->
 
         </div>
         <div class="col-sm-12 col-xl-4">
@@ -302,7 +302,7 @@
                             <button name="topFunBtn" data-page="alert" type="button" class="btn btn-secondary col-4 d-flex jusity-content-center">
                                 <img src="${iconObj.iconClass}" class="w-100"></img>
                                 </button>
-                            <button id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary" data-id="${obj.subSys}" style="font-size: 24px">${obj.text}</button>
+                            <button id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary" data-id="${obj.subSys}" style="font-size: 20px">${obj.text}</button>
                         </div>`;
                 $("#sysSubBtnList").append(strHtml);
             }
@@ -333,7 +333,7 @@
                             <button name="topFunBtn" data-page="alert" type="button" class="btn btn-secondary col-4">
                                 <img src="${iconClass}" class="w-100 "></img>
                                 </button>
-                            <button id="sysSubCardBtn${subSysObj.sub_system_tag}" type="button" class="btn btn-secondary" data-id="${subSysObj.sub_system_tag}"  style="font-size: 24px">${subSysObj.full_name}</button>
+                            <button id="sysSubCardBtn${subSysObj.sub_system_tag}" type="button" class="btn btn-secondary" data-id="${subSysObj.sub_system_tag}"  style="font-size: 20px">${subSysObj.full_name}</button>
                         </div>`;
                     })
                 })
@@ -461,10 +461,10 @@
                     }
                 }).then(res => res.json())
                 .then(data => {
-                    console.log(data.data)
+                    console.log(allAlarmCount)
                     const { finish, notfinish } = data.data
                     chartWorOrdFin([finish, notfinish]); // 已完成 未完成
-                    chartWorOrdErr([finish + notfinish, allAlarmCount - (finish + notfinish)]);
+                    chartWorOrdErr([allAlarmCount - (finish + notfinish), finish + notfinish]);
                 })
 
         })