From d57bf17605e3b8b9c224a0f72f92754b083a8305 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 21 May 2024 16:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4form=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision-boot/device/quitRunningDev.ts | 4 +- src/api/supervision-boot/survey/index.ts | 17 ++ .../components1/testQuestions.vue | 122 +++++++------- src/views/pqs/supervise/retire/index.vue | 4 +- .../supervise/technology/components/alarm.vue | 159 +++++++++--------- .../technology/components/earlyWarn.vue | 123 +++++--------- 6 files changed, 191 insertions(+), 238 deletions(-) create mode 100644 src/api/supervision-boot/survey/index.ts diff --git a/src/api/supervision-boot/device/quitRunningDev.ts b/src/api/supervision-boot/device/quitRunningDev.ts index afa6f08f..4912638c 100644 --- a/src/api/supervision-boot/device/quitRunningDev.ts +++ b/src/api/supervision-boot/device/quitRunningDev.ts @@ -18,7 +18,7 @@ export const addRunningDevice = (data: any) => { /** - * 新增设备退运 + * 更新设备退运 */ export const quitRunningDeviceUpdate = (data: any) => { return createAxios({ @@ -41,8 +41,6 @@ export const cancelQuitRunningDevice = (data: any) => { - - /** * 根据id获取设备的详细数据 */ diff --git a/src/api/supervision-boot/survey/index.ts b/src/api/supervision-boot/survey/index.ts new file mode 100644 index 00000000..4f330553 --- /dev/null +++ b/src/api/supervision-boot/survey/index.ts @@ -0,0 +1,17 @@ +import createAxios from '@/utils/request' + +import { SUPERVISION_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = SUPERVISION_BOOT + '/generalSurvey' + + +/** + * 针对有问题的现场测试发起告警单 + */ +export const initiateWarningLeaflet = (id: string, subId: string) => { + return createAxios({ + url: MAPPING_PATH + '/initiateWarningLeaflet?id=' + id + '&subId=' + subId, + method: 'GET' + }) +} + diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue index 3a4bad24..d50c448e 100644 --- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue +++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue @@ -1,45 +1,25 @@ - - + diff --git a/src/views/pqs/supervise/retire/index.vue b/src/views/pqs/supervise/retire/index.vue index a363e344..d1cf0041 100644 --- a/src/views/pqs/supervise/retire/index.vue +++ b/src/views/pqs/supervise/retire/index.vue @@ -27,11 +27,9 @@ import TableStore from '@/utils/tableStore' import Table from '@/components/table/index.vue' import TableHeader from '@/components/table/header/index.vue' -import { nextTick, onMounted, provide, ref } from 'vue' +import { onMounted, provide, ref } from 'vue' import { useRouter } from 'vue-router' -import { dateFormatter, formatPast2 } from '@/utils/formatTime' import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue' -import { activateUser } from '@/api/user-boot/user' import { ElMessage } from 'element-plus' import { ElMessageBox } from 'element-plus/es' import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunningDev' diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index eef83225..9f0ccdd8 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -1,10 +1,12 @@