From 6e9dd840dbac1eb7504f78ca9784fe9afe98e753 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 4 Nov 2024 09:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=8D=95=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E8=A7=A3=E5=86=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../electricalEnergy/components1/complaints.vue  |  4 ++--
 .../electricalEnergy/components1/testRun.vue     |  4 ++--
 .../supervise/technology/components/alarm.vue    | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index 3c2814f1..4bf70b6c 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -160,7 +160,7 @@ const tableStore = new TableStore({
         },
         {
           name: 'edit',
-          title: '告警单详情',
+          title: '详情',
           type: 'primary',
           icon: 'el-icon-Open',
           render: 'basicButton',
@@ -171,7 +171,7 @@ const tableStore = new TableStore({
           click:  row => {
             detailRef.value.open({
               row: row,
-              title: '告警单详情',
+              title: '详情',
            
             })
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
index 1a7082b9..b2175be4 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -187,7 +187,7 @@ const tableStore = new TableStore({
         },
         {
           name: 'edit',
-          title: '告警单详情',
+          title: '详情',
           type: 'primary',
           icon: 'el-icon-Open',
           render: 'basicButton',
@@ -198,7 +198,7 @@ const tableStore = new TableStore({
           click: row => {
             detailRef.value.open({
               row: row,
-              title: '告警单详情',
+              title: '详情',
 
             })
 
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index f0cd7628..f2aa7c0e 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -120,6 +120,22 @@ const tableStore = new TableStore({
                 return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
+        {
+            field: 'dealState',
+            title: '是否解决',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+
+            },
+            replaceValue: {
+                0: '未解决',
+                1: '已解决',
+
+            }
+        },
         // {
         //     title: '报告',
         //     minWidth: '150',