diff --git a/Backend/wwwroot/upload/device_icon/767e5f37-6c7a-4e95-b20a-c5c16be7dace.png b/Backend/wwwroot/upload/device_icon/767e5f37-6c7a-4e95-b20a-c5c16be7dace.png
new file mode 100644
index 0000000..79096e5
Binary files /dev/null and b/Backend/wwwroot/upload/device_icon/767e5f37-6c7a-4e95-b20a-c5c16be7dace.png differ
diff --git a/Backend/wwwroot/upload/floor_map/1e271998-6c36-486a-96b2-12d776ea1c62.svg b/Backend/wwwroot/upload/floor_map/1e271998-6c36-486a-96b2-12d776ea1c62.svg
new file mode 100644
index 0000000..34d11ed
--- /dev/null
+++ b/Backend/wwwroot/upload/floor_map/1e271998-6c36-486a-96b2-12d776ea1c62.svg
@@ -0,0 +1,1393 @@
+
+
+
diff --git a/Backend/wwwroot/upload/floor_map/2e5be49c-f8e8-4977-b5b6-db4d95ff9691.svg b/Backend/wwwroot/upload/floor_map/2e5be49c-f8e8-4977-b5b6-db4d95ff9691.svg
deleted file mode 100644
index 38360db..0000000
--- a/Backend/wwwroot/upload/floor_map/2e5be49c-f8e8-4977-b5b6-db4d95ff9691.svg
+++ /dev/null
@@ -1,3016 +0,0 @@
-
-
-
diff --git a/Backend/wwwroot/upload/floor_map/3b8b86a2-7714-4ed4-8f09-b7da68540027.svg b/Backend/wwwroot/upload/floor_map/3b8b86a2-7714-4ed4-8f09-b7da68540027.svg
new file mode 100644
index 0000000..34d11ed
--- /dev/null
+++ b/Backend/wwwroot/upload/floor_map/3b8b86a2-7714-4ed4-8f09-b7da68540027.svg
@@ -0,0 +1,1393 @@
+
+
+
diff --git a/Backend/wwwroot/upload/floor_map/4fb9b321-272b-48b3-9171-93af6769f95e.svg b/Backend/wwwroot/upload/floor_map/4fb9b321-272b-48b3-9171-93af6769f95e.svg
new file mode 100644
index 0000000..34d11ed
--- /dev/null
+++ b/Backend/wwwroot/upload/floor_map/4fb9b321-272b-48b3-9171-93af6769f95e.svg
@@ -0,0 +1,1393 @@
+
+
+
diff --git a/Backend/wwwroot/upload/floor_map/c0de2199-e62b-4f82-b7f7-abacd4e1cd17.svg b/Backend/wwwroot/upload/floor_map/c0de2199-e62b-4f82-b7f7-abacd4e1cd17.svg
deleted file mode 100644
index 38360db..0000000
--- a/Backend/wwwroot/upload/floor_map/c0de2199-e62b-4f82-b7f7-abacd4e1cd17.svg
+++ /dev/null
@@ -1,3016 +0,0 @@
-
-
-
diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index 0412120..6ede9d8 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -123,19 +123,6 @@
}
}, null, "POST").send();
- //let strHtml = `
- //
- //
- // | 設備編號 |
- // B01-B2-19F-CR-001 |
- //
- //
- // | 設備名稱 |
- // A區迴路001 |
-
- //
- //
- //
`
return tabEle.prop("outerHTML");
}
@@ -173,7 +160,7 @@
${drawStateTabBlo()}
-
+
${drawErrRecTabBlo()}
@@ -185,97 +172,104 @@
`,
- group:"device",
- onShow: function (tooltipEle, oriEle) {
- var tab = new YT.Tab({ tabName: "cardTab" })
- //基本資料tab block
- $("#info").append(drawInfoTabBlo(devGuid))
- loadOpeRecTable();
- //loadErrRecTable2($(oriEle).data("number"));
- loadErrRecTable();
- }
+ group: "device",
+ onShow: function (tooltipEle, oriEle) {
+ var tab = new YT.Tab({ tabName: "cardTab" })
+ //基本資料tab block
+ $("#info").append(drawInfoTabBlo(devGuid))
+ loadOpeRecTable();
+ //loadErrRecTable2($(oriEle).data("number"));
+ loadErrRecTable();
+ }
+ })
})
+ }
- function loadOpeRecTable() {
- let url = "https://api.npoint.io/31e717774a0f5822cc7b";
- let tag = "#opeRecTable";
+ function loadOpeRecTable() {
+ let url = baseApiUrl + "/api/Device/GetOpeDevice";
+ let tag = "#opeRecTable";
- let column_defs = [
- { "targets": [0], "width": "8%", "sortable": true },
- { "targets": [1], "width": "8%", "sortable": true },
- { "targets": [2], "width": "7%", "sortable": true },
- { "targets": [3], "width": "7%", "sortable": true },
- ];
+ let column_defs = [
+ { "targets": [0], "width": "8%", "sortable": true },
+ { "targets": [1], "width": "8%", "sortable": true },
+ { "targets": [2], "width": "7%", "sortable": true },
+ { "targets": [3], "width": "7%", "sortable": true },
+ ];
- let columns = [
- {
- "title": "異常ID",
- "data": "errId",
- },
- {
- "title": "異常原因",
- "data": "errReason",
- },
- {
- "title": "ACK確認",
- "data": "ackCheck",
- },
- {
- "title": "發生/賦歸時間",
- "data": "time",
+ let columns = [
+ {
+ "title": "類型",
+ "data": "work_type",
+ },
+ {
+ "title": "項目",
+ "data": "fix_do",
+ },
+ {
+ "title": "處理人員",
+ "data": "work_person_name",
+ },
+ {
+ "title": "發生/完成時間",
+ "data": "finish_time",
+ "render": function (data,type,row) {
+ return row.created_at + "
" + data;
},
+ },
- ];
+ ];
+
+
- let callback = function () {
- $('#opeRecTable').wrap(""); //不採用datatable內建scrollbody，會導致thead跑掉
- let api = this.api();
- api.columns.adjust();
- }
+ //let callback = function () {
+ // $('#opeRecTable').wrap(""); //不採用datatable內建scrollbody，會導致thead跑掉
+ // let api = this.api();
+ // api.columns.adjust();
+ //}
- opeRecTable = new YourTeam.JqDataTables.getTableByAjax(url, tag, null, columns, column_defs, callback, null, null, null, null, null, "tpi");
- }
+ opeRecTable = new YourTeam.JqDataTables.getTableByAjax(url, tag, null, columns, column_defs,null, null, null, null, null, null, "tpi");
+ }
- function loadErrRecTable() {
- let tag = "#errRecTable";
- let datas;
- //getOneDeviceAlarmTop10ByBaja(_devicePath, callback);
+ function loadErrRecTable() {
+ let tag = "#errRecTable";
+ let datas;
+ //getOneDeviceAlarmTop10ByBaja(_devicePath, callback);
- let column_defs = [
- { "targets": [0], "width": "8%", "sortable": true },
- { "targets": [1], "width": "8%", "sortable": true },
- { "targets": [2], "width": "7%", "sortable": true },
- { "targets": [3], "width": "7%", "sortable": true },
- ];
+ let column_defs = [
+ { "targets": [0], "width": "8%", "sortable": true },
+ { "targets": [1], "width": "8%", "sortable": true },
+ { "targets": [2], "width": "7%", "sortable": true },
+ { "targets": [3], "width": "7%", "sortable": true },
+ ];
- let columns = [
- {
- "title": "異常ID",
- "data": "uuid",
- },
- {
- "title": "異常原因",
- "data": "msgText",
- },
- {
- "title": "ACK確認",
- "data": "ackState",
- },
- {
- "title": "發生/賦歸時間",
- "data": "timestamp",
- },
+ let columns = [
+ {
+ "title": "異常ID",
+ "data": "uuid",
+ },
+ {
+ "title": "異常原因",
+ "data": "msgText",
+ },
+ {
+ "title": "ACK確認",
+ "data": "ackState",
+ },
+ {
+ "title": "發生/賦歸時間",
+ "data": "timestamp",
+ },
- ];
+ ];
- //let callback = function (result) {
- // datas = result;
- //}
- let result = '{"count": 2,"data":[{ "uuid": "43dc7846-bd96-4be2-ab35-f11aec729c60","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:30:24.951 AM UTC+08:00"},{"uuid": "7c309846-d862-4a8b-803b-cdc8e0efa092","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:00:24.893 AM UTC+08:00"}]}';
- let json_object = JSON.parse(result);
- datas = json_object['data'];
- errRecTable = new YourTeam.JqDataTables.getTableByStatic(tag, datas, columns, column_defs);
- }
+ //let callback = function (result) {
+ // datas = result;
+ //}
+ let result = '{"count": 2,"data":[{ "uuid": "43dc7846-bd96-4be2-ab35-f11aec729c60","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:30:24.951 AM UTC+08:00"},{"uuid": "7c309846-d862-4a8b-803b-cdc8e0efa092","msgText": "","ackState": "1","timestamp": "2022-Nov-16 10:00:24.893 AM UTC+08:00"}]}';
+ let json_object = JSON.parse(result);
+ datas = json_object['data'];
+ errRecTable = new YourTeam.JqDataTables.getTableByStatic(tag, datas, columns, column_defs);
+ }
//function loadErrRecTable2(allPath) {
// if (allPath != undefined && allPath != null) {
@@ -314,7 +308,7 @@
// });
// }
//}
- }
+ // }
diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html
index e08554a..2db4803 100644
--- a/Frontend/_sysMonFloor.html
+++ b/Frontend/_sysMonFloor.html
@@ -12,14 +12,15 @@
\ No newline at end of file