From dc869f57f289c5cd3b816779356dd5969a76ea10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 26 Apr 2024 14:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=8A=E8=AD=A6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/board/index/index.vue      |  1 -
 ruoyi-ui/src/views/board/smartScene/index.vue | 71 +++++++++++++------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/board/index/index.vue b/ruoyi-ui/src/views/board/index/index.vue
index 36c5b25..3ccedfe 100644
--- a/ruoyi-ui/src/views/board/index/index.vue
+++ b/ruoyi-ui/src/views/board/index/index.vue
@@ -438,7 +438,6 @@ export default {
       this.$refs.chart3.setData(option3)
     },
     dispose(e) {
-      console.log(e)
       this.$confirm('该问题已处理？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/ruoyi-ui/src/views/board/smartScene/index.vue b/ruoyi-ui/src/views/board/smartScene/index.vue
index b7c6f7d..a58722e 100644
--- a/ruoyi-ui/src/views/board/smartScene/index.vue
+++ b/ruoyi-ui/src/views/board/smartScene/index.vue
@@ -15,22 +15,22 @@
 
     <div class="table1">
       <div style="background-color: #094170">
-        <div class="scrollTable" style="font-weight: bold;width: 8%">
+        <div class="scrollTable" style="font-weight: bold;width: 10%">
           告警编号
         </div>
-        <div class="scrollTable" style="font-weight: bold;width: 8%">
+        <div class="scrollTable" style="font-weight: bold;width: 15%">
           告警类型
         </div>
         <div class="scrollTable" style="font-weight: bold;width: 15%">
           告警级别
         </div>
-        <div class="scrollTable" style="font-weight: bold;width: 21%">
+        <div class="scrollTable" style="font-weight: bold;width: 30%">
           告警单元
         </div>
         <div class="scrollTable" style="font-weight: bold;width: 20%">
           告警时间
         </div>
-        <div class="scrollTable" style="font-weight: bold;width: 8%">
+        <div class="scrollTable" style="font-weight: bold;width: 10%">
           处理情况
         </div>
       </div>
@@ -38,23 +38,24 @@
                            style="height: calc(100% - 33px);overflow: hidden;">
         <div v-for="(item, index) in table1Data" :key="index">
           <div :style='"background-color:" + ((index % 2 === 0) ? "#053460" : "#032d57")'>
-            <div class="scrollTable" style="width: 8%">
-              {{ item.data1 }}
+            <div class="scrollTable" style="width: 10%">
+              {{ item.alarmInfoId }}
             </div>
-            <div class="scrollTable" style="width: 8%">
-              {{ item.data2 }}
+            <div class="scrollTable" style="width: 15%">
+              {{ item.alarmTypeName }}
             </div>
             <div class="scrollTable" style="width: 15%">
-              {{ item.data3 }}
+              {{ item.alarmLevelName }}
             </div>
-            <div class="scrollTable" style="width: 21%">
-              {{ item.data4 }}
+            <div class="scrollTable" style="width: 30%">
+              {{ item.monitorUnitName }}
             </div>
             <div class="scrollTable" style="width: 20%">
-              {{ item.data5 }}
+              {{ item.alarmTime }}
             </div>
-            <div class="scrollTable" style="width: 8%">
-              <span style="color: #67C23A;">已处理</span>
+            <div class="scrollTable" style="width: 10%">
+              <el-button v-if="item.handleStatus === '0'" size="mini" type="primary" @click="dispose(item)">处理</el-button>
+                            <span v-else style="color: #67C23A;">已处理</span>
             </div>
           </div>
         </div>
@@ -90,6 +91,9 @@ import {
   getAlarmCountGroupAlarmType,
   getAlarmInfos
 } from '@/api/board/smartScene'
+import {
+  handleAlarmInfo
+} from '@/api/board/index'
 
 export default {
   components: {
@@ -175,15 +179,36 @@ export default {
     },
     async setAlarmInfos(e) {
       const {rows: data} = await getAlarmInfos({"sceneId":e})
-      this.table1Data = data.map((e,i)=>{
-        return {
-          data1: e.alarmInfoId,
-          data2: e.alarmTypeName,
-          data3: e.alarmLevelName,
-          data4: e.monitorUnitName,
-          data5: e.alarmTime,
-        }
-      })
+      this.table1Data = data
+    },
+    dispose(e) {
+      this.$confirm('该问题已处理？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handleAlarmInfo({
+          alarmInfoId:e.alarmInfoId
+        }).then(e=>{
+          if(e.code === 200){
+            this.$message({
+              type: 'success',
+              message: '已处理!'
+            });
+            this.setTable3()
+          }else{
+            this.$message({
+              type: 'info',
+              message: '网络错误'
+            });
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
     }
   }
 };