From 8c9b8f9ffe8788c84347aed3ac132fc0fd024243 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 21 Mar 2024 09:57:52 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=A4=E8=B0=83=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Dialogs/Intermodulation/index.vue  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
index 30942903..5c905f9d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -16,10 +16,7 @@
           </div>
         </ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.productId"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -160,9 +157,9 @@ export default {
       } else {
         this.yData = this.hzYData;
       }
-      console.log('xdata', this.xData);
-      console.log('ydata', this.hzYData);
-      console.log('rdata', this.jnYData);
+      // console.log('xdata', this.xData);
+      // console.log('ydata', this.hzYData);
+      // console.log('rdata', this.jnYData);
       setTimeout(() => {
         this.isShowCar = true;
       }, 1000)
@@ -179,8 +176,8 @@ export default {
         method: "get",
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
-        this.objectValue = result.data[0];
-        this.carNum = result.data[0]['1'];
+        this.objectValue = result.data[result.data.length - 1];
+        this.carNum = result.data[result.data.length - 1]['1'];
         result.data.forEach(it => {
           this.xData.push(moment(it.timestamp).format("HH:mm"));
           this.hzYData.push(it['1']);

From c1f6c851612cccdf01ef65926a7a18c1e89f31e2 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Thu, 21 Mar 2024 11:22:03 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/equipment/type/api.js        |  2 +-
 .../components/Dialogs/Broadcast/index.vue    |  2 +-
 .../Home/components/Dialogs/Camera/index.vue  |  2 +-
 .../Dialogs/DrivingGuidance/index.vue         |  2 +-
 .../Dialogs/FatigueWakesUp/index.vue          | 27 +++++++++---
 .../Dialogs/GuardrailCollision/index.vue      |  4 +-
 .../Dialogs/Intermodulation/index.vue         | 42 +++++++++++--------
 .../components/Dialogs/SmartDevice/index.vue  | 33 ++++++++++-----
 .../pages/Home/components/InfoBoard/index.vue |  2 +-
 9 files changed, 76 insertions(+), 40 deletions(-)

diff --git a/ruoyi-ui/src/api/equipment/type/api.js b/ruoyi-ui/src/api/equipment/type/api.js
index 72980505..f4a47dd1 100644
--- a/ruoyi-ui/src/api/equipment/type/api.js
+++ b/ruoyi-ui/src/api/equipment/type/api.js
@@ -145,7 +145,7 @@ export function listDevicesType() {
 // 设备在线率统计
 export function deviceStatusList(id) {
   return request({
-    url: "/system/status/deviceStatusList?deviceld=" + id,
+    url: "/system/status/deviceStatusList/" + id,
     method: "get",
   });
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
index 2cc5b2f8..1c85889a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/index.vue
@@ -12,7 +12,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 150px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index c1666b0a..6c78bec1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -27,7 +27,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
index 8ba65e9e..2b75466b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/index.vue
@@ -11,7 +11,7 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
index 03508f22..22e2b3b1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -4,11 +4,20 @@
       <Video class="video-stream" :pileNum="dialogData.stakeMark" />
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
-          <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
+          <Descriptions
+            labelWidth="72px"
+            :list="list"
+            :data="data"
+            style="gap: 18px"
+          />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" style="height: 180px" />
+          <LineChart
+            v-if="activeName === 'third'"
+            :productId="dialogData.id"
+            style="height: 180px"
+          />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -17,7 +26,10 @@
       <Button @click.native="deviceControlVisible = true">设备操作</Button>
     </template>
 
-    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" />
+    <DeviceControlDialog
+      v-model="deviceControlVisible"
+      :deviceId="dialogData.iotDeviceId"
+    />
   </Dialog>
 </template>
 
@@ -25,7 +37,10 @@
 import Dialog from "@screen/components/Dialog/index.vue";
 import Descriptions from "@screen/components/Descriptions.vue";
 import Button from "@screen/components/Buttons/Button.vue";
-import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import {
+  getRoadInfoByStakeMark,
+  getProduct,
+} from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 import Video from "@screen/components/Video";
 import DeviceControlDialog from "./components/DeviceControlDialog.vue";
 
@@ -99,7 +114,7 @@ export default {
     if (roadInfo) this.$set(this.data, "roadName", roadInfo.roadName);
   },
   methods: {
-    handleClickTabs() { },
+    handleClickTabs() {},
   },
 };
 </script>
@@ -140,7 +155,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/Home/components/Dialogs/GuardrailCollision/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
index 05a05c68..61581fdc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
@@ -9,7 +9,7 @@
         </ElTabPane>
 
         <ElTabPane label="在线率统计" name="third">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -179,7 +179,7 @@ div.switcher {
     align-items: center;
     justify-content: end;
 
-    >div {
+    > div {
       font-size: 16px;
       padding: 6px 12px;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
index 5c905f9d..7c78195f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -9,14 +9,22 @@
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
           <div class="content-second" style="height: 185px">
-            <RadioGroup v-model="roadType" :options="roadTypeList" @input="changeRadio" />
+            <RadioGroup
+              v-model="roadType"
+              :options="roadTypeList"
+              @input="changeRadio"
+            />
             <span>当前车流量: {{ carNum }}辆</span>
-            <LineChartForTraffic style="flex: 1" v-if="isShowCar && activeName === 'second'" :xData="xData"
-              :yData="yData" />
+            <LineChartForTraffic
+              style="flex: 1"
+              v-if="isShowCar && activeName === 'second'"
+              :xData="xData"
+              :yData="yData"
+            />
           </div>
         </ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" />
         </ElTabPane>
       </ElTabs>
     </div>
@@ -40,7 +48,7 @@ import { dialogDelayVisible } from "./../mixin";
 import request from "@/utils/request";
 import { Message } from "element-ui";
 import RadioGroup from "@screen/components/FormConfig/components/RadioGroup/index.vue";
-import moment from 'moment/moment';
+import moment from "moment/moment";
 
 // 广播发布
 export default {
@@ -72,8 +80,8 @@ export default {
       },
       carNum: 0,
       objectValue: {
-        '1': 0,
-        '3': 0
+        1: 0,
+        3: 0,
       },
       xData: [],
       yData: [],
@@ -150,7 +158,7 @@ export default {
   },
   methods: {
     changeRadio(value) {
-      this.carNum = this.objectValue[value + ''];
+      this.carNum = this.objectValue[value + ""];
       this.isShowCar = false;
       if (value == 3) {
         this.yData = this.jnYData;
@@ -162,7 +170,7 @@ export default {
       // console.log('rdata', this.jnYData);
       setTimeout(() => {
         this.isShowCar = true;
-      }, 1000)
+      }, 1000);
     },
     getPropertiesHistory(deviceId) {
       this.xData = [];
@@ -177,17 +185,17 @@ export default {
       }).then((result) => {
         if (result.code != 200) return Message.error(result?.msg);
         this.objectValue = result.data[result.data.length - 1];
-        this.carNum = result.data[result.data.length - 1]['1'];
-        result.data.forEach(it => {
+        this.carNum = result.data[result.data.length - 1]["1"];
+        result.data.forEach((it) => {
           this.xData.push(moment(it.timestamp).format("HH:mm"));
-          this.hzYData.push(it['1']);
-          this.jnYData.push(it['3']);
+          this.hzYData.push(it["1"]);
+          this.jnYData.push(it["3"]);
           this.yData = this.hzYData;
-        })
+        });
         this.isShowCar = true;
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -240,7 +248,7 @@ div.switcher {
     align-items: center;
     justify-content: end;
 
-    >div {
+    > div {
       font-size: 16px;
       padding: 6px 12px;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
index a539da76..39049f20 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
@@ -14,15 +14,22 @@
         <ElTabPane label="在线率统计" name="third">
           <LineChart
             v-if="activeName === 'third'"
-            :productId="dialogData.productId"
+            :productId="dialogData.id"
             style="height: 180px"
           />
         </ElTabPane>
       </ElTabs>
     </div>
     <template #footer>
-      <Button v-if="activeName != 'first' && data.deviceState == '1'" @click.native="deviceControlVisible = true"> 设备操作 </Button>
-      <Button v-else-if="activeName != 'first'" style="background-color: #bbb;"> 设备离线 </Button>
+      <Button
+        v-if="activeName != 'first' && data.deviceState == '1'"
+        @click.native="deviceControlVisible = true"
+      >
+        设备操作
+      </Button>
+      <Button v-else-if="activeName != 'first'" style="background-color: #bbb">
+        设备离线
+      </Button>
     </template>
 
     <DeviceControlDialog
@@ -99,7 +106,7 @@ export default {
           label: "设备状态",
           key: "deviceState",
           // enum: "DeviceTypeEnum",
-          visible: false
+          visible: false,
         },
         {
           label: "设备状态",
@@ -117,7 +124,11 @@ export default {
     // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
 
     let deviceInfo = await this.getDeviceInfo();
-    this.data = { ...this.dialogData, roadName: null, deviceStateLiteral : deviceInfo.data.formatValue.deviceState };
+    this.data = {
+      ...this.dialogData,
+      roadName: null,
+      deviceStateLiteral: deviceInfo.data.formatValue.deviceState,
+    };
 
     // console.log(
     //   "%c [ dialogData ]-103-「index.vue」",
@@ -134,15 +145,17 @@ export default {
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
-  methods:{
+  methods: {
     async getDeviceInfo() {
       return request({
-        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}/3`,
+        url: `/business/device/properties/latest/${
+          this.dialogData.iotDeviceId || "10.0.36.143-1883"
+        }/3`,
         method: "get",
-        params: {}
+        params: {},
       });
-    }
-  }
+    },
+  },
 };
 </script>
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
index c3377bd1..cf5c629e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
@@ -94,7 +94,7 @@
                   <el-tab-pane label="在线率统计" name="third">
                     <LineChart
                       v-if="activeTab === 'third'"
-                      :productId="selectedDevice.productId"
+                      :productId="selectedDevice.id"
                       style="height: 160px"
                     />
                   </el-tab-pane>

From 8c23804467119b83072611b33b02f48f8157de98 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 11:34:21 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=91=84=E5=83=8F?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Camera/components/CameraControlDialog.vue |  5 +-
 .../Home/components/Dialogs/Camera/index.vue  | 47 +++++++++----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
index 9149ed8d..82d803f2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
@@ -27,10 +27,7 @@
           <span>{{ item.label }}</span>
           <img src="../images/add.svg" @click="controlClick(item.add)">
         </div>
-        <div>雨刷
-          <Button @click.native="controlClick(49)">开</Button>
-          <Button @click.native="controlClick(48)">关</Button>
-        </div>
+
 
       </div>
     </div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index c1666b0a..2dba6497 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -7,29 +7,24 @@
           <Descriptions :list="list" :data="data" style="gap: 18px">
             <template #content-deviceName>
               <span>{{ dialogData.deviceName || "-" }}</span>
-              <img
-                @click="controlDialogVisible = true"
-                v-if="
-                  [0, '0'].includes(
-                    dialogData.parseOtherConfig &&
-                      dialogData.parseOtherConfig.ptzCtrl
-                  )
-                "
-                src="@screen/images/camera-control-icon.svg"
-                width="18px"
-                height="18px"
-                style="cursor: pointer"
-              />
+              <img @click="controlDialogVisible = true" v-if="[0, '0'].includes(
+    dialogData.parseOtherConfig &&
+    dialogData.parseOtherConfig.ptzCtrl
+  )
+    " src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer" />
             </template>
           </Descriptions>
+          <div style="width:50%;display:flex;margin-top:18px">
+            <span
+              style="color: #3de8ff;font-size: 15px;font-family: PingFang SC, PingFang SC;font-weight: 400;line-height: 18px;">
+              雨刷: </span>
+            <Button style="margin-left:5px;" @click.native="controlClick(49)">开</Button>
+            <Button style="margin-left:5px;" @click.native="controlClick(48)">关</Button>
+          </div>
         </ElTabPane>
         <ElTabPane label="摄相机参数" name="second">摄相机参数</ElTabPane>
         <ElTabPane label="在线率统计" name="third">
-          <LineChart
-            v-if="activeName === 'third'"
-            :productId="dialogData.productId"
-            style="height: 180px"
-          />
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.productId" style="height: 180px" />
         </ElTabPane>
       </ElTabs>
 
@@ -39,10 +34,7 @@
       </div>
     </div>
 
-    <CameraControlDialog
-      :deviceId="dialogData.iotDeviceId"
-      v-model="controlDialogVisible"
-    />
+    <CameraControlDialog :deviceId="dialogData.iotDeviceId" v-model="controlDialogVisible" />
   </Dialog>
 </template>
 
@@ -58,6 +50,8 @@ import {
   getRoadInfoByStakeMark,
   getOrganizationName,
 } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { controlCamera } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { throttle } from "lodash"
 
 import { dialogDelayVisible } from "./../mixin";
 
@@ -108,12 +102,12 @@ export default {
           label: "设备状态",
           key: "deviceState",
           enum: "DeviceTypeEnum",
-          gridColumn: 2,
+          // gridColumn: 2,
         },
         {
           label: "状态更新时间",
           key: "updateTime",
-          gridColumn: 2,
+          // gridColumn: 2,
           // enum: "CameraDirectionEnum"
         },
         // {
@@ -137,6 +131,9 @@ export default {
     console.log(this.data, "this.data");
   },
   methods: {
+    controlClick: throttle(function (type) {
+      controlCamera(this.deviceId, type)
+    }, 150),
     visibleClose(bool) {
       if (bool) return;
 
@@ -199,7 +196,7 @@ export default {
     align-items: center;
     justify-content: end;
 
-    > div {
+    >div {
       font-size: 16px;
       padding: 6px 12px;
     }

From a16d2be4351a2e82dae02bdf36d26f76fa277571 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 21 Mar 2024 14:55:53 +0800
Subject: [PATCH 4/8] =?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       |  1 +
 .../event/plan/addAndEditDialog/index.vue     | 62 ++++++++++---------
 .../control/event/plan/formTable/index.vue    | 53 ++++++++--------
 .../src/views/JiHeExpressway/utils/enum.js    | 60 +++++++++---------
 4 files changed, 88 insertions(+), 88 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 78cf1f81..c8c55c04 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
@@ -297,6 +297,7 @@ export default {
           if (result.code != 200) return Message.error(result?.msg);
           let data = result.data;
           data.stringDirection = gzDirectionMapping[data.direction] || data.direction;
+          data.startTime = data?.occurrenceTime || '';
 
           data.videoList = [];
           if (data.otherConfig) {
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 97459bb7..f805d786 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
@@ -245,15 +245,17 @@ export default {
       })
 
     },
-    async loadData() {
-      if (this.deviceData.length <= 0) {
-        let result = await request({
-          url: `business/device/query?deviceType=2`,
-          method: "get",
-        })
-        if (result.code != 200) return Message.error(result?.msg);
+    async loadData(deviceType = 1) {
+      this.deviceData = [];
+      let result = await request({
+        url: `business/device/query?deviceType=${deviceType}`,
+        method: "get",
+      })
+      if (result.code != 200) return Message.error(result?.msg);
+      if (deviceType == 1) {
+        this.deviceData = result.data.filter(it => it.childType !== '1-1')
+      } else {
         this.deviceData = result.data;
-        // return result.data;
       }
       return this.deviceData;
     },
@@ -312,32 +314,32 @@ export default {
           // this.submitting = false;
           let secondFormTable = this.$refs['secondFormTable'].tableData || [];
           let thirdFormTable = this.$refs['thirdFormTable'].tableData || [];
-          let flg = false;
-          for (let item of secondFormTable) {
-            if (this.areAllValuesEmpty(item)) { flg = true; break };
-          }
-          if (flg) return Message.warning('执行操作子项不能为空！');
-          for (let item of thirdFormTable) {
-            if (this.areAllValuesEmpty(item)) { flg = true; break };
-          }
-          if (flg) return Message.warning('恢复操作子项不能为空！');
-          console.log('12', secondFormTable);
-          console.log('34', thirdFormTable);
+          // let flg = false;
+          // for (let item of secondFormTable) {
+          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
+          // }
+          // if (flg) return Message.warning('执行操作子项不能为空！');
+          // for (let item of thirdFormTable) {
+          //   if (this.areAllValuesEmpty(item)) { flg = true; break };
+          // }
+          // if (flg) return Message.warning('恢复操作子项不能为空！');
+          // console.log('12', secondFormTable);
+          // console.log('34', thirdFormTable);
           let dcArr = [];
-          // let id = '';
-          // if (this.dialogType == 2) id = this.planId;
-          // secondFormTable.forEach(it => {
-          //   dcArr.push(this.formatData(it, 1, id));
-          // })
-          // thirdFormTable.forEach(it => {
-          //   dcArr.push(this.formatData(it, 2, id));
-          // })
+          let id = '';
+          if (this.dialogType == 2) id = this.planId;
+          secondFormTable.forEach(it => {
+            dcArr.push(this.formatData(it, 1, id));
+          })
+          thirdFormTable.forEach(it => {
+            dcArr.push(this.formatData(it, 2, id));
+          })
 
           console.log({
             ...this.formData,
             dcExecuteAction: dcArr
           })
-          return;
+          // return;
           if (this.dialogType == 1) {//新增
             request({
               url: `/business/plans`,
@@ -385,7 +387,7 @@ export default {
 
     },
     areAllValuesEmpty(obj) {
-      console.log('ass',obj)
+      console.log('ass', obj)
       return Object.keys(obj).every(function (key) {
         const value = obj[key];
         return (
@@ -413,7 +415,7 @@ export default {
 
 .EventAddPlanDialog {
   gap: 9px;
-  width: 1080px;
+  width: 1280px;
   height: 310px;
   display: flex;
   flex-direction: column;
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 2137a2c7..5fd79f6e 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
@@ -11,7 +11,7 @@
                 </template>
             </ElTableColumn>
 
-            <ElTableColumn prop="searchRule" width="260">
+            <ElTableColumn prop="searchRule" width="230">
                 <template slot-scope="scope">
                     <div class="plhx">
                         <el-select v-model="scope.row.searchRule" placeholder="检索规则条件">
@@ -32,7 +32,7 @@
                 </template>
             </ElTableColumn>
 
-            <ElTableColumn prop="deviceList" width="370">
+            <ElTableColumn prop="deviceList" width="400">
                 <template slot-scope="scope">
                     <div class="mjs">
                         <el-select v-if="scope.row.searchRule == 1" v-model="scope.row.deviceList" placeholder="请选择设备"
@@ -50,23 +50,23 @@
                             <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 == 10" 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 == 12" class="mjs">
-                            <el-select v-model="scope.row.controlModel" placeholder="请选择控制模式">
-                                <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 == '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="工作状态">
-                                <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
-                                    :value="item.value"></el-option>
-                            </el-select>
-                        </div>
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.controlModel"
+                            placeholder="请选择模式">
+                            <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 == '01' && scope.row.deviceType == 12"
+                            v-model="scope.row.time" is-range style="" range-separator="-" placeholder="选择时间"
+                            value-format="HH:mm" format="HH:mm">
+                        </el-time-picker>
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.state" placeholder="工作状态">
+                            <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
+                                :value="item.value"></el-option>
+                        </el-select>
 
                         <el-input v-if="scope.row.deviceType == 5" v-model="scope.row.content"
                             placeholder="请输入发布内容"></el-input>
@@ -220,7 +220,7 @@ export default {
         }
     },
     async created() {
-        let loadData = await this.loadData();
+        let loadData = await this.loadData(1);
         // console.log('aa',loadData)
         this.sbOptions = loadData;
     },
@@ -238,17 +238,10 @@ export default {
             // })
 
         },
-        changeDeviceType(value) {
+        async changeDeviceType(value) {
             this.deviceType = value;
-            // if(value == 1){
-            //     this.searchRule = 1
-            // }else if(value == 2){
-            //     this.searchRule = 1
-            // }else if(value == 3){
-            //     this.searchRule = 1
-            // }else if(value == 4){
-            //     this.searchRule = 1
-            // }
+            console.log('value', value)
+            this.sbOptions = await this.loadData(value);
         },
         onAdd(id) {
             this.tableData.push({
@@ -303,6 +296,10 @@ export default {
         }
     }
 
+    .ms {
+        width: 160px;
+    }
+
     .plhx {
         display: flex;
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 6823f1d1..bfd5c63c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -847,15 +847,15 @@ export const gzmsMap = {
 export const planDeviceMap = {
   1: "摄像机",
   2: "可变信息标志",
-  3: "气象监测器",
-  4: "出口诱导灯",
+  // 3: "气象监测器",
+  // 4: "出口诱导灯",
   5: "路段语音广播",
-  6: "护栏碰撞",
-  7: "毫米波雷达",
+  // 6: "护栏碰撞",
+  // 7: "毫米波雷达",
   8: "合流区预警",
-  9: "智慧锥桶",
+  // 9: "智慧锥桶",
   10: "激光疲劳唤醒",
-  11: "类交通量调查站",
+  // 11: "一类交通量调查站",
   12: "行车诱导",
   13: "智能设备箱",
   14: "光线在线监测",
@@ -870,42 +870,42 @@ export const planDeviceOptions = [
     value: 2,
     label: "可变信息标志",
   },
-  {
-    value: 3,
-    label: "气象监测器",
-  },
-  {
-    value: 4,
-    label: "出口诱导灯",
-  },
+  // {
+  //   value: 3,
+  //   label: "气象监测器",
+  // },
+  // {
+  //   value: 4,
+  //   label: "出口诱导灯",
+  // },
   {
     value: 5,
     label: "路段语音广播",
   },
-  {
-    value: 6,
-    label: "护栏碰撞",
-  },
-  {
-    value: 7,
-    label: "毫米波雷达",
-  },
+  // {
+  //   value: 6,
+  //   label: "护栏碰撞",
+  // },
+  // {
+  //   value: 7,
+  //   label: "毫米波雷达",
+  // },
   {
     value: 8,
     label: "合流区预警",
   },
-  {
-    value: 9,
-    label: "智慧锥桶",
-  },
+  // {
+  //   value: 9,
+  //   label: "智慧锥桶",
+  // },
   {
     value: 10,
     label: "激光疲劳唤醒",
   },
-  {
-    value: 11,
-    label: "类交通量调查站",
-  },
+  // {
+  //   value: 11,
+  //   label: "一类交通量调查站",
+  // },
   {
     value: 12,
     label: "行车诱导",

From e1ac03026232eed184e680f66e91fb92254750e4 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 17:00:50 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat=20=E6=91=84=E5=83=8F=E5=A4=B4=20?=
 =?UTF-8?q?=E5=85=A8=E6=99=AF=E7=9B=B8=E6=9C=BA=E6=97=A0=E9=9B=A8=E5=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/Camera/index.vue           | 5 ++++-
 ruoyi-ui/src/views/JiHeExpressway/utils/enum.js              | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
index 2dba6497..d3925f33 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
@@ -14,7 +14,8 @@
     " src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer" />
             </template>
           </Descriptions>
-          <div style="width:50%;display:flex;margin-top:18px">
+          <div v-if="PanoramicCameraTypes.indexOf(dialogData.childType) == -1"
+            style="width:50%;display:flex;margin-top:18px">
             <span
               style="color: #3de8ff;font-size: 15px;font-family: PingFang SC, PingFang SC;font-weight: 400;line-height: 18px;">
               雨刷: </span>
@@ -45,6 +46,7 @@ import Video from "@screen/components/Video";
 import Descriptions from "@screen/components/Descriptions.vue";
 import CameraControlDialog from "./components/CameraControlDialog.vue";
 import LineChart from "../../LineChart/index.vue";
+import { PanoramicCameraTypes } from "@screen/utils/enum.js";
 
 import {
   getRoadInfoByStakeMark,
@@ -69,6 +71,7 @@ export default {
   },
   data() {
     return {
+      PanoramicCameraTypes,
       activeName: "first",
       controlDialogVisible: false,
       data: {},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index 6823f1d1..bb19b734 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -984,6 +984,7 @@ const BoardChildTypes = {
   "2-3": "雨棚可变信息标志",
   "2-4": "站前悬臂式可变信息标志",
 };
+export const PanoramicCameraTypes = Object.keys(CameraChildTypes).slice(3, 5);
 
 export const ChildTypes = {
   1: CameraChildTypes,

From 9587314306271449486dec8437db8e365ab489e9 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 17:01:24 +0800
Subject: [PATCH 6/8] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/pages/control/event/event/index.vue      | 6 +++---
 1 file changed, 3 insertions(+), 3 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 78cf1f81..78dd8cd9 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
@@ -161,7 +161,7 @@ export default {
     getData() {
       if (this.activeName === '-1') {
         request({
-          url: `/perceivedEvents/warning/perceivedEventsList`,
+          url: `/perceivedEvents/warning/perceivedEventsList`,//感知事件
           method: "post",
           params: { pageNum: this.searchData.pageNum, pageSize: this.searchData.pageSize },
           data: { ...this.searchData, warningState: 1 }
@@ -255,9 +255,9 @@ export default {
     },
     firstBtnClick(id) {
       console.log("id", id);
-      if (this.activeName == '-1') {
+      if (this.activeName == '-1') { //除了 感知事件外的 事件专题 均须处理
         request({
-          url: `/perceivedEvents/warning/getWarningById`,
+          url: `/perceivedEvents/warning/getWarningById`,//感知事件
           method: "post",
           data: { id }
         }).then((result) => {

From 42842f62334d5defc8de990b613429809478e4f3 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Thu, 21 Mar 2024 17:56:13 +0800
Subject: [PATCH 7/8] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/Broadcast/components/BroadcastReleases.vue          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 1aa3a6e0..e02c9b03 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -8,7 +8,7 @@
             id="otherConfig" label="deviceName">
             <template #[otherConfig]="{ data }">
               <span style="color: #6EE5FE;">
-                {{ data.deviceName }}(当前设备)
+                {{ data.deviceName }}(当前)
               </span>
             </template>
           </CheckboxGroup>

From 49242b9face6bbba4600e77c78cfa6ba70a60846 Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Thu, 21 Mar 2024 17:59:40 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eventPlanDialog/index.vue                 | 128 ++++---
 .../EventDetailDialog/formTable/index.vue     | 336 ++++++++++++++++++
 .../event/event/EventDetailDialog/index.vue   |   3 +-
 .../EventDetailDialog/qbbDialog/index.vue     | 308 ++++++++++++++++
 4 files changed, 728 insertions(+), 47 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue

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 d65be481..9812d198 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
@@ -13,7 +13,7 @@
                         <div class="text">联动设备:</div>
                     </el-col>
                     <el-col :span="22">
-                        <FormTable ref="secondFormTable" :tableData="secondFormData"></FormTable>
+                        <FormTable ref="secondFormTable" :tableData="secondFormData" :type="1"></FormTable>
                     </el-col>
                 </el-row>
             </div>
@@ -23,14 +23,16 @@
                         <div class="text">恢复操作:</div>
                     </el-col>
                     <el-col :span="22">
-                        <FormTable ref="thirdFormTable" :tableData="thirdFormData"></FormTable>
+                        <FormTable ref="thirdFormTable" :tableData="thirdFormData" :type="2"></FormTable>
                     </el-col>
                 </el-row>
             </div>
         </div>
 
         <template #footer>
-            <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">强制恢复</Button>
+            <Button v-if="isDisBtn" style="padding:0 24px;  pointer-events: none; background-color: #C9C9C9;"
+                @click.native="handleRestore" :loading="submitting">强制恢复</Button>
+            <Button v-else style="padding:0 24px;" @click.native="handleRestore" :loading="submitting">强制恢复</Button>
             <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">确认</Button>
             <Button style="background: #C9C9C9;padding:0 24px;"
                 @click.native="modelVisible = false, submitting = false">取消</Button>
@@ -40,12 +42,11 @@
 
 <script>
 import Dialog from "@screen/components/Dialog/index";
-import FormTable from '../../../plan/formTable/index.vue';
+import FormTable from '../formTable/index.vue';
 import Button from '@screen/components/Buttons/Button.vue';
 import request from '@/utils/request';
 import { Message } from "element-ui";
 import { throttle } from "lodash"
-import { isDate } from 'mathjs';
 
 
 export default {
@@ -66,17 +67,23 @@ export default {
     },
     props: {
         visible: Boolean,
+        activeName: String,
         info: {
             type: Array,
             default: () => []
+        },
+        eventFormData: {
+            type: Object,
+            default: () => { }
         }
     },
     data() {
         return {
             title: '事件确认',
+            isDisBtn: true,
             dialogType: 1,
             planId: 0,
-            plans: [],
+            planInfo: {},
             submitting: false,
             secondFormData: [{
                 deviceType: 1,
@@ -186,6 +193,7 @@ export default {
                 if (this.visible) {
                     if (this.info.length > 0) {
                         this.planName = this.info[0]?.planName || '';
+                        this.planInfo = this.info[0];
                         this.initData(this.info[0]);
                     }
                 }
@@ -243,10 +251,21 @@ export default {
             }
             return this.deviceData;
         },
+        async getTemplateAutomatic() {
+            request({
+                url: `/business/plans/event/automatic`,
+                method: "post",
+            }).then((result) => {
+                if (result.code != 200) return Message.error(result?.msg);
+                this.sbOptions = result.data;
+
+            }).catch(() => {
+                Message.error("查询可变信息标识失败");
+            })
+        },
         changeRadio(value) {
-            console.log('va', value)
             let plan = this.info.find(it => it.planName == value);
-            console.log('plan', plan)
+            this.planInfo = plan;
             this.initData(plan);
         },
         formatData(it, value = 1) {
@@ -289,47 +308,53 @@ export default {
         },
         handleSubmit() {
             // this.submitting = false;
-            let secondFormTable = this.$refs['secondFormTable'].tableData || [];
-            let thirdFormTable = this.$refs['thirdFormTable'].tableData || [];
-            console.log('12', thirdFormTable);
-            let dcArr = [];
-            let id = '';
-            if (this.dialogType == 2) id = this.planId;
-            secondFormTable.forEach(it => {
-                dcArr.push(this.formatData(it, 1, id));
-            })
-            thirdFormTable.forEach(it => {
-                dcArr.push(this.formatData(it, 2, id));
-            })
 
-            console.log({
-                dcExecuteAction: dcArr
-            })
-            return;
-            if (this.dialogType == 1) {//新增
+            // let secondFormTable = this.$refs['secondFormTable'].tableData || [];
+            // let thirdFormTable = this.$refs['thirdFormTable'].tableData || [];
+            // console.log('12', thirdFormTable);
+            // let dcArr = [];
+            // let id = '';
+            // if (this.dialogType == 2) id = this.planId;
+            // secondFormTable.forEach(it => {
+            //     dcArr.push(this.formatData(it, 1, id));
+            // })
+            // thirdFormTable.forEach(it => {
+            //     dcArr.push(this.formatData(it, 2, id));
+            // })
 
-            } else if (this.dialogType == 2) {//修改
-                // request({
-                //     url: `/business/plans`,
-                //     method: "put",
-                //     data: {
-                //         ...this.formData,
-                //         id: this.planId,
-                //         dcExecuteAction: dcArr
-                //     }
-                // }).then((result) => {
-                //     if (result.code != 200) return Message.error(result?.msg);
-                //     Message.success("提交成功");
-                //     this.modelVisible = false;
-                // }).catch(() => {
-                //     Message.error("提交失败");
-                // }).finally(() => {
-                //     this.submitting = false;
-                //     this.$emit('reInitData', true);
-                // })
+            let reqData = {
+                operationType: 1,//1-执行操作 2-恢复操作
+                dcEmergencyPlans: this.planInfo,
+                dcEvent: this.eventFormData
+            };
+
+            // let url = '';
+            // if (this.activeName == '-1') {//感知
+            //     url = '/business/plans/event/confirm';
+            //     reqData = { ...reqData, dcWarning: { ...reqData.dcEvent } }
+            // } else {//交通
+            //     url = '/business/plans/event/confirm';
+            // }
+            console.log('reqData', reqData)
+            return;
+            request({
+                url: url,
+                method: "post",
+                data: reqData
+            }).then((result) => {
+                if (result.code != 200) return Message.error(result?.msg);
+                Message.success("提交成功");
+                this.modelVisible = false;
+            }).catch(() => {
+                Message.error("提交失败");
+            }).finally(() => {
+                this.submitting = false;
+                // this.$emit('reInitData', true);
+            })
 
-            }
 
+        },
+        handleRestore() {
 
         }
     }
@@ -349,7 +374,7 @@ export default {
 
 .EventAddPlanDialog {
     gap: 9px;
-    width: 1080px;
+    width: 1280px;
     height: 310px;
     display: flex;
     flex-direction: column;
@@ -376,5 +401,16 @@ export default {
         justify-content: end;
         gap: 15px;
     }
+
+    // .disabledBtn {
+    //     height: 24px;
+    //     border-radius: 48px;
+    //     background: #C9C9C9;
+    //     padding: 0 24px;
+    //     color: white !important;
+    //     display: flex;
+    //     align-items: center;
+    //     justify-content: center;
+    // }
 }
 </style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue
new file mode 100644
index 00000000..c71effe3
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/formTable/index.vue
@@ -0,0 +1,336 @@
+<template>
+    <div class="EventDetail">
+        <Table :data="tableData" :show-header="false">
+            <ElTableColumn prop="deviceType" width="160">
+                <template slot-scope="scope">
+                    <el-select v-model="scope.row.deviceType" placeholder="请选择设备类型" @change="changeDeviceType">
+                        <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="searchRule" width="230">
+                <template slot-scope="scope">
+                    <div class="plhx">
+                        <el-select v-model="scope.row.searchRule" placeholder="检索规则条件">
+                            <el-option v-for="item in zyOptions" :key="item.value" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+
+                        <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 == 4" v-model="scope.row.number" :min="0"
+                            :max="9999" style="width: 130px;"></el-input-number>
+                        <p v-if="scope.row.searchRule == 4" style="width: 56px;">公里</p>
+                    </div>
+
+                </template>
+            </ElTableColumn>
+
+            <ElTableColumn prop="deviceList" width="400">
+                <template slot-scope="scope">
+                    <div class="mjs">
+                        <el-select v-if="scope.row.searchRule == 1" v-model="scope.row.deviceList" placeholder="请选择设备"
+                            multiple collapse-tags>
+                            <el-option v-for="item in sbOptions" :key="item.id" :label="item.deviceName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                        <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 == 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 == 10" placeholder="时长(分钟)"
+                            v-model="scope.row.operationDuration" :min="0" :max="999"></el-input-number>
+
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.controlModel"
+                            placeholder="请选择模式">
+                            <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 == '01' && scope.row.deviceType == 12"
+                            v-model="scope.row.time" is-range style="" range-separator="-" placeholder="选择时间"
+                            value-format="HH:mm" format="HH:mm">
+                        </el-time-picker>
+                        <el-select v-if="scope.row.deviceType == 12" v-model="scope.row.state" placeholder="工作状态">
+                            <el-option v-for="item in gzztOptions" :key="item.value" :label="item.label"
+                                :value="item.value"></el-option>
+                        </el-select>
+
+                        <el-input v-if="scope.row.deviceType == 5" v-model="scope.row.content"
+                            placeholder="请输入发布内容"></el-input>
+
+                    </div>
+                </template>
+            </ElTableColumn>
+
+
+            <ElTableColumn label="操作" width="100">
+                <template slot-scope="scope">
+                    <ElButton class="elButton" icon="el-icon-plus" plain size="mini"
+                        @click.native="onAdd(scope.row.id)" />
+                    <ElButton class="elButton" icon="el-icon-delete" plain size="mini"
+                        @click.native="onDel(scope.$index)" />
+                </template>
+            </ElTableColumn>
+        </Table>
+
+        <!-- 情报板弹窗 -->
+        <QbbDialog :visible="isShowDialog" :info="qbbData" :type="type" @close="onCloseDialog" @dialogSubmit="dialogSubmit" />
+    </div>
+</template>
+
+<script>
+import Table from '@screen/components/Table.vue';
+import Button from '@screen/components/Buttons/Button.vue';
+import request from "@/utils/request";
+import QbbDialog from "../qbbDialog/index.vue";
+import { Message } from 'element-ui'
+import { planDeviceOptions } from "@screen/utils/enum.js";
+
+
+export default {
+    name: 'formTable',
+    components: {
+        Button,
+        Table,
+        QbbDialog
+    },
+    model: {
+        prop: 'visible',
+        event: 'update:value'
+    },
+    inject: ['loadData'],
+    props: {
+        visible: Boolean,
+        eventType: Number,
+        type: Number,
+        tableData: {
+            type: Array,
+            default: () => [{
+                deviceType: 1,
+                searchRule: 1,
+                qbb: ''
+            }]
+        }
+    },
+    data() {
+        return {
+            // tableData: [
+            //     {
+            //         deviceType: 1,
+            //         searchRule: 1,
+            //         qbb: '安全行驶'
+            //     }
+            // ],
+            isShowDialog: false,
+            deviceOptions: planDeviceOptions,
+            zyOptions: [
+                {
+                    value: 1,
+                    label: '指定设备资源'
+                },
+                {
+                    value: 2,
+                    label: '事发上游最近'
+                },
+                {
+                    value: 3,
+                    label: '事发下游最近'
+                },
+                {
+                    value: 4,
+                    label: '最近公里数'
+                },
+            ],
+            gzztOptions: [
+                {
+                    value: "01",
+                    label: "常亮"
+                },
+                {
+                    value: "02",
+                    label: "流水"
+                },
+                {
+                    value: "03",
+                    label: "闪烁"
+                },
+                {
+                    value: "04",
+                    label: "关闭",
+                }
+            ],
+            gzmsOptions: [
+                {
+                    value: "SETMD0",
+                    label: "激光关闭"
+                },
+                {
+                    value: "SETMD1",
+                    label: "常亮模式"
+                },
+                {
+                    value: "SETMD2",
+                    label: "间隔100ms闪烁模式"
+                },
+                {
+                    value: "SETMD3",
+                    label: "间隔200ms闪烁模式",
+                },
+                {
+                    value: "SETMD4",
+                    label: "间隔500ms闪烁模式",
+                },
+                {
+                    value: "SETMD5",
+                    label: "2次闪烁模式"
+                },
+                {
+                    value: "SETMD6",
+                    label: "SOS模式"
+                },
+                {
+                    value: "SETMD7",
+                    label: "自定义模式1",
+                },
+                {
+                    value: "SETMD8",
+                    label: "自定义模式2",
+                },
+                {
+                    value: "SETMD9",
+                    label: "自定义模式3",
+                }
+            ],
+            qbbData: {},
+            sbOptions: [],
+            deviceType: 1,
+            index: 1
+        }
+    },
+    async created() {
+        let loadData = await this.loadData(1);
+        // console.log('aa',loadData)
+        this.sbOptions = loadData;
+    },
+    methods: {
+        initData() {
+            // request({
+            //     url: `business/device/query?deviceType=2`,
+            //     method: "get",
+            // }).then((result) => {
+            //     if (result.code != 200) return Message.error(result?.msg);
+            //     this.sbOptions = result.data;
+
+            // }).catch(() => {
+            //     Message.error("查询可变信息标识失败");
+            // })
+
+        },
+        async changeDeviceType(value) {
+            this.deviceType = value;
+            console.log('value', value)
+            this.sbOptions = await this.loadData(value);
+        },
+        onAdd(id) {
+            this.tableData.push({
+                deviceType: 1,
+                searchRule: 1,
+                qbb: ''
+            })
+        },
+        onDel(index) {
+            if (this.tableData.length <= 1) {
+                return Message.warning('最后一项不可删除！');
+            }
+            this.tableData.splice(index, 1)
+        },
+        clickQbb(index) {
+            this.index = index;
+            this.qbbData = this.tableData[index].dcInfoBoardTemplate;
+            if (this.type == 1) {
+                this.isShowDialog = true;
+            }
+        },
+        onCloseDialog() {
+            this.isShowDialog = false;
+        },
+        dialogSubmit(data) {
+            this.tableData[this.index].qbb = data.content;
+            this.tableData[this.index].otherConfig = JSON.stringify(data);
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.EventDetail {
+    display: flex;
+    gap: 9px;
+    width: 100%;
+    // height: 768px;
+    min-height: 50px;
+    margin-top: 5px;
+    flex-direction: column;
+
+    ::v-deep {
+        .el-table .el-table__cell {
+            padding: 0 5px;
+        }
+    }
+
+    .mjs {
+        display: flex;
+
+        >div {
+            margin-right: 10px;
+        }
+    }
+
+    .ms {
+        width: 160px;
+    }
+
+    .plhx {
+        display: flex;
+    }
+
+    ::v-deep {
+        .el-tag.el-tag--info {
+            max-width: 100px;
+        }
+
+        .el-range-editor--medium .el-range__icon,
+        .el-range-editor--medium .el-range__close-icon {
+            display: none;
+        }
+    }
+
+}
+
+.elButton {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    color: #FFFFFF;
+}
+
+.elButton:hover,
+.elButton:focus {
+    background: #2ba8c3;
+    border-radius: 2px 2px 2px 2px;
+    border-color: #FFFFFF;
+    color: #FFFFFF;
+}
+</style>
\ No newline at end of file
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 9ef9e2b3..f3355d78 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,8 @@
     </div>
 
     <!-- 确认弹窗 -->
-    <EventPlanDialog :visible="isShowDialog" :info="info" @close="onCloseAddNew" />
+    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
+      @close="onCloseAddNew" />
 
     <template #footer>
       <Button style="padding: 0 24px;" @click.native="onDelete">误报</Button>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue
new file mode 100644
index 00000000..78e2c569
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/qbbDialog/index.vue
@@ -0,0 +1,308 @@
+<template>
+    <Dialog v-model="modelVisible" title="情报板确认">
+        <div class="EventAddPlanDialog">
+            <h4>预案内容</h4>
+            <dev class="listBox disPid">
+                <div class="tplItem">
+                    <!-- 模板内容 -->
+                    <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="{}"></BoardTplPreview>
+                    <!-- 操作按钮 -->
+                    <div class="infoBtnBox infoBtnBoxSm">
+                        <p class="btn">
+                            <!-- <el-radio v-model="radio1" :label="1" @input="changeRadio(1)" /> -->
+                        </p>
+                    </div>
+                </div>
+            </dev>
+            <h4>自动生成</h4>
+            <dev class="listBox disPid">
+                <div class="tplItem">
+                    <!-- 模板内容 -->
+                    <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="{}"></BoardTplPreview>
+                    <!-- 操作按钮 -->
+                    <div class="infoBtnBox infoBtnBoxSm">
+                        <p class="btn">
+                            <!-- <el-radio v-model="radio1" :label="2" @input="changeRadio(2)" /> -->
+                        </p>
+                    </div>
+                </div>
+            </dev>
+            <h4>情报板模版</h4>
+            <vuescroll :ops="scrollOptions" class="listBox">
+                <div v-for="(item) in templateAvailable" :key="item.dictValue">
+                    <!-- 原来是<el-collapse v-model="activeNames"> -->
+                    <h5>{{ item.dictLabel }}</h5>
+                    <div v-for="(itm, indx) in item.list" :key="indx" class="tplItem">
+                        <!-- 模板内容 -->
+                        <BoardTplPreview class="boardPreview" boardWH="1400*200" :tpl="itm"></BoardTplPreview>
+                        <!-- 操作按钮 -->
+                        <div class="infoBtnBox infoBtnBoxSm">
+                            <p class="btn">
+                                <el-radio v-model="radio1" :label="itm.id" @input="changeRadio(itm)" />
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </vuescroll>
+        </div>
+        <template #footer>
+            <Button style="background: #C9C9C9;padding:0 24px;"
+                @click.native="modelVisible = false, submitting = false">取消</Button>
+            <Button style="padding:0 24px;" @click.native="handleSubmit" :loading="submitting">确认</Button>
+        </template>
+    </Dialog>
+</template>
+
+<script>
+import vuescroll from "vuescroll";
+import scrollOptions from "@/common/scrollbar.js";
+import BoardTplPreview from "@screen/components/infoBoard/BoardTplPreview.vue";
+import Dialog from "@screen/components/Dialog/index";
+import Button from '@screen/components/Buttons/Button.vue';
+import { getTemplateList } from "@/api/board/template";
+import DeviceControlDialog from '../../../../../Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue';
+
+export default {
+    name: 'qbbDialog',
+    components: {
+        Dialog,
+        Button,
+        vuescroll,
+        BoardTplPreview,
+        DeviceControlDialog
+    },
+    model: {
+        prop: 'visible',
+        event: 'close'
+    },
+    props: {
+        visible: Boolean,
+        type: Number,
+        info: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    data() {
+        return {
+            submitting: false,
+            selectedSize: "",
+            scrollOptions,
+            templateAvailable: null,
+            tplCategory: [],
+            templateAll: [],
+            radio1: '',
+            itmData: {}
+        }
+    },
+    mounted() {
+        if (this.type == 1) {
+            this.initData();
+        }
+    },
+    computed: {
+        modelVisible: {
+            get() {
+                if (this.visible) {
+                    if (this.info && this.info.id) {
+                        this.radio1 = Number(this.info.id);
+                    }
+                }
+                return this.visible;
+            },
+            set(val) {
+                this.$emit('close', val)
+            }
+        },
+    },
+    methods: {
+        initData() {
+            if (this.tplCategory.length && this.templateAll.length) {
+                this.____setAvailableTemplate();
+            } else {
+                Promise.all([
+                    this.____getTemplateCategory(),
+                    this.____getAllTemplate(),
+                ]).then((res) => {
+                    this.____setAvailableTemplate();
+                });
+            }
+
+        },
+        // 获取信息模板分类
+        ____getTemplateCategory() {
+            return this.getDicts("iot_template_category").then((res) => {
+                this.tplCategory = res.data;
+            });
+        },
+        //获取全部模版
+        ____getAllTemplate() {
+            return getTemplateList().then((res) => {
+                this.templateAll = res.data;
+            });
+        },
+        // 设置当前设备可用的模板
+        ____setAvailableTemplate() {
+            this.templateAvailable = [];
+            this.tplCategory.forEach((item, index) => {
+                let arr = this.templateAll["" + index];
+                if (arr.length > 0) {
+                    let temp = [];
+                    arr.forEach((tpl) => {
+                        if (tpl.screenSize) {
+                            temp.push(tpl);
+                        }
+                    });
+                    if (temp.length > 0) {
+                        this.templateAvailable.push({
+                            ...item,
+                            list: temp,
+                        });
+                    }
+                }
+            });
+        },
+        changeRadio(data) {
+            this.itmData = data;
+        },
+        handleSubmit() {
+            this.modelVisible = false;
+            this.$emit('dialogSubmit', this.itmData);
+        }
+
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.listBox {
+    padding: 20px;
+
+    .tplItem {
+        margin-right: 14px;
+        display: flex;
+        align-items: stretch;
+        padding-bottom: 10px;
+
+        .boardPreview {
+            border: 1px solid rgba(61, 232, 255, 0.5);
+            // width: 560px;
+            // height:80px;
+            flex: 1;
+        }
+
+        .infoBtnBox {
+            &.infoBtnBoxSm {
+                width: 60px;
+            }
+
+            width: 110px;
+            height: 80px;
+            display: flex;
+            margin-left: 10px;
+            /* // border: solid 1px #05afe3; */
+            border: 1px solid rgba(61, 232, 255, 0.5);
+            display: flex;
+            justify-content: space-around;
+            align-items: center;
+
+            .btn {
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+                width: 15px;
+                height: 30px;
+
+                &.btnApply {
+                    background-image: url(~@/assets/jihe/images/button/toLeft.svg);
+                }
+
+                &.btnEdit {
+                    background-image: url(~@/assets/jihe/images/button/edit.svg);
+                }
+
+                &.btnDelete {
+                    background-image: url(~@/assets/jihe/images/button/delete.svg);
+                }
+            }
+
+            i {
+                font-size: 24px;
+                color: #666;
+                padding-left: 4px;
+                cursor: pointer;
+                caret-color: rgba(0, 0, 0, 0);
+                user-select: none;
+            }
+
+            i:hover {
+                color: #05afe3;
+            }
+
+            .disabledClass {
+                pointer-events: none;
+                cursor: auto !important;
+                color: #ccc;
+            }
+        }
+    }
+
+    .controlBox {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        display: flex;
+        justify-content: center;
+    }
+
+    .el-collapse {
+        max-height: 100% !important;
+        overflow: auto;
+        border-bottom: none;
+        border-top: none;
+        padding: 0 0.5vw;
+    }
+}
+
+.disPid {
+    padding: 0 20px !important;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+    transition: opacity .24s;
+}
+
+.fade-enter,
+.fade-leave-to {
+    opacity: 0;
+}
+
+.EventAddPlanDialog {
+    gap: 9px;
+    width: 650px;
+    height: 700px;
+    display: flex;
+    flex-direction: column;
+
+    h4 {
+        margin: 0 0 5px 0;
+    }
+
+    ::v-deep {
+        .el-radio__label {
+            display: none;
+        }
+    }
+
+    .form {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    .footer {
+        display: flex;
+        justify-content: end;
+        gap: 15px;
+    }
+}
+</style>
\ No newline at end of file