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

Frontend/_alert.html

@@ -230,11 +230,11 @@
 			if (!pageAct.selAllSysSub) {
 				console.log(this);
 				pageAct.selAllSysSub = true;
-				
+
 				$.each($('input[type=checkbox][data-type=sub]:checked'), function (i, v) {
 					$(v).click();
 				});
-				
+
 				if (pageAct.SysType == "all") {
 					if (!$(this).is(':checked')) {
 						$(this).prop('checked', true);
@@ -509,7 +509,7 @@
 			//						<a href="#" id="selAllSys" onclick="selAllSysVal(this)" class="btn btn-secondary">全部類別</a>
 			//					</div>`;
 			//}
-			
+
 			//$.each(res.data.history_Main_Systems, function (i, v) {
 			//	if (pageAct.mainStatus) {
 			//		mainStrHtml += `<div class="col-auto">
@@ -698,10 +698,10 @@
 			{
 				"title": "Ack 確認",
 				"data": "ackState",
-				"render": function (data) {
+				"render": function (data, type, row, meta) {
 					let confirm = data == "1" ? "未確認" : "確認";
 					let btnCol = data == "1" ? "warning" : "info";
-					return `<td><a href="#" onclick="return false" class="btn btn-${btnCol}">${confirm}</a></td>`
+					return data == "1" ? `<td><button onclick="chgAck('${row.uuid}')" class="btn btn-${btnCol}">${confirm}</button></td>` : `<td><button class="btn btn-${btnCol}">${confirm}</button></td>`;
 				}
 			},
 			{
@@ -848,4 +848,11 @@
 			}
 		}, null, "POST").send();
 	}
+
+	function chgAck(devUuid) {
+		$.post(window.location.origin + '/obix/alarm/' + devUuid + '/ack', '<obj is="obix:AckAlarmIn"><str name="ackUser" val="obix" /></obj>', function () {
+
+		}, "text");
+		getData();
+	}
 </script>

Frontend/_historyData.html

@@ -269,7 +269,7 @@
 			new Date(start).getTime(),
 			new Date(end).getTime(),
 			pageAct.deviceName,
-            "Mitsubishi_Sup",
+            "Mitsubishi_JACE8000",
 		    callBackFromHistory);
     }
 

FrontendWebApi/ApiControllers/DashboardController.cs

@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Data.SqlTypes;
 using System.IO;
 using System.Threading.Tasks;
+using System.Text;
 
 namespace FrontendWebApi.ApiControllers
 {

FrontendWebApi/Models/AlarmRecord.cs

@@ -66,5 +66,6 @@ namespace FrontendWebApi.Models
         public string alarmClass_txt { get; set; }
         public string device_name { get; set; }
         public string errMsg { get; set; }
+        public string uuid { get; set; }
     }
 }