From 4ed24230d0e7b862a76a0bccb3a9ef90af7276a0 Mon Sep 17 00:00:00 2001 From: suixy <2277317060@qq.com> Date: Fri, 24 Oct 2025 09:00:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/layout/components/Sidebar/SidebarItem.vue | 6 +- src/utils/dateReportUtils.js | 63 ++++ .../ems/base/baseMonitorWorkUnit/index.vue | 18 +- .../base/baseMonitorWorkUnit/index.vue.bak | 4 +- src/views/ems/base/baseWorkUnit/index.vue | 14 +- src/views/ems/base/baseWorkUnit/index.vue.bak | 4 +- .../ems/record/recordDnbInstant/index.vue.bak | 4 +- .../record/recordLatestSteamInstant/index.vue | 14 +- .../recordLatestSteamInstant/index.vue.bak | 4 +- .../ems/record/recordSteamInstant/index.vue | 19 +- .../record/recordSteamInstant/index.vue.bak | 4 +- .../ems/record/recordWaterInstant/index.vue | 14 +- .../record/recordWaterInstant/index.vue.bak | 4 +- .../TemperatureHumidityMonitoring/index.vue | 4 +- .../index.vue.bak | 4 +- .../TemperatureHumidityMonitoring2/index.vue | 4 +- .../index.vue.bak | 4 +- .../TemperatureHumidityMonitoring3/index.vue | 4 +- .../index.vue.bak | 4 +- .../index.vue.bak | 4 +- .../ems/report/currentIOTCurve/index.vue | 4 +- .../ems/report/currentIOTCurve/index.vue.bak | 4 +- .../ems/report/currentSteamCurve/copy.vue | 78 +++-- .../ems/report/currentSteamCurve/good.vue | 190 ++++++------- .../ems/report/currentSteamCurve/index.vue | 6 +- .../report/currentSteamCurve/index.vue.bak | 4 +- .../report/currentVibrationCurve/index.vue | 6 +- .../currentVibrationCurve/index.vue.bak | 4 +- .../ems/report/currentVoltageCurve/index.vue | 4 +- .../report/currentVoltageCurve/index.vue.bak | 4 +- src/views/ems/report/energyPreview/index.vue | 10 +- .../ems/report/energyPreview/index.vue.bak | 4 +- .../report/energyStatisticalReport/index.vue | 8 +- .../energyStatisticalReport/index.vue.bak | 4 +- .../ems/report/pointSteamCurve/index.vue | 6 +- .../ems/report/pointSteamCurve/index.vue.bak | 4 +- vite.config.ts | 29 +- ....timestamp-1761267307255-04680f2afeae6.mjs | 268 ++++++++++++++++++ 39 files changed, 593 insertions(+), 247 deletions(-) create mode 100644 src/utils/dateReportUtils.js create mode 100644 vite.config.ts.timestamp-1761267307255-04680f2afeae6.mjs diff --git a/package.json b/package.json index a676e98..a951f05 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,10 @@ "swiper": "^11.2.8", "uuid": "^11.0.5", "vform3-builds": "^3.0.10", - "vue": "3.4.34", + "vue": "3.5.21", "vue-barcode": "^1.3.0", "vue-cropper": "1.1.1", + "vue-datepicker-next": "1.0.3", "vue-draggable-resizable": "^3.0.0", "vue-i18n": "9.10.2", "vue-json-pretty": "2.4.0", diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index c9e270e..1577d37 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -50,9 +50,9 @@ import { countTaskWaitByCurrentUser } from '@/api/workflow/task'; const badge = ref(0); const getBadge = () => { if (onlyOneChild.value.meta?.title === '我的待办' || props.item?.meta?.title === '我的任务') { - countTaskWaitByCurrentUser().then(e => { - badge.value = e.data; - }); + // countTaskWaitByCurrentUser().then(e => { + // badge.value = e.data; + // }); } }; onMounted(() => { diff --git a/src/utils/dateReportUtils.js b/src/utils/dateReportUtils.js new file mode 100644 index 0000000..6485110 --- /dev/null +++ b/src/utils/dateReportUtils.js @@ -0,0 +1,63 @@ +export function getHoursBetween(startHourStr, endHourStr) { + const startHour = new Date(startHourStr) + let endHour = new Date(endHourStr) + let nowDate = new Date() + nowDate.setHours(nowDate.getHours() - 1); + if (endHour.getTime() > nowDate.getTime()) { + endHour = nowDate + } + const hours = [] + while (startHour <= endHour) { + const hourString = `${startHour.getFullYear()}-${String(startHour.getMonth() + 1).padStart(2, '0')}-${String(startHour.getDate()).padStart(2, '0')} ${String(startHour.getHours()).padStart(2, '0')}:00:00` + hours.push(hourString) + startHour.setTime(startHour.getTime() + 60 * 60 * 1000) + } + // return hours; + return hours.sort((a, b) => new Date(b) - new Date(a)) +} + +export function getDatesBetween(startDateStr, endDateStr) { + const startDate = new Date(startDateStr) + let endDate = new Date(endDateStr) + let nowDate = new Date() + nowDate.setHours(nowDate.getHours() - 1); + if (endDate.getTime() > nowDate.getTime()) { + endDate = nowDate + } + const dates = [] + while (startDate <= endDate) { + dates.push(`${startDate.getFullYear()}-${String(startDate.getMonth() + 1).padStart(2, '0')}-${String(startDate.getDate()).padStart(2, '0')}`) + startDate.setDate(startDate.getDate() + 1) + } + // return dates; + return dates.sort((a, b) => new Date(b) - new Date(a)) +} + +export function getMonthsBetween(startMonthStr, endMonthStr) { + const result = [] + const startDate = new Date(startMonthStr + '-01') + let endDate = new Date(endMonthStr + '-01') + const currentDate = new Date(startDate) + let nowDate = new Date() + nowDate.setHours(nowDate.getHours() - 1); + if (endDate.getTime() > nowDate.getTime()) { + endDate = nowDate + } + while (currentDate <= endDate) { + const year = currentDate.getFullYear() + const month = String(currentDate.getMonth() + 1).padStart(2, '0') + result.push(`${year}-${month}`) + currentDate.setMonth(currentDate.getMonth() + 1) + } + return result.sort((a, b) => new Date(b) - new Date(a)) +} + +export function getYearsBetween(startYearStr, endYearStr) { + const result = [] + const startYear = Number(startYearStr.substring(0, 4)) + const endYear = Number(endYearStr.substring(0, 4)) + for (let i = startYear; i <= endYear; i++) { + result.push(`${i}`) + } + return result.sort((a, b) => new Date(b) - new Date(a)) +} diff --git a/src/views/ems/base/baseMonitorWorkUnit/index.vue b/src/views/ems/base/baseMonitorWorkUnit/index.vue index 1e338a3..139ae29 100644 --- a/src/views/ems/base/baseMonitorWorkUnit/index.vue +++ b/src/views/ems/base/baseMonitorWorkUnit/index.vue @@ -7,7 +7,7 @@ v-model="workUnitName" placeholder="请输入统计单元名称" clearable - + prefix-icon="Search" style="margin-bottom: 20px" /> @@ -100,7 +100,7 @@ type="primary" plain icon="Plus" - + @click="handleAdd" v-hasPermi="['ems/base:baseMonitorWorkUnit:add']" >新增 @@ -111,7 +111,7 @@ type="success" plain icon="Edit" - + :disabled="single" @click="handleUpdate" v-hasPermi="['ems/base:baseMonitorWorkUnit:edit']" @@ -123,7 +123,7 @@ type="danger" plain icon="Delete" - + :disabled="multiple" @click="handleDelete" v-hasPermi="['ems/base:baseMonitorWorkUnit:remove']" @@ -135,7 +135,7 @@ type="warning" plain icon="Download" - + @click="handleExport" v-hasPermi="['ems/base:baseMonitorWorkUnit:export']" >导出 @@ -188,7 +188,7 @@ - +