From a398ca63612e9dc991c8b43f4d3e8bf0e717431c Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 5 Jul 2024 09:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=20=E8=AF=95=E8=BF=90?=
=?UTF-8?q?=E8=A1=8C=20=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=20=E5=9C=A8=E7=BA=BF=E7=9B=91=E6=B5=8B=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/supervision-boot/lineRunTest/index.ts | 31 ++-
.../components1/form/alarmList.vue | 2 +-
.../electricalEnergy/components1/online.vue | 4 +-
.../electricalEnergy/components1/testRun.vue | 245 ++++++++++++++++++
.../pqs/supervise/electricalEnergy/index.vue | 4 +
.../supervise/technology/components/alarm.vue | 4 +-
.../technology/components/earlyWarn.vue | 6 +-
src/views/pqs/supervise/technology/detail.vue | 4 +-
.../components/cycleDetection/form.vue | 16 +-
.../components/cycleDetection/index.vue | 42 ++-
src/views/pqs/supervise/testRun/index.vue | 70 ++++-
11 files changed, 401 insertions(+), 27 deletions(-)
create mode 100644 src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
diff --git a/src/api/supervision-boot/lineRunTest/index.ts b/src/api/supervision-boot/lineRunTest/index.ts
index e597bb8c..97f1523e 100644
--- a/src/api/supervision-boot/lineRunTest/index.ts
+++ b/src/api/supervision-boot/lineRunTest/index.ts
@@ -10,18 +10,31 @@ export const addRunTest = (data: any) => {
data: data
})
}
-
+export const update = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/supervisionTempLineRunTest/update',
+ method: 'POST',
+ data: data
+ })
+}
+export const cancel = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/supervisionTempLineRunTest/cancel',
+ method: 'POST',
+ data: data
+ })
+}
export const getRunTestById = (id: string) => {
return createAxios({
url: '/supervision-boot/supervisionTempLineRunTest/getRunTestById?id=' + id,
- method: 'get',
+ method: 'get'
+ })
+}
+export const initiateWarningLeaflet = (data: any) => {
+ return createAxios({
+ url: '/supervision-boot/lineRunTestProblem/initiateWarningLeaflet',
+ method: 'POST',
+ data
})
}
-
-
-
-
-
-
-
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue
index 7647e738..4488619f 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/form/alarmList.vue
@@ -120,7 +120,7 @@ const open = (row: any) => {
dialogVisible.value = true
List.value = row.row
title.value = row.text
- form.value = { ...row.form, ...form.value }
+ form.value = { ...form.value, ...row.form }
}
const handleClose = () => {
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index 1d688f4e..ce0847fe 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -90,7 +90,7 @@ const dictData = useDictData()
import { useRouter } from 'vue-router'
const router = useRouter() // 路由对象
//字典获取超标指标
-const exceeded = dictData.getBasicData('Indicator_Type')
+const exceeded = dictData.getBasicData('Steady_Statis')
const tableRef = ref()
const industry = dictData.getBasicData('Business_Type')
const TableHeaderRef = ref()
@@ -281,6 +281,7 @@ const tableStore = new TableStore({
beforeSearchFun: () => {
tableStore.table.params.currentPage = tableStore.table.params.pageNum
list.value.deptId = tableStore.table.params.deptId
+
list.value.searchBeginTime = tableStore.table.params.searchBeginTime
list.value.searchEndTime = tableStore.table.params.searchEndTime
list.value.alertThreshold = tableStore.table.params.alertThreshold
@@ -352,6 +353,7 @@ const launch = (title: string) => {
form: list.value,
row: tableStore.table.selection
})
+ console.log("🚀 ~ launch ~ list.value:", list.value)
}
const changeArea = e => {
level.value = e.data.level
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
new file mode 100644
index 00000000..b55e7afa
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
diff --git a/src/views/pqs/supervise/electricalEnergy/index.vue b/src/views/pqs/supervise/electricalEnergy/index.vue
index fda25b1b..cc2c8694 100644
--- a/src/views/pqs/supervise/electricalEnergy/index.vue
+++ b/src/views/pqs/supervise/electricalEnergy/index.vue
@@ -10,6 +10,9 @@
+
+
+