diff --git a/src/stores/useElecTotalMeterStore.js b/src/stores/useElecTotalMeterStore.js index c36623c..0fe2e51 100644 --- a/src/stores/useElecTotalMeterStore.js +++ b/src/stores/useElecTotalMeterStore.js @@ -77,11 +77,11 @@ const useElecStore = defineStore("elecData", () => { const gettimeToHistory = (item) => { const id = item.id; - const startTime = dayjs("2025-05-08T16:30:00.000+08:00") + const startTime = dayjs() .subtract(13, "day") .startOf("day") .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") .format("YYYY-MM-DDTHH:mm:ss.000+08:00"); @@ -130,8 +130,8 @@ const useElecStore = defineStore("elecData", () => { // 提取今天和昨天的数据 for (const [timestamp, value] of dataMap) { const date = dayjs(timestamp).format("YYYY-MM-DD"); - const today = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); - const yesterday = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); + const today = dayjs().format("YYYY-MM-DD"); + const yesterday = dayjs().subtract(1, "day").format("YYYY-MM-DD"); if (date === today) { todayelecdata.value.set(timestamp, value); diff --git a/src/views/dashboard/DashboardPage.vue b/src/views/dashboard/DashboardPage.vue index 1b296c9..58bdc77 100644 --- a/src/views/dashboard/DashboardPage.vue +++ b/src/views/dashboard/DashboardPage.vue @@ -43,11 +43,11 @@ const yesterdayTodayData = ref({ categories: [], values: [ { - name: `${dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD")} 用電量`, + name: `${dayjs().format("YYYY-MM-DD")} 用電量`, 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: [], }, ], @@ -68,7 +68,7 @@ const weekComparisonData = ref({ }); const generateWeekCategories = () => { - const today = dayjs("2025-05-08T16:30:00.000+08:00"); + const today = dayjs(); const currentDay = today.day(); const daysOfWeek = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]; const dynamicCategories = []; @@ -91,8 +91,8 @@ watch( (newElecData) => { console.log("elecStandCostSummary", newElecData); if (newElecData && newElecData.dailyResults) { - const today = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); - const yesterday = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); + const today = dayjs().format("YYYY-MM-DD"); + const yesterday = dayjs().subtract(1, "day").format("YYYY-MM-DD"); const todayData = newElecData.dailyResults.find( (item) => item.dateStr === today @@ -151,8 +151,8 @@ watch( ([newTodayData, newYesterdayData]) => { console.log("todayyesterday", newTodayData, newYesterdayData); - const todayDate = dayjs("2025-05-08T16:30:00.000+08:00").format("YYYY-MM-DD"); - const yesterdayDate = dayjs("2025-05-08T16:30:00.000+08:00").subtract(1, "day").format("YYYY-MM-DD"); + const todayDate = dayjs().format("YYYY-MM-DD"); + const yesterdayDate = dayjs().subtract(1, "day").format("YYYY-MM-DD"); const categories = []; const todayValues = [];