From 420ce468997f0023ecca5a8226a774f8bb0dba96 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 14:13:14 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix=20=E5=8E=BB=E6=8E=89=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=93=E9=A2=98=E7=9A=84=E6=9C=BA=E6=9E=84=E5=92=8C?=
 =?UTF-8?q?=E5=AE=8C=E7=BB=93=E6=97=B6=E9=97=B4=E5=AD=97=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/TrafficIncidents/index.vue        | 49 ++++++----------
 .../event/dispatch/EventDetailDialog/data.js  | 56 +++++++++----------
 .../event/event/EventDetailDialog/data.js     | 18 +++---
 3 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
index 6985b889..171c8a65 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
@@ -1,25 +1,12 @@
 <template>
-  <Dialog
-    v-model="obverseVisible"
-    :title="dialogData._itemData && dialogData._itemData.title"
-  >
+  <Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title">
     <div class="TrafficIncidents">
       <div class="header">
         <Video class="video-stream" :pileNum="dialogData.stakeMark" />
-        <Video
-          class="video-stream"
-          :pileNum="dialogData.stakeMark"
-          :rangeIndex="1"
-        />
+        <Video class="video-stream" :pileNum="dialogData.stakeMark" :rangeIndex="1" />
       </div>
 
-      <Descriptions
-        labelWidth="72px"
-        :list="list"
-        :data="data"
-        style="gap: 18px"
-        column="7"
-      />
+      <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
   </Dialog>
 </template>
@@ -55,11 +42,11 @@ export default {
         deviceVendors: "XXX厂家",
       },
       list: [
-        {
-          label: "机构",
-          key: "organizationName",
-          gridColumn: "3",
-        },
+        // {
+        //   label: "机构",
+        //   key: "organizationName",
+        //   gridColumn: "3",
+        // },
         {
           label: "高速名称",
           key: "roadName",
@@ -109,11 +96,11 @@ export default {
           enum: "CameraDirectionEnum",
           gridColumn: "3",
         },
-        {
-          label: "完结时间",
-          key: "endTime",
-          gridColumn: "3",
-        },
+        // {
+        //   label: "完结时间",
+        //   key: "endTime",
+        //   gridColumn: "3",
+        // },
         {
           label: "事件描述",
           key: "description",
@@ -132,12 +119,12 @@ export default {
         if (code != 200) return;
 
         this.data = { ...data, ...this.data };
-        console.log('trafficIncidents',data);
+        console.log('trafficIncidents', data);
       })
-      .catch((err) => {});
+      .catch((err) => { });
   },
   methods: {
-    handleClickTabs() {},
+    handleClickTabs() { },
   },
 };
 </script>
@@ -158,7 +145,7 @@ export default {
     display: flex;
     gap: 9px;
 
-    > div.video-stream {
+    >div.video-stream {
       height: 210px;
     }
   }
@@ -186,7 +173,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDetailDialog/data.js
index 3d2c9ffd..195ace82 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/dispatch/EventDetailDialog/data.js
@@ -5,8 +5,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "桩号:",
@@ -14,8 +14,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "行驶方向:",
@@ -23,8 +23,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "事件类型:",
@@ -32,8 +32,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "事件原因:",
@@ -41,8 +41,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "事件状态:",
@@ -50,8 +50,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "操作员:",
@@ -59,8 +59,8 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
   {
     label: "发生时间:",
@@ -68,18 +68,18 @@ export const formList = [
     type: "input",
     options: {
       disabled: true,
-      placeholder: ''
-    }
-  },
-  {
-    label: "完结时间:",
-    key: "endTime",
-    type: "input",
-    options: {
-      disabled: true,
-      placeholder: ''
-    }
-  },
+      placeholder: "",
+    },
+  },
+  // {
+  //   label: "完结时间:",
+  //   key: "endTime",
+  //   type: "input",
+  //   options: {
+  //     disabled: true,
+  //     placeholder: ''
+  //   }
+  // },
   {
     label: "事件描述:",
     key: "direction",
@@ -87,8 +87,8 @@ export const formList = [
     gridColumn: 3,
     options: {
       disabled: true,
-      placeholder: ''
-    }
+      placeholder: "",
+    },
   },
 ];
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
index e2cb54ac..e5f7792c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
@@ -71,15 +71,15 @@ export const formList = [
       placeholder: "",
     },
   },
-  {
-    label: "完结时间:",
-    key: "endTime",
-    type: "input",
-    options: {
-      disabled: true,
-      placeholder: "",
-    },
-  },
+  // {
+  //   label: "完结时间:",
+  //   key: "endTime",
+  //   type: "input",
+  //   options: {
+  //     disabled: true,
+  //     placeholder: "",
+  //   },
+  // },
   {
     label: "水膜厚度(mm):",
     key: "waterFilmThickness",

From 1a69bd33ba74b4c6376d85af5cc7de21e851b4de Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Tue, 19 Mar 2024 14:24:11 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E9=A2=84=E6=A1=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/plan/addAndEditDialog/index.vue     | 199 +++++++++---------
 .../control/event/plan/formTable/index.vue    |  24 ++-
 .../pages/control/event/plan/index.vue        |  33 ++-
 .../control/event/plan/qbbDialog/index.vue    |   7 +-
 4 files changed, 143 insertions(+), 120 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index 3e3a8593..f70a2249 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -27,25 +27,6 @@
                                 :value="item.value">
                             </el-option>
                         </el-select>
-                        <!-- <el-select v-if="formData.eventCategory == 1 && formData.eventType == 6"
-                            v-model="formData.triggerMechanism" placeholder="请选择触发类型">
-                            <el-option-group label="主线">
-                                <el-option label="主线封闭" value="1"></el-option>
-                                <el-option label="主线限行" value="2"></el-option>
-                            </el-option-group>
-                            <el-option-group label="收费站">
-                                <el-option label="收费站封闭" value="3"></el-option>
-                                <el-option label="收费站限行" value="4"></el-option>
-                            </el-option-group>
-                            <el-option-group label="匝道立交">
-                                <el-option label="匝道立交封闭" value="5"></el-option>
-                                <el-option label="匝道立交限行" value="6"></el-option>
-                            </el-option-group>
-                            <el-option-group label="服务区">
-                                <el-option label="服务区封闭" value="7"></el-option>
-                                <el-option label="服务区限行" value="8"></el-option>
-                            </el-option-group>
-                        </el-select> -->
 
                     </el-form-item>
                 </div>
@@ -355,6 +336,81 @@ const optionsMap = {
         7: [],
     }
 };
