From 0a89f6cb2005d7fafcbc251f4140f27ba9b201a5 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 09:43:21 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=20=E5=9B=BE=E6=A0=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index c83ffcbf..d7f43c81 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -29,6 +29,7 @@ export const DeviceForMap = {
          * 1 枪机 不可控
          */
         const type = JSON.parse(item.otherConfig || "{}")?.ptzCtrl || 1;
+
         return cameraIcon[`${type}${+!bool}`];
       },
     },
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 524388bf..bbfe02d6 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
@@ -97,7 +97,7 @@ export class MarkerCluster {
 
     const deviceIcon =
       typeof config.iconCallback === "function" &&
-      config.iconCallback(currentState, config.item);
+      config.iconCallback(currentState, extData, config.item);
 
     return deviceIcon ? deviceIcon : currentState ? normal : fault;
   }
@@ -179,7 +179,7 @@ export class MarkerCluster {
       border: 1px solid rgba(42,217,253,0.6);
     ">
       <div style="height: 26px; width: 100%; display: flex;align-items: center; justify-content: space-between; padding: 0 15px; background: linear-gradient(90deg, #237E9B 0%, rgba(23,145,184,0) 100%);">
-        <span>重复</span>
+        <span>重叠</span>
         <img class="info-close" style="width: 12px;cursor: pointer;" src="${require("@screen/images/dialog/icon-close.svg")}" />
       </div>
       <div style="padding: 15px 9px;flex: 1; overflow: auto;" class="info-window-content">

From 1834f195a6cf25596ea2e919c09ccc13d282f289 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 09:49:55 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoadAndEvents/utils/buttonEvent.js        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index d7f43c81..af0471fb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -50,6 +50,27 @@ export const DeviceForMap = {
     deviceType: "13",
     dialog: "SmartDevice",
   },
+  交调: {
+    deviceType: "11",
+  },
+  合流区: {
+    deviceType: "8",
+  },
+  护栏碰撞: {
+    deviceType: "6",
+  },
+  智慧锥桶: {
+    deviceType: "9",
+  },
+  毫米波雷达: {
+    deviceType: "7",
+  },
+  气象检测器: {
+    deviceType: "3",
+  },
+  疲劳唤醒: {
+    deviceType: "10",
+  },
 };
 
 export function getHandleDeviceType(item) {

From d76c1aaac6a9bc250067f86046bdbf02e0ae7725 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 10:11:04 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E4=BA=A4=E8=B0=83=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6=E8=BD=A6?=
 =?UTF-8?q?=E8=BE=86=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/LineChart/chart.js             | 102 ++++++++++
 .../components/LineChart/index.vue            |  23 +++
 .../components/LineChartForTraffic/chart.js   | 110 ++++++++++
 .../components/LineChartForTraffic/index.vue  |  23 +++
 .../Dialogs/Intermodulation/index.vue         | 188 ++++++++++++++++++
 .../Dialogs/PerceiveEvent/index.vue           |  19 +-
 .../Home/components/RoadAndEvents/index.vue   |   2 +
 .../RoadAndEvents/utils/buttonEvent.js        |   1 +
 8 files changed, 458 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js
new file mode 100644
index 00000000..b8fb844a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/chart.js
@@ -0,0 +1,102 @@
+import * as echarts from "echarts";
+
+export const lineChartOption = {
+  color: ["#2AD9FD"],
+  xAxis: {
+    name: "日",
+    type: "category",
+    // boundaryGap: ["15%", "15%"],
+    nameTextStyle: {
+      color: "#2AD9FD",
+      align: "right",
+      fontSize: 15,
+      padding: [0, -15, 0, 0],
+    },
+    boundaryGap: false,
+    data: ["1", "5", "10", "15", "20", "25", "30"],
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+    },
+    axisLine: {
+      lineStyle: {
+        color: "#668598",
+      },
+    },
+  },
+  grid: {
+    left: 51,
+    top: 15,
+    bottom: 24,
+    right: 36,
+  },
+  tooltip: {
+    trigger: "axis",
+    backgroundColor: "rgba(0,0,0,0.36)",
+    borderWidth: 0,
+    textStyle: {
+      color: "#fff",
+    },
+    formatter: "{b}：{c}",
+    // formatter: function([axisData]) {
+    //   console.log(axisData)
+    //     let str = axisData.name + ' ' + axisData.data + '辆</br>';
+    //     // params.forEach(item => {
+    //     //     if (item.seriesName === '供温' || item.seriesName === '回温') {
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '</br>';
+    //     //     } else if (item.seriesName === '压力值(Mpa)') {
+    //     //         // 柱状图渐变时设置marker
+    //     //         item.marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#6C50F3;"></span>';
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' m';
+    //     //     }
+    //     // });
+    //     return str;
+    // }
+  },
+  yAxis: {
+    max: 100,
+    type: "value",
+    // nameGap: 24,
+    splitLine: {
+      lineStyle: {
+        type: [6, 9],
+        color: "rgba(255,255,255, .3)",
+        // dashOffset: [10, 10],
+        // cap: 21,
+        // width: 2
+      },
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+      formatter: "{value} %",
+    },
+  },
+  series: [
+    {
+      data: [0, 90, 65, 90, 45, 36, 27],
+      type: "line",
+      showSymbol: false,
+      smooth: true,
+      lineStyle: {
+        color: "#2AD9FD",
+      },
+      areaStyle: {
+        opacity: 0.8,
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgb(90, 227, 255, .9)",
+          },
+          {
+            offset: 1,
+            color: "rgba(42,217,253,0)",
+          },
+        ]),
+      },
+    },
+  ],
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue
new file mode 100644
index 00000000..31d73d94
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChart/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class='chart LineChart' ref="LineChartRef" />
+</template>
+
+<script>
+import * as echarts from "echarts";
+import { lineChartOption } from "./chart"
+
+export default {
+  name: 'LineChart',
+  mounted() {
+    const chartIns = echarts.init(this.$refs.LineChartRef);
+    chartIns.setOption(lineChartOption);
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.LineChart {
+  flex: 1;
+  height: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
new file mode 100644
index 00000000..a9c61988
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
@@ -0,0 +1,110 @@
+import * as echarts from "echarts";
+
+export const lineChartOption = {
+  color: ["#2AD9FD"],
+  xAxis: {
+    name: "时",
+    type: "category",
+    // boundaryGap: ["15%", "15%"],
+    nameTextStyle: {
+      color: "#2AD9FD",
+      align: "right",
+      fontSize: 15,
+      padding: [0, -15, 0, 0],
+    },
+    boundaryGap: false,
+    data: ["0", "2", "4", "6", "8", "10", "12", "14", "16", "18", "20", "22"],
+    axisTick: {
+      show: false,
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+    },
+    axisLine: {
+      lineStyle: {
+        color: "#668598",
+      },
+    },
+  },
+
+  yAxis: {
+    max: 1,
+    name: "辆",
+    type: "value",
+    nameTextStyle: {
+      color: "#2AD9FD",
+      // align: "right",
+      fontSize: 15,
+      // padding: [0, -15, 0, 0],
+    },
+    // nameGap: 24,
+    splitLine: {
+      lineStyle: {
+        type: [6, 9],
+        color: "rgba(255,255,255, .3)",
+        // dashOffset: [10, 10],
+        // cap: 21,
+        // width: 2
+      },
+    },
+    axisLabel: {
+      color: "#fff",
+      fontSize: 12,
+      formatter: "{value}",
+    },
+  },
+  grid: {
+    left: 51,
+    top: 33,
+    bottom: 24,
+    right: 36,
+  },
+  tooltip: {
+    trigger: "axis",
+    backgroundColor: "rgba(0,0,0,0.36)",
+    borderWidth: 0,
+    textStyle: {
+      color: "#fff",
+    },
+    formatter: "{b}：{c}",
+    // formatter: function([axisData]) {
+    //   console.log(axisData)
+    //     let str = axisData.name + ' ' + axisData.data + '辆</br>';
+    //     // params.forEach(item => {
+    //     //     if (item.seriesName === '供温' || item.seriesName === '回温') {
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' ℃' + '</br>';
+    //     //     } else if (item.seriesName === '压力值(Mpa)') {
+    //     //         // 柱状图渐变时设置marker
+    //     //         item.marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:#6C50F3;"></span>';
+    //     //         str += item.marker + item.seriesName + ' : ' + item.data.value + ' m';
+    //     //     }
+    //     // });
+    //     return str;
+    // }
+  },
+  series: [
+    {
+      data: [0, 0.3, 0.6, 0.24, 0.15, 0.66, 0.9, 0, 0.36, 0.51, 0.72, 0.6, 0.3],
+      type: "line",
+      showSymbol: false,
+      smooth: true,
+      lineStyle: {
+        color: "#2AD9FD",
+      },
+      areaStyle: {
+        opacity: 0.8,
+        color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+          {
+            offset: 0,
+            color: "rgb(90, 227, 255, .9)",
+          },
+          {
+            offset: 1,
+            color: "rgba(42,217,253,0)",
+          },
+        ]),
+      },
+    },
+  ],
+};
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue
new file mode 100644
index 00000000..31d73d94
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <div class='chart LineChart' ref="LineChartRef" />
+</template>
+
+<script>
+import * as echarts from "echarts";
+import { lineChartOption } from "./chart"
+
+export default {
+  name: 'LineChart',
+  mounted() {
+    const chartIns = echarts.init(this.$refs.LineChartRef);
+    chartIns.setOption(lineChartOption);
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.LineChart {
+  flex: 1;
+  height: 100%;
+}
+</style>
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
new file mode 100644
index 00000000..057d3960
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <Dialog v-model="obverseVisible" title="一类交调站弹窗">
+    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+
+    <div class="Intermodulation">
+      <ElTabs v-model="activeName" class="tabs">
+        <ElTabPane label="基本信息" name="first">
+
+          <Descriptions :list="list" :data="data" style="gap: 18px" />
+        </ElTabPane>
+        <ElTabPane label="设备参数" name="second">
+          <div class="content-second">
+            <RadioGroup v-model="roadType" :options="roadTypeList" />
+            <LineChartForTraffic v-if="activeName === 'second'" />
+          </div>
+        </ElTabPane>
+        <ElTabPane label="在线统计率" name="third">
+          <LineChart v-if="activeName === 'third'" />
+        </ElTabPane>
+      </ElTabs>
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue"
+import Descriptions from '@screen/components/Descriptions.vue';
+import Video from "@screen/components/Video"
+import LineChart from './components/LineChart/index.vue';
+import LineChartForTraffic from './components/LineChartForTraffic/index.vue';
+import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue';
+
+import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import { dialogDelayVisible } from "./../mixin"
+import request from "@/utils/request";
+import { Message } from 'element-ui';
+import RadioGroup from '@screen/components/FormConfig/components/RadioGroup/index.vue';
+
+// 广播发布
+export default {
+  name: 'Intermodulation',
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Button,
+    Descriptions,
+    LineChart,
+    LineChartForTraffic,
+    Video,
+    Switcher,
+    RadioGroup
+  },
+  data() {
+    return {
+      activeName: 'first',
+      releaseVisible: false,
+      secondLoading: true,
+      data: {
+        deviceName: "LH24",
+        roadName: "G35济泽高速",
+        stakeMark: "k094+079",
+        direction: "1",
+        organizationName: "山东高速济南发展公司",
+        brand: "XXX厂家",
+        deviceState: "0",
+      },
+
+      roadTypeList: [
+        { key: '1', label: '济南方向' },
+        { key: '3', label: '菏泽方向' },
+      ],
+      roadType: '1',
+      list: [
+        {
+          label: '设备名称',
+          key: "deviceName",
+        },
+        {
+          label: '设备桩号',
+          key: "stakeMark",
+        },
+        {
+          label: '道路名称',
+          key: "roadName",
+        },
+        {
+          label: '设备方向',
+          key: "direction",
+          enum: "CameraDirectionEnum"
+        },
+        {
+          label: '设备状态',
+          key: "deviceState",
+          enum: "DeviceTypeEnum"
+        },
+        // {
+        //   label: '设备厂商',
+        //   key: "brand",
+        // },
+      ],
+      activeOption: {
+        active: {
+          text: "开"
+        },
+        unActive: {
+          text: "关"
+        }
+      },
+      devicesList: []
+    }
+  },
+  async created() {
+    // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
+
+    this.data = { ...this.dialogData, roadName: null }
+
+    console.log("%c [ dialogData ]-103-「index.vue」", "font-size:15px; background:#36347c; color:#7a78c0;", this.dialogData);
+
+    // getProduct(this.dialogData.productId)
+    //   .then(data => {
+    //     this.dialogData.brand = data.brand;
+    //   })
+
+    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+
+    if (roadInfo) this.data.roadName = roadInfo.roadName;
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang='scss'>
+div.switcher {
+  font-size: 12px;
+  padding: 2px;
+}
+</style>
+<style lang='scss' scoped>
+.Intermodulation {
+  width: 510px;
+  height: 240px;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+
+  .camera-video {
+    flex: 1.5;
+  }
+
+  .tabs {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    ::v-deep {
+      .el-tabs__content {
+        flex: 1;
+
+        .el-tab-pane {
+          height: 100%;
+        }
+      }
+    }
+  }
+
+  .content-second {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    gap: 9px;
+  }
+
+  .bottom {
+    margin-top: 12px;
+    display: flex;
+    gap: 9px;
+    align-items: center;
+    justify-content: end;
+
+    >div {
+      font-size: 16px;
+      padding: 6px 12px;
+    }
+  }
+}
+</style>
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 f406e4d2..3f395ffc 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
@@ -97,15 +97,14 @@ export default {
             options: []
           },
         },
-
-        {
-          label: "车辆类型:",
-          key: "vehicleType",
-          type: "select",
-          options: {
-            options: vehicleTypeList
-          },
-        },
+        // {
+        //   label: "车辆类型:",
+        //   key: "vehicleType",
+        //   type: "select",
+        //   options: {
+        //     options: vehicleTypeList
+        //   },
+        // },
         {
           label: "事件描述:",
           key: "remark",
@@ -239,7 +238,7 @@ export default {
           id: this.dialogData.id,
           warningType: this.data.warningType,
           warningSubclass: this.data.warningSubclass,
-          vehicleType: this.data.vehicleType,
+          // vehicleType: this.data.vehicleType,
           remark: this.data.remark,
           lane: this.data.lane.join(",")
         }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 2e3e528d..7b02fefb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -46,6 +46,7 @@ import Broadcast from "./../Dialogs/Broadcast/index.vue";
 import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue";
 import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue";
 import SmartDevice from "./../Dialogs/SmartDevice/index.vue";
+import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
 
 export default {
   name: 'RoadAndEvents',
@@ -59,6 +60,7 @@ export default {
     TrafficIncidents,
     PerceiveEvent,
     SmartDevice,
+    Intermodulation
   },
   data() {
     return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index af0471fb..a1ce3709 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -52,6 +52,7 @@ export const DeviceForMap = {
   },
   交调: {
     deviceType: "11",
+    dialog: "Intermodulation",
   },
   合流区: {
     deviceType: "8",

From 16f482c01b3ea369b5670e42c850e115ee1ff376 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 10:38:12 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E8=BF=91=E7=9B=B8=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/Dialogs/TrafficIncidents/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

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 96beb4bc..d28cd585 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,6 +1,8 @@
 <template>
   <Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title">
     <div class="TrafficIncidents">
+      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+
       <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
   </Dialog>
@@ -10,6 +12,7 @@
 import Dialog from "@screen/components/Dialog/index.vue";
 import Descriptions from '@screen/components/Descriptions.vue';
 // import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
+import Video from "@screen/components/Video"
 
 import request from "@/utils/request";
 import { dialogDelayVisible } from "./../mixin"
@@ -21,6 +24,7 @@ export default {
   components: {
     Dialog,
     Descriptions,
+    Video
   },
   data() {
     return {
@@ -129,6 +133,7 @@ export default {
   color: #fff;
   display: flex;
   flex-direction: column;
+  gap: 12px;
 
   .camera-video {
     flex: 1.5;

From d159d36c04624d23c1048b184dbdac5432e4318b Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 11:21:44 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/components/Video/Video.vue      |  6 +++++-
 .../JiHeExpressway/components/Video/index.vue      |  7 ++++++-
 .../JiHeExpressway/components/Video/videoStream.js |  4 ++--
 .../components/Dialogs/TrafficIncidents/index.vue  | 14 +++++++++++++-
 .../Home/components/RoadAndEvents/utils/map.js     |  8 +++++---
 5 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
index 801faa20..e496002a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/Video.vue
@@ -19,11 +19,15 @@ export default {
     url: {
       type: String,
       default: null
+    },
+    rangeIndex: {
+      type: Number,
+      default: 0
     }
   },
   async mounted() {
     // const player = await openLiveVideo(this.$refs.videoContainerRef, { camId: this.camId, url: this.url, pileNum: this.pileNum })
-    const player = new HttpLivePlayer(this.$refs.videoContainerRef, { camId: this.camId, url: this.url, pileNum: this.pileNum });
+    const player = new HttpLivePlayer(this.$refs.videoContainerRef, { camId: this.camId, url: this.url, pileNum: this.pileNum, rangeIndex: this.rangeIndex });
 
     this.$once("hook:beforeDestroy", () => player?.destroy());
   }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
index 03409082..a47c01f4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
@@ -13,7 +13,8 @@
       </div>
     </div>
     <Transition name="fade" mode="out-in">
-      <Video v-if="active === 'video'" class="video-stream" :pileNum="pileNum" :camId="camId" :url="url" />
+      <Video :rangeIndex="rangeIndex" v-if="active === 'video'" class="video-stream" :pileNum="pileNum" :camId="camId"
+        :url="url" />
       <img v-else src="./view.png" />
     </Transition>
   </div>
@@ -41,6 +42,10 @@ export default {
     url: {
       type: String,
       default: null
+    },
+    rangeIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index d9d5f2cb..f97c7f7b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -58,7 +58,7 @@ export async function openVideoStream(container, { camId, url } = {}) {
   return player;
 }
 
-async function getUrl({ camId, url, pileNum } = {}) {
+async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
   // return testFlvUrl;
   if (url) return url;
 
@@ -69,7 +69,7 @@ async function getUrl({ camId, url, pileNum } = {}) {
       return;
     }
 
-    camId = data[0].camId;
+    camId = data[rangeIndex || 0]?.camId;
   }
 
   if (camId) {
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 d28cd585..2adbf40e 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,7 +1,10 @@
 <template>
   <Dialog v-model="obverseVisible" :title="dialogData._itemData && dialogData._itemData.title">
     <div class="TrafficIncidents">
-      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+      <div class="header">
+        <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+        <Video class="video-stream" :pileNum="dialogData.stakeMark" :rangeIndex="1" />
+      </div>
 
       <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" column="7" />
     </div>
@@ -139,6 +142,15 @@ export default {
     flex: 1.5;
   }
 
+  .header {
+    display: flex;
+    gap: 9px;
+
+    >div.video-stream {
+      height: 210px;
+    }
+  }
+
   .tabs {
     flex: 1;
     display: flex;
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 bbfe02d6..733756f5 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
@@ -39,8 +39,6 @@ export class MarkerCluster {
   constructor() {}
 
   getMap() {
-    if (this.map) return this.map;
-
     return (this.map = Vue.prototype.mapIns);
   }
 
@@ -52,7 +50,11 @@ export class MarkerCluster {
 
     this.data.push(...data);
 
-    if (!this.markerCluster) await this.setMarkerCluster();
+    if (
+      !this.markerCluster ||
+      this.markerCluster.getMap() !== Vue.prototype.mapIns
+    )
+      await this.setMarkerCluster();
 
     const map = this.getMap();
 

From ff241dc81be43f27654fa02b305bf8564746a407 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 11:45:02 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E9=9F=B3?=
 =?UTF-8?q?=E5=B9=BF=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormConfig/components/ElCheckboxGroup.vue    |   3 ++-
 .../Broadcast/components/BroadcastReleases.vue   |   4 ++--
 .../Dialogs/Broadcast/images/offline.jpg         | Bin 0 -> 7997 bytes
 .../Dialogs/Broadcast/images/online.jpg          | Bin 0 -> 6515 bytes
 .../Home/components/Dialogs/Broadcast/index.vue  |   9 ++++++++-
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/offline.jpg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/online.jpg

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
index dbc58383..a67596fa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
@@ -1,6 +1,7 @@
 <template>
   <ElCheckboxGroup v-bind="$attrs" v-on="$listeners" class='ElCheckboxGroup' :style="{ gap }">
-    <ElCheckbox v-for="item in options" :label="item[id] || item[label]" :key="item[id] || item[label]">
+    <ElCheckbox v-for="item in options" :disabled="item.disabled" :label="item[id] || item[label]"
+      :key="item[id] || item[label]">
       <slot :name="item[id] || item[label]" :data="item">{{ item[label] }}</slot>
     </ElCheckbox>
   </ElCheckboxGroup>
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 ee2cde65..a6051485 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
@@ -4,7 +4,7 @@
       <div class="body">
         <div class="left">
           <div class="title">路测广播列表</div>
-          <CheckboxGroup class="checkbox-group" v-model="checkList" :options="musicList" id="otherConfig"
+          <CheckboxGroup class="checkbox-group" gap="9px" v-model="checkList" :options="musicList" id="otherConfig"
             label="deviceName">
             <template #[otherConfig]="{ data }">
               <span style="color: #6EE5FE;">
@@ -88,7 +88,7 @@ export default {
   created() {
     getDeviceList(5)
       .then(data => {
-        if (Array.isArray(data)) this.musicList = data;
+        if (Array.isArray(data)) this.musicList = data.map((item) => ({ ...item, disabled: item.deviceState != 1 }));
       })
   },
   methods: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/offline.jpg b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/offline.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2e604138c8401f9a5bb4f03e5b2ad51191c71bcc
GIT binary patch
literal 7997
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
CSx~nC

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/online.jpg b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/images/online.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..37aaa43da2ec9d011b6c2c55f3979659d6c8d422
GIT binary patch
literal 6515
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

literal 0
HcmV?d00001

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 85556b84..9a026420 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
@@ -5,7 +5,12 @@
     <div class="Broadcast">
       <ElTabs v-model="activeName" @tab-click="handleClickTabs" class="tabs">
         <ElTabPane label="基本信息" name="first">
-          <Descriptions :list="list" :data="data" style="gap: 18px" />
+          <Descriptions :list="list" :data="data" style="gap: 18px">
+            <template #content-deviceState>
+              <img :src="require(`./images/${data.deviceState == 1 ? 'online' : 'offline'}.jpg`)" width="18">
+              {{ DeviceTypeEnum[data.deviceState] || "-" }}
+            </template>
+          </Descriptions>
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">设备参数</ElTabPane>
       </ElTabs>
@@ -26,6 +31,7 @@ import Button from "@screen/components/Buttons/Button.vue"
 import Descriptions from '@screen/components/Descriptions.vue';
 import BroadcastReleases from "./components/BroadcastReleases.vue"
 import Video from "@screen/components/Video"
+import { DeviceTypeEnum } from "@screen/utils/enum.js";
 
 import { getRoadInfoByStakeMark, getOrganizationName, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import { dialogDelayVisible } from "./../mixin"
@@ -54,6 +60,7 @@ export default {
         brand: "XXX厂家",
         deviceState: "0",
       },
+      DeviceTypeEnum,
       list: [
         {
           label: '设备名称',

From d91eb3da6c0d92af552781fae378363adb2f46da Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 15:14:57 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=B1=20=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=8F=82=E6=95=B0=20=E6=93=8D=E4=BD=9C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DeviceControlDialog.vue        |  16 +-
 .../Dialogs/DrivingGuidance/index.vue         |  32 +-
 .../components/DeviceControlDialog.vue        | 278 ++++++++++++++++++
 .../Dialogs/FatigueWakesUp/index.vue          | 139 +++++++++
 .../components/LineChartForTraffic/chart.js   |   2 +-
 .../Dialogs/Intermodulation/index.vue         |   2 +-
 .../Dialogs/PerceiveEvent/index.vue           |   1 +
 .../components/DeviceControlDialog.vue        |  56 ++++
 .../SmartDevice/components/DeviceParams.vue   | 174 +++++++++++
 .../components/Dialogs/SmartDevice/index.vue  | 128 ++------
 .../Home/components/RoadAndEvents/index.vue   |   4 +-
 .../RoadAndEvents/utils/buttonEvent.js        |   1 +
 .../components/RoadAndEvents/utils/map.js     |   6 +
 .../components/Switcher.vue                   |   3 +
 .../src/views/JiHeExpressway/utils/common.js  |   2 +-
 15 files changed, 715 insertions(+), 129 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 3f22193c..d22bb7e3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -76,6 +76,7 @@ export default {
     visible: Boolean,
     deviceId: String
   },
+  inject: ['requestURL'],
   data() {
     return {
       submitting: false,
@@ -188,21 +189,8 @@ export default {
     }
   },
   methods: {
-    requestURL(functionId, options = {}) {
-      return new Promise((resolve, reject) => {
-        request.post(`business/device/functions/${this.deviceId}/${functionId}`, options)
-          .then((result) => {
-            if (result.code != 200) return reject();
-
-            resolve(result.data[0]);
-          })
-          .catch((err) => {
-            reject();
-          });
-      });
-    },
     reDisplay() {
-      this.requestURL(52)
+      this.requestURL()
         .then(async (data) => {
           await delay(0);
 
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 da0e1d12..af8a36b3 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
@@ -27,6 +27,7 @@ import Descriptions from '@screen/components/Descriptions.vue';
 import DeviceControlDialog from "./components/DeviceControlDialog.vue"
 import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import Video from "@screen/components/Video"
+import request from "@/utils/request";
 
 import { dialogDelayVisible } from "./../mixin"
 
@@ -34,6 +35,11 @@ import { dialogDelayVisible } from "./../mixin"
 export default {
   name: 'DrivingGuidance',
   mixins: [dialogDelayVisible],
+  provide() {
+    return {
+      requestURL: this.requestURL
+    }
+  },
   components: {
     Dialog,
     Button,
@@ -80,6 +86,10 @@ export default {
           label: '设备厂商',
           key: "brand",
         },
+        {
+          label: '工作模式',
+          key: "workMode",
+        },
       ]
     }
   },
@@ -94,13 +104,33 @@ export default {
 
       });
 
+    this.requestURL(52)
+      .then((result) => {
+        this.data.workMode = { "00": "手动控制", "01": "自动控制", "02": "万年历" }[result.mode];
+      })
+      .catch((err) => {
+
+      });
+
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
     console.log("%c [ roadInfo ]-103-「index.vue」", "font-size:15px; background:#36347c; color:#7a78c0;", roadInfo.roadName);
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
   },
   methods: {
-    handleClickTabs() { }
+    requestURL(functionId = 52, options = {}) {
+      return new Promise((resolve, reject) => {
+        request.post(`business/device/functions/${this.dialogData.iotDeviceId}/${functionId}`, options)
+          .then((result) => {
+            if (result.code != 200) return reject();
+
+            resolve(result.data[0]);
+          })
+          .catch((err) => {
+            reject();
+          });
+      })
+    }
   }
 }
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
new file mode 100644
index 00000000..6ffc3d19
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/components/DeviceControlDialog.vue
@@ -0,0 +1,278 @@
+<template>
+  <Dialog v-model="modelVisible" title="设备操作">
+    <div class='DeviceControlDialog'>
+
+      <ElTabs v-model="activeName" class="tabs">
+        <ElTabPane label="一般模式" name="first">
+          <Form v-model="formData" class="form" ref="FormConfigRef" :formList="formList1" column="1" labelWidth="120px" />
+        </ElTabPane>
+        <ElTabPane label="自定义模式" name="second">
+          <Form class="form" ref="FormConfigRef" :formList="formList2" column="1" labelWidth="120px" />
+        </ElTabPane>
+      </ElTabs>
+    </div>
+
+    <template #footer>
+      <Button style="background-color: rgba(0, 179, 204, .3);" @click.native="modelVisible = false, submitting = false">
+        取消
+      </Button>
+      <Button @click.native="handleSubmit" :loading="submitting">
+        确定
+      </Button>
+    </template>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import Button from "@screen/components/Buttons/Button.vue"
+import Form from '@screen/components/FormConfig';
+
+import { delay } from "@screen/utils/common.js"
+import request from "@/utils/request";
+
+import { Message } from "element-ui";
+
+
+export default {
+  name: 'DeviceControlDialog',
+  components: {
+    Dialog,
+    Button,
+    Form
+  },
+  model: {
+    prop: 'visible',
+    event: "update:value"
+  },
+  props: {
+    visible: Boolean,
+    deviceId: String
+  },
+  data() {
+    return {
+      submitting: false,
+      activeName: "first",
+      formData: {},
+      formList1: [
+        {
+          label: "设备模式:",
+          key: "controlType",
+          type: "RadioGroup",
+          default: "00",
+          options: {
+            type: 'circle',
+            options: [
+              {
+                key: "00",
+                label: "常量",
+              },
+              {
+                key: "01",
+                label: "闪烁",
+              }
+            ],
+          },
+        },
+        {
+          label: "操作时长:",
+          key: "onWorkStatus",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+          }
+        },
+      ],
+      formList2: [
+        {
+          label: "设备模式:",
+          key: "controlType",
+          type: "RadioGroup",
+          default: "00",
+          options: {
+            type: 'circle',
+            options: [
+              {
+                key: "00",
+                label: "常量",
+              },
+              {
+                key: "01",
+                label: "闪烁",
+              }
+            ],
+          },
+        },
+        {
+          label: "线路选择:",
+          key: "onWorkStatus2",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+          }
+        },
+        {
+          label: "操作时长:",
+          key: "onWorkStatus",
+          required: true,
+          type: "select",
+          options: {
+            placeholder: "请选择",
+          }
+        },
+      ]
+    }
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:value', val)
+      }
+    }
+  },
+  watch: {
+    modelVisible: {
+      immediate: true,
+      handler(bool) {
+        if (!bool) return;
+
+        this.reDisplay();
+      }
+    }
+  },
+  methods: {
+    requestURL(functionId, options = {}) {
+      return new Promise((resolve, reject) => {
+        request.post(`business/device/functions/${this.deviceId}/${functionId}`, options)
+          .then((result) => {
+            if (result.code != 200) return reject();
+
+            resolve(result.data[0]);
+          })
+          .catch((err) => {
+            reject();
+          });
+      });
+    },
+    reDisplay() {
+      this.requestURL(52)
+        .then(async (data) => {
+          await delay(0);
+
+          const formData = this.$refs.FormConfigRef?.formData;
+
+          formData.controlType = data.mode;
+
+          switch (data.mode) {
+            case "00":
+              formData.onWorkStatus = data.onWorkStatus;
+              formData.inWorkStatus = data.inWorkStatus;
+              break;
+            case "01":
+            case "02":
+              await this.requestURL("3C")
+                .then((data2) => {
+                  formData.onWorkStatus = data2.onWorkStatus;
+                  formData.inWorkStatus = data2.inWorkStatus;
+
+                  if (data.mode === '01')
+                    formData.displayTime = [data.startDisplay, data.endDisplay];
+                })
+                .catch(() => { });
+              break;
+          }
+
+          this.oldFormData = { ...formData };
+
+        })
+    },
+    handleSubmit() {
+      const result = {}, formData = this.$refs.FormConfigRef?.formData;
+
+      result.mode = formData.controlType;
+
+      delete result.controlType;
+
+      if (result.mode === '01') {
+        if (!formData.displayTime?.length) return Message.error(`时间不能为空!`);
+      }
+
+      if (!formData.onWorkStatus || !formData.inWorkStatus) return Message.error(`工作状态不能为空!`);
+
+      if (["01", "02"].includes(result.mode)) {
+        if (["04", "00"].includes(formData.onWorkStatus)) return Message.error(`上行工作状态不能选择当前类型!`);
+        if (["04", "00"].includes(formData.inWorkStatus)) return Message.error(`下行工作状态不能选择当前类型!`);
+      }
+
+      result.onWorkStatus = formData.onWorkStatus;
+      result.inWorkStatus = formData.inWorkStatus;
+
+      this.submitting = true;
+
+      // this.submitting = false;
+      // return;
+
+      /**
+       * 接口 地址
+       *
+       * https://www.showdoc.com.cn/2450725213006196/10877717880262686
+       */
+      let promise = [];
+
+      switch (result.mode) {
+        case "00":
+          promise.push(this.requestURL("51", result))
+          break;
+        case "01":
+        case "02":
+
+          const options = { mode: result.mode };
+
+          if (result.mode === '01') {
+            options.startDisplayTime = formData.displayTime[0];
+            options.endDisplayTime = formData.displayTime[1];
+          }
+
+          promise.push(
+            this.requestURL("30", {
+              onWorkStatus: result.onWorkStatus,
+              inWorkStatus: result.inWorkStatus,
+            }),
+            this.requestURL("51", options),
+          )
+          break;
+      }
+      Promise.all(promise)
+        .then(() => {
+          this.modelVisible = false;
+        })
+        .catch((err) => {
+          console.log("%c [ err ]-110-「DeviceControlDialog.vue」", "font-size:15px; background:#547bf2; color:#98bfff;", err);
+          Message.error(`设备操作失败!`);
+        })
+        .finally(() => {
+          this.submitting = false;
+        })
+    }
+  },
+}
+</script>
+
+<style lang='scss' scoped>
+.DeviceControlDialog {
+  width: 450px;
+  height: 210px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+
+  .tips {
+    font-size: 12px;
+  }
+}
+</style>
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
new file mode 100644
index 00000000..38ea7f9d
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/FatigueWakesUp/index.vue
@@ -0,0 +1,139 @@
+<template>
+  <Dialog v-model="obverseVisible" title="疲劳唤醒弹窗">
+    <div class="FatigueWakesUp">
+      <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+
+      <Descriptions labelWidth="72px" :list="list" :data="data" style="gap: 18px" />
+    </div>
+
+    <template #footer>
+      <Button @click.native="deviceControlVisible = true">设备操作</Button>
+    </template>
+
+    <DeviceControlDialog v-model="deviceControlVisible" :deviceId="dialogData.iotDeviceId" />
+  </Dialog>
+</template>
+
+<script>
+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 Video from "@screen/components/Video"
+import DeviceControlDialog from "./components/DeviceControlDialog.vue"
+
+import request from "@/utils/request";
+import { dialogDelayVisible } from "./../mixin"
+
+// 疲劳唤醒弹窗
+export default {
+  name: 'FatigueWakesUp',
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Descriptions,
+    Video,
+    DeviceControlDialog,
+    Button
+  },
+  data() {
+    return {
+      deviceControlVisible: false,
+      data: {
+        deviceType: "行车诱导",
+        deviceStation: "k094+079",
+        roadName: "G35济泽高速",
+        direction: "1",
+        deviceState: "0",
+        deviceVendors: "XXX厂家",
+      },
+      list: [
+        {
+          label: '设备名称',
+          key: "deviceName",
+        },
+        {
+          label: '设备桩号',
+          key: "stakeMark",
+        },
+        {
+          label: '道路名称',
+          key: "roadName",
+        },
+        {
+          label: '设备方向',
+          key: "direction",
+          enum: "CameraDirectionEnum"
+        },
+        {
+          label: '设备状态',
+          key: "deviceState",
+          enum: "DeviceTypeEnum"
+        },
+        {
+          label: '设备厂商',
+          key: "brand",
+        },
+      ]
+    }
+  },
+  async created() {
+    this.data = { ...this.dialogData };
+
+    getProduct(this.dialogData.productId)
+      .then(data => {
+        this.dialogData.brand = data.brand;
+      })
+
+    const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
+
+    if (roadInfo) this.data.roadName = roadInfo.roadName;
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.FatigueWakesUp {
+  width: 420px;
+  color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding-bottom: 24px;
+
+  .camera-video {
+    flex: 1.5;
+  }
+
+  .tabs {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+
+    ::v-deep {
+      .el-tabs__content {
+        flex: 1;
+
+        .el-tab-pane {
+          height: 100%;
+        }
+      }
+    }
+  }
+
+  .bottom {
+    margin-top: 12px;
+    display: flex;
+    gap: 9px;
+    align-items: center;
+    justify-content: end;
+
+    >div {
+      font-size: 16px;
+      padding: 6px 12px;
+    }
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
index a9c61988..95649615 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/components/LineChartForTraffic/chart.js
@@ -55,7 +55,7 @@ export const lineChartOption = {
     },
   },
   grid: {
-    left: 51,
+    left: 33,
     top: 33,
     bottom: 24,
     right: 36,
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 057d3960..31018ac2 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
@@ -5,12 +5,12 @@
     <div class="Intermodulation">
       <ElTabs v-model="activeName" class="tabs">
         <ElTabPane label="基本信息" name="first">
-
           <Descriptions :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
           <div class="content-second">
             <RadioGroup v-model="roadType" :options="roadTypeList" />
+            <span>当前车流量: 999辆</span>
             <LineChartForTraffic v-if="activeName === 'second'" />
           </div>
         </ElTabPane>
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 3f395ffc..735a1a83 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
@@ -80,6 +80,7 @@ export default {
           key: "warningType",
           type: "select",
           options: {
+            disabled: true,
             options: WarningTypeList
           },
           ons: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
new file mode 100644
index 00000000..23f1108a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
@@ -0,0 +1,56 @@
+<template>
+  <Dialog v-model="modelVisible" title="设备操作">
+    <div class='DeviceControlDialog'>
+      <DeviceParams :dialogData="dialogData" />
+
+    </div>
+  </Dialog>
+</template>
+
+<script>
+import Dialog from "@screen/components/Dialog/index.vue";
+import DeviceParams from "./DeviceParams.vue"
+
+export default {
+  name: 'DeviceControlDialog',
+  components: {
+    Dialog,
+    DeviceParams
+  },
+  model: {
+    prop: 'visible',
+    event: "update:value"
+  },
+  props: {
+    visible: Boolean,
+    dialogData: {
+      type: Object,
+      default: () => ({})
+    },
+  },
+  computed: {
+    modelVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:value', val)
+      }
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.DeviceControlDialog {
+  width: 510px;
+  display: flex;
+  flex-direction: column;
+  gap: 15px;
+  min-height: 360px;
+
+  .tips {
+    font-size: 12px;
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue
new file mode 100644
index 00000000..de3f4492
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceParams.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class='DeviceParams'>
+    <div class="no-data" v-if="!devicesList.length" v-loading="secondLoading">暂无设备参数</div>
+    <Descriptions :list="devicesList" style="gap: 18px;" column="5">
+      <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
+        <span>{{ data.text }}</span>
+        <Switcher class="switcher" :disabled="disabled" :activeOption="activeOption" :value="data.state"
+          @change="(value) => handleSwitcherChange(value, data)" />
+      </template>
+    </Descriptions>
+  </div>
+</template>
+
+<script>
+import Descriptions from '@screen/components/Descriptions.vue';
+import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue';
+
+import request from "@/utils/request";
+import { Message } from 'element-ui';
+import { confirm } from "@screen/utils/common";
+
+export default {
+  name: 'DeviceParams',
+  components: {
+    Descriptions,
+    Switcher
+  },
+  props: {
+    dialogData: {
+      type: Object,
+      default: () => ({})
+    },
+    disabled: Boolean
+  },
+  data() {
+    return {
+      secondLoading: true,
+      devicesList: [],
+      activeOption: {
+        active: {
+          text: "开"
+        },
+        unActive: {
+          text: "关"
+        }
+      }
+    }
+  },
+  created() {
+    // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
+    // 获取设备参数
+    request({
+      url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || '10.0.36.143-1883'}`,
+      method: "get",
+      params: {}
+    })
+      .then(result => {
+        if (result.code != 200) return;
+        const [deviceInfo] = result.data;
+
+        const typeMap = {
+          ac: '220v',
+          dc: '12v',
+        }
+
+        for (const key in deviceInfo.formatValue) {
+          // electricity 电流
+          // voltage 电压
+          if (key.includes('electricity')) {
+            const args = key.match(/[a-z]+|[0-9]+$/g);
+
+            const type = args[0], num = args.slice(-1)[0], prefix = args.slice(0, 2).join('_');
+            this.devicesList.push(
+              {
+                label: `支路${num} （${typeMap[type]}）   电压`,
+                key: `${prefix}_voltage_${num}`,
+                text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
+                gridColumn: 3
+              },
+              {
+                label: '电流',
+                key: `${prefix}_electricity_${num}`,
+                text: deviceInfo.formatValue[key],
+                gridColumn: 2,
+                state: deviceInfo.value[key] > 0
+              }
+            );
+          }
+        }
+        this.devicesList.push(
+          {
+            label: '风扇',
+            key: `fan_status`,
+            text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
+            gridColumn: 1
+          },
+          {
+            label: '箱门',
+            key: `door_status`,
+            text: { 0: '关闭', 1: '打开' }[deviceInfo.formatValue['door_status']] || '-',
+            gridColumn: 1
+          },
+          {
+            label: '温度',
+            key: `temperature`,
+            text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-',
+            gridColumn: 1
+          },
+          {
+            label: '湿度',
+            key: `humidity`,
+            text: deviceInfo.formatValue['humidity'] || '-',
+            gridColumn: 1
+          },
+          {
+            label: '市电掉电',
+            key: `power_status`,
+            text: { 0: '正常', 1: '掉电' }[deviceInfo.formatValue['power_status']] || '-',
+            gridColumn: 2
+          },
+        )
+        // this.data = result.rows;
+        // this.total = result.total;
+      })
+      .finally(() => {
+        this.secondLoading = false
+      })
+  },
+  methods: {
+    async handleSwitcherChange(value, data) {
+      data.state = value;
+
+      const isContinue = await confirm({ message: "是否要删除该辖段信息?" })
+        .catch(() => {
+          data.state = !value;
+        });
+
+      if (!isContinue) return;
+
+      // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
+      request({
+        url: `/business/device/functions/${this.dialogData.iotDeviceId}/${102}`,
+        method: "POST",
+        data: {
+          deviceName: data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en",
+          // 开关：1=打开，0=关闭
+          value: value ? 1 : 0
+        }
+      })
+        .then(result => {
+          if (result.code != 200) {
+            Message.error("操作失败");
+            data.state = !value;
+            return;
+          };
+          Message.success("操作成功");
+        })
+        .catch(() => {
+          data.state = !value;
+          Message.error("操作失败");
+        })
+    },
+    getSlotKey(key) {
+      return key.includes('electricity') ? key : ''
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.DeviceParams {
+  height: 100%;
+}
+</style>
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 42ae305c..fcd88622 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
@@ -8,20 +8,21 @@
           <Descriptions :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
-          <div class="no-data" v-if="!devicesList.length" v-loading="secondLoading">暂无设备参数</div>
-          <Descriptions :list="devicesList" style="gap: 18px;" column="5">
-            <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
-              <span>{{ data.text }}</span>
-              <Switcher class="switcher" :activeOption="activeOption" :value="data.state"
-                @change="(value) => handleSwitcherChange(value, data)" />
-            </template>
-          </Descriptions>
+          <DeviceParams disabled :dialogData="dialogData" />
         </ElTabPane>
         <ElTabPane label="在线统计率" name="third">
-          <LineChart v-if="activeName === 'third'" />
+          <LineChart v-if="activeName === 'third'" style="height: 222px" />
         </ElTabPane>
       </ElTabs>
     </div>
+
+    <template #footer>
+      <Button @click.native="deviceControlVisible = true">
+        设备操作
+      </Button>
+    </template>
+
+    <DeviceControlDialog v-model="deviceControlVisible" :dialogData="dialogData" />
   </Dialog>
 </template>
 
@@ -31,12 +32,11 @@ import Button from "@screen/components/Buttons/Button.vue"
 import Descriptions from '@screen/components/Descriptions.vue';
 import Video from "@screen/components/Video"
 import LineChart from './components/LineChart/index.vue';
-import Switcher from '@screen/pages/service/PublishingChannelManagement/components/Switcher.vue';
+import DeviceParams from "./components/DeviceParams.vue"
+import DeviceControlDialog from "./components/DeviceControlDialog.vue"
 
 import { getRoadInfoByStakeMark, getProduct } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js"
 import { dialogDelayVisible } from "./../mixin"
-import request from "@/utils/request";
-import { Message } from 'element-ui';
 
 // 广播发布
 export default {
@@ -44,17 +44,18 @@ export default {
   mixins: [dialogDelayVisible],
   components: {
     Dialog,
-    Button,
     Descriptions,
     LineChart,
     Video,
-    Switcher
+    Button,
+    DeviceParams,
+    DeviceControlDialog
   },
   data() {
     return {
       activeName: 'first',
       releaseVisible: false,
-      secondLoading: true,
+      deviceControlVisible: false,
       data: {
         deviceName: "LH24",
         roadName: "G35济泽高速",
@@ -91,16 +92,7 @@ export default {
           label: '设备厂商',
           key: "brand",
         },
-      ],
-      activeOption: {
-        active: {
-          text: "开"
-        },
-        unActive: {
-          text: "关"
-        }
-      },
-      devicesList: []
+      ]
     }
   },
   async created() {
@@ -118,90 +110,6 @@ export default {
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
-
-    // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
-    // 获取设备参数
-    request({
-      url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
-      method: "get",
-      params: {}
-    })
-      .then(result => {
-        if (result.code != 200) return;
-        const [deviceInfo] = result.data;
-
-        const typeMap = {
-          ac: '220v',
-          dc: '12v',
-        }
-
-        for (const key in deviceInfo.formatValue) {
-          // electricity 电流
-          // voltage 电压
-          if (key.includes('electricity')) {
-            const args = key.match(/[a-z]+|[0-9]+$/g);
-
-            const type = args[0], num = args.slice(-1)[0], prefix = args.slice(0, 2).join('_');
-            this.devicesList.push(
-              {
-                label: `支路${num} （${typeMap[type]}）   电压`,
-                key: `${prefix}_voltage_${num}`,
-                text: deviceInfo.formatValue[`${prefix}_voltage_${num}`],
-                gridColumn: 3
-              },
-              {
-                label: '电流',
-                key: `${prefix}_electricity_${num}`,
-                text: deviceInfo.formatValue[key],
-                gridColumn: 2,
-                state: deviceInfo.value[key] > 0
-              }
-            );
-          }
-        }
-        this.devicesList.push({
-          label: '风扇',
-          key: `fan_status`,
-          text: { 0: '正常', 1: '开' }[deviceInfo.formatValue['fan_status']] || '-',
-          gridColumn: 5
-        })
-        // this.data = result.rows;
-        // this.total = result.total;
-      })
-      .finally(() => {
-        this.secondLoading = false
-      })
-  },
-  methods: {
-    handleSwitcherChange(value, data) {
-      data.state = value;
-
-      // https://www.yuque.com/dayuanzhong-ovjwn/gkht0m/ww776d5kzs72ilzh?singleDoc=
-      request({
-        url: `/business/device/functions/${this.dialogData.iotDeviceId}/${102}`,
-        method: "POST",
-        data: {
-          deviceName: data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en",
-          // 开关：1=打开，0=关闭
-          value: value ? 1 : 0
-        }
-      })
-        .then(result => {
-          if (result.code != 200) {
-            Message.error("操作失败");
-            data.state = !value;
-            return;
-          };
-          Message.success("操作成功");
-        })
-        .catch(() => {
-          data.state = !value;
-          Message.error("操作失败");
-        })
-    },
-    getSlotKey(key) {
-      return key.includes('electricity') ? key : ''
-    }
   }
 }
 </script>
@@ -215,7 +123,7 @@ div.switcher {
 <style lang='scss' scoped>
 .SmartDevice {
   width: 510px;
-  height: 240px;
+  // height: 240px;
   color: #fff;
   display: flex;
   flex-direction: column;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 7b02fefb..da9db393 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -47,6 +47,7 @@ import TrafficIncidents from "./../Dialogs/TrafficIncidents/index.vue";
 import PerceiveEvent from "./../Dialogs/PerceiveEvent/index.vue";
 import SmartDevice from "./../Dialogs/SmartDevice/index.vue";
 import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
+import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue";
 
 export default {
   name: 'RoadAndEvents',
@@ -60,7 +61,8 @@ export default {
     TrafficIncidents,
     PerceiveEvent,
     SmartDevice,
-    Intermodulation
+    Intermodulation,
+    FatigueWakesUp
   },
   data() {
     return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index a1ce3709..94154c38 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -71,6 +71,7 @@ export const DeviceForMap = {
   },
   疲劳唤醒: {
     deviceType: "10",
+    dialog: "FatigueWakesUp",
   },
 };
 
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 733756f5..55ab2de4 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
@@ -298,6 +298,12 @@ export class MarkerCluster {
             return;
           }
 
+          console.log(
+            "%c [ 点击地图坐标 ]-302-「map.js」",
+            "font-size:15px; background:#8f8c0b; color:#d3d04f;",
+            data[0]
+          );
+
           data[0].config.markerClick?.(data[0].extData, data[0].config?.item);
         });
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Switcher.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Switcher.vue
index 5af19bd6..7285f2a3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Switcher.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Switcher.vue
@@ -25,6 +25,7 @@ export default {
       type: Boolean,
       default: false
     },
+    disabled: Boolean
   },
   emit: ['change'],
   data() {
@@ -60,6 +61,8 @@ export default {
   },
   methods: {
     toggle() {
+      if (this.disabled) return;
+
       this.$emit("change", this.active = !this.active)
     }
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
index 1245ace8..6e14122b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/common.js
@@ -87,7 +87,7 @@ export function confirm({
       ...args,
     })
       .then(() => {
-        resolve();
+        resolve(true);
       })
       .catch(() => {
         reject("取消 Confirm");

From c373af3ed1b9fbc017cd6022d18dc26eb866486d Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Tue, 6 Feb 2024 16:19:05 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=84=9F=E7=9F=A5=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/event/perceiveEvent.js       |  13 +-
 .../components/dailyDisposal/assets/charts.js |   2 +-
 .../components/dailyDisposal/index.vue        |   6 +-
 .../components/dayTotal/index.vue             |   3 +-
 .../components/eventQuery/assets/charts2.js   |   2 +-
 .../components/eventSource/assets/charts.js   | 174 +++++++++---------
 .../components/eventSource/index.vue          | 100 ++++++----
 .../components/railway/assets/charts.js       |   2 +-
 .../components/typeAnalysis/index.vue         |   2 +-
 9 files changed, 168 insertions(+), 136 deletions(-)

diff --git a/ruoyi-ui/src/api/event/perceiveEvent.js b/ruoyi-ui/src/api/event/perceiveEvent.js
index 159329f1..ed8a01aa 100644
--- a/ruoyi-ui/src/api/event/perceiveEvent.js
+++ b/ruoyi-ui/src/api/event/perceiveEvent.js
@@ -77,13 +77,14 @@ export function geTwarningTotal(query) {
 
          //感知事件源分析
          export function getWarningSourceGroup(query) {
-            //system/status/tablist
             return request({
-                url: '/perceivedEvents/warning/warningSourceGroup',
-                method: 'post',
-                params: {
-                  ...query,
-                }
+                // url: '/perceivedEvents/warning/warningSourceGroup',
+                // method: 'post',
+                url: '/business/warning/list',
+                method: 'get',
+                // params: {
+                //   ...query,
+                // }
               })
           }          
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
index 9b141dbe..cf553c78 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js
@@ -22,7 +22,7 @@ var options = {
       orient: 'vertical',
       top: "center",
       icon: "circle",
-      right: 30,
+      right: 15,
       itemGap: 16,
       itemWidth: 8,
       itemHeight: 8,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
index 3a4a511a..e7552bb8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/index.vue
@@ -140,9 +140,9 @@ export default {
         context.lineWidth = 1; // 设置线段宽度
 
         // 绘制圆角矩形
-        drawRoundRect(context, 260, 50, 120, 24, 12, gr)
-        drawRoundRect(context, 260, 78, 120, 24, 12, gr)
-        drawRoundRect(context, 260, 106, 120, 24, 12, gr)
+        drawRoundRect(context, 272, 50, 120, 24, 12, gr)
+        drawRoundRect(context, 272, 78, 120, 24, 12, gr)
+        drawRoundRect(context, 272, 106, 120, 24, 12, gr)
 
       });
     });
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
index b3c8a8b2..065a5262 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/index.vue
@@ -13,6 +13,7 @@ import WgtTitle from '../../../widgets/title'
 import * as echarts from "echarts";
 import chartsStatistics from "./assets/charts";
 import { getDailyCumulative } from '../../../../../../../api/event/perceiveEvent';
+import moment from "moment";
 
 export default {
   name: 'RailWayDay',
@@ -88,7 +89,7 @@ export default {
             }
 
             data.forEach((it) => {
-              timer.push(it.time);
+              timer.push(moment(it.time).format('HH:mm'));
               number.push(it.number);
             });
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js
index 875a0c74..9637be33 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js
@@ -107,7 +107,7 @@ var options = {
     //圆环中间内容
     text: "{zb|12}",
     subtext: "类型分析",
-    left: "19%",
+    left: "17.5%",
     top: "40%",
     textStyle: {
       rich: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
index a3b07119..3d1cfac4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js
@@ -1,41 +1,55 @@
-let data = [{
-  average: 30,
-  name: '视频识别',
-  percent: 0.2
-}, {
-  average: 25,
-  name: '雷达识别',
-  percent: 0.25
-}, {
-  average: 15,
-  name: '锥桶',
-  percent: 0.08
-}, {
-  average: 30,
-  name: '护栏碰撞',
-  percent: 0.14
-}]
+let data = [
+  {
+    average: 30,
+    name: "视频识别",
+    percent: 0.2,
+  },
+  {
+    average: 25,
+    name: "雷达识别",
+    percent: 0.25,
+  },
+  {
+    average: 15,
+    name: "锥桶",
+    percent: 0.3,
+  },
+  {
+    average: 30,
+    name: "护栏碰撞",
+    percent: 0.25,
+  },
+];
 
 window.mainData = data;
 
-let chartData = [], lengData = [], colorList = ['#006EDF', '#00FF00', '#FFC30D', '#FF8400', '#1DA7FF', '#2967EA'];
+let chartData = [],
+  lengData = [],
+  colorList = [
+    "#006EDF",
+    "#00FF00",
+    "#FFC30D",
+    "#FF8400",
+    "#1DA7FF",
+    "#2967EA",
+  ];
 for (let i = 0; i < data.length; i++) {
   chartData.push({
     value: data[i].average,
     name: data[i].name,
-    percent: data[i].percent,
-    color: colorList[i]
-  })
+    // percent: data[i].percent,
+    color: colorList[i],
+  });
   lengData.push({
     name: data[i].name,
-    color: colorList[i]
-  })
+    color: colorList[i],
+  });
 }
 
-let a = chartData.map(t => {
-  t.value = parseInt(t.value)
-  return t
-})
+let a = chartData.map((t) => {
+  t.value = parseInt(t.value);
+  return t;
+});
 const sum = a.reduce((per, cur) => per + cur.value, 0);
 const gap = (1 * sum) / 100;
 const pieData1 = [];
@@ -64,14 +78,15 @@ var options = {
     confine: true,
     textStyle: {
       fontSize: 10, // 字体大小
-      color: '#333',
+      color: "#333",
     },
-    color: '#333',
+    color: "#333",
     backgroundColor: "#ffffff",
   },
-  title: {   //圆环中间内容
-    text: '{tb|100}',
-    subtext: '{zb|总数}',
+  title: {
+    //圆环中间内容
+    text: "{tb|100}",
+    subtext: "{zb|总数}",
     left: "22%",
     top: "40%",
     textStyle: {
@@ -80,24 +95,24 @@ var options = {
           width: 45,
           color: "#fff",
           fontSize: 21,
-          align: 'center'
-        }
-      }
+          align: "center",
+        },
+      },
     },
     subtextStyle: {
       rich: {
         zb: {
           width: 45,
-          color: '#fff',
+          color: "#fff",
           fontSize: 13,
-          align: 'center'
-        }
-      }
+          align: "center",
+        },
+      },
     },
   },
-  color: ['#5973FF', '#14d8b4', '#FFC30D', '#61D8FF', '#1DA7FF', '#2967EA'],
+  color: ["#5973FF", "#14d8b4", "#FFC30D", "#61D8FF", "#1DA7FF", "#2967EA"],
   legend: {
-    top: '20%',
+    top: "8%",
     right: 0,
     orient: "vertical", //改变排列方式
     icon: "circle", //改变legend小图标形状
@@ -116,7 +131,7 @@ var options = {
           padding: 5,
           marginLeft: 5,
           color: "#37E7FF",
-        }
+        },
       },
     },
     itemStyle: {
@@ -124,32 +139,27 @@ var options = {
     },
     data: lengData,
     formatter: function (name) {
-      let total = 0
-      let target = 0
+      let target = 0;
       if (!mainData) return "";
-      for (let i = 0; i < data.length; i++) {
-        if (window.mainData[i]) {
-          total += window.mainData[i].percent
-          if (window.mainData[i].name === name) {
-            target = window.mainData[i].percent
-          }
+      for (let i = 0; i < window.mainData.length; i++) {
+        if (window.mainData[i].name === name) {
+          target = window.mainData[i].percent;
         }
       }
       var arr = [
-        '{a|' + name + (name.length == 4 ? '}' : '}      '),
-        '{b|' + ((target / total) * 100).toFixed(2) + '%}',
-      ]
-      return arr.join('  ')
+        "{a|" + name + (name.trim().length == 4 ? "}" : "}      "),
+        "{b|" + (target * 100).toFixed(0) + "%}",
+      ];
+      return arr.join("  ");
     },
-
   },
   series: [
     {
-      name: '',
-      avoidLabelOverlap: true,//防止标签重叠
-      type: 'pie',
-      radius: ['63%', '73%'], //大小
-      center: ['30%', '50%'], //位置
+      name: "",
+      avoidLabelOverlap: true, //防止标签重叠
+      type: "pie",
+      radius: ["63%", "73%"], //大小
+      center: ["30%", "50%"], //位置
       hoverAnimation: true,
       itemStyle: {
         normal: {
@@ -165,37 +175,37 @@ var options = {
         },
         normal: {
           length: 30, // 指示线长度
-          length2: 80
+          length2: 80,
         },
       },
       data: pieData1,
       label: {
         show: false,
-        formatter: function (params) { },
+        formatter: function (params) {},
         textStyle: {
-          fontSize: '18',
-          fontWeight: 'bold',
-          color: '#fff'
+          fontSize: "18",
+          fontWeight: "bold",
+          color: "#fff",
         },
         rich: {
           color0: {
-            color: '#D56383',
+            color: "#D56383",
           },
           color1: {
-            color: '#00FF95',
+            color: "#00FF95",
           },
           color3: {
-            color: '#FFE900',
+            color: "#FFE900",
           },
           color2: {
-            color: '#F5B157',
+            color: "#F5B157",
           },
           color4: {
-            color: '#1DA7FF',
+            color: "#1DA7FF",
           },
           color5: {
-            color: '#2967EA'
-          }
+            color: "#2967EA",
+          },
         },
       },
       emphasis: {
@@ -203,11 +213,11 @@ var options = {
       },
     },
     {
-      type: 'gauge',
+      type: "gauge",
       zlevel: 0,
       splitNumber: 360,
-      radius: '50%',
-      center: ['30%', '50%'],
+      radius: "50%",
+      center: ["30%", "50%"],
       startAngle: 90,
       endAngle: -269.9999,
       axisLine: {
@@ -224,7 +234,7 @@ var options = {
         length: 68,
         lineStyle: {
           width: 2,
-          color: '#277DCA',
+          color: "#277DCA",
         },
       },
       pointer: {
@@ -235,11 +245,11 @@ var options = {
       },
     },
     {
-      type: 'gauge',
+      type: "gauge",
       zlevel: 2,
       splitNumber: 185,
-      radius: '80%',
-      center: ['30%', '50%'],
+      radius: "80%",
+      center: ["30%", "50%"],
       startAngle: 90,
       endAngle: -269.9999,
       axisLine: {
@@ -256,7 +266,7 @@ var options = {
         length: 2,
         lineStyle: {
           width: 1,
-          color: '#017383',
+          color: "#017383",
         },
       },
       pointer: {
@@ -266,7 +276,7 @@ var options = {
         show: 0,
       },
     },
-  ]
+  ],
 };
 
-export default options
\ No newline at end of file
+export default options;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
index 529ffc82..4a178653 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/index.vue
@@ -56,66 +56,81 @@ export default {
 
         getWarningSourceGroup().then((res) => {
           if (res.code == 200) {
-            let data = res.data.warningSourceList;
-            let total = res.data.total;
+            let data = res.rows;
+            let total = 0;
+
             if (data.length > 0) {
-              let warningTypes = [];
-              let number = [];
-              data.forEach((it, index )=> {
+              let chartData = [
+                {
+                  average: 0,
+                  name: '视频AI   ',
+                  percent: 0.3
+                },
+                {
+                  average: 0,
+                  name: '雷达识别',
+                  percent: 0.2
+                }, {
+                  average: 0,
+                  name: '锥桶',
+                  percent: 0.1
+                }, {
+                  average: 0,
+                  name: '护栏碰撞',
+                  percent: 0.2
+                }, {
+                  average: 0,
+                  name: '扫码报警',
+                  percent: 0.1
+                }, {
+                  average: 0,
+                  name: '非机预警',
+                  percent: 0.1
+                },
+              ]
+              data.forEach(it => {
                 if (it.warningSource == 1) {
-                  warningTypes.push('交通拥堵');
+                  chartData[0].average++;
                 }
                 if (it.warningSource == 2) {
-                  warningTypes.push('行人');
+                  chartData[1].average++;
                 }
                 if (it.warningSource == 3) {
-                  warningTypes.push('非机动车');
+                  chartData[2].average++;
                 }
                 if (it.warningSource == 4) {
-                  warningTypes.push('停车');
+                  chartData[3].average++;
                 }
                 if (it.warningSource == 5) {
-                  warningTypes.push('倒车/逆行');
+                  chartData[4].average++;
                 }
                 if (it.warningSource == 6) {
-                  warningTypes.push('烟火');
-                }
-                if (it.warningSource == 7) {
-                  warningTypes.push('撒落物');
-                }
-                if (it.warningSource == 8) {
-                  warningTypes.push('异常天气');
+                  chartData[5].average ++;
                 }
-                if (it.warningSource == 9) {
-                  warningTypes.push('护栏碰撞');
-                }
-
-                number.push(it.number);
-                drawRoundRect(context, 231, 37 + (index * 27), 138, 20, 12, gr);
+                total ++;
+                // drawRoundRect(context, 231, 37 + (index * 27), 138, 20, 12, gr);
               })
+              // console.log('data',chartData)
               let colorList = ['#006EDF', '#00FF00', '#FFC30D', '#FF8400', '#1DA7FF', '#2967EA'];
               let lengData = [];
               let mainData = [];
-              let mainCount = 0;
-              for (let j = 0; j < number.length; j++) {
-                mainCount += number[j];
-              }
-              for (let i = 0; i < warningTypes.length; i++) {
-                let it = warningTypes[i];
+
+              for (let i = 0; i < chartData.length; i++) {
+                let it = chartData[i];
                 lengData.push({
-                  name: it,
+                  name: it.name,
                   color: colorList[i],
-                  value: number[i],
+                  value: it.average,
                 });
                 mainData.push({
-                  name: it,
+                  name: it.name,
                   color: colorList[i],
-                  value: number[i],
-                  percent: number[i] / mainCount
+                  value: it.average,
+                  percent: it.average / total
                 })
               }
               window.mainData = mainData;
-              console.log('mainData',mainData)
+              // console.log('mainData', mainData)
               chartsStatistics.title.text = `{tb|${total}}`;
               chartsStatistics.title.subtext = "{zb|总数}";
 
@@ -123,11 +138,12 @@ export default {
               chartsStatistics.series[0].data = mainData;
 
               myChart.on('mouseover', (params) => {
+                // console.log('params',params)
                 if (params.componentType == 'graphic') {
                   return
                 }
                 chartsStatistics.title.text = `{tb|${params.percent}%}`;
-                chartsStatistics.title.subtext =  `{zb|${params.data.name}}`;
+                chartsStatistics.title.subtext = `{zb|${params.data.name}}`;
                 // chartsStatistics.title.left = "22%";
                 myChart.setOption(chartsStatistics);
               })
@@ -140,7 +156,9 @@ export default {
                 myChart.setOption(chartsStatistics);
               })
             }
+
           }
+
           myChart.setOption(chartsStatistics);
         })
 
@@ -157,10 +175,12 @@ export default {
         let gr = context.createLinearGradient(230, 0, 360, 0);
         gr.addColorStop(1, 'rgba(92,197,255,0)');
         gr.addColorStop(0, 'rgba(92,197,255,0.3)');
-        // drawRoundRect(context, 241, 37, 134, 20, 12, gr);
-        // drawRoundRect(context, 241, 64, 134, 20, 12, gr);
-        // drawRoundRect(context, 241, 91, 134, 20, 12, gr);
-        // drawRoundRect(context, 241, 118, 134, 20, 12, gr);
+        drawRoundRect(context, 248, 15, 134, 21, 12, gr);
+        drawRoundRect(context, 248, 42, 134, 21, 12, gr);
+        drawRoundRect(context, 248, 69, 134, 21, 12, gr);
+        drawRoundRect(context, 248, 96, 134, 21, 12, gr);
+        drawRoundRect(context, 248, 123, 134, 21, 12, gr);
+        drawRoundRect(context, 248, 150, 134, 21, 12, gr);
 
         context.lineWidth = 1; // 设置线段宽度
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
index f12e058c..2f7545d0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railway/assets/charts.js
@@ -102,7 +102,7 @@ var options = {
             data: sdata,
             color: '#fff',
             formatter: (c) => {
-               return `{a|}{b|${c.value}辆}`
+               return `{a|}{b|${c.value}件}`
             },
             rich: {
                a: {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
index c6cf05f0..5b74735f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/index.vue
@@ -117,7 +117,7 @@ export default {
                 });
               }
 
-              drawRoundRect(context, 254, 8 + i * 28, 120, 24, 12, gr)
+              drawRoundRect(context, 250, 8 + i * 28, 120, 24, 12, gr)
             }
 
             chartsStatistics.legend.data = typeAnalysisData?.map(x => x.name);

From 4b6c79707cde576e53ac17fa54e926ca3221eb2d Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 16:23:31 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=80=E7=B1=BB?=
 =?UTF-8?q?=E4=BA=A4=E8=B0=83=E7=AB=99=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/Dialogs/Intermodulation/index.vue      | 7 +++----
 1 file changed, 3 insertions(+), 4 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 31018ac2..c9e55a7a 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
@@ -8,10 +8,10 @@
           <Descriptions :list="list" :data="data" style="gap: 18px" />
         </ElTabPane>
         <ElTabPane label="设备参数" name="second">
-          <div class="content-second">
+          <div class="content-second" style="height: 185px;">
             <RadioGroup v-model="roadType" :options="roadTypeList" />
             <span>当前车流量: 999辆</span>
-            <LineChartForTraffic v-if="activeName === 'second'" />
+            <LineChartForTraffic style="flex: 1;" v-if="activeName === 'second'" />
           </div>
         </ElTabPane>
         <ElTabPane label="在线统计率" name="third">
@@ -125,8 +125,6 @@ export default {
     const roadInfo = await getRoadInfoByStakeMark(this.dialogData.stakeMark);
 
     if (roadInfo) this.data.roadName = roadInfo.roadName;
-  },
-  methods: {
   }
 }
 </script>
@@ -169,6 +167,7 @@ div.switcher {
     display: flex;
     flex-direction: column;
     height: 100%;
+    overflow: hidden;
     gap: 9px;
   }
 

From 67c41ebd3eb370a88f183b0158cd2714df3be8b0 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 16:25:35 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=8E=8B=E7=BC=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index da9db393..97c6a60e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
@@ -9,8 +9,8 @@
 
     <!-- group -->
     <div name="fade-group" tag="div" class="tabs-content">
-      <div class="device-item" v-for="(item, index) in tabContentData" :key="item.id" @click="handleDevice(item)"
-        :style="getStart(index)">
+      <div class="device-item keep-ratio" v-for="(item, index) in tabContentData" :key="item.id"
+        @click="handleDevice(item)" :style="getStart(index)">
         <div class="device-icon"
           :style="{ backgroundImage: `url(${require(`@screen/images/layer/${active}/${item.title}${item.status}.svg`)})`, '--bgColor': `rgba(0, 209, 255, ${item.status ? 0.3 : 0})` }" />
         <span>{{ item.title }}</span>

From 14e5c1df7e6374e1791e343215c3d2de224e127f Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Tue, 6 Feb 2024 16:30:01 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 9a026420..aa697716 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
@@ -8,7 +8,7 @@
           <Descriptions :list="list" :data="data" style="gap: 18px">
             <template #content-deviceState>
               <img :src="require(`./images/${data.deviceState == 1 ? 'online' : 'offline'}.jpg`)" width="18">
-              {{ DeviceTypeEnum[data.deviceState] || "-" }}
+              {{ DeviceTypeEnum[data.deviceState] || "" }}
             </template>
           </Descriptions>
         </ElTabPane>