ko.ko/guandu_front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

時間更新為最新資料

Browse Source
This commit is contained in:
huliang 2025-06-17 17:13:59 +08:00
parent 5555a51579
commit 9f17d6d8c1
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/stores/useElecTotalMeterStore.js
View File

@ -77,11 +77,11 @@ const useElecStore = defineStore("elecData", () => {
const gettimeToHistory = (item) => { const gettimeToHistory = (item) => {
const id = item.id; const id = item.id;
const startTime = dayjs("2025-05-08T16:30:00.000+08:00") const startTime = dayjs()
.subtract(13, "day") .subtract(13, "day")
.startOf("day") .startOf("day")
.format("YYYY-MM-DDTHH:mm:ss.000+08:00"); .format("YYYY-MM-DDTHH:mm:ss.000+08:00");
const endTime = dayjs("2025-05-08T16:30:00.000+08:00") const endTime = dayjs()
.endOf("day") .endOf("day")
.format("YYYY-MM-DDTHH:mm:ss.000+08:00"); .format("YYYY-MM-DDTHH:mm:ss.000+08:00");
@ -130,8 +130,8 @@ const useElecStore = defineStore("elecData", () => {
// 提取今天和昨天的数据 // 提取今天和昨天的数据
for (const [timestamp, value] of dataMap) { for (const [timestamp, value] of dataMap) {
const date = dayjs(timestamp).format("YYYY-MM-DD"); const date = dayjs(timestamp).format("YYYY-MM-DD");
const today = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); const today = dayjs().format("YYYY-MM-DD");
const yesterday = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); const yesterday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
if (date === today) { if (date === today) {
todayelecdata.value.set(timestamp, value); todayelecdata.value.set(timestamp, value);

14
src/views/dashboard/DashboardPage.vue
View File

@ -43,11 +43,11 @@ const yesterdayTodayData = ref({
categories: [], categories: [],
values: [ values: [
{ {
name: `${dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD")} 用電量`, name: `${dayjs().format("YYYY-MM-DD")} 用電量`,
value: [], value: [],
}, },
{ {
name: `${dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD")} 用電量`, name: `${dayjs().subtract(1, "day").format("YYYY-MM-DD")} 用電量`,
value: [], value: [],
}, },
], ],
@ -68,7 +68,7 @@ const weekComparisonData = ref({
}); });
const generateWeekCategories = () => { const generateWeekCategories = () => {
const today = dayjs("2025-05-08T16:30:00.000+08:00"); const today = dayjs();
const currentDay = today.day(); const currentDay = today.day();
const daysOfWeek = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; const daysOfWeek = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
const dynamicCategories = []; const dynamicCategories = [];
@ -91,8 +91,8 @@ watch(
(newElecData) => { (newElecData) => {
console.log("elecStandCostSummary", newElecData); console.log("elecStandCostSummary", newElecData);
if (newElecData && newElecData.dailyResults) { if (newElecData && newElecData.dailyResults) {
const today = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); const today = dayjs().format("YYYY-MM-DD");
const yesterday = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); const yesterday = dayjs().subtract(1, "day").format("YYYY-MM-DD");
const todayData = newElecData.dailyResults.find( const todayData = newElecData.dailyResults.find(
(item) => item.dateStr === today (item) => item.dateStr === today
@ -151,8 +151,8 @@ watch(
([newTodayData, newYesterdayData]) => { ([newTodayData, newYesterdayData]) => {
console.log("todayyesterday", newTodayData, newYesterdayData); console.log("todayyesterday", newTodayData, newYesterdayData);
const todayDate = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); const todayDate = dayjs().format("YYYY-MM-DD");
const yesterdayDate = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); const yesterdayDate = dayjs().subtract(1, "day").format("YYYY-MM-DD");
const categories = []; const categories = [];
const todayValues = []; const todayValues = [];