From ad3e168124791afd390bc0e3c3c78539521d31ce Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 30 Oct 2025 09:47:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E7=BB=9F=E4=B8=80API=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B=E5=B9=B6=E4=BC=98=E5=8C=96=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为所有新增、修改、删除接口函数添加 AxiosPromise 返回类型 - 将 Vue 组件中的 slot="footer" 替换为 #footer 语法 - 统一日期时间格式化字符串由 "yyyy-MM-dd HH:mm:ss" 更改为 "YYYY-MM-DD HH:mm:ss"- 在图表组件中增加数据存在性判断和空状态展示 -修复部分组件中字典数据引用错误的问题 - 调整图表容器底部边距以改善视觉效果 --- src/api/ems/base/baseCollectDeviceInfo.ts | 6 +++--- src/api/ems/base/baseEnergyPrice.ts | 6 +++--- src/api/ems/base/baseEnergyType.ts | 6 +++--- src/api/ems/base/baseMonitorInfo.ts | 6 +++--- src/api/ems/base/baseMonitorThreshold.ts | 6 +++--- src/api/ems/base/baseMonitorWorkUnit.ts | 6 +++--- src/api/ems/base/baseSharePrice.ts | 6 +++--- src/api/ems/base/baseWorkUnit.ts | 6 +++--- src/api/ems/record/recordAlarmData.ts | 6 +++--- src/api/ems/record/recordAlarmRule.ts | 6 +++--- src/api/ems/record/recordDnbInstant.ts | 6 +++--- src/api/ems/record/recordIOTInstant.ts | 6 +++--- src/api/ems/record/recordSteamInstant.ts | 6 +++--- src/api/ems/record/recordVibrationInstant.ts | 6 +++--- src/api/ems/record/recordWaterInstant.ts | 6 +++--- .../report/TemperatureHumidityMonitoring.ts | 2 +- src/api/ems/report/reportPointDnb.ts | 6 +++--- src/api/ems/report/reportPointSteam.ts | 12 ++++++------ src/api/ems/report/reportPointWater.ts | 6 +++--- .../ems/base/baseMonitorInfoSteam/index.vue | 10 ++++++---- .../ems/base/baseMonitorInfoWater/index.vue | 4 ++-- .../ems/record/recordAlarmData/index.vue | 12 +++++++----- .../ems/record/recordDnbInstant/index.vue | 8 ++++---- .../ems/record/recordIOTInstant/index.vue | 4 ++-- .../record/recordLatestSteamInstant/index.vue | 8 ++++---- .../ems/record/recordSteamInstant/index.vue | 6 +++--- .../record/recordVibrationInstant/index.vue | 16 ++++++++-------- .../ems/record/recordWaterInstant/index.vue | 8 ++++---- .../ems/report/currentIOTCurve/index.vue | 4 ++-- .../ems/report/currentSteamCurve/index.vue | 16 +++++++++++++++- .../report/currentVibrationCurve/index.vue | 2 +- src/views/ems/report/energyPreview/index.vue | 4 ++-- .../report/energyStatisticalReport/index.vue | 2 +- .../ems/report/pointSteamCurve/index.vue | 19 ++++++++++++++++++- .../ems/report/reportPointWater/index.vue | 2 +- 35 files changed, 138 insertions(+), 103 deletions(-) diff --git a/src/api/ems/base/baseCollectDeviceInfo.ts b/src/api/ems/base/baseCollectDeviceInfo.ts index 35a950d..f5c93f3 100644 --- a/src/api/ems/base/baseCollectDeviceInfo.ts +++ b/src/api/ems/base/baseCollectDeviceInfo.ts @@ -26,7 +26,7 @@ export function getBaseCollectDeviceInfo(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseCollectDeviceInfo', method: 'post', @@ -37,7 +37,7 @@ export function addBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) { /** * 修改采集设备信息 */ -export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) { +export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm): AxiosPromise { return request({ url: '/ems/base/baseCollectDeviceInfo', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseCollectDeviceInfo(data: BaseCollectDeviceInfoForm) { /** * 删除采集设备信息 */ -export function delBaseCollectDeviceInfo(objId: string | number | Array) { +export function delBaseCollectDeviceInfo(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseCollectDeviceInfo/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseEnergyPrice.ts b/src/api/ems/base/baseEnergyPrice.ts index ea41d0d..2a91be2 100644 --- a/src/api/ems/base/baseEnergyPrice.ts +++ b/src/api/ems/base/baseEnergyPrice.ts @@ -26,7 +26,7 @@ export function getBaseEnergyPrice(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseEnergyPrice', method: 'post', @@ -37,7 +37,7 @@ export function addBaseEnergyPrice(data: BaseEnergyPriceForm) { /** * 修改能源月份单价 */ -export function updateBaseEnergyPrice(data: BaseEnergyPriceForm) { +export function updateBaseEnergyPrice(data: BaseEnergyPriceForm): AxiosPromise { return request({ url: '/ems/base/baseEnergyPrice', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseEnergyPrice(data: BaseEnergyPriceForm) { /** * 删除能源月份单价 */ -export function delBaseEnergyPrice(objId: string | number | Array) { +export function delBaseEnergyPrice(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseEnergyPrice/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseEnergyType.ts b/src/api/ems/base/baseEnergyType.ts index f1d4e86..e4390c1 100644 --- a/src/api/ems/base/baseEnergyType.ts +++ b/src/api/ems/base/baseEnergyType.ts @@ -26,7 +26,7 @@ export function getBaseEnergyType(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseEnergyType', method: 'post', @@ -37,7 +37,7 @@ export function addBaseEnergyType(data: BaseEnergyTypeForm) { /** * 修改能源类型信息 */ -export function updateBaseEnergyType(data: BaseEnergyTypeForm) { +export function updateBaseEnergyType(data: BaseEnergyTypeForm): AxiosPromise { return request({ url: '/ems/base/baseEnergyType', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseEnergyType(data: BaseEnergyTypeForm) { /** * 删除能源类型信息 */ -export function delBaseEnergyType(objId: string | number | Array) { +export function delBaseEnergyType(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseEnergyType/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseMonitorInfo.ts b/src/api/ems/base/baseMonitorInfo.ts index 1e4bc5a..d7dc4da 100644 --- a/src/api/ems/base/baseMonitorInfo.ts +++ b/src/api/ems/base/baseMonitorInfo.ts @@ -26,7 +26,7 @@ export function getBaseMonitorInfo(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseMonitorInfo', method: 'post', @@ -37,7 +37,7 @@ export function addBaseMonitorInfo(data: BaseMonitorInfoForm) { /** * 修改计量设备信息 */ -export function updateBaseMonitorInfo(data: BaseMonitorInfoForm) { +export function updateBaseMonitorInfo(data: BaseMonitorInfoForm): AxiosPromise { return request({ url: '/ems/base/baseMonitorInfo', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseMonitorInfo(data: BaseMonitorInfoForm) { /** * 删除计量设备信息 */ -export function delBaseMonitorInfo(objId: string | number | Array) { +export function delBaseMonitorInfo(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseMonitorInfo/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseMonitorThreshold.ts b/src/api/ems/base/baseMonitorThreshold.ts index 3b9a54b..5897d0c 100644 --- a/src/api/ems/base/baseMonitorThreshold.ts +++ b/src/api/ems/base/baseMonitorThreshold.ts @@ -26,7 +26,7 @@ export function getBaseMonitorThreshold(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseMonitorThreshold', method: 'post', @@ -37,7 +37,7 @@ export function addBaseMonitorThreshold(data: BaseMonitorThresholdForm) { /** * 修改计量设备阈值维护 */ -export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm) { +export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm): AxiosPromise { return request({ url: '/ems/base/baseMonitorThreshold', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseMonitorThreshold(data: BaseMonitorThresholdForm) { /** * 删除计量设备阈值维护 */ -export function delBaseMonitorThreshold(objId: string | number | Array) { +export function delBaseMonitorThreshold(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseMonitorThreshold/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseMonitorWorkUnit.ts b/src/api/ems/base/baseMonitorWorkUnit.ts index 0595362..d5153ab 100644 --- a/src/api/ems/base/baseMonitorWorkUnit.ts +++ b/src/api/ems/base/baseMonitorWorkUnit.ts @@ -26,7 +26,7 @@ export function getBaseMonitorWorkUnit(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseMonitorWorkUnit', method: 'post', @@ -37,7 +37,7 @@ export function addBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) { /** * 修改统计计量信息 */ -export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) { +export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm): AxiosPromise { return request({ url: '/ems/base/baseMonitorWorkUnit', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseMonitorWorkUnit(data: BaseMonitorWorkUnitForm) { /** * 删除统计计量信息 */ -export function delBaseMonitorWorkUnit(objId: string | number | Array) { +export function delBaseMonitorWorkUnit(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseMonitorWorkUnit/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseSharePrice.ts b/src/api/ems/base/baseSharePrice.ts index dfdb942..b2ca34a 100644 --- a/src/api/ems/base/baseSharePrice.ts +++ b/src/api/ems/base/baseSharePrice.ts @@ -26,7 +26,7 @@ export function getBaseSharePrice(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseSharePrice', method: 'post', @@ -37,7 +37,7 @@ export function addBaseSharePrice(data: BaseSharePriceForm) { /** * 修改分时电价维护 */ -export function updateBaseSharePrice(data: BaseSharePriceForm) { +export function updateBaseSharePrice(data: BaseSharePriceForm): AxiosPromise { return request({ url: '/ems/base/baseSharePrice', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseSharePrice(data: BaseSharePriceForm) { /** * 删除分时电价维护 */ -export function delBaseSharePrice(objId: string | number | Array) { +export function delBaseSharePrice(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseSharePrice/' + objId, method: 'delete' diff --git a/src/api/ems/base/baseWorkUnit.ts b/src/api/ems/base/baseWorkUnit.ts index f5c2f86..6646a15 100644 --- a/src/api/ems/base/baseWorkUnit.ts +++ b/src/api/ems/base/baseWorkUnit.ts @@ -26,7 +26,7 @@ export function getBaseWorkUnit(objId: string | number): AxiosPromise { return request({ url: '/ems/base/baseWorkUnit', method: 'post', @@ -37,7 +37,7 @@ export function addBaseWorkUnit(data: BaseWorkUnitForm) { /** * 修改统计单元信息 */ -export function updateBaseWorkUnit(data: BaseWorkUnitForm) { +export function updateBaseWorkUnit(data: BaseWorkUnitForm): AxiosPromise { return request({ url: '/ems/base/baseWorkUnit', method: 'put', @@ -48,7 +48,7 @@ export function updateBaseWorkUnit(data: BaseWorkUnitForm) { /** * 删除统计单元信息 */ -export function delBaseWorkUnit(objId: string | number | Array) { +export function delBaseWorkUnit(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/base/baseWorkUnit/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordAlarmData.ts b/src/api/ems/record/recordAlarmData.ts index f7eb6a3..e2a8fb5 100644 --- a/src/api/ems/record/recordAlarmData.ts +++ b/src/api/ems/record/recordAlarmData.ts @@ -26,7 +26,7 @@ export function getRecordAlarmData(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordAlarmData', method: 'post', @@ -37,7 +37,7 @@ export function addRecordAlarmData(data: RecordAlarmDataForm) { /** * 修改告警数据 */ -export function updateRecordAlarmData(data: RecordAlarmDataForm) { +export function updateRecordAlarmData(data: RecordAlarmDataForm): AxiosPromise { return request({ url: '/ems/record/recordAlarmData', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordAlarmData(data: RecordAlarmDataForm) { /** * 删除告警数据 */ -export function delRecordAlarmData(objId: string | number | Array) { +export function delRecordAlarmData(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordAlarmData/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordAlarmRule.ts b/src/api/ems/record/recordAlarmRule.ts index c5f1e50..9100825 100644 --- a/src/api/ems/record/recordAlarmRule.ts +++ b/src/api/ems/record/recordAlarmRule.ts @@ -26,7 +26,7 @@ export function getRecordAlarmRule(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordAlarmRule', method: 'post', @@ -37,7 +37,7 @@ export function addRecordAlarmRule(data: RecordAlarmRuleForm) { /** * 修改告警规则 */ -export function updateRecordAlarmRule(data: RecordAlarmRuleForm) { +export function updateRecordAlarmRule(data: RecordAlarmRuleForm): AxiosPromise { return request({ url: '/ems/record/recordAlarmRule', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordAlarmRule(data: RecordAlarmRuleForm) { /** * 删除告警规则 */ -export function delRecordAlarmRule(objId: string | number | Array) { +export function delRecordAlarmRule(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordAlarmRule/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordDnbInstant.ts b/src/api/ems/record/recordDnbInstant.ts index 795da24..863a545 100644 --- a/src/api/ems/record/recordDnbInstant.ts +++ b/src/api/ems/record/recordDnbInstant.ts @@ -26,7 +26,7 @@ export function getRecordDnbInstant(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordDnbInstant', method: 'post', @@ -37,7 +37,7 @@ export function addRecordDnbInstant(data: RecordDnbInstantForm) { /** * 修改DNB即时数据 */ -export function updateRecordDnbInstant(data: RecordDnbInstantForm) { +export function updateRecordDnbInstant(data: RecordDnbInstantForm): AxiosPromise { return request({ url: '/ems/record/recordDnbInstant', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordDnbInstant(data: RecordDnbInstantForm) { /** * 删除DNB即时数据 */ -export function delRecordDnbInstant(objId: string | number | Array) { +export function delRecordDnbInstant(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordDnbInstant/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordIOTInstant.ts b/src/api/ems/record/recordIOTInstant.ts index 0ee9655..0074a25 100644 --- a/src/api/ems/record/recordIOTInstant.ts +++ b/src/api/ems/record/recordIOTInstant.ts @@ -26,7 +26,7 @@ export function getRecordIOTInstant(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordIOTInstant', method: 'post', @@ -37,7 +37,7 @@ export function addRecordIOTInstant(data: RecordIOTInstantForm) { /** * 修改IOT即时数据 */ -export function updateRecordIOTInstant(data: RecordIOTInstantForm) { +export function updateRecordIOTInstant(data: RecordIOTInstantForm): AxiosPromise { return request({ url: '/ems/record/recordIOTInstant', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordIOTInstant(data: RecordIOTInstantForm) { /** * 删除IOT即时数据 */ -export function delRecordIOTInstant(objId: string | number | Array) { +export function delRecordIOTInstant(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordIOTInstant/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordSteamInstant.ts b/src/api/ems/record/recordSteamInstant.ts index 997d070..92fb6d0 100644 --- a/src/api/ems/record/recordSteamInstant.ts +++ b/src/api/ems/record/recordSteamInstant.ts @@ -26,7 +26,7 @@ export function getRecordSteamInstant(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordSteamInstant', method: 'post', @@ -37,7 +37,7 @@ export function addRecordSteamInstant(data: RecordSteamInstantForm) { /** * 修改蒸汽即时数据 */ -export function updateRecordSteamInstant(data: RecordSteamInstantForm) { +export function updateRecordSteamInstant(data: RecordSteamInstantForm): AxiosPromise { return request({ url: '/ems/record/recordSteamInstant', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordSteamInstant(data: RecordSteamInstantForm) { /** * 删除蒸汽即时数据 */ -export function delRecordSteamInstant(objId: string | number | Array) { +export function delRecordSteamInstant(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordSteamInstant/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordVibrationInstant.ts b/src/api/ems/record/recordVibrationInstant.ts index cbb367c..9dc0cb3 100644 --- a/src/api/ems/record/recordVibrationInstant.ts +++ b/src/api/ems/record/recordVibrationInstant.ts @@ -26,7 +26,7 @@ export function getRecordVibrationInstant(objId: string | number): AxiosPromise< /** * 新增振动即时数据 */ -export function addRecordVibrationInstant(data: RecordVibrationInstantForm) { +export function addRecordVibrationInstant(data: RecordVibrationInstantForm): AxiosPromise { return request({ url: '/ems/record/recordVibrationInstant', method: 'post', @@ -37,7 +37,7 @@ export function addRecordVibrationInstant(data: RecordVibrationInstantForm) { /** * 修改振动即时数据 */ -export function updateRecordVibrationInstant(data: RecordVibrationInstantForm) { +export function updateRecordVibrationInstant(data: RecordVibrationInstantForm): AxiosPromise { return request({ url: '/ems/record/recordVibrationInstant', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordVibrationInstant(data: RecordVibrationInstantForm) { /** * 删除振动即时数据 */ -export function delRecordVibrationInstant(objId: string | number | Array) { +export function delRecordVibrationInstant(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordVibrationInstant/' + objId, method: 'delete' diff --git a/src/api/ems/record/recordWaterInstant.ts b/src/api/ems/record/recordWaterInstant.ts index 4de34cd..97ac242 100644 --- a/src/api/ems/record/recordWaterInstant.ts +++ b/src/api/ems/record/recordWaterInstant.ts @@ -26,7 +26,7 @@ export function getRecordWaterInstant(objId: string | number): AxiosPromise { return request({ url: '/ems/record/recordWaterInstant', method: 'post', @@ -37,7 +37,7 @@ export function addRecordWaterInstant(data: RecordWaterInstantForm) { /** * 修改水即时数据 */ -export function updateRecordWaterInstant(data: RecordWaterInstantForm) { +export function updateRecordWaterInstant(data: RecordWaterInstantForm): AxiosPromise { return request({ url: '/ems/record/recordWaterInstant', method: 'put', @@ -48,7 +48,7 @@ export function updateRecordWaterInstant(data: RecordWaterInstantForm) { /** * 删除水即时数据 */ -export function delRecordWaterInstant(objId: string | number | Array) { +export function delRecordWaterInstant(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/record/recordWaterInstant/' + objId, method: 'delete' diff --git a/src/api/ems/report/TemperatureHumidityMonitoring.ts b/src/api/ems/report/TemperatureHumidityMonitoring.ts index 7723124..3611c7f 100644 --- a/src/api/ems/report/TemperatureHumidityMonitoring.ts +++ b/src/api/ems/report/TemperatureHumidityMonitoring.ts @@ -26,7 +26,7 @@ export function getTemperatureHumidity(objId: string | number): AxiosPromise { return request({ url: '/ems/report/temperatureHumidity', method: 'post', diff --git a/src/api/ems/report/reportPointDnb.ts b/src/api/ems/report/reportPointDnb.ts index 471fb81..b9b0211 100644 --- a/src/api/ems/report/reportPointDnb.ts +++ b/src/api/ems/report/reportPointDnb.ts @@ -37,7 +37,7 @@ export function generateReportPointDnb(data: ReportPointDnbForm) { /** * 新增DNB点位报表 */ -export function addReportPointDnb(data: ReportPointDnbForm) { +export function addReportPointDnb(data: ReportPointDnbForm): AxiosPromise { return request({ url: '/ems/report/reportPointDnb', method: 'post', @@ -48,7 +48,7 @@ export function addReportPointDnb(data: ReportPointDnbForm) { /** * 修改DNB点位报表 */ -export function updateReportPointDnb(data: ReportPointDnbForm) { +export function updateReportPointDnb(data: ReportPointDnbForm): AxiosPromise { return request({ url: '/ems/report/reportPointDnb', method: 'put', @@ -59,7 +59,7 @@ export function updateReportPointDnb(data: ReportPointDnbForm) { /** * 删除DNB点位报表 */ -export function delReportPointDnb(objId: string | number | Array) { +export function delReportPointDnb(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/report/reportPointDnb/' + objId, method: 'delete' diff --git a/src/api/ems/report/reportPointSteam.ts b/src/api/ems/report/reportPointSteam.ts index 7519fb2..8bb06e8 100644 --- a/src/api/ems/report/reportPointSteam.ts +++ b/src/api/ems/report/reportPointSteam.ts @@ -56,27 +56,27 @@ export function pointSteamInstantList(query) { } // 新增蒸汽整点数据 -export function addReportPointSteam(data) { +export function addReportPointSteam(data: ReportPointSteamForm): AxiosPromise { return request({ url: '/ems/report/reportPointSteam', method: 'post', data: data - }) + }); } // 修改蒸汽整点数据 -export function updateReportPointSteam(data) { +export function updateReportPointSteam(data: ReportPointSteamForm): AxiosPromise { return request({ url: '/ems/report/reportPointSteam', method: 'put', data: data - }) + }); } // 删除蒸汽整点数据 -export function delReportPointSteam(objId) { +export function delReportPointSteam(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/report/reportPointSteam/' + objId, method: 'delete' - }) + }); } diff --git a/src/api/ems/report/reportPointWater.ts b/src/api/ems/report/reportPointWater.ts index c2b289d..9860dae 100644 --- a/src/api/ems/report/reportPointWater.ts +++ b/src/api/ems/report/reportPointWater.ts @@ -37,7 +37,7 @@ export function generateReportPointWater(data: ReportPointWaterForm) { /** * 新增水整点报表 */ -export function addReportPointWater(data: ReportPointWaterForm) { +export function addReportPointWater(data: ReportPointWaterForm): AxiosPromise { return request({ url: '/ems/report/reportPointWater', method: 'post', @@ -48,7 +48,7 @@ export function addReportPointWater(data: ReportPointWaterForm) { /** * 修改水整点报表 */ -export function updateReportPointWater(data: ReportPointWaterForm) { +export function updateReportPointWater(data: ReportPointWaterForm): AxiosPromise { return request({ url: '/ems/report/reportPointWater', method: 'put', @@ -59,7 +59,7 @@ export function updateReportPointWater(data: ReportPointWaterForm) { /** * 删除水整点报表 */ -export function delReportPointWater(objId: string | number | Array) { +export function delReportPointWater(objId: string | number | Array): AxiosPromise { return request({ url: '/ems/report/reportPointWater/' + objId, method: 'delete' diff --git a/src/views/ems/base/baseMonitorInfoSteam/index.vue b/src/views/ems/base/baseMonitorInfoSteam/index.vue index 981b0ec..3328c84 100644 --- a/src/views/ems/base/baseMonitorInfoSteam/index.vue +++ b/src/views/ems/base/baseMonitorInfoSteam/index.vue @@ -217,10 +217,12 @@ - + diff --git a/src/views/ems/base/baseMonitorInfoWater/index.vue b/src/views/ems/base/baseMonitorInfoWater/index.vue index 8438fd6..0340d9d 100644 --- a/src/views/ems/base/baseMonitorInfoWater/index.vue +++ b/src/views/ems/base/baseMonitorInfoWater/index.vue @@ -46,7 +46,7 @@ {{dict.label}} diff --git a/src/views/ems/record/recordAlarmData/index.vue b/src/views/ems/record/recordAlarmData/index.vue index f43d0ca..4aa3867 100644 --- a/src/views/ems/record/recordAlarmData/index.vue +++ b/src/views/ems/record/recordAlarmData/index.vue @@ -183,7 +183,7 @@ @@ -230,10 +230,12 @@ - + diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue index df21228..49e578f 100644 --- a/src/views/ems/record/recordDnbInstant/index.vue +++ b/src/views/ems/record/recordDnbInstant/index.vue @@ -42,7 +42,7 @@ @@ -228,7 +228,7 @@ - + diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue index cacea03..aae1fea 100644 --- a/src/views/ems/record/recordIOTInstant/index.vue +++ b/src/views/ems/record/recordIOTInstant/index.vue @@ -40,7 +40,7 @@ @@ -221,7 +221,7 @@ diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue index 28f43e0..9a3c770 100644 --- a/src/views/ems/record/recordSteamInstant/index.vue +++ b/src/views/ems/record/recordSteamInstant/index.vue @@ -42,7 +42,7 @@ @@ -246,7 +246,7 @@ diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue index 1e4501a..a1d6d53 100644 --- a/src/views/ems/record/recordVibrationInstant/index.vue +++ b/src/views/ems/record/recordVibrationInstant/index.vue @@ -34,7 +34,7 @@ --> @@ -236,7 +236,7 @@ @@ -259,7 +259,7 @@ --> @@ -267,7 +267,7 @@ diff --git a/src/views/ems/record/recordWaterInstant/index.vue b/src/views/ems/record/recordWaterInstant/index.vue index 935af61..8ea7acd 100644 --- a/src/views/ems/record/recordWaterInstant/index.vue +++ b/src/views/ems/record/recordWaterInstant/index.vue @@ -35,7 +35,7 @@ @@ -199,7 +199,7 @@ - + diff --git a/src/views/ems/report/currentIOTCurve/index.vue b/src/views/ems/report/currentIOTCurve/index.vue index e9e013a..6e30bd7 100644 --- a/src/views/ems/report/currentIOTCurve/index.vue +++ b/src/views/ems/report/currentIOTCurve/index.vue @@ -42,7 +42,7 @@ -
+
+
@@ -147,6 +148,8 @@ export default { title: '', // 是否显示弹出层 open: false, + // 是否有图表数据 + hasChartData: false, // 查询参数 queryParams: { pageNum: 1, @@ -752,6 +755,17 @@ export default { try { const {data} = await steamInstantList(query) + // 根据数据是否存在设置 hasChartData + this.hasChartData = data && data.length > 0; + + if (!this.hasChartData) { + // 如果没有数据,清空图表并返回 + this.$refs.Chart1.setData({}); + this.$refs.Chart2.setData({}); + this.$refs.Chart3.setData({}); + return; + } + // 处理瞬时流量数据 const fluxFlowResult = this.processDataBreaks(data, 'fluxFlow') // 处理温度数据 diff --git a/src/views/ems/report/currentVibrationCurve/index.vue b/src/views/ems/report/currentVibrationCurve/index.vue index 340daef..ff52a3d 100644 --- a/src/views/ems/report/currentVibrationCurve/index.vue +++ b/src/views/ems/report/currentVibrationCurve/index.vue @@ -42,7 +42,7 @@ - 重置 - +
+ +
+
+ +
@@ -192,6 +197,7 @@ export default { }, monthBeforeYear: false }, + hasChartData: false, } }, created() { @@ -320,6 +326,17 @@ export default { async getChart() { let query = JSON.parse(JSON.stringify(this.queryParams)) const {data} = await pointSteamInstantList(query) + + if (!data || data.length === 0) { + this.hasChartData = false; + // Clear existing charts if no data + if (this.$refs.Chart1) { + this.$refs.Chart1.setData({}); + } + return; + } + + this.hasChartData = true; let option1 = { title: { text: this.selectMonitorName + ' 耗量', diff --git a/src/views/ems/report/reportPointWater/index.vue b/src/views/ems/report/reportPointWater/index.vue index 6b646ad..0ee5e22 100644 --- a/src/views/ems/report/reportPointWater/index.vue +++ b/src/views/ems/report/reportPointWater/index.vue @@ -42,7 +42,7 @@