diff --git a/Frontend/_dashboard.html b/Frontend/_dashboard.html index b39b8f5..3e9fe1d 100644 --- a/Frontend/_dashboard.html +++ b/Frontend/_dashboard.html @@ -358,11 +358,23 @@ x.mainSys == mainSysObj.main_system_tag && x.subSys == subSysObj.sub_system_tag )[0]?.iconClass; - strHtml += `
- - +
`; }); }); diff --git a/Frontend/_reportManagement.html b/Frontend/_reportManagement.html index 520a32d..92bc0bb 100644 --- a/Frontend/_reportManagement.html +++ b/Frontend/_reportManagement.html @@ -1,1024 +1,1091 @@
-
-
-

報表管理

+
+
+

報表管理

-
-
-
- - -
-
-
-
-
-

-
- 費每度單價 -
- - -
- 選擇單一月份 -
- - - -

-
-
-

-
棟別
-
-

-
-
- -
-
- - - - -
- 單位：kWh -
-
-
diff --git a/Frontend/_systemMonitor.html b/Frontend/_systemMonitor.html index c874b58..535ba8d 100644 --- a/Frontend/_systemMonitor.html +++ b/Frontend/_systemMonitor.html @@ -1,79 +1,79 @@ 
-
-
- -
-
-
-
- -
+
+
+
+ +
+
+
+
-
-
-
diff --git a/Frontend/index.html b/Frontend/index.html index 5b17f89..f00d5ad 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -1190,7 +1190,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li pageAct.buiTag = $(actEle).prop("id").split("buiBtn")[1]; pageAct.buiName = $(actEle).text(); pageAct.urn = $(actEle).data("urn"); - console.log("building"); clearTimeout(refreshPageTimer); refreshPageTimer = setTimeout(() => { @@ -1344,7 +1343,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li ) { lastPageAct = JSON.parse(sessionStorage.getItem("pageAct")); } - if ( (lastPageAct.sysSubTag && lastPage == "systemMonitor") || lastPage == "sysElevator" @@ -1352,11 +1350,11 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li ) { $("#sysMonTopBtn").YTTab("set"); if (!pageAct.isShowBuildingInMenu) { - $(`#subSysBtn${lastPageAct.sysSubTag}`).click(); + $(`#buiBtn${lastPageAct.buiTag}`).click(); } else { $( `#subSysBtn${lastPageAct.sysSubTag - }[data-building-tag=${buildingTagOnJquery(pageAct.buiTag)}]` + }[data-building-tag=${buildingTagOnJquery(lastPageAct.buiTag)}]` ).click(); } } else { @@ -1911,15 +1909,16 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li } function setSysTagForPageAct(obj) { + console.log($(obj).data("subsysobj")) pageAct.sysMainTag = - $(obj).data("subSysObj")?.main_system_tag || + $(obj).data("subsysobj")?.main_system_tag || pageAct.sysSubObj.main_system_tag; pageAct.sysSubTag = - $(obj).data("subSysObj")?.sub_system_tag || + $(obj).data("subsysobj")?.sub_system_tag || pageAct.sysSubObj.sub_system_tag; pageAct.sysSubName = - $(obj).data("subSysObj")?.full_name || pageAct.sysSubName; - pageAct.sysSubObj = $(obj).data("subSysObj") || pageAct.sysSubObj; + $(obj).data("subsysobj")?.full_name || pageAct.sysSubName; + pageAct.sysSubObj = $(obj).data("subsysobj") || pageAct.sysSubObj; getDevItem(); } @@ -2234,7 +2233,13 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li { href: "javascript:;" }, [], `subSysBtn${subSysObj.sub_system_tag}`, - { page: page, tabname: "systemMonitor" }, + { + page: page, + tabname: "systemMonitor", + "building-tag": buildingTagOnJquery( + pageAct.buiTag + ), + }, "topFunBtn" ); li.append(a); @@ -2243,10 +2248,10 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li subSysObj.main_system_tag = mainSysObj.main_system_tag; $("#sysMonBtnList").append(li); if (index === 0 && index2 === 0) { - pageAct.sysMainTag = mainSysObj.main_system_tag; - pageAct.sysSubName = subSysObj.full_name; - pageAct.sysSubObj = subSysObj; - pageAct.sysSubTag = subSysObj.sub_system_tag; + // pageAct.sysMainTag = mainSysObj.main_system_tag; + // pageAct.sysSubName = subSysObj.full_name; + // pageAct.sysSubObj = subSysObj; + // pageAct.sysSubTag = subSysObj.sub_system_tag; $(`#subSysBtn${subSysObj.sub_system_tag}`).addClass( "active" );