jay.chang/ibms-MCUT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Frontend]修正dashboard月份比較 | 按鈕大小

Browse Source
This commit is contained in:
Celeste 2023-09-01 13:10:32 +08:00
parent 1547cb5a6e
commit 18746d5a42
1 changed files with 1243 additions and 1238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Frontend/_dashboard.html
View File

@ -168,7 +168,8 @@
<div class="row h-100"> <div class="row h-100">
<div class="col-sm-12 col-lg-4"> <div class="col-sm-12 col-lg-4">
<div class="row" id="sysSubBtnList"></div> <div class="row h-100 d-flex justify-content-between"
id="sysSubBtnList"></div>
</div> </div>
<div class="col-sm-12 col-lg-8"> <div class="col-sm-12 col-lg-8">
<div class="row h-100"> <div class="row h-100">
@ -319,11 +320,13 @@
let iconObj = sysIconList.filter( let iconObj = sysIconList.filter(
(x) => x.mainSys == obj.mainSys && x.subSys == obj.subSys (x) => x.mainSys == obj.mainSys && x.subSys == obj.subSys
)[0]; )[0];
strHtml = `<div class="btn-group btn-group-lg col-lg-6 mb-4 dev-group"> strHtml = `<div class="btn-group col-lg-6 mb-4 dev-group">
<button name="topFunBtn" data-page="systemMonitor" type="button" class="btn btn-secondary col-4 d-flex jusity-content-center disabled" disabled> <button name="topFunBtn" data-page="systemMonitor" type="button" class="btn btn-secondary col-4 disabled px-2 h-100" disabled>
<img src="${iconObj.iconClass}" class="w-100"></img> <img src="${iconObj.iconClass}" class="w-100"></img>
</button> </button>
<button name="topFunBtn" data-page="systemMonitor" id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary disabled" disabled data-id="${obj.subSys}" style="font-size: 20px">${obj.text}</button> <button name="topFunBtn" data-page="systemMonitor" id="sysSubCardBtn${obj.subSys}" type="button" class="btn btn-secondary disabled px-2 h-100" disabled data-id="${obj.subSys}">
<span class="h2">${obj.text}</span>
</button>
</div>`; </div>`;
$("#sysSubBtnList").append(strHtml); $("#sysSubBtnList").append(strHtml);
} }
@ -358,10 +361,10 @@
x.mainSys == mainSysObj.main_system_tag && x.mainSys == mainSysObj.main_system_tag &&
x.subSys == subSysObj.sub_system_tag x.subSys == subSysObj.sub_system_tag
)[0]?.iconClass; )[0]?.iconClass;
strHtml += `<div class="btn-group btn-group-lg col-lg-6 mb-4 dev-group" data-id="/${pageAct.AreaTag strHtml += `<div class="btn-group col-lg-6 mb-4 dev-group" data-id="/${pageAct.AreaTag
}/${pageAct.buiTag}/${mainSysObj.main_system_tag}/${subSysObj.sub_system_tag }/${pageAct.buiTag}/${mainSysObj.main_system_tag}/${subSysObj.sub_system_tag
}"> }">
<button name="topFunBtn" data-page="systemMonitor" type="button" class="btn btn-secondary col-4" data-subSysobj=${JSON.stringify( <button name="topFunBtn" data-page="systemMonitor" type="button" class="btn btn-secondary col-4 px-2 h-100" data-subSysobj=${JSON.stringify(
{ {
...subSysObj, ...subSysObj,
main_system_tag: mainSysObj.main_system_tag, main_system_tag: mainSysObj.main_system_tag,
@ -370,11 +373,13 @@
<img src="${iconClass}" class="w-100 "></img> <img src="${iconClass}" class="w-100 "></img>
</button> </button>
<button name="topFunBtn" data-page="systemMonitor" id="sysSubCardBtn${subSysObj.sub_system_tag <button name="topFunBtn" data-page="systemMonitor" id="sysSubCardBtn${subSysObj.sub_system_tag
}" type="button" class="btn btn-secondary" data-id="${subSysObj.sub_system_tag }" type="button" class="btn btn-secondary px-2 h4 h-100" data-id="${subSysObj.sub_system_tag
}" data-subSysObj=${JSON.stringify({ }" data-subSysObj=${JSON.stringify({
...subSysObj, ...subSysObj,
main_system_tag: mainSysObj.main_system_tag, main_system_tag: mainSysObj.main_system_tag,
})} style="font-size: 20px">${subSysObj.full_name}</button> })} >
<span class="h2">${subSysObj.full_name}</span>
</button>
</div>`; </div>`;
}); });
}); });
@ -476,7 +481,7 @@
} }
chartContractValue( chartContractValue(
"contractValueChart2", "contractValueChart2",
((value / contractCapacityForchart1) * 100).roundDecimal(2) ((value / contractCapacityForchart2) * 100).roundDecimal(2)
); );
} }
}); });
@ -574,7 +579,7 @@
// 本月及上月用電 // 本月及上月用電
const prevMonth = `${new Date().getFullYear()}-${new Date().getMonth() < 10 ? "0" : "" const prevMonth = `${new Date().getFullYear()}-${new Date().getMonth() < 10 ? "0" : ""
}${new Date().getMonth()}-01T00:00:00`; }${new Date().getMonth()}-01T00:00:00`;
const thisMonth = `${new Date().getFullYear()}-${new Date().getMonth() < 10 ? "0" : "" const thisMonth = `${new Date().getFullYear()}-${new Date().getMonth() + 2 < 10 ? "0" : ""
}${new Date().getMonth() + 2}-01T00:00:00`; }${new Date().getMonth() + 2}-01T00:00:00`;
getElectricMeterDayDataByBaja( getElectricMeterDayDataByBaja(
devNum, devNum,