From 2be46cee386caa27417c40809ba5db667f36112d Mon Sep 17 00:00:00 2001 From: zch Date: Tue, 4 Mar 2025 10:59:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E5=A2=9E=E5=8A=A0=E9=87=87?= =?UTF-8?q?=E9=9B=86=E6=97=B6=E9=97=B4=E5=92=8C=E8=AE=B0=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个组件中添加采集日期范围和采集时间范围的选择器 - 修改查询参数以包含采集时间和记录时间 - 优化时间范围的默认值设置 - 调整时间格式以适应后端接口要求 --- .../base/baseMonitorInfoIOTDevice/index.vue | 17 ++- .../ems/record/recordSteamInstant/index.vue | 81 ++++++----- .../ems/report/currentSteamCurve/index.vue | 56 +++++-- .../ems/report/pointSteamCurve/index.vue | 87 ++++++----- .../ems/report/reportPointSteam/index.vue | 137 ++++++++++++------ 5 files changed, 238 insertions(+), 140 deletions(-) diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue index 5eef614..476daef 100644 --- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue +++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue @@ -56,9 +56,14 @@ - + + + @@ -412,7 +417,13 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }).catch(() => { }); - } + }, + + /** 获取能源类型名称 */ + getEnergyTypeName(energyTypeId) { + const energyType = this.energyTypeList.find(item => item.energyTypeId === energyTypeId); + return energyType ? energyType.energyName : ''; + }, } }; diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue index 780c59e..b79114d 100644 --- a/src/views/ems/record/recordSteamInstant/index.vue +++ b/src/views/ems/record/recordSteamInstant/index.vue @@ -49,7 +49,7 @@ end-placeholder="结束时间" > --> - + + + + + + + + + 搜索 重置 @@ -290,6 +315,8 @@ export default { daterangeCollectTime: [], // 记录时间时间范围 daterangeRecordTime: [], + // 时间范围 + timerangeRecordTime: [], // 查询参数 queryParams: { pageNum: 1, @@ -336,6 +363,20 @@ export default { /* const nowDate = parseTime(new Date(), '{y}-{m}-{d}') this.daterangeCollectTime[0] = nowDate + ' 00:00:00' this.daterangeCollectTime[1] = nowDate + ' 23:59:59'*/ + + const today = new Date(); + const yesterday = new Date(today); + yesterday.setDate(today.getDate() - 1); + + //时间默认为8点 + /* this.timerangeRecordTime = ['08:30:00', '08:30:00']; */ + this.timerangeRecordTime[0] = '08:00:00'; + this.timerangeRecordTime[1] = '08:00:00'; + + this.daterangeRecordTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ; + this.daterangeRecordTime[1] = parseTime(today, '{y}-{m}-{d}') ; + + this.getTreeselect() this.getTreeMonitorInfo() this.getList() @@ -372,12 +413,12 @@ export default { this.loading = true this.queryParams.params = {} if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) { - this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0] - this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1] + this.queryParams.params['beginCollectTime'] =this.daterangeCollectTime[0] + ' ' + this.timerangeRecordTime[0]; + this.queryParams.params['endCollectTime'] =this.daterangeCollectTime[1] + ' ' + this.timerangeRecordTime[1]; } if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) { - this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0] - this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] + this.queryParams.params['beginRecordTime'] =this.daterangeRecordTime[0] + ' ' + this.timerangeRecordTime[0]; + this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] + 'T' + this.timerangeRecordTime[1]; } listRecordSteamInstant(this.queryParams).then(response => { this.recordSteamInstantList = response.rows @@ -514,36 +555,6 @@ export default { } } } -/* - -function sortByPrefixOrder(data, order) { - // 将数据按前缀分组 - const groupedData = {}; - data.forEach(item => { - const prefix = item.code.split('_')[0]; - if (!groupedData[prefix]) { - groupedData[prefix] = []; - } - groupedData[prefix].push(item); - }); - - // 按照特定顺序排序 - const sortedData = []; - order.forEach(prefix => { - if (groupedData[prefix]) { - sortedData.push(...groupedData[prefix]); - } - }); - // 处理不在特定顺序中的数据 - data.forEach(item => { - if (!sortedData.includes(item)) { - sortedData.push(item); - } - }); - - return sortedData; -} -*/