From 15bd1ac6d29149e6720eb04db725b3d73f68aecb Mon Sep 17 00:00:00 2001 From: sjl <1716605279@qq.com> Date: Mon, 2 Mar 2026 15:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8A=A5=E5=91=8A=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/user.js | 3 - src/api/event-boot/report.ts | 26 +++++++- .../area/getIntegrityData/index.vue | 17 +++++- .../voltageSags/report/eventReports/index.vue | 61 ++++++++++++++----- 4 files changed, 84 insertions(+), 23 deletions(-) diff --git a/src/api/admin/user.js b/src/api/admin/user.js index f521786f..66d442c4 100644 --- a/src/api/admin/user.js +++ b/src/api/admin/user.js @@ -81,9 +81,6 @@ export function deleteSystemConfig( data) { params: data }) } - - - //新增系统配置 export function addSystemConfig(data) { diff --git a/src/api/event-boot/report.ts b/src/api/event-boot/report.ts index 6815083c..db65595b 100644 --- a/src/api/event-boot/report.ts +++ b/src/api/event-boot/report.ts @@ -2,13 +2,35 @@ import createAxios from '@/utils/request' import { genFileId, ElMessage, ElNotification } from 'element-plus' //事件报告 +// export function getEventReport(data) { +// return createAxios({ +// url: '/event-boot/report/getEventReport', +// method: 'post', +// data +// }) +// } + export function getEventReport(data) { return createAxios({ - url: '/event-boot/report/getEventReport', + url: '/event-boot/report/createEventReport', method: 'post', - data + data, + responseType: 'blob' + }).then(async res => { + let load: any = await readJsonBlob(res) + if (load.code) { + if (load.data.code == 'A0011') { + ElMessage.warning('下载失败!') + } else { + ElMessage.warning(load.data.message) + } + } else { + return res + } }) } + + // 生成报告 export function getAreaReport(data) { return createAxios({ diff --git a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue index e80b3d9c..3c1953f6 100644 --- a/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue @@ -427,7 +427,9 @@ const makeUp = () => { tableRef.value .getRef() .getCheckboxRecords() - .find((item: any) => item.level == '6') || [] + .filter((item: any) => item.level == '6') || [] + + if (list.length == 0) { return ElMessage({ @@ -435,6 +437,16 @@ const makeUp = () => { type: 'warning' }) } + + // 检查是否有 comFlag 等于 0 的项 + const hasOfflineDevice = list.some((item: any) => item.comFlag === 0) + + if (hasOfflineDevice) { + return ElMessage({ + message: '请选择在线监测点进行补招', + type: 'warning' + }) + } timeData.value = [] timePopUp.value = true } @@ -455,7 +467,8 @@ const makeUpSubmit = () => { reCallEndTime: timeData.value[1], reCallStartTime: timeData.value[0] } - +console.log('2222',form) +return socket(form) timePopUp.value = false logPopUp.value = true diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue index 93bfe97b..d4dd0c77 100644 --- a/src/views/pqs/voltageSags/report/eventReports/index.vue +++ b/src/views/pqs/voltageSags/report/eventReports/index.vue @@ -1,6 +1,6 @@