diff --git a/Frontend/_alert.html b/Frontend/_alert.html index 1f69c26..728e68a 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", 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 } - -