From 8175372bdc0a46e50f5311093ad153dc43d8005b Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 20 Mar 2024 15:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E4=BA=8B=E4=BB=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonPhrases/index.vue                   |  2 +-
 .../disposalProcess/index.vue                 |  2 +-
 .../event/event/EventDetailDialog/index.vue   | 32 +++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
index 80265e13..7e50ced6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue
@@ -4,7 +4,7 @@
         <div class="header">
             <el-form ref="form" label-width="120px">
                 <el-form-item label="事件类型">
-                    <el-select v-model="eventType" placeholder="请选择" style="width: 220px">
+                    <el-select v-model="eventType" placeholder="请选择" style="width: 220px" disabled>
                         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
index 2af67d2d..ba1d80d4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue
@@ -3,7 +3,7 @@
         <div class="header">
             <el-form ref="form" label-width="120px">
                 <el-form-item label="事件类型">
-                    <el-select v-model="eventType" placeholder="请选择" style="width: 220px">
+                    <el-select v-model="eventType" placeholder="请选择" style="width: 220px" disabled>
                         <el-option v-for="item in eventTypeOptions" :key="item.value" :label="item.label"
                             :value="item.value">
                         </el-option>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 32b3599f..9ef9e2b3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -171,16 +171,28 @@ export default {
           // this.modelVisible = false;
           //   this.$emit('queryData', true);
           //   return;
-          request({
-            url: `/business/warning/delete`,
-            method: "post",
-            data: { id: this.formData.id }
-          }).then(result => {
-            if (result.code == 200) Message.success('成功！');
-            else Message.error(result?.msg);
-            this.modelVisible = false;
-            this.$emit('queryData', true);
-          })
+          if (this.activeName == '-1') {
+            request({
+              url: `/business/warning/delete`,
+              method: 'post',
+              data: { id: this.formData.id }
+            }).then(result => {
+              if (result.code == 200) Message.success('成功！');
+              else Message.error(result?.msg);
+              this.modelVisible = false;
+              this.$emit('queryData', true);
+            })
+          } else {
+            request({
+              url: `dc/system/event/${this.formData.eventType}/${this.formData.id}`,
+              method: 'delete',
+            }).then(result => {
+              if (result.code == 200) Message.success('成功！');
+              else Message.error(result?.msg);
+              this.modelVisible = false;
+              this.$emit('queryData', true);
+            })
+          }
         })
 
       }