+const typeMap = {
+    1: [{
+        value: 1,
+        label: '交通事故'
+    },
+    {
+        value: 2,
+        label: '车辆故障'
+    },
+    {
+        value: 3,
+        label: '交通管制'
+    },
+    {
+        value: 4,
+        label: '交通拥堵'
+    },
+    {
+        value: 5,
+        label: '非法上路'
+    },
+    {
+        value: 6,
+        label: '路障清除'
+    },
+    {
+        value: 7,
+        label: '施工建设'
+    },
+    {
+        value: 8,
+        label: '服务区异常'
+    },
+    {
+        value: 9,
+        label: '设施设备隐患'
+    },
+    {
+        value: 10,
+        label: '异常天气'
+    },
+    {
+        value: 11,
+        label: '其他事件'
+    }],
+    2: [{
+        value: 1,
+        label: '异常天气'
+    },
+    {
+        value: 2,
+        label: '拥堵'
+    },
+    {
+        value: 3,
+        label: '非机动车'
+    },
+    {
+        value: 4,
+        label: '行人'
+    },
+    {
+        value: 5,
+        label: '烟火'
+    },
+    {
+        value: 6,
+        label: '抛洒物'
+    },
+    {
+        value: 7,
+        label: '逆行'
+    },
+    ]
+}
 
 export default {
     name: 'addAndEditDialog',
@@ -490,6 +546,8 @@ export default {
                     if (Object.keys(this.detail).length > 0) {
                         this.title = '修改预案';
                         this.dialogType = 2;
+                        this.eventOptions = typeMap[this.detail.eventCategory];
+                        this.mechanismOptions = optionsMap[this.detail.eventCategory || 1][this.detail.eventType];
                         this.initData(this.detail.id);
                     } else {
                         this.title = '新增预案';
@@ -538,16 +596,21 @@ export default {
                 this.secondFormData = [];
                 this.thirdFormData = [];
                 dcExecuteAction.forEach(it => {
+                    let action = {};
+                    if (it.otherConfig) {
+                        let config = JSON.parse(it.otherConfig);
+                        action = { ...it, ...config, qbb: (config?.dcInfoBoardTemplate?.content || '') };
+                    }
                     if (it.deviceList) {
-                        it.deviceList = it.deviceList.split(',');
+                        action.deviceList = it.deviceList.split(',').map(str => Number(str));
                     }
                     if (it.actionType == 1) {
-                        this.secondFormData.push(it);
+                        this.secondFormData.push(action);
                     } else if (it.actionType == 2) {
-                        this.thirdFormData.push(it);
+                        this.thirdFormData.push(action);
                     }
                 })
-
+                console.log('secondFormData', this.secondFormData)
             }).catch((err) => {
                 console.log(err)
                 Message.error("查询事件预案列表失败", err);
@@ -561,7 +624,6 @@ export default {
                     method: "get",
                 })
                 if (result.code != 200) return Message.error(result?.msg);
-                console.log('123');
                 this.deviceData = result.data;
                 // return result.data;
             }
@@ -571,81 +633,15 @@ export default {
             this.mechanismOptions = optionsMap[this.formData.eventCategory || 1][value];
         },
         changeRadio(value = 1) {
-            const optionsMap = {
-                1: [{
-                    value: 1,
-                    label: '异常天气'
-                },
-                {
-                    value: 2,
-                    label: '交通事故'
-                },
-                {
-                    value: 3,
-                    label: '非法上路'
-                },
-                {
-                    value: 4,
-                    label: '车辆故障'
-                },
-                {
-                    value: 5,
-                    label: '交通拥堵'
-                },
-                {
-                    value: 6,
-                    label: '交通管制'
-                },
-                {
-                    value: 7,
-                    label: '服务区异常'
-                },
-                {
-                    value: 8,
-                    label: '施工建设'
-                },
-                {
-                    value: 9,
-                    label: '路障清除'
-                }],
-                2: [{
-                    value: 1,
-                    label: '异常天气'
-                },
-                {
-                    value: 2,
-                    label: '拥堵'
-                },
-                {
-                    value: 3,
-                    label: '非机动车'
-                },
-                {
-                    value: 4,
-                    label: '行人'
-                },
-                {
-                    value: 5,
-                    label: '烟火'
-                },
-                {
-                    value: 6,
-                    label: '抛洒物'
-                },
-                {
-                    value: 7,
-                    label: '逆行'
-                },
-                ]
-            }
-            this.eventOptions = optionsMap[value];
+            this.formData.triggerMechanism = '';
+            this.eventOptions = typeMap[value];
             this.changeEventType();
         },
         handleChange() {
 
         },
-        formatData(it, value = 1) {
-            let data = { ...it, actionType: value }
+        formatData(it, value = 1, id = '') {
+            let data = { ...it, actionType: value, emergencyPlansId: id }
             if (it.deviceList && typeof it.deviceList !== 'string' && it.deviceList.length > 0) {
                 data.deviceList = it.deviceList.join(',');
             } else {
@@ -682,19 +678,22 @@ export default {
                 if (valid) {
                     // this.submitting = false;
                     let secondFormTable = this.$refs['secondFormTable'].tableData || [];
+                    // console.log('12', secondFormTable);
                     let thirdFormTable = this.$refs['thirdFormTable'].tableData || [];
                     let dcArr = [];
+                    let id = '';
+                    if (this.dialogType == 2) id = this.planId;
                     secondFormTable.forEach(it => {
-                        dcArr.push(this.formatData(it, 1));
+                        dcArr.push(this.formatData(it, 1, id));
                     })
                     thirdFormTable.forEach(it => {
-                        dcArr.push(this.formatData(it, 2));
+                        dcArr.push(this.formatData(it, 2, id));
                     })
 
-                    console.log({
-                        ...this.formData,
-                        dcExecuteAction: dcArr
-                    })
+                    // console.log({
+                    //     ...this.formData,
+                    //     dcExecuteAction: dcArr
+                    // })
                     // return;
                     if (this.dialogType == 1) {//新增
                         request({
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
index 789661f9..dae791e5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
@@ -20,13 +20,13 @@
                             </el-option>
                         </el-select>
 
-                        <el-input-number v-if="scope.row.searchRule == 2" v-model="scope.row.number" :min="0"
-                            :max="9999" style="width: 130px;"></el-input-number>
-                        <p v-if="scope.row.searchRule == 2">个</p>
+                        <el-input-number v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3"
+                            v-model="scope.row.number" :min="0" :max="9999" style="width: 130px;"></el-input-number>
+                        <p v-if="scope.row.searchRule == 2 || scope.row.searchRule == 3">个</p>
 
-                        <el-input-number v-if="scope.row.searchRule == 3" v-model="scope.row.number" :min="0"
+                        <el-input-number v-if="scope.row.searchRule == 4" v-model="scope.row.number" :min="0"
                             :max="9999" style="width: 130px;"></el-input-number>
-                        <p v-if="scope.row.searchRule == 3" style="width: 56px;">公里</p>
+                        <p v-if="scope.row.searchRule == 4" style="width: 56px;">公里</p>
                     </div>
 
                 </template>
@@ -41,19 +41,19 @@
                                 :value="item.id">
                             </el-option>
                         </el-select>
-                        <el-input @click.native="clickQbb(scope.$index)" v-if="scope.row.deviceType == 1"
+                        <el-input @click.native="clickQbb(scope.$index)" v-if="scope.row.deviceType == 2"
                             placeholder="请选择" v-model="scope.row.qbb" readonly>
                             <i slot="suffix" class="el-input__icon el-icon-search"></i>
                         </el-input>
 
-                        <el-select v-if="scope.row.deviceType == 2" v-model="scope.row.gzms" placeholder="工作模式">
+                        <el-select v-if="scope.row.deviceType == 10" v-model="scope.row.gzms" placeholder="工作模式">
                             <el-option v-for="item in gzmsOptions" :key="item.value" :label="item.label"
                                 :value="item.value"></el-option>
                         </el-select>
-                        <el-input-number v-if="scope.row.deviceType == 2" placeholder="操作时长(分钟)"
+                        <el-input-number v-if="scope.row.deviceType == 10" placeholder="操作时长(分钟)"
                             v-model="scope.row.operationDuration" :min="0" :max="999"></el-input-number>
 
-                        <div v-if="scope.row.deviceType == 3" class="mjs">
+                        <div v-if="scope.row.deviceType == 12" class="mjs">
                             <el-select v-model="scope.row.controlModel" placeholder="请选择控制模式">
                                 <el-option label="手动模式" :value="1"></el-option>
                                 <el-option label="自动模式" :value="2"></el-option>
@@ -68,7 +68,7 @@
                             </el-select>
                         </div>
 
-                        <el-input v-if="scope.row.deviceType == 4" v-model="scope.row.content"
+                        <el-input v-if="scope.row.deviceType == 5" v-model="scope.row.content"
                             placeholder="请输入发布内容"></el-input>
 
                     </div>
@@ -87,7 +87,7 @@
         </Table>
 
         <!-- 情报板弹窗 -->
-        <QbbDialog :visible="isShowDialog" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
+        <QbbDialog :visible="isShowDialog" :info="qbbData" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
     </div>
 </template>
 
@@ -269,6 +269,7 @@ export default {
                     label: "自定义模式3",
                 }
             ],
+            qbbData: {},
             sbOptions: [],
             deviceType: 1,
             index: 1
@@ -320,6 +321,7 @@ export default {
         },
         clickQbb(index) {
             this.index = index;
+            this.qbbData = this.tableData[index].dcInfoBoardTemplate;
             this.isShowDialog = true;
         },
         onCloseDialog() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index d9153625..c1ec7f7f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -28,8 +28,8 @@
                 <ElTableColumn prop="strEventType" label="事件类型" width="100" align="center" />
                 <ElTableColumn prop="planName" label="预案名称" width="140" align="center" />
                 <ElTableColumn prop="triggeringCondition" label="检索条件" width="140" />
-                <ElTableColumn prop="deviceType" label="设备类型" width="140" />
-                <ElTableColumn prop="controllableDevice" label="可控设备" width="200" />
+                <ElTableColumn prop="strDeviceType" label="设备类型" width="140" />
+                <ElTableColumn prop="controllableDeviceName" label="可控设备"/>
                 <ElTableColumn prop="controlCommand" label="控制指令" />
                 <ElTableColumn label="操作" width="210" align="center">
                     <template slot-scope="scope">
@@ -65,7 +65,8 @@ import { Message } from 'element-ui'
 import { searchFormList } from './data';
 
 const eventTypeMap = {
-    0: {
+    0: {},
+    1: {
         1: '交通事故',
         2: '车辆故障',
         3: '交通管制',
@@ -78,7 +79,7 @@ const eventTypeMap = {
         10: '异常天气',
         11: '其他事件',
     },
-    1: {
+    2: {
         1: '异常天气',
         2: '拥堵',
         3: '非机动车',
@@ -87,10 +88,25 @@ const eventTypeMap = {
         6: '抛洒物',
         7: '逆行',
     },
-    2: {}
+    3: {}
 
 }
-
+const deviceMap = {
+    1: '摄像机',
+    2: '可变信息标志',
+    3: '气象监测器',
+    4: '出口诱导灯',
+    5: '路段语音广播',
+    6: '护栏碰撞',
+    7: '毫米波雷达',
+    8: '合流区预警',
+    9: '智慧锥桶',
+    10: '激光疲劳唤醒',
+    11: '类交通量调查站',
+    12: '行车诱导',
+    13: '智能设备箱',
+    14: '光线在线监测',
+}
 
 export default {
     name: 'controlEventPlan',
@@ -128,8 +144,9 @@ export default {
             }).then((result) => {
                 if (result.code != 200) return Message.error(result?.msg);
                 result.rows.forEach(it => {
-                    it.strEventCategory = it.eventCategory == 0 ? '交通事件' : '感知事件';
+                    it.strEventCategory = it.eventCategory == 1 ? '交通事件' : '感知事件';
                     it.strEventType = eventTypeMap[it.eventCategory || 0][it.eventType];
+                    it.strDeviceType = deviceMap[it.deviceType];
                 })
                 this.tableData = result.rows;
                 this.total = result.total;
@@ -154,7 +171,7 @@ export default {
             this.isShowDialog = true;
         },
         handleSearch(data) {
-            console.log(data);
+            // console.log(data);
             this.searchData = { ...this.searchData, ...data }
             this.initData();
         },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
index faccbff2..3bbf4f75 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/qbbDialog/index.vue
@@ -49,7 +49,7 @@ export default {
     },
     props: {
         visible: Boolean,
-        detail: {
+        info: {
             type: Object,
             default: () => { }
         }
@@ -72,6 +72,11 @@ export default {
     computed: {
         modelVisible: {
             get() {
+                if (this.visible) {
+                    if (this.info && this.info.id) {
+                        this.radio1 = Number(this.info.id);
+                    }
+                }
                 return this.visible;
             },
             set(val) {

From f867933e35ac04a097905d117959466b99704fd6 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 15:11:27 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/HomeVectorControl/index.vue        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
index ae5317a9..9dd29d39 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeVectorControl/index.vue
@@ -27,9 +27,8 @@ export default {
   methods: {
     handleClick(type) {
       this.activeIcon = this.activeIcon === type ? null : type;
-      if (this.activeIcon) window.showStakeText = true;
-      else window.showStakeText = false;
-      markerClusterIns.setData();
+
+      // markerClusterIns.setData();
     },
     filterEnd(data) {
       this.activeIcon = null;

From a3d45bf27f6cc974dc8ec8d64f90562cb98a90c5 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 15:16:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?feat=20=E8=BD=A6=E9=81=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E4=B8=BA=E5=BD=B1=E5=93=8D=E8=BD=A6=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/TrafficIncidents/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
index 171c8a65..f30b7d55 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/TrafficIncidents/index.vue
@@ -69,7 +69,7 @@ export default {
           gridColumn: "3",
         },
         {
-          label: "车道列表",
+          label: "影响车道",
           key: "lang",
           enum: "LaneOccupancy",
           gridColumn: "3",

From 5b8ed8704a8704e6e712097c37eb8d88879d6c7a Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 15:41:09 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E6=84=9F=E7=9F=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=BC=B9=E7=AA=97=E4=B8=ADVideo=E6=A0=87?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/PerceiveEvent/index.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
index d1a4347e..76bc1c34 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/PerceiveEvent/index.vue
@@ -3,7 +3,7 @@
     <div class="PerceiveEvent">
       <!-- <Video class="item-video" /> -->
       <div class="video-pic">
-        <Video style="height: 100%;flex:1" :showHeader="activeName != '-1'" :url="dialogData.formData.videoList[0]"
+        <Video style="height: 100%;flex:1" :showHeader="false" :url="dialogData.formData.videoList[0]"
           videoType="mp4" />
         <Carousel style="flex: 1;height: 100%;" :pictures="dialogData.formData.pictures" />
       </div>

From c08f1e58cbbf97c7caa1fe726ee49866b661d554 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Tue, 19 Mar 2024 16:05:25 +0800
Subject: [PATCH 06/10] bug

---
 .../event/event/EventDetailDialog/data.js     | 22 +++---
 .../event/event/EventDetailDialog/index.vue   |  8 +-
 .../pages/control/event/event/data.js         |  8 +-
 .../pages/control/event/event/index.vue       | 74 +------------------
 .../event/plan/addAndEditDialog/index.vue     |  4 +-
 .../src/views/JiHeExpressway/utils/enum.js    | 53 ++++++++-----
 6 files changed, 59 insertions(+), 110 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
index e5f7792c..9bb55a80 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/data.js
@@ -36,8 +36,8 @@ export const formList = [
     },
   },
   {
-    label: "事件原因:",
-    key: "eventCause",
+    label: "高速名称:",
+    key: "roadName",
     type: "input",
     options: {
       disabled: true,
@@ -71,15 +71,15 @@ export const formList = [
       placeholder: "",
     },
   },
-  // {
-  //   label: "完结时间:",
-  //   key: "endTime",
-  //   type: "input",
-  //   options: {
-  //     disabled: true,
-  //     placeholder: "",
-  //   },
-  // },
+  {
+    label: "预计结束时间:",
+    key: "estimatedEndTime",
+    type: "input",
+    options: {
+      disabled: true,
+      placeholder: "",
+    },
+  },
   {
     label: "水膜厚度(mm):",
     key: "waterFilmThickness",
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 f27fcd9d..8e7d6f29 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
@@ -4,10 +4,10 @@
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic">
-        <Video style="height: 100%; width: 380px;" :showHeader="activeName != '-1'" :url="formData.videoList[0]"
-          videoType="mp4" />
-        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;" :url="formData.videoList[1]"
-          videoType="mp4" />
+        <Video style="height: 100%; width: 380px;" :showHeader="activeName != '-1'"
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[0] : ''" videoType="mp4" />
+        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px;"
+          :url="(formData.videoList && formData.videoList.length > 0) ? formData.videoList[1] : ''" videoType="mp4" />
 
         <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
       </div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
index 9debcc93..026e67f5 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
@@ -84,10 +84,10 @@ export const gjSearchFormList = [
           key: "6",
           label: "非机预警",
         },
-        {
-          key: "7",
-          label: "气象监测器",
-        },
+        // {
+        //   key: "7",
+        //   label: "气象监测器",
+        // },
       ],
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index fa289023..45d927c8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -64,6 +64,7 @@ import { tabMap, gjSearchFormList, gzSearchFormList } from "./data";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import { Loading } from 'element-ui';
+import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping } from "@screen/utils/enum.js"
 
 function getRandomData(min = 1, max = 15) {
   return Math.floor(Math.random() * (max - min + 1)) + min;
@@ -85,7 +86,7 @@ const warningSourceMapping = {
   4: '护栏碰撞',
   5: '扫码报警',
   6: '非机预警',
-  7: '气象监测器'
+  // 7: '气象监测器'
 }
 const gzDirectionMapping = {
   '1': '菏泽方向',
@@ -98,77 +99,6 @@ const warningStateMapping = {
   3: '已终止',
   4: '自动结束'
 }
-const warningTypeMapping = {
-  1: '交通拥堵',
-  2: '行人',
-  3: '非机动车',
-  4: '停车',
-  5: '倒车/逆行',
-  6: '烟火',
-  7: '撒落物',
-  8: '异常天气',
-  9: '护栏碰撞',
-  10: '交通事故',
-  11: '车辆故障',
-  99: '其它',
-}
-const warningSubclassTypeMapping = {
-  1: {
-    "1-1": "拥堵",
-    "1-2": "缓行",
-  },
-  2: {
-    "2-1": "普通行人",
-    "2-2": "工作人员",
-  },
-  3: {
-    "3-1": "摩托车",
-    "3-2": "自行车",
-    "3-3": "三轮车",
-  },
-  4: {
-    "4-1": "非工程车",
-    "4-2": "工程车",
-    "4-3": "主路有车",
-    "4-4": "匝道有车",
-    "4-5": "车辆故障",
-    "4-6": "交通事故",
-    "4-7": "应急车道被占用",
-    "4-8": "车离开应急车道",
-    "4-9": "其他",
-  },
-  5: {
-    "5-1": "倒车/逆行",
-  },
-  6: {
-    "6-1": "烟火",
-  },
-  7: {
-    "7-1": "撒落物",
-  },
-  8: {
-    "8-1": "雨",
-    "8-2": "冰雹",
-    "8-3": "风",
-    "8-4": "雾",
-    "8-5": "高温",
-    "8-6": "积水",
-    "8-7": "路面湿滑",
-    "8-8": "路面结冰",
-    "8-9": "道路能见度低",
-    "8-10": "道路团雾",
-  },
-  9: {
-    "9-1": "只碰撞不倾斜",
-    "9-2": "只倾斜无碰撞",
-    "9-3": "碰撞后倾斜",
-  },
-  10: {},
-  11: {},
-  99: {
-    "99-1": "其他",
-  },
-}
 
 export default {
   name: "RoadNetworkMonitoring2",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index f70a2249..bea6206b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -445,7 +445,7 @@ export default {
             formData: {
                 eventCategory: 1,
                 eventType: 1,
-                triggerMechanism: '1-1'
+                triggerMechanism: ''
             },
             secondFormData: [{
                 deviceType: 1,
@@ -555,7 +555,7 @@ export default {
                         this.formData = {
                             eventCategory: 1,
                             eventType: 1,
-                            triggerMechanism: '1-1'
+                            triggerMechanism: ''
                         }
                         this.secondFormData = [{
                             deviceType: 1,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 787457b8..304c8a64 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -136,18 +136,18 @@ export const InfoWarningSource = {
 
 // 事件主类 warningType
 export const WarningType = {
-  1: "交通拥堵",
-  2: "行人",
-  3: "非机动车",
-  4: "停车",
-  5: "倒车/逆行",
-  6: "烟火",
-  7: "撒落物",
-  8: "异常天气",
-  9: "护栏碰撞",
-  10: "交通事故",
-  11: "车辆故障",
-  99: "其他",
+  1: '交通拥堵',
+  2: '行人',
+  3: '非机动车',
+  4: '停车',
+  5: '违规驾驶',
+  6: '路障',
+  7: '道路施工',
+  8: '异常天气',
+  9: '护栏碰撞',
+  10: '交通事故',
+  11: '车辆故障',
+  99: '其他事件',
 };
 
 export const WarningTypeList = Object.keys(WarningType).map((key) => {
@@ -177,20 +177,29 @@ export const WarningSubclass = {
     "4-2": "工程车",
     "4-3": "主路有车",
     "4-4": "匝道有车",
-    "4-5": "车辆故障",
-    "4-6": "交通事故",
+    // "4-5": "车辆故障",
+    // "4-6": "交通事故",
     "4-7": "应急车道被占用",
     "4-8": "车离开应急车道",
     "4-9": "其他",
   },
   5: {
     "5-1": "倒车/逆行",
+    "5-2": "压线",
+    "5-3": "掉头",
+    "5-4": "超速",
+    "5-5": "低速",
+    "5-6": "违规变道",
+    "5-7": "未保持安全距离",
   },
   6: {
-    "6-1": "烟火",
+    "6-1": "烟雾",
+    "6-2": "火灾",
+    "6-3": "障碍物",
+    "6-4": "抛洒物",
   },
   7: {
-    "7-1": "撒落物",
+    "7-1": "道路施工",
   },
   8: {
     "8-1": "雨",
@@ -209,8 +218,18 @@ export const WarningSubclass = {
     "9-2": "只倾斜无碰撞",
     "9-3": "碰撞后倾斜",
   },
+  10: {
+    "10-1": "未知",
+    "10-2": "单车事故",
+    "10-3": "多车事故",
+  },
+  11: {
+    "11-1": "车辆抛锚",
+    "11-2": "车辆炸胎（有备胎）",
+    "11-3": "车辆炸胎（无备胎）",
+  },
   99: {
-    "99-1": "其他",
+    "99-1": "其他事件",
   },
 };
 

From 86b6710ae9d419c6bd13f27c24fffe17a4d65f3f Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 16:26:05 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20enum=20=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/JiHeExpressway/utils/enum.js    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 304c8a64..8c7f934b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -82,6 +82,7 @@ export const CameraControlTypeEnum = {
   },
 };
 
+//交通事件类型
 export const EventTopics = {
   交通事故: 1,
   车辆故障: 2,
@@ -134,20 +135,20 @@ export const InfoWarningSource = {
   },
 };
 
-// 事件主类 warningType
+// 感知事件主类 warningType
 export const WarningType = {
-  1: '交通拥堵',
-  2: '行人',
-  3: '非机动车',
-  4: '停车',
-  5: '违规驾驶',
-  6: '路障',
-  7: '道路施工',
-  8: '异常天气',
-  9: '护栏碰撞',
-  10: '交通事故',
-  11: '车辆故障',
-  99: '其他事件',
+  1: "交通拥堵",
+  2: "行人",
+  3: "非机动车",
+  4: "停车",
+  5: "违规驾驶",
+  6: "路障",
+  7: "道路施工",
+  8: "异常天气",
+  9: "护栏碰撞",
+  10: "交通事故",
+  11: "车辆故障",
+  99: "其他事件",
 };
 
 export const WarningTypeList = Object.keys(WarningType).map((key) => {
@@ -157,7 +158,7 @@ export const WarningTypeList = Object.keys(WarningType).map((key) => {
   };
 });
 
-// 事件主类的子类(上方) warningSubclass
+// 感知事件主类的子类(上方) warningSubclass
 export const WarningSubclass = {
   1: {
     "1-1": "拥堵",

From e74f2193b785ef3636501eb288ea6d95a6d6f7bd Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 19 Mar 2024 16:53:40 +0800
Subject: [PATCH 08/10] =?UTF-8?q?feat=20=E4=BC=98=E5=8C=96=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/map.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index fcf6e74a..6f17f0bd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -192,8 +192,8 @@ export class MarkerCluster {
         totalPages > 1
           ? `
       <div id="paginationContainer" style="text-align:center;margin-bottom:5px;">
-      <button style="cursor: pointer;    background: #00B3CC;border-radius: 8px;border: 0px;" onclick="renderData(window.page-1)">上一页</button>
-      <button style="cursor: pointer;    background: #00B3CC;border-radius: 8px;border: 0px;" onclick="renderData(window.page+1)">下一页</button>
+      <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page-1)">上一页</button>
+      <button style="padding: 0 15px;background: #00B3CC;border-radius: 48px;cursor: pointer;opacity: 1;gap: 6px;font-size: 14px;font-weight: 500;color: #FFFFFF;border: 1px solid rgba(42, 217, 253, 0.6);" onclick="renderData(window.page+1)">下一页</button>
       </div>`
           : ""
       }

From 2b5a669a1f47e9baf7f6c4b4084c2f35a5278578 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Tue, 19 Mar 2024 17:56:27 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E9=A2=84=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/control/event/event/index.vue       | 12 ------
 .../event/plan/addAndEditDialog/index.vue     | 40 ++++++++++++++++++-
 .../control/event/plan/formTable/index.vue    | 10 ++---
 .../pages/control/event/plan/index.vue        |  4 +-
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index 45d927c8..78cf1f81 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -66,18 +66,6 @@ import { Message } from "element-ui";
 import { Loading } from 'element-ui';
 import { WarningType as warningTypeMapping, WarningSubclass as warningSubclassTypeMapping } from "@screen/utils/enum.js"
 
-function getRandomData(min = 1, max = 15) {
-  return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
-function getMockData() {
-  return Array.from({ length: getRandomData(9, 24) }).map(() => ({
-    time: "2023.12.22 13:00:00",
-    source: "视频智能识别",
-    location: "k100+000",
-    direction: "济南方向",
-  }));
-}
 
 const warningSourceMapping = {
   1: '视频AI',
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index bea6206b..8648cb3b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -412,6 +412,29 @@ const typeMap = {
     ]
 }
 
+const gzztMap = {
+    "01": '常亮',
+    "02": '流水',
+    "03": '闪烁',
+    "04": '关闭',
+}
+const gzmsMap = {
+    "SETMD0": "激光关闭",
+    "SETMD1": "常亮模式",
+    "SETMD2": "间隔100ms闪烁模式",
+    "SETMD3": "间隔200ms闪烁模式",
+    "SETMD4": "间隔500ms闪烁模式",
+    "SETMD5": "2次闪烁模式",
+    "SETMD6": "SOS模式",
+    "SETMD7": "自定义模式1",
+    "SETMD8": "自定义模式2",
+    "SETMD9": "自定义模式3",
+}
+const controlModelMap = {
+    "00": '手动模式',
+    "01": '自动模式',
+    "02": '万年历',
+}
 export default {
     name: 'addAndEditDialog',
     components: {
@@ -599,7 +622,15 @@ export default {
                     let action = {};
                     if (it.otherConfig) {
                         let config = JSON.parse(it.otherConfig);
-                        action = { ...it, ...config, qbb: (config?.dcInfoBoardTemplate?.content || '') };
+                        let qbb = ''
+                        if (config.id) {
+                            qbb = config.content;
+                            config = { dcInfoBoardTemplate: config };
+                        }
+                        // if (config.state) {
+                        //     config.gzms = config.state
+                        // }
+                        action = { ...it, ...config, qbb: qbb };
                     }
                     if (it.deviceList) {
                         action.deviceList = it.deviceList.split(',').map(str => Number(str));
@@ -653,12 +684,16 @@ export default {
             if (it.controlModel) {
                 let other = {
                     controlModel: it.controlModel,
+                    controlModelName: controlModelMap[it.controlModel],
                     state: it.state,
+                    name: gzztMap[it.state]
                 }
                 if (it.time && it?.time[0]) {
                     other = {
                         controlModel: it.controlModel,
+                        controlModelName: controlModelMap[it.controlModel],
                         state: it.state,
+                        name: gzztMap[it.state],
                         startTime: it.time[0],
                         endTime: it.time[1]
                     }
@@ -668,6 +703,7 @@ export default {
             if (it.gzms) {
                 data.otherConfig = JSON.stringify({
                     state: it.gzms,
+                    name: gzmsMap[it.gzms],
                     operationDuration: it.operationDuration,
                 })
             }
@@ -678,8 +714,8 @@ export default {
                 if (valid) {
                     // this.submitting = false;
                     let secondFormTable = this.$refs['secondFormTable'].tableData || [];
-                    // console.log('12', secondFormTable);
                     let thirdFormTable = this.$refs['thirdFormTable'].tableData || [];
+                    console.log('12', thirdFormTable);
                     let dcArr = [];
                     let id = '';
                     if (this.dialogType == 2) id = this.planId;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
index dae791e5..e3804335 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/formTable/index.vue
@@ -55,11 +55,11 @@
 
                         <div v-if="scope.row.deviceType == 12" class="mjs">
                             <el-select v-model="scope.row.controlModel" placeholder="请选择控制模式">
-                                <el-option label="手动模式" :value="1"></el-option>
-                                <el-option label="自动模式" :value="2"></el-option>
-                                <el-option label="万年历" :value="3"></el-option>
+                                <el-option label="手动模式" value="00"></el-option>
+                                <el-option label="自动模式" value="01"></el-option>
+                                <el-option label="万年历" value="02"></el-option>
                             </el-select>
-                            <el-time-picker v-if="scope.row.controlModel == 2" v-model="scope.row.time" is-range
+                            <el-time-picker v-if="scope.row.controlModel == '01'" v-model="scope.row.time" is-range
                                 style="" range-separator="-" placeholder="选择时间" value-format="HH:mm" format="HH:mm">
                             </el-time-picker>
                             <el-select v-model="scope.row.state" placeholder="工作状态">
@@ -329,7 +329,7 @@ export default {
         },
         dialogSubmit(data) {
             this.tableData[this.index].qbb = data.content;
-            this.tableData[this.index].otherConfig = JSON.stringify({ dcInfoBoardTemplate: data });
+            this.tableData[this.index].otherConfig = JSON.stringify(data);
         }
     }
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index c1ec7f7f..77b20840 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -28,7 +28,7 @@
                 <ElTableColumn prop="strEventType" label="事件类型" width="100" align="center" />
                 <ElTableColumn prop="planName" label="预案名称" width="140" align="center" />
                 <ElTableColumn prop="triggeringCondition" label="检索条件" width="140" />
-                <ElTableColumn prop="strDeviceType" label="设备类型" width="140" />
+                <ElTableColumn prop="deviceType" label="设备类型" width="140" />
                 <ElTableColumn prop="controllableDeviceName" label="可控设备"/>
                 <ElTableColumn prop="controlCommand" label="控制指令" />
                 <ElTableColumn label="操作" width="210" align="center">
@@ -146,7 +146,7 @@ export default {
                 result.rows.forEach(it => {
                     it.strEventCategory = it.eventCategory == 1 ? '交通事件' : '感知事件';
                     it.strEventType = eventTypeMap[it.eventCategory || 0][it.eventType];
-                    it.strDeviceType = deviceMap[it.deviceType];
+                    // it.strDeviceType = deviceMap[it.deviceType];
                 })
                 this.tableData = result.rows;
                 this.total = result.total;

From 633e287c7377344f8db659dcb90160ff6af5db53 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Tue, 19 Mar 2024 18:19:56 +0800
Subject: [PATCH 10/10] bug

---
 .../eventPlanDialog/index.vue                 | 29 ++++++-------------
 .../event/event/EventDetailDialog/index.vue   |  6 ++--
 .../pages/control/event/plan/index.vue        |  2 +-
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
index fb7721a6..d13d831f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/eventPlanDialog/index.vue
@@ -4,8 +4,7 @@
             <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
                 <div class="first">
                     <el-radio-group v-model="planName">
-                        <el-radio-button label="名称1"></el-radio-button>
-                        <el-radio-button label="名称2"></el-radio-button>
+                        <el-radio-button v-for="item in info" :key="item.id" :label="item.planName"></el-radio-button>
                     </el-radio-group>
                 </div>
 
@@ -68,9 +67,9 @@ export default {
     },
     props: {
         visible: Boolean,
-        detail: {
-            type: Object,
-            default: () => { }
+        info: {
+            type: Array,
+            default: () => []
         }
     },
     data() {
@@ -95,6 +94,7 @@ export default {
                 qbb: ''
             }],
             planName: '',
+            dcExecuteAction: [],
             deviceData: [],
             eventOptions: [
                 {
@@ -198,6 +198,8 @@ export default {
         modelVisible: {
             get() {
                 if (this.visible) {
+                    this.planName = this.info[0]?.planName || '';
+                    this.dcExecuteAction = this.info[0]?.dcExecuteAction || [];
                 }
                 return this.visible;
             },
@@ -207,16 +209,8 @@ export default {
         },
     },
     methods: {
-        initData(id = 1) {
-            request({
-                url: `/business/plans/list/${id}`,
-                method: "get",
-            }).then((result) => {
-                if (result.code != 200) return Message.error(result?.msg);
-                let data = result.data;
-                let dcExecuteAction = result.data.dcExecuteAction;
-
-                this.planId = data.id;
+        initData(data) {
+            this.planId = data.id;
                 this.formData = {
                     eventCategory: data.eventCategory,
                     planName: data.planName,
@@ -236,11 +230,6 @@ export default {
                     }
                 })
 
-            }).catch((err) => {
-                console.log(err)
-                Message.error("查询事件预案列表失败", err);
-            })
-
         },
         async loadData() {
             if (this.deviceData.length <= 0) {
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 8e7d6f29..fc7b1da8 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
@@ -18,7 +18,7 @@
     </div>
 
     <!-- 确认弹窗 -->
-    <EventPlanDialog :visible="isShowDialog" @close="onCloseAddNew" />
+    <EventPlanDialog :visible="isShowDialog" :info="info" @close="onCloseAddNew" />
 
     <template #footer>
       <Button style="padding: 0 24px;" @click.native="onDelete">误报</Button>
@@ -73,6 +73,7 @@ export default {
     return {
       formList,
       isShowDialog: false,
+      info: [],
       timeLine1List: [{
         time: "",
         label: "",
@@ -188,7 +189,6 @@ export default {
     onSubmit() {
       this.isShowDialog = true;
       let url = '/business/plans/list/warning/type'
-      let data = {}
       if (this.activeName == '-1') {
         url = '/business/plans/list/warning/type'
       } else {
@@ -200,7 +200,7 @@ export default {
         data: this.formData
       }).then(result => {
         if (result.code != 200) return Message.error(result?.msg);
-        console.log('result', result)
+        this.info = result.data;
       })
 
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
index 77b20840..b95e3727 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/index.vue
@@ -28,7 +28,7 @@
                 <ElTableColumn prop="strEventType" label="事件类型" width="100" align="center" />
                 <ElTableColumn prop="planName" label="预案名称" width="140" align="center" />
                 <ElTableColumn prop="triggeringCondition" label="检索条件" width="140" />
-                <ElTableColumn prop="deviceType" label="设备类型" width="140" />
+                <ElTableColumn prop="deviceType" label="设备类型"  />
                 <ElTableColumn prop="controllableDeviceName" label="可控设备"/>
                 <ElTableColumn prop="controlCommand" label="控制指令" />
                 <ElTableColumn label="操作" width="210" align="center">