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

修正首頁圖表為定時更新

Browse Source
This commit is contained in:
JouChun 2024-03-09 15:03:37 -05:00
parent 2ef31fc7ea
commit 631128c79a
2 changed files with 1270 additions and 1244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Frontend/_dashboard.html
View File

@ -391,6 +391,7 @@
"POST"
).send();
}
// 取得 自動須量
function getAutDemVal() {
let url = baseApiUrl + "/api/Dashboard/GetContractValue";
@ -677,12 +678,14 @@
// 圖表 - 今天與昨天用電量 (長條圖)
function chartEveDaysElec(todayData, yesData) {
let eveDayElecChartCanvas = $("#eveDayElecChart").get(0).getContext("2d");
let curHour = new Date().getHours();
todayData.data = todayData.filter((x) => x.timestamp.$time.$hour < curHour);
yesData.data = yesData.filter((x) => x.timestamp.$time.$hour < curHour);
todayData.data = todayData.filter((x) => x.timestamp.$time.$hour <= curHour);
yesData.data = yesData.filter((x) => x.timestamp.$time.$hour <= curHour);
let labels = todayData?.data?.map((x) => x.timestamp.$time.$hour);
let eveDayElecChartData = {
labels: todayData?.data.map((x) => x.timestamp.$time.$hour),
labels,
datasets: [
{
id: "today",
@ -710,7 +713,6 @@
},
],
};
let eveDayElecChartOptions = {
maintainAspectRatio: false,
responsive: true,
@ -752,25 +754,35 @@
});
// console.log(eveDayElecChart)
} else {
eveDayElecChart.data.labels.splice(0, eveDayElecChart.data.labels.length);
eveDayElecChart.data.labels.push(...labels);
eveDayElecChart.data.datasets.forEach((dataset) => {
if (dataset.order == 1) {
dataset.data = todayData?.data.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(...yesData?.data.map((x) => x.sum));
// dataset.data = yesData?.data.map((x) => x.sum);
} else {
dataset.data = yesData?.data.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(...todayData?.data.map((x) => x.sum));
//dataset.data = todayData?.data.map((x) => x.sum);
}
eveDayElecChart.update();
});
}
}
// 圖表 - 這週與上週用電量 (長條圖)
function chartEveWeeksElec(curWeekData, prevWeekData) {
// console.log(curWeekData.map(x => x.sum),prevWeekData.map(x => x.sum))
let eveWeekElecChartCanvas = $("#eveWeekElecChart").get(0).getContext("2d");
let eveWeekElecChartData = {
labels: curWeekData.map((x) =>
let eveWeekElecChartCanvas = $("#eveWeekElecChart").get(0).getContext("2d");
let labels = curWeekData?.map((x) =>
dayToChiDay(strToDate(x.timestamp.$cEncStr, "day"))
),
);
let eveWeekElecChartData = {
labels,
datasets: [
{
id: "today",
@ -839,12 +851,20 @@
});
// console.log(eveWeekElecChart,eveWeekElecChartData, eveWeekElecChartOptions)
} else {
eveWeekElecChart.data.labels.splice(0, eveWeekElecChart.data.labels.length);
eveWeekElecChart.data.labels.push(...labels);
eveWeekElecChart.data.datasets.forEach((dataset) => {
if (dataset.order == 1) {
dataset.data = curWeekData.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(...prevWeekData.map((x) => x.sum));
//dataset.data = prevWeekData.map((x) => x.sum);
} else {
dataset.data = prevWeekData.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(...curWeekData.map((x) => x.sum));
//dataset.data = curWeekData.map((x) => x.sum);
}
eveWeekElecChart.update();
});
}
}
@ -852,9 +872,9 @@
// 圖表 - 本月即上月用電量
function chartEveMonsElec(curMonData, prevMonData) {
let eveMonElecChartCanvas = $("#eveMonElecChart").get(0).getContext("2d");
let labels = curMonData?.map((x) => x.timestamp.$date.$day);
let eveMonElecChartData = {
labels: curMonData.map((x) => x.timestamp.$date.$day),
labels,
datasets: [
{
id: "curMon",
@ -923,13 +943,18 @@
});
// console.log(eveWeekElecChart,eveWeekElecChartData, eveWeekElecChartOptions)
} else {
eveMonElecChart.data.labels.splice(0, eveMonElecChart.data.labels.length);
eveMonElecChart.data.labels.push(...labels);
eveMonElecChart.data.datasets.forEach((dataset) => {
if (dataset.order == 1) {
dataset.data = curMonData.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(...prevMonData.map((x) => x.sum));
} else {
dataset.data = prevMonData.map((x) => x.sum);
dataset.data.splice(0, dataset.data.length);
dataset.data.push(... curMonData.map((x) => x.sum));
}
});
eveMonElecChart.update();
}
}
@ -1178,7 +1203,9 @@
},
detail: {
valueAnimation: true,
formatter: (value) => { return `\t\n ${value} % \t\n ${Math.round(pValue)} kW` },
formatter: (value) => {
return `\t\n ${value} % \t\n ${Math.round(pValue)} kW`
},
color: "inherit",
fontSize: 20,
},
@ -1277,10 +1304,15 @@
}
}
$(window).on("timeout:5m", function () {
//$(window).on("timeout:5m", function () {
//console.log("五分鐘更新");
// getElectricBaja();
// });
setInterval(() => {
console.log("五分鐘更新");
getElectricBaja();
});
}, 300000)
onEvent("click", "button[id^=sysSubCardBtn]", function () {
let subSysTag = $(this).data("id");

12
FrontendWebApi/appsettings.Development.json
View File

@ -14,15 +14,9 @@
},
"DBConfig": {
"MySqlDBConfig": {
"Server": "FYlY+w0XDIz+jmF2rlZWJw==", //0.201
"Port": "js2LutKe+rdjzdxMPQUrvQ==",
//"Database": "VJB2XC+lAtzuHObDGMVOAA==", //30
//"Database": "IgYBsgG2VLKKxFb64j7LOA==", //wsp
//"Database": "7gWfmZ28HGIJZbxEbK+0yg==", //tpe_dome_dome
//"Database": "siTUcDaC/g2yGTMFWD72Kg==", //tpe_dome_hotel
//"Database": "iuaY0h0+TWkir44/eZLDqw==", //tpe_dome_office
//"Database": "Rq7Gn4x6LwBvVtl7GY8LbA==", //MCUT
"Database": "j9LOmjFh2/9PpuwnVB8ugqnKdBDJHx1AAT7aTWeh37E=", // ibms_mcut_online
"Server": "CYGthbCeGtAXT4s1NOSJHQ==", //0.201"
"Port": "mkF51jVbg40V5K5eTh2Ckw==", //306"
"Database": "XZ2fOBnta9kdVGEb7y92cg==", //ibms_mcut
"Root": "SzdxEgaJJ7tcTCrUl2zKsA==",
"Password": "FVAPxztxpY4gJJKQ/se4bQ=="
}