From 4f8bd586de85c454f735983601aacbf6db01d640 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Fri, 2 Feb 2024 17:53:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E8=BF=87=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commonPhrases/index.vue                   |  2 +-
 .../disposalProcess/index.vue                 | 47 ++++++++++++++-----
 2 files changed, 36 insertions(+), 13 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 56ced59a..673193e6 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
@@ -78,7 +78,7 @@ export default {
                 result.data.processConfigList?.forEach(it => {
                     const phrs = it.commonPhrases.split(',');
                     phrs?.forEach(phr => {
-                        if (!this.tableData.find(op => op.phrases == phr)) this.tableData.push({ phrases: phr })
+                        if (phr && !this.tableData.find(op => op.phrases == phr)) this.tableData.push({ phrases: phr })
                     })
 
                 })
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 29785a60..524c397d 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
@@ -15,7 +15,8 @@
                                 <ElInput v-model="scope.row.processNode" placeholder="请输入流程名称" />
                             </ElFormItem>
                             <ElFormItem label="常用语">
-                                <ElSelect class="disposal-process-select" v-model="scope.row.commonPhrases" multiple :collapse-tags="true">
+                                <ElSelect class="disposal-process-select" v-model="scope.row.commonPhrases" multiple
+                                    :collapse-tags="true">
                                     <ElOption v-for="item in options" :key="item.key || item.value" :label="item.label"
                                         :value="item.key || item.value">
                                     </ElOption>
@@ -124,20 +125,23 @@ export default {
                 method: "get",
             }).then(result => {
                 if (result.code != 200) return Message.error(result.msg);
-                this.tableData = result.data.processConfigList;
                 this.eventType = result.data.eventType;
 
                 result.data.processConfigList?.forEach(it => {
                     const phrs = it.commonPhrases.split(',');
                     if (addFlg) {
                         phrs?.forEach(phr => {
-                            if (!this.options.find(op => op.key == phr)) this.options.push({ key: phr })
+                            if (phr && !this.options.find(op => op.key == phr)) this.options.push({ key: phr })
                         })
                     }
-
-                    it.commonPhrases = phrs
+                    if(phrs && phrs[0]) {
+                        it.commonPhrases = phrs
+                    }
                 })
 
+                this.tableData = result.data.processConfigList;
+                // console.log('this.tableData', this.tableData)
+
             })
 
 
@@ -201,14 +205,33 @@ export default {
 </style>
 
 <style lang="scss">
-    .disposal-process-select {
-        .el-tag.el-tag--info {
-            background-color: #19546C;
-            border-color: #113B4E;
-            .el-select__tags-text {
-                color: #fff;
-            }
+.disposal-process-select {
+
+    //下拉选
+    .el-tag.el-tag--info {
+        background-color: #19546C;
+        border-color: #113B4E;
+
+        //文字
+        .el-select__tags-text {
+            color: #fff;
         }
+
+        //i标签 背景
+        // .el-select .el-tag__close.el-icon-close {
+        //     background-color: #2a7290 !important;
+        // }
+
+        // .el-tag.el-tag--info .el-tag__close {
+        //     color: #fff;
+        // }
+
     }
+}
+
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+    background-color: #0d5f79;
+}
+
 </style>
   
\ No newline at end of file