diff --git a/Frontend/_alert.html b/Frontend/_alert.html
index 1f69c26..4e5e306 100644
--- a/Frontend/_alert.html
+++ b/Frontend/_alert.html
@@ -1049,7 +1049,10 @@
let columns = [
{
title: "棟別-樓層",
- data: "buildingFloorName_zh",
+ data: "buildingFloorName_zh",
+ render: (data) => {
+ return data.replace("$3", "");
+ },
},
{
title: "異常ID",
@@ -1104,9 +1107,6 @@
{
title: "異常原因",
data: "msgText",
- render: function (data) {
- return data.split(":")[0];
- },
},
{
title: "Ack 確認",
diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html
index 04b2d01..0b35379 100644
--- a/Frontend/_historyData.html
+++ b/Frontend/_historyData.html
@@ -119,13 +119,30 @@
pageAct.hisBuiName = "";
hisFirst = true;
$(function () {
- flatpickr(".selectDate", {});
- flatpickr(".selectMonth", { dateFormat: "Y-m", });
+ flatpickr(".selectDate", {
+ locale: "zh_tw",
+ });
+ flatpickr(".selectMonth", {
+ dateFormat: "Y-m",
+ locale: "zh_tw",
+ onMonthChange: (selectedDates, dateStr, instance) => {
+ const curMon = new Date(
+ `${instance.currentYear}-${instance.currentMonth + 1}`
+ );
+ instance.setDate(curMon);
+ },
+ onYearChange: (selectedDates, dateStr, instance) => {
+ const curMon = new Date(
+ `${instance.currentYear}-${instance.currentMonth + 1}`
+ );
+ instance.setDate(curMon);
+ },
+ });
let html = "";
for (let building of pageAct.buildList) {
html += ``;
+ ${building.full_name}
+ `;
}
$("#his_building").find(".item").empty();
$("#his_building").find(".item").append(html);
@@ -262,12 +279,12 @@
$.each(res.data.history_Main_Systems, function (index, val) {
if (pageAct.mainStatus) {
strHtml += `
-
- ${val.full_name
+ ${val.full_name
}
-
- `;
i1 = val.history_Sub_systems != null && i1 == null ? index : null;
@@ -277,13 +294,13 @@
i2 = val2.device != null && i2 == null ? index2 : null;
strHtml += `-
-
-
- ${val2.full_name}
-
-
-
+ ${val2.full_name}
+
+
+
`;
+
+ ${val3.full_name}
+
+
+
`;
if (pageAct.mainStatus) {
if (index == i1 && index2 == i2 && first) {
@@ -450,7 +467,7 @@
new Date(new Date().setDate(new Date().getDate() + 1)),
"date"
);
-
+ $(".flatpickr-innerContainer").show();
if (type == "day" || type == "today" || type == "ytd") {
let date = type == "ytd" ? ytd : now;
$("#his_startdate").css("display", "block");
@@ -495,6 +512,7 @@
$("#his_enddate").css("display", "none");
$("#getmonth").css("display", "block");
$("#getmonth").val(now.substr(0, 7));
+ $(".flatpickr-innerContainer").hide();
} else if (type == "ytd") {
$("#his_startdate").css("display", "block");
$("#his_enddate").css("display", "none");
diff --git a/Frontend/index.html b/Frontend/index.html
index bfb7c23..5dd0db4 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -9,76 +9,76 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
-->
-
- Marketing Dashboard - Application Intel - SmartAdmin v4.5.1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ Marketing Dashboard - Application Intel - SmartAdmin v4.5.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-