From b43534488fc7e14718363b9f9cff0552e524fa71 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 2 Apr 2024 17:01:52 +0800
Subject: [PATCH 01/21] =?UTF-8?q?feat=20=E6=9B=B4=E6=96=B0=E6=91=84?=
 =?UTF-8?q?=E5=83=8F=E5=A4=B4=E6=92=AD=E6=94=BE=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/components/Video/videoStream.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
index dc4b6fff..d52db42b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/videoStream.js
@@ -8,6 +8,11 @@ import {
   getNearCameraNew,
 } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
 
+const ErrorTypesCn = {
+  NetworkError: "网络错误",
+  MediaError: "媒体错误",
+  OtherError: "其他错误",
+};
 /**
  * flv 视频测试
  * https://bilibili.github.io/flv.js/demo/
@@ -96,7 +101,10 @@ async function getUrl({ camId, url, pileNum, rangeIndex } = {}) {
     url = data.liveUrl;
   }
 
-  if (!url) return Promise.reject("获取 url 失败!");
+  if (!url) {
+    Message.warning("未获取到当前相机的播放地址");
+    return Promise.reject("获取 url 失败!");
+  }
 
   return url;
 }
@@ -187,7 +195,9 @@ export class HttpLivePlayer {
       console.log("errorType", errorType);
       console.log("errorDetail", errorDetail);
       console.log("errorInfo", errorInfo);
-
+      Message.warning(
+        `视频流加载失败, ${ErrorTypesCn[errorType] || "其他错误"}`
+      );
       this.initLiveVideo();
     });
 

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

---
 .../event/event/EventDetailDialog/index.vue   |  4 +-
 .../postTrendsMonth/assets/charts.js          | 19 +++++---
 .../postTrendsMonth/assets/charts2.js         | 47 ++++++++++++-------
 .../postTrendsMonth/assets/charts3.js         | 11 ++++-
 .../components/postTrendsMonth/index.vue      |  2 +-
 .../components/daylyAnalysis/assets/charts.js |  2 +-
 .../PublishingChannelManagement/index.vue     |  2 +-
 7 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 0fa76476..4781411f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="15%">
+  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
     <div
       class="EventDetail"
       :style="{
-        height: activeName == '-1' || activeName == '0' ? '380px' : '768px',
+        height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
       }"
     >
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
index 28f57d2a..022abe5c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
@@ -18,20 +18,24 @@ let data3 = [200, 530, 920, 400, 600, 700, 300, 800];
 let options = {
   tooltip: {
     show: true,
-    trigger: "axis",
+    // trigger: "axis",
     axisPointer: {
       // 坐标轴指示器，坐标轴触发有效
       type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
     },
-    valueFormatter: function (value) {
-      return value + " 起";
+    formatter: function (params) {
+      if (params.seriesName == "路段里程数") {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 公里</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      }
     },
   },
   grid: {
     left: "0",
     right: "0",
     top: "90px",
-    bottom: "20px",
+    bottom: "-10px",
     containLabel: true,
   },
   xAxis: {
@@ -52,11 +56,14 @@ let options = {
       interval: 0,
       align: "center",
       rotate: "1",
-      margin: "20",
+      margin: 30,
       textStyle: {
         fontSize: 10,
         color: "#E5E7E8",
       },
+      formatter: (value) => {
+        return value.split("-").join("\n\n");
+      },
     },
   },
   yAxis: [
@@ -262,7 +269,6 @@ let options = {
         opacity: 1,
         color: function (params) {
           var a = params.name;
-          // console.log("==========a=============", a);
           return new echarts.graphic.LinearGradient(
             0,
             0,
@@ -322,7 +328,6 @@ let options = {
         opacity: 1,
         color: function (params) {
           var a = params.name;
-          // console.log("==========a=============", a);
           return new echarts.graphic.LinearGradient(
             0,
             0,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
index ee01021c..3619aed6 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js
@@ -4,15 +4,30 @@ let lc2 = [400, 550, 200, 140, 400, 550];
 let options = {
   tooltip: {
     show: true,
-    trigger: "axis",
-    valueFormatter: function (value) {
-      return value + " 起";
+    trigger: "item",
+    formatter: function (params) {
+      console.log(77, params.seriesName);
+      // params.forEach((item) => {
+      //   console.log(item);
+      //   if (item.seriesName == "平均处置时长") {
+      //     console.log(77, item.seriesName);
+      //     return `<div>${item.marker} ${item.name} <span style="font-weight: bold;">${item.value} 分钟</span></div>`;
+      //   }
+      // });
+      if (params.seriesName == "平均处置时长") {
+        console.log(77, params.seriesName);
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      } else if (params.seriesName == "去年同期平均处置时长") {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      }
     },
   },
   grid: {
     right: "4%",
     top: "90px",
-    left: "2%",
+    left: "30px",
     bottom: "0%",
     containLabel: true,
   },
@@ -86,12 +101,12 @@ let options = {
           // formatter: "{value} °C",
         },
       },
-      // axisLine: {
-      //   show: false,
-      // },
-      // axisTick: {
-      //   show: false,
-      // },
+      axisLine: {
+        show: false,
+      },
+      axisTick: {
+        show: false,
+      },
       splitLine: {
         show: false,
         lineStyle: {
@@ -227,14 +242,14 @@ let options = {
       yAxisIndex: 1,
       data: lc2,
       type: "line",
-      symbol: "none",
-      symbolSize: 20,
+      // symbol: "none",
+      symbolSize: 5,
       smooth: true,
       color: "#E2BA74",
       lineStyle: {
         color: "#E2BA74",
         width: 1,
-        type: "dashed",
+        // type: "dashed",
         // dashOffset:50
       },
     },
@@ -243,14 +258,14 @@ let options = {
       yAxisIndex: 1,
       data: lc,
       type: "line",
-      symbol: "none",
-      symbolSize: 20,
+      // symbol: "none",
+      symbolSize: 5,
       smooth: true,
       color: "#FB6D07",
       lineStyle: {
         color: "#FB6D07",
         width: 1,
-        type: "dashed",
+        // type: "dashed",
         // dashOffset:50
       },
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
index 83691ff5..fa80a0e0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js
@@ -23,8 +23,14 @@ var options = {
   },
   tooltip: {
     show: true,
-    valueFormatter: function (value) {
-      return value + " 起";
+    trigger: "item",
+    formatter: function (params) {
+      if (params.seriesName == "事件数量（起）") {
+        console.log(77, params.seriesName);
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 起</span></div>`;
+      } else {
+        return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 分钟</span></div>`;
+      }
     },
   },
   legend: {
@@ -33,6 +39,7 @@ var options = {
     itemHeight: 8,
     itemWidth: 8,
     top: "5%",
+
     right: "0%",
     textStyle: {
       // fontSize: 12,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
index 9a273147..3dbcaf2c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
@@ -324,7 +324,7 @@ export default {
       margin-bottom: 10px;
       left: 20px;
       top: 10px;
-      z-index: 0;
+      z-index: 1;
 
       div {
         white-space: nowrap;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
index 51095a7b..5a5152e7 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/daylyAnalysis/assets/charts.js
@@ -5,7 +5,7 @@ var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15];
 var options = {
   tooltip: {
     formatter: function (params) {
-      console.log("params", params);
+      // console.log("params", params);
       if (params.seriesName == "增收金额") {
         return `<div>${params.marker} ${params.name} <span style="font-weight: bold;">${params.value} 万元</span></div>`;
       } else {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
index a56c1d30..5a2366e9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue
@@ -18,7 +18,7 @@
       </div>
 
       <InputSearch
-        style="width: 402px"
+        style="width: 480px"
         :formList="searchFormList"
         @handleSearch="handleSearch"
       />

From 19b5137730e50e16a0bac65f4f985a4e4a2aa15e Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Tue, 2 Apr 2024 18:22:19 +0800
Subject: [PATCH 03/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BB=B6=E8=BF=9F=E6=89=93=E5=BC=80=E8=81=9A=E5=90=88=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index a0b120d9..ab20e917 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
@@ -238,19 +238,19 @@ export class MarkerCluster {
 
     const reset = () => {
       if (!window.openInfoWindow) {
-        // console.log(window.openInfoWindow, "rest");
+        // console.log("窗口movestart中", new Date());
         this.infoWindow?.close?.();
       }
     };
 
     map.on("zoomstart", reset);
-    map.on("mapmove", reset);
+    map.on("zoomend", reset);
+    map.on("movestart", reset);
     map.on("moveend", async () => {
       if (window.openInfoWindow) {
-        console.log("窗口位移结束");
+        // console.log("窗口位移结束", new Date());
         window.openInfoWindow = false;
-        await new Promise((resolve) => setTimeout(resolve, 840));
-        window.infoWindow?.open?.();
+        // window.infoWindow?.open?.();
       }
     });
 

From 41266ed2d443696422a26f97236f741f1c4198bd Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 3 Apr 2024 10:28:48 +0800
Subject: [PATCH 04/21] =?UTF-8?q?=E5=A4=AA=E9=98=B3=E8=83=BD=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layer/路测设备/太阳能板.svg       |   5 +
 .../路测设备/太阳能板_active.svg      |   3 +
 .../layer/路测设备/太阳能板_fault.svg |   3 +
 .../components/DeviceControlDialog.vue        |  55 +++++
 .../SolarEnergy/components/DeviceParams.vue   | 160 ++++++++++++++
 .../components/Dialogs/SolarEnergy/data.js    |  44 ++++
 .../components/Dialogs/SolarEnergy/index.vue  | 197 ++++++++++++++++++
 .../Home/components/RoadAndEvents/index.vue   |   2 +
 .../RoadAndEvents/utils/buttonEvent.js        |   4 +
 9 files changed, 473 insertions(+)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_active.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_fault.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceControlDialog.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/data.js
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue

diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板.svg
new file mode 100644
index 00000000..0c8315e6
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="17" viewBox="0 0 20 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142815835">
+<path id="Vector" d="M10.7401 12.0997V14.218H14.3689V16.1134H5.29693V14.218H8.92573V12.0997H10.7401ZM3.66073 9.01901L3.03433 11.7838H1.22803C0.939128 11.7838 0.666428 11.6488 0.490928 11.4166C0.315428 11.1844 0.261428 10.8847 0.339728 10.6066L0.796028 9.01901H3.66073ZM9.37933 9.01901V11.7838H3.96583L4.59223 9.01901H9.37933ZM15.6622 9.01901L16.2886 11.7838H10.2865V9.01901H15.6622ZM19.1695 9.01901L19.6258 10.6093C19.7041 10.8874 19.6501 11.1871 19.4746 11.4166C19.3018 11.6488 19.0291 11.7838 18.7375 11.7838H17.2174L16.591 9.01901H19.1695ZM4.28713 6.25421L3.86863 8.09831H1.06333L1.59253 6.25421H4.28713ZM9.37933 6.25421V8.09831H4.80013L5.21863 6.25421H9.37933ZM15.0358 6.25421L15.4543 8.09831H10.2865V6.25421H15.0358ZM18.3757 6.25421L18.9049 8.09831H16.3831L15.9673 6.25421H18.3757ZM4.91353 3.48941L4.49503 5.33351H1.85713L2.38633 3.48941H4.91353ZM9.37933 3.48941V5.33351H5.42653L5.84503 3.48941H9.37933ZM14.4094 3.48941L14.8279 5.33351H10.2865V3.48941H14.4094ZM17.5819 3.48941L18.1111 5.33351H15.7567L15.3382 3.48941H17.5819ZM5.53993 0.724609L5.12143 2.56871H2.65093L2.98843 1.39421C3.10183 1.00001 3.46363 0.727309 3.87403 0.727309H5.53993V0.724609ZM9.37933 0.724609V2.56871H6.05293L6.47143 0.724609H9.37933ZM13.783 0.724609L14.2015 2.56871H10.2865V0.724609H13.783ZM16.0942 0.724609C16.5046 0.724609 16.8664 0.997309 16.9798 1.39151L17.3173 2.56871H15.1303L14.7118 0.724609H16.0942Z" fill="#0FD4FF"/>
+</g>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_active.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_active.svg
new file mode 100644
index 00000000..cdab49c1
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_active.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Vector" d="M10.4354 11.3751V13.4934H14.0642V15.3888H4.99224V13.4934H8.62104V11.3751H10.4354ZM3.35604 8.2944L2.72964 11.0592H0.923341C0.634441 11.0592 0.361741 10.9242 0.186241 10.692C0.0107407 10.4598 -0.0432593 10.1601 0.0350407 9.882L0.491341 8.2944H3.35604ZM9.07464 8.2944V11.0592H3.66114L4.28754 8.2944H9.07464ZM15.3575 8.2944L15.9839 11.0592H9.98184V8.2944H15.3575ZM18.8648 8.2944L19.3211 9.8847C19.3994 10.1628 19.3454 10.4625 19.1699 10.692C18.9971 10.9242 18.7244 11.0592 18.4328 11.0592H16.9127L16.2863 8.2944H18.8648ZM3.98244 5.5296L3.56394 7.3737H0.758641L1.28784 5.5296H3.98244ZM9.07464 5.5296V7.3737H4.49544L4.91394 5.5296H9.07464ZM14.7311 5.5296L15.1496 7.3737H9.98184V5.5296H14.7311ZM18.071 5.5296L18.6002 7.3737H16.0784L15.6626 5.5296H18.071ZM4.60884 2.7648L4.19034 4.6089H1.55244L2.08164 2.7648H4.60884ZM9.07464 2.7648V4.6089H5.12184L5.54034 2.7648H9.07464ZM14.1047 2.7648L14.5232 4.6089H9.98184V2.7648H14.1047ZM17.2772 2.7648L17.8064 4.6089H15.452L15.0335 2.7648H17.2772ZM5.23524 0L4.81674 1.8441H2.34624L2.68374 0.6696C2.79714 0.2754 3.15894 0.00269997 3.56934 0.00269997H5.23524V0ZM9.07464 0V1.8441H5.74824L6.16674 0H9.07464ZM13.4783 0L13.8968 1.8441H9.98184V0H13.4783ZM15.7895 0C16.1999 0 16.5617 0.2727 16.6751 0.6669L17.0126 1.8441H14.8256L14.4071 0H15.7895Z" fill="#FFDB82"/>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_fault.svg
new file mode 100644
index 00000000..0d47a964
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/太阳能板_fault.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Vector" d="M10.4354 11.3751V13.4934H14.0642V15.3888H4.99224V13.4934H8.62104V11.3751H10.4354ZM3.35604 8.2944L2.72964 11.0592H0.923341C0.634441 11.0592 0.361741 10.9242 0.186241 10.692C0.0107407 10.4598 -0.0432593 10.1601 0.0350407 9.882L0.491341 8.2944H3.35604ZM9.07464 8.2944V11.0592H3.66114L4.28754 8.2944H9.07464ZM15.3575 8.2944L15.9839 11.0592H9.98184V8.2944H15.3575ZM18.8648 8.2944L19.3211 9.8847C19.3994 10.1628 19.3454 10.4625 19.1699 10.692C18.9971 10.9242 18.7244 11.0592 18.4328 11.0592H16.9127L16.2863 8.2944H18.8648ZM3.98244 5.5296L3.56394 7.3737H0.758641L1.28784 5.5296H3.98244ZM9.07464 5.5296V7.3737H4.49544L4.91394 5.5296H9.07464ZM14.7311 5.5296L15.1496 7.3737H9.98184V5.5296H14.7311ZM18.071 5.5296L18.6002 7.3737H16.0784L15.6626 5.5296H18.071ZM4.60884 2.7648L4.19034 4.6089H1.55244L2.08164 2.7648H4.60884ZM9.07464 2.7648V4.6089H5.12184L5.54034 2.7648H9.07464ZM14.1047 2.7648L14.5232 4.6089H9.98184V2.7648H14.1047ZM17.2772 2.7648L17.8064 4.6089H15.452L15.0335 2.7648H17.2772ZM5.23524 0L4.81674 1.8441H2.34624L2.68374 0.6696C2.79714 0.2754 3.15894 0.00269997 3.56934 0.00269997H5.23524V0ZM9.07464 0V1.8441H5.74824L6.16674 0H9.07464ZM13.4783 0L13.8968 1.8441H9.98184V0H13.4783ZM15.7895 0C16.1999 0 16.5617 0.2727 16.6751 0.6669L17.0126 1.8441H14.8256L14.4071 0H15.7895Z" fill="#FF5F5F"/>
+</svg>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceControlDialog.vue
new file mode 100644
index 00000000..dd73bbda
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceControlDialog.vue
@@ -0,0 +1,55 @@
+<template>
+  <Dialog v-model="modelVisible" title="设备操作" width="550px">
+    <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/SolarEnergy/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
new file mode 100644
index 00000000..d51163fb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class='DeviceParams'>
+    <div class="no-data" v-if="!devicesList.length" v-loading="secondLoading">暂无设备参数</div>
+    <Descriptions :list="devicesList" :data="devicesData" style="gap: 18px;" column="6">
+      <template v-for="item in devicesList.slice(0, -1)" #[`content-${getSlotKey(item.key)}`]="{ data }">
+        <span>{{ data.text }}</span>
+        <Switcher v-if="!disabled" class="switcher" :activeOption="activeOption" :value="data.state"
+          @change="(value) => handleSwitcherChange(value, data)" />
+        <ElTag style="margin-left: 20px;" v-else effect="dark" :type="data.state ? '' : 'info'">{{ data.state ? '开' :
+      '关' }}
+        </ElTag>
+      </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";
+import { devicesFormList } from '../data.js';
+
+export default {
+  name: 'DeviceParams',
+  components: {
+    Descriptions,
+    Switcher
+  },
+  props: {
+    dialogData: {
+      type: Object,
+      default: () => ({})
+    },
+    disabled: Boolean
+  },
+  data() {
+    return {
+      secondLoading: true,
+      devicesList: [],
+      devicesData: {},
+      activeOption: {
+        active: {
+          text: "开"
+        },
+        unActive: {
+          text: "关"
+        }
+      }
+    }
+  },
+  created() {
+    // this.devicesList = devicesFormList;
+    this.devicesList = [];
+    let devs = [];
+    // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => {
+    Promise.all([this.getAc()]).then(res => {
+      console.log('res', res)
+      request({
+        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
+        method: "get",
+      }).then(result => {
+        if (result.code != 200) return Message.error("操作失败");
+        result.data.forEach(item => {
+          devs.push({
+            label: item.propertyName,
+            key: item.property,
+            gridColumn: 3,
+          });
+          this.devicesData[item.property] = item.formatValue;
+        });
+        this.devicesList = devs;
+      })
+
+    })
+  },
+  methods: {
+    getAc() {
+      return request({
+        url: `/business/device/batchFunctions`,
+        method: "post",
+        data: {
+          devices: [{
+            iotDeviceId: this.dialogData.iotDeviceId,
+            id: this.dialogData.id,
+          }],
+          functions: [
+            {
+              functionId: "A1",
+            }, {
+              functionId: "A2",
+            }, {
+              functionId: "A3",
+            }, {
+              functionId: "A4",
+            }, {
+              functionId: "A5",
+            }, {
+              functionId: "A6",
+            }
+          ],
+          // parameter: {}
+        }
+      })
+    },
+    async handleSwitcherChange(value, data) {
+      let str = data.state ? "关闭" : "开启";
+      let deviceName = "";
+      if (data.key.includes("fan")) {
+        str += "风扇?";
+        deviceName = "fan_out_en";
+      } else {
+        str += "该支路?"
+        deviceName = data.key.match(/^[a-z]+_out|[0-9]+/g).join("_") + "_en"; //dc_out_2_en    ac_out_2_en;
+      }
+      data.state = value;
+      const isContinue = await confirm({ message: `${str}` })
+        .catch(() => {
+          console.log(data.state, value, 333)
+          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,
+          // 开关：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.includes('fan') ? key : ''
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.DeviceParams {
+  height: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/data.js
new file mode 100644
index 00000000..1820068a
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/data.js
@@ -0,0 +1,44 @@
+export const devicesFormList = [
+  {
+    label: "设备内温度过高",
+    key: `theInternalTemperatureOfTheDeviceOverheats`,
+    // text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "阵列电压",
+    key: `arrayVoltage`,
+    // text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "阵列电流",
+    key: `arrayCurrent`,
+    // text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "发电功率L",
+    key: `generatingPowerL`,
+    text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "发电功率H",
+    key: `generatingPowerH`,
+    text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "负载电压",
+    key: `loadVoltage`,
+    text: "-",
+    gridColumn: 2,
+  },
+  {
+    label: "负载电流",
+    key: `loadCurrent`,
+    text: "-",
+    gridColumn: 2,
+  },
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
new file mode 100644
index 00000000..f43ad33b
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue
@@ -0,0 +1,197 @@
+<template>
+  <Dialog v-model="obverseVisible" title="太阳能板" width="550px">
+    <Video class="video-stream" :pileNum="dialogData.stakeMark" />
+
+    <div class="SolarEnergy">
+      <ElTabs v-model="activeName" class="tabs">
+        <ElTabPane label="基本信息" name="first">
+          <!-- {{ dialogData }} -->
+          <Descriptions :list="list" :data="data" style="gap: 18px" />
+        </ElTabPane>
+        <ElTabPane label="设备参数" name="second">
+          <DeviceParams disabled :dialogData="dialogData" />
+        </ElTabPane>
+        <ElTabPane label="在线率统计" name="third">
+          <LineChart v-if="activeName === 'third'" :productId="dialogData.id" style="height: 180px" />
+        </ElTabPane>
+      </ElTabs>
+    </div>
+    <!-- <template #footer>
+      <Button v-if="activeName != 'first' && data.deviceState == '1'" @click.native="deviceControlVisible = true">
+        设备操作
+      </Button>
+      <Button v-else-if="activeName != 'first'" style="background-color: #bbb">
+        设备离线
+      </Button>
+    </template> -->
+
+    <DeviceControlDialog v-model="deviceControlVisible" :dialogData="dialogData" />
+  </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 "../../LineChart/index.vue";
+import DeviceParams from "./components/DeviceParams.vue";
+import DeviceControlDialog from "./components/DeviceControlDialog.vue";
+
+import request from "@/utils/request";
+
+import {
+  getRoadInfoByStakeMark,
+  getProduct,
+} from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
+import { dialogDelayVisible } from "./../mixin";
+import { resolve } from "@antv/x6/lib/registry/node-anchor/util";
+
+// 太阳能板
+export default {
+  name: "SolarEnergy",
+  mixins: [dialogDelayVisible],
+  components: {
+    Dialog,
+    Descriptions,
+    LineChart,
+    Video,
+    Button,
+    DeviceParams,
+    DeviceControlDialog,
+  },
+  data() {
+    return {
+      activeName: "first",
+      releaseVisible: false,
+      deviceControlVisible: false,
+      data: {
+        deviceName: "LH24",
+        roadName: "G35济泽高速",
+        stakeMark: "k094+079",
+        direction: "1",
+        organizationName: "山东高速济南发展公司",
+        brand: "XXX厂家",
+        deviceState: "0",
+      },
+      list: [
+        {
+          label: "设备名称",
+          key: "deviceName",
+        },
+        {
+          label: "设备桩号",
+          key: "stakeMark",
+        },
+        {
+          label: "道路名称",
+          key: "roadName",
+        },
+        {
+          label: "设备方向",
+          key: "direction",
+          enum: "CameraDirectionEnum",
+        },
+        {
+          label: "设备状态",
+          key: "deviceState",
+          enum: "DeviceTypeEnum",
+          // visible: false,
+        },
+        // {
+        //   label: "设备状态",
+        //   key: "deviceStateLiteral",
+        // },
+        {
+          label: "设备厂商",
+          key: "manufacturer",
+        },
+      ],
+    };
+  },
+  async created() {
+    // if (!this.dialogData.iotDeviceId) this.dialogData.iotDeviceId = '10.0.36.146-1883';
+
+    // let deviceInfo = await this.getDeviceInfo();
+    this.data = {
+      ...this.dialogData,
+      roadName: null,
+      // deviceStateLiteral: deviceInfo.data.formatValue.deviceState,
+    };
+
+    // 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: {
+    async getDeviceInfo() {
+      return request({
+        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId || "10.0.36.143-1883"
+          }/3`,
+        method: "get",
+        params: {},
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+div.switcher {
+  font-size: 12px;
+  padding: 2px;
+}
+</style>
+<style lang="scss" scoped>
+.SolarEnergy {
+  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%;
+        }
+      }
+    }
+  }
+
+  .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/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 44487c11..b5fbf7dc 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 SolarEnergy from "./../Dialogs/SolarEnergy/index.vue";
 import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
 import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue";
 
@@ -65,6 +66,7 @@ export default {
     TrafficIncidents,
     PerceiveEvent,
     SmartDevice,
+    SolarEnergy,
     Intermodulation,
     GuardrailCollision,
     FatigueWakesUp
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 bd316ae4..022ff1e1 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
@@ -74,6 +74,10 @@ export const DeviceForMap = {
     deviceType: "10",
     dialog: "FatigueWakesUp",
   },
+  太阳能板: {
+    deviceType: "15",
+    dialog: "SolarEnergy",
+  },
 };
 
 export const lngLatMap = {}; //优化  缩略图 + 地图 复用lngLatmap

From fa184c0539556fba3f2e64d3911db4ba1be92abe Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 3 Apr 2024 14:11:35 +0800
Subject: [PATCH 05/21] =?UTF-8?q?=E5=A4=AA=E9=98=B3=E8=83=BD=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialogs/SolarEnergy/components/DeviceParams.vue        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
index d51163fb..3241e95e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
@@ -84,20 +84,27 @@ export default {
           devices: [{
             iotDeviceId: this.dialogData.iotDeviceId,
             id: this.dialogData.id,
+            deviceType: 15
           }],
           functions: [
             {
               functionId: "A1",
+              params: {}
             }, {
               functionId: "A2",
+              params: {}
             }, {
               functionId: "A3",
+              params: {}
             }, {
               functionId: "A4",
+              params: {}
             }, {
               functionId: "A5",
+              params: {}
             }, {
               functionId: "A6",
+              params: {}
             }
           ],
           // parameter: {}

From ba67e97e611837e53fea9fb0926cfd5ae735e5f7 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Wed, 3 Apr 2024 15:46:12 +0800
Subject: [PATCH 06/21] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/common/menuData.js               |  12 +-
 .../components/infoBoard/BoardPreview.vue     |   2 +-
 .../infoBoard/BoardRecordPreview.vue          | 111 ++++++++++++++++
 .../pages/service/boardRecord/index.vue       | 123 +++++++++---------
 ruoyi-ui/vue.config.js                        |   6 +-
 5 files changed, 182 insertions(+), 72 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue

diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index 70e7f16d..9a1cbf94 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -177,12 +177,12 @@ export default [
         path: "/service/board",
         component: "service/board/index.vue",
       },
-      // {
-      //   title: "情报板记录",
-      //   name: "boardRecord",
-      //   path: "/service/boardRecord",
-      //   component: "service/boardRecord/index.vue",
-      // },
+      {
+        title: "情报板记录",
+        name: "boardRecord",
+        path: "/service/boardRecord",
+        component: "service/boardRecord/index.vue",
+      },
       {
         title: "情报板敏感词",
         name: "sensitive",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
index 51c3e6da..b3b7d445 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardPreview.vue
@@ -74,7 +74,7 @@ export default {
                 this.boardStyle =  {
                     width: `${arr[0] * scale}px`,
                     height: `${arr[1] * scale}px`,
-                    "background-color":`${this.tpl.backgroundColor}px`,
+                    "background-color":`${this.tpl.backgroundColor}`,
                     "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.verticalAlignment]  //模板的字段为为formatStyle
                 }
                 let fontSize = 0;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue
new file mode 100644
index 00000000..b4f2cfeb
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardRecordPreview.vue
@@ -0,0 +1,111 @@
+<template>
+    <div class="boardPreview" ref="compBox">
+        <div class="boardBox" :style="boardStyle" v-if="isReady">
+            <p class="boardTxt" v-for="item,index in contentArr" :key="index" :style="boardTxtStyle" v-html="item" v-if="(index + 1) <= lineTotal">
+            </p>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    name:"BoardPreview",
+    data(){
+        return {
+            isReady: false,
+            boardStyle:null,
+            boardTxtStyle:null,
+            contentArr:{
+                type:Array,
+                default:()=>[]
+            },
+            lineTotal: 0
+        }
+    },
+    props:{
+        tpl: {
+            type: Object,
+            default: ()=>{}
+        },
+    },
+    watch:{
+        tpl:{
+            handler(newV){
+                this.contentArr = this.tpl.CONTENT.replaceAll(/\\\\n/g, '\n').replaceAll(/\\=/g, '=').replaceAll(/\\,/g, ',').replaceAll(/ /g, '&nbsp').split('\n');
+                this.setStyle();
+            },
+            deep:true,
+            immediate:true
+        }
+    },
+    computed:{
+    },
+    mounted(){
+    },
+    methods:{
+        setStyle() {
+            this.$nextTick(() => {
+
+                let boxW = this.$refs["compBox"].clientWidth;
+                let boxH = this.$refs["compBox"].clientHeight;
+                let boardW = this.tpl.width;
+                let boardH = this.tpl.height;
+                let scale = 1;
+                if (boxH > 20) {  //判断是否设置了显示高度，判断>0即可，20是为了兼容误差
+                    if (boardW / boardH > boxW / boxH) {
+                        scale = boxW / boardW;
+                    } else {
+                        scale = boxH / boardH;
+                    }
+                } else {
+                    if (boardW > boxW) {
+                        scale = boxW / boardW;
+                    }
+                }
+
+                this.boardStyle =  {
+                    width: `${boardW * scale}px`,
+                    height: `${boardH * scale}px`,
+                    "align-items" : ['flex-start', 'flex-end', 'center'][this.tpl.formatStyle]  //模板的字段为为formatStyle
+                }
+                let fontSize = 0;
+                if (_.isString(this.tpl.FONT_SIZE)) {
+                    fontSize = this.tpl.FONT_SIZE.replace('px', '') * 1;
+                } else {
+                    fontSize = this.tpl.fontSize;
+                }
+                this.boardTxtStyle = {
+                    "color": "#" + this.tpl.COLOR,  //模板的字段为fontColor
+                    "font-size": `${fontSize*scale}px`,
+                    "font-family": this.fontTypeDic[this.tpl.FONT || '3'],   //模板的字段为fontType
+                    "min-height": `${fontSize * scale}px`
+                }
+                this.lineTotal = Math.floor(boardH / fontSize);
+                this.isReady = true;
+                
+            })
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.boardPreview{
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    .boardBox {
+        background-color: #000;
+        display: flex;
+        overflow: hidden;
+        flex-direction: column;
+        justify-content: center;
+        .boardTxt{
+            color: #f00;
+            line-height: 1;
+            margin-bottom: 0;
+            word-break: keep-all;
+            white-space: nowrap;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index a6218c69..bd10cfeb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -1,6 +1,5 @@
 <template>
   <div class='board_record'>
-
     <!-- 搜索栏 -->
     <div class="filter">
       <div>
@@ -22,22 +21,38 @@
 
     <!-- 内容 -->
     <div class="body">
-      <Table :data="tableData">
-        <ElTableColumn label="序号" width="60" />
-        <ElTableColumn label="发布设备" width="60" />
-        <ElTableColumn label="屏幕尺寸" width="60" />
-        <ElTableColumn label="设备方向" width="60" />
-        <ElTableColumn label="设备桩号" width="60" />
-        <ElTableColumn prop="eventName" label="发布内容" width="240" />
-        <ElTableColumn prop="eventName" label="发布事件" width="240" />
-        <ElTableColumn prop="eventName" label="发布状态" width="240" />
-        <ElTableColumn prop="eventName" label="发布用户" width="240" />
+      <Table :data="tableData" height="100%">
+        <el-table-column label="序号" type="index" :index="indexMethod" width="60"/>
+        <ElTableColumn label="发布时间" prop="releaseTime" width="180"/>
+        <ElTableColumn label="设备ID" prop="deviceId" width="120"/>
+        <ElTableColumn label="设备名称" prop="deviceName" />
+        <ElTableColumn label="桩号" prop="stakeMark" width="100" />
+        <el-table-column
+          prop="direction"
+          label="方向"
+          width="120"
+          :formatter="formatterDirection" />
+        <ElTableColumn label="内容" prop="releaseContent" width="500" header-align="center">
+          <template slot-scope="scope">
+            <el-carousel direction="horizontal" :autoplay="false" indicator-position="inside" height="80px" arrow="never" class="board_shower">
+              <el-carousel-item v-for="item,index in JSON.parse(scope.row.releaseContent)" :key="index">
+                <BoardRecordPreview :tpl="item" style="height: 100%;"/>
+              </el-carousel-item>
+            </el-carousel>
+          </template>
+        </ElTableColumn>
+        <ElTableColumn label="状态" prop="releaseStatus" width="120" :formatter="formatterStatus"/>
+        <ElTableColumn label="用户名" prop="releaseUserName" width="180" />
+        <ElTableColumn label="用户ID" prop="releaseUserId" width="180" />
+        <ElTableColumn label="用户IP" prop="releaseIp" width="200" />
+       <!--
         <ElTableColumn label="操作" width="210">
           <template slot-scope="scope">
             <ElButton type="text" style="color: #00D1FF;" @click="showDisposal(scope.row.eventType)">流程配置</ElButton>
             <ElButton type="text" style="color: #00EBC1;" @click="showPhrases(scope.row)">常用语</ElButton>
           </template>
         </ElTableColumn>
+      -->
       </Table>
     </div>
 
@@ -56,16 +71,20 @@ import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
 import Pagination from '@screen/components/Pagination.vue';
 import Table from '@screen/components/Table.vue';
 import request from "@/utils/request";
+import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
+import {DirectionTypes} from '@screen/utils/enum.js';
 
 export default {
   name: 'boardRecord',
   components: {
     ButtonGradient,
     Pagination,
-    Table
+    Table,
+    BoardRecordPreview
   },
   data() {
     return {
+      testData : {"STAY":"30","ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"32","CONTENT":"因改扩建施工 平阴南、梁山收费站出入口封闭","width":"768","height":"64","formatStyle":"2"},
       tableData: [],
       isShowPhrases: false,
       isShowDisposal: false,
@@ -83,9 +102,18 @@ export default {
     this.initData();
   },
   methods: {
+    indexMethod(index) {
+        return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
+      },
+    formatterDirection(row, column) {
+        return DirectionTypes[row.direction];
+      },
+    formatterStatus(row, column) {
+        return ["","成功"][row.releaseStatus];
+      },
     initData() {
       request({
-        url: `/business/dcEventType/list`,
+        url: `/business/boardReleaseLog/list`,
         method: "get",
         params: this.searchData,
       }).then((result) => {
@@ -96,44 +124,14 @@ export default {
     },
     onRefresh() {
       this.tableData = [];
-      setTimeout(() => {
-        this.initData();
-      }, 100);
+      this.searchData.pageNum = 1;
+      this.initData();
     },
     onSizeChange(pageSize) {
+      this.tableData = [];
       this.searchData.pageSize = pageSize;
-      this.getData();
-    },
-    showPhrases(data) {
-      if (data?.processConfigList.length <= 0) {
-        Message.warning('请先配置流程！');
-        return;
-      }
-      let process = []
-      data.processConfigList.forEach(it => {
-        process.push({
-          id: it.id,
-          commonPhrases: it.commonPhrases,
-          label: it.processNode,
-          isActive: false,
-        })
-      })
-      this.process = process;
-      this.isShowPhrases = true;
-      this.eventType = data.eventType;
-    },
-    showDisposal(eventType) {
-      this.isShowDisposal = true;
-      this.eventType = eventType;
-    },
-    onClosePhrases() {
-      this.isShowPhrases = false
-    },
-    onCloseDisposal() {
-      this.isShowDisposal = false;
-    },
-    onUpdatePhrasesData(phrasesData) {
-      this.phrasesData = phrasesData;
+      this.searchData.pageNum = 1;
+      this.initData();
     }
   }
 }
@@ -141,14 +139,11 @@ export default {
 
 <style lang='scss' scoped>
 .board_record {
-  padding: 21px;
-
+  padding: 0 14px 14px;
+  width:100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-  z-index: 6;
-  width: 100%;
-  height: 100%;
 
   .filter {
     height: 60px;
@@ -164,15 +159,6 @@ export default {
 
   .body {
     flex: 1;
-    position: relative;
-    overflow: hidden;
-
-    .content {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      overflow: auto;
-    }
   }
 
   .footer {
@@ -182,5 +168,18 @@ export default {
     align-items: center;
     justify-content: center;
   }
+
+  .board_shower{
+    margin: 4px;
+  }
+  ::v-deep .el-carousel__indicators--horizontal{
+    line-height: 0; height: 16px;
+    .el-carousel__indicator--horizontal{
+      padding: 7px 4px;
+    }
+  }
+  ::v-deep .el-table__cell div {
+    padding: 0 10px !important;
+  }
 }
 </style>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 12505ec7..69be49da 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -31,7 +31,7 @@ module.exports = {
   devServer: {
     host: "0.0.0.0",
     port: port,
-    https: true,
+    // https: true,
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -52,8 +52,8 @@ module.exports = {
         // target: `http://10.0.81.204:8087`, //现场后台 刘文阁
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
-        // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥
+        target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
+        // target: `http://10.168.68.42:8087`, //王思祥
         // target: `http://10.168.65.194:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝

From 0d45d30288bb1f4da1679b602946f81e2bc6f302 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 3 Apr 2024 16:06:51 +0800
Subject: [PATCH 07/21] 1

---
 .../FormConfig/components/ElCheckboxGroup.vue |  31 +-
 .../JiHeExpressway/images/home-Word/word.png  | Bin 0 -> 1291 bytes
 .../pages/Home/components/HomeWord/index.vue  | 117 +++++++
 .../views/JiHeExpressway/pages/Home/index.vue |  99 +++---
 .../components/postTrendsDay/assets/charts.js |   2 +-
 .../postTrendsMonth/assets/charts.js          |   2 +-
 .../components/postTrendsMonth/index.vue      |   6 +-
 .../components/deviceSummary/index.vue        | 326 +++++++++++-------
 .../components/trafficIndicators/index.vue    |   2 +-
 9 files changed, 394 insertions(+), 191 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/home-Word/word.png
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWord/index.vue

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 e6bbdb4e..c484c49e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
@@ -1,14 +1,26 @@
 <template>
-  <ElCheckboxGroup v-bind="$attrs" v-on="$listeners" class="ElCheckboxGroup" :style="{ gap }">
-    <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>
+  <ElCheckboxGroup
+    v-bind="$attrs"
+    v-on="$listeners"
+    class="ElCheckboxGroup"
+    :style="{ gap }"
+  >
+    <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>
       <div v-if="showIcon">
-        <img v-if="item.deviceState == '0' || item.deviceState == null" src="@/assets/jihe/images/offline.svg"
-          class="state">
-        <img v-else src="@/assets/jihe/images/online.svg" class="state">
+        <img
+          v-if="item.deviceState == '0' || item.deviceState == null"
+          src="@/assets/jihe/images/offline.svg"
+          class="state"
+        />
+        <img v-else src="@/assets/jihe/images/online.svg" class="state" />
       </div>
     </ElCheckbox>
   </ElCheckboxGroup>
@@ -58,6 +70,7 @@ export default {
       display: flex;
       align-items: center;
       gap: 6px;
+      width: 87px;
 
       .el-checkbox__input {
         line-height: 0;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/home-Word/word.png b/ruoyi-ui/src/views/JiHeExpressway/images/home-Word/word.png
new file mode 100644
index 0000000000000000000000000000000000000000..346ee3157a306018cb764e9f0f4fa8fab3a95359
GIT binary patch
literal 1291
zcmV+m1@!ufP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1fWSoK~#7F<yt>)
z)G!o(soJFs4U8}}H^9&$wG|@+SBbs-23&Wf_8Z*YC!qZV4J$=zJAl|O9axYmicncE
z3qmSLy$Zns;_+T==N!km-k;oE0zb)0V!zn_<vl+?+i@UgAYzp+tCUvc)urSaVxdeO
zN+*=g9LEWuXkapw_9<QB@VJz9RAHK+4!D%+I2xHOv?<kK(x67S$3$p41gQ~^QVS=K
zHn$Dq08UOzS>U#JAWxteOGQB)@&F1?RW$6wD8OQpQW%aL7R&syFqm1Qa1>>M)uA{R
zQXXC2g9wGn01nI6C?pH@%o&Sd3(7-^!F^4Qw*)a1v%Cl8L)A3Ngeg*C8_G$H!6sQD
zljLhxV<py>0-I#4wOC^%*Oo$uG<K73B8{O~19?z>xROh3icc~GeMf@sw=Ctylqxc9
z!C+`=byu|figOL%$f>{qx%UHlRZpK9F&9N_6NbYj&mVFQ3Hy-mKyq6^hb_;J-;sOw
z5_vc1ajC&~5tmu1I#;XwxxDAR1xPm@XwN4`nQzEfjSlS5M`#!_AU{ln`eMGH0=|T8
z_!HG@wA4~}kvYzS*l>wEry7<Kh#89oRBkmn*||iS?5GDrLe5PaamM#^fH(J7Q-Z6{
z0Oq|!4ikF>#RZe7#!shD(-K|{;BG2hT;VY`NcdDU0?>vkK(SMW*n5|$p7AbkIUr;^
zF@W<Xz}Fy|$Kz_*8sM)oF%OE4AEEMiNi5Y(6I5`^LF{Bbop*0rn4uls3=|z~f~+we
zUDuw8StvF__!)LJ!vuMpEz<MnqqMZHLBkoebUAvS=(>y@3L5)|JY~eadq=+O1=!Ph
zJwb#`G0bX6Edizp>O+k#XVHV{6%}~AB~3GAQ`9@}>24UrgdFgVbmLW{(L`->LhV<}
zdfjTt!E>r_kzI#xZ(C%F>B-rptd(6eHzM`{y3vORmS{s>t45g*X}Fg6dm-rc9-F0%
zMLT#9g?dS1>_i?O+UmVxQ#^yg5mIVe^7+%{X}&u|PLbJ2l+3vzKD5tc!LY=dYF9``
z4N>EAOg14uuqIphu~7vy0^jA#$(eCBBkg>Uugs^9zV^%}bf`Qim9f@_`B+(SVg7c~
z-flhcDL%~VGq0ipH9;Rke^{rN*3^S^C^Zmcv%B9QWO(toXQ_kpIF#6he(~kC?vRe0
z$EUoC;1pV<qX|wC^PxY4>PBiv-_P6D=OAgSwyzqUHycw)Z%?Y+JUfdyu{5IhnZSuf
zI$BT8N}+%{)q(3>^^TO|1?VOu<4iFg5V^rCnP*!PEnxZ(FFUHg2mpR{1S#Px_Gul!
zo#%cm8q#6vkY3LE#e<4AE?WIa*HRw_#bNn0Pb}?t<)y-<477DVadbZhS3Np9<XrD;
zTpP(t^zJ)O=kVN){>+cjHhKI%$4FA3SSHyUO_NklU{Sqf5)Bvzs4w!02OmZO7L%M0
zc>s%LmJP@gR3V2`|JE-@8aZBjwQ=%j;kbShGYHluL~wjsni4@K#N&FpK>~^c2_Fme
z>#PGg1G_&v^IA;(=<FF{A&5|jw-9)jEcc(C{{jcursIdv%?1Df002ovPDHLkV1kGv
BLTms4

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWord/index.vue
new file mode 100644
index 00000000..617040e5
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeWord/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="HomeVector">
+    <el-tooltip effect="light" content="高速运营快报" placement="left">
+      <Button
+        :class="['btn', { 'btn-active': activeIcon }]"
+        @click.native="handleClick('Vector')"
+      >
+        <div>
+          <img
+            src="@screen/images/home-Word/word.png"
+            style="width: 26px; height: 26px"
+          />
+        </div>
+      </Button>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+import Button from "@screen/components/Buttons/Button.vue";
+import Form from "@screen/components/FormConfig";
+import { delay, exportFile, confirm } from "@screen/utils/common";
+import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import { merge, cloneDeep } from "lodash";
+import { markerClusterIns } from "@screen/pages/Home/components/RoadAndEvents/utils/map.js";
+export default {
+  name: "HomeVector",
+  components: {
+    Button,
+    Form,
+  },
+  data() {
+    return {
+      activeIcon: null,
+    };
+  },
+  created() {
+    this.activeIcon = window.showStakeText ? "Vector" : null;
+  },
+  methods: {
+    handleClick(type) {
+      // this.activeIcon = this.activeIcon === type ? null : type;
+      // if (this.activeIcon) window.showStakeText = true;
+      // else window.showStakeText = false;
+
+      exportFile({
+        url: "/business/word/trafficSituationReport",
+        filename: "通行情况",
+        ext: "docx",
+      });
+    },
+
+    filterEnd(data) {
+      this.activeIcon = null;
+      // this.filterData = data;
+      this.$parent.$refs.RoadAndEventsRef?.setFilterData?.(data);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+div.el-popper.global-input-search-popover {
+  background: rgba(6, 66, 88, 0.8);
+  border: 1px solid rgba(42, 217, 253, 0.6);
+  position: relative;
+  padding-top: 36px;
+  transform: translateY(24px);
+  // margin-top: 6vh;
+
+  .body {
+    .title {
+      background: linear-gradient(
+        90deg,
+        #237e9b 0%,
+        rgba(23, 145, 184, 0) 100%
+      );
+      padding: 3px 9px;
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+    }
+
+    .close {
+      padding: 3px 9px;
+      cursor: pointer;
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: fit-content;
+    }
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.image {
+  width: 50vw;
+  height: 65vh;
+}
+
+.HomeVector {
+  .btn {
+    padding: 9px;
+    background: linear-gradient(180deg, #152e3c 0%, #163a45 100%);
+    border-radius: 4px;
+    overflow: hidden;
+    height: unset;
+    border: 1px solid rgba(40, 144, 167, 1);
+  }
+
+  .btn-active {
+    background: linear-gradient(180deg, #005c79 0%, #009bcc 100%);
+  }
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
index 94b661f3..b0fd17c3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
@@ -1,41 +1,54 @@
 <template>
   <div class="Home">
-      <AMapContainer ref="AMapContainerRef" @update:isGisCompleted="(data) => {
-        this.isGisCompleted = data;
-      }
-        " />
-      <section class="content">
-        <!-- 左侧 -->
-        <div class="content-l">
-          <!-- 上 -->
-          <FocusedMonitoring class="card-menu" />
-  
-          <!-- 下 -->
-          <RoadAndEvents ref="RoadAndEventsRef" :isGisCompleted="isGisCompleted" class="content-l-b card-menu" />
-        </div>
-  
-        <!-- 右侧 -->
-        <div class="content-r">
-          <div class="home-icons">
-            <HomeFilter class="item" />
-            <HomeFrame class="item" />
-            <HomeVector class="item" />
-            <!-- <HomeVectorControl class="item" /> -->
-            <!-- <HomeFrameControl class="item" /> -->
-          </div>
-          <ConditionStatistics class="right card-menu" />
-        </div>
-      </section>
-  
-      <footer class="footer card-menu">
-        <div class="footer-title">
-          <span>济菏高速缩略图</span>
-          <i class="el-icon-s-fold" style="color: #2ad9fd; transform: rotate(-90deg)" @click.stop="handleShrink" />
-        </div>
-        <div class="footer-content">
-          <Thumbnail />
+    <AMapContainer
+      ref="AMapContainerRef"
+      @update:isGisCompleted="
+        (data) => {
+          this.isGisCompleted = data;
+        }
+      "
+    />
+    <section class="content">
+      <!-- 左侧 -->
+      <div class="content-l">
+        <!-- 上 -->
+        <FocusedMonitoring class="card-menu" />
+
+        <!-- 下 -->
+        <RoadAndEvents
+          ref="RoadAndEventsRef"
+          :isGisCompleted="isGisCompleted"
+          class="content-l-b card-menu"
+        />
+      </div>
+
+      <!-- 右侧 -->
+      <div class="content-r">
+        <div class="home-icons">
+          <HomeFilter class="item" />
+          <HomeFrame class="item" />
+          <HomeVector class="item" />
+          <HomeWord class="item" />
+          <!-- <HomeVectorControl class="item" /> -->
+          <!-- <HomeFrameControl class="item" /> -->
         </div>
-      </footer>
+        <ConditionStatistics class="right card-menu" />
+      </div>
+    </section>
+
+    <footer class="footer card-menu">
+      <div class="footer-title">
+        <span>济菏高速缩略图</span>
+        <i
+          class="el-icon-s-fold"
+          style="color: #2ad9fd; transform: rotate(-90deg)"
+          @click.stop="handleShrink"
+        />
+      </div>
+      <div class="footer-content">
+        <Thumbnail />
+      </div>
+    </footer>
   </div>
 </template>
 
@@ -48,10 +61,11 @@ import AMapContainer from "./components/AMapContainer/index.vue";
 import HomeFilter from "./components/HomeFilter/index.vue";
 import HomeFrame from "./components/HomeFrame/index.vue";
 import HomeVector from "./components/HomeVector/index.vue";
+import HomeWord from "./components/HomeWord/index.vue";
 import HomeFrameControl from "./components/HomeFrameControl/index.vue";
 import HomeVectorControl from "./components/HomeVectorControl/index.vue";
 
-import Button from '@screen/components/Buttons/Button.vue';
+import Button from "@screen/components/Buttons/Button.vue";
 import Vue from "vue";
 // import InfoBoard from "./components/InfoBoard"
 
@@ -69,6 +83,7 @@ export default {
     HomeVector,
     HomeFrameControl,
     HomeVectorControl,
+    HomeWord,
     // InfoBoard
   },
   data() {
@@ -81,8 +96,8 @@ export default {
   provide() {
     return {
       getMap: () => this.$refs.AMapContainerRef.getMapInstance(),
-      activeDeviceTypes: Vue.observable([])
-    }
+      activeDeviceTypes: Vue.observable([]),
+    };
   },
   methods: {
     handleShrink(e) {
@@ -132,7 +147,7 @@ export default {
     height: min-content;
     pointer-events: none;
 
-    >div {
+    > div {
       pointer-events: auto;
     }
 
@@ -146,7 +161,7 @@ export default {
       overflow: hidden;
       height: 100%;
 
-      >div {
+      > div {
         pointer-events: all;
         flex: 1;
       }
@@ -170,8 +185,6 @@ export default {
         .item {
           padding-top: 15px;
         }
-
-
       }
 
       .right {
@@ -189,7 +202,7 @@ export default {
     will-change: height;
     bottom: 0;
 
-    >div {
+    > div {
       pointer-events: all;
     }
 
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
index af418882..ef60ef77 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js
@@ -22,7 +22,7 @@ var options = {
   grid: {
     top: "15%", //上边距
     right: "0", //右边距
-    left: "15px", //左边距
+    left: "30px", //左边距
     bottom: "10%", //下边距
     containLabel: true,
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
index c4e1c67f..aa240068 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js
@@ -33,7 +33,7 @@ let options = {
   },
   grid: {
     left: "0",
-    right: "0",
+    right: "30px",
     top: "90px",
     bottom: "-10px",
     containLabel: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
index 3dbcaf2c..a2cbbfcb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/index.vue
@@ -147,7 +147,7 @@ export default {
           value: "4",
         },
       ],
-      dateTime: "2024-01-01 00:00:00",
+      dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
     };
   },
 
@@ -217,6 +217,7 @@ export default {
     },
     async searchQuery() {
       let startTime = "";
+      console.log("searchQuery", this.type);
       if (this.type == 3) {
         let year = moment().year();
         // console.log(year, this.quarter);
@@ -237,6 +238,7 @@ export default {
       //   type: this.type,
       //   startTime: startTime,
       // }
+      console.log("++++++++++++", startTime);
       var formData = new FormData();
       formData.append("direction", this.direction);
       formData.append("type", this.type);
@@ -319,7 +321,7 @@ export default {
       display: flex;
       align-items: center;
       height: 40px;
-      width: 100%;
+      width: 500px;
       font-size: 14px;
       margin-bottom: 10px;
       left: 20px;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
index 16ad3715..f5fe9dd4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
@@ -1,148 +1,201 @@
 <template>
-  <Empty v-if="!dataList || dataList.length<=0" text="暂无数据..."></Empty>
-    <div v-else class='deviceSummary'>
-        
-        <div class="item" v-for=" (item, index) in dataList" :key="index">
-          <div class="item_con">
-              <div class="title-tool">
-                <span class="text">{{ item.title }}</span>
+  <Empty v-if="!dataList || dataList.length <= 0" text="暂无数据..."></Empty>
+  <div v-else class="deviceSummary">
+    <draggable
+      tag="div"
+      :list="dataList"
+      @end="____onDragend"
+      ghostClass="ghost_class"
+      dragClass="drag_class"
+      chosenClass="chosen_class"
+      class="draggable"
+    >
+      <div class="item" v-for="(item, index) in dataList" :key="index">
+        <div class="item_con">
+          <div class="title-tool">
+            <span class="text">{{ item.title }}</span>
+          </div>
+          <div class="item-body">
+            <div class="left-body">
+              <div class="icon">
+                <i class="el-icon-menu" v-if="item.title.includes('全部')" />
+                <img
+                  src="@screen/images/layer/路测设备/毫米波雷达.svg"
+                  v-if="item.title.includes('雷达')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/情报板.svg"
+                  v-if="item.title.includes('可变信息标志')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/摄像机.svg"
+                  v-if="item.title.includes('枪型')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/设备箱.svg"
+                  v-if="item.title.includes('设备箱')"
+                />
+                <img
+                  src="@screen/images/deviceType/ball.svg"
+                  v-if="item.title.includes('球形摄像机')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/合流区.svg"
+                  v-if="item.title.includes('合流区预警')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/行车诱导.svg"
+                  v-if="item.title.includes('行车诱导')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/护栏碰撞.svg"
+                  v-if="item.title.includes('碰撞')"
+                />
+                <img
+                  src="@screen/images/deviceType/ball.svg"
+                  v-if="item.title.includes('全景摄像机')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/交调.svg"
+                  v-if="item.title.includes('交通量调')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/气象检测器.svg"
+                  v-if="item.title.includes('气象')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/语音广播.svg"
+                  v-if="item.title.includes('语音广播')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/疲劳唤醒.svg"
+                  v-if="item.title.includes('疲劳唤醒')"
+                />
+              </div>
+              <div class="numUnit">
+                <span class="num">{{ item.total }}</span>
+                <span class="unit">套</span>
+              </div>
+            </div>
+            <div class="line"></div>
+            <div class="right-list">
+              <div class="list-text">
+                <span class="title">在用：</span>
+                <div class="value value4">
+                  {{ item.sumUseState }}
+                </div>
               </div>
-              <div class="item-body">
-                <div class="left-body">
-                  <div class="icon">
-                    <i class="el-icon-menu" v-if="item.title.includes('全部')"/>
-                    <img src="@screen/images/layer/路测设备/毫米波雷达.svg" v-if="item.title.includes('雷达')" />
-                    <img src="@screen/images/layer/路测设备/情报板.svg" v-if="item.title.includes('可变信息标志')" />
-                    <img src="@screen/images/layer/路测设备/摄像机.svg" v-if="item.title.includes('枪型')" />
-                    <img src="@screen/images/layer/路测设备/设备箱.svg" v-if="item.title.includes('设备箱')" />
-                    <img src="@screen/images/deviceType/ball.svg" v-if="item.title.includes('球形摄像机')" />
-                    <img src="@screen/images/layer/路测设备/合流区.svg" v-if="item.title.includes('合流区预警')" />
-                    <img src="@screen/images/layer/路测设备/行车诱导.svg" v-if="item.title.includes('行车诱导')" />
-                    <img src="@screen/images/layer/路测设备/护栏碰撞.svg" v-if="item.title.includes('碰撞')" />
-                    <img src="@screen/images/deviceType/ball.svg" v-if="item.title.includes('全景摄像机')" />
-                    <img src="@screen/images/layer/路测设备/交调.svg" v-if="item.title.includes('交通量调')" />
-                    <img src="@screen/images/layer/路测设备/气象检测器.svg" v-if="item.title.includes('气象')" />
-                    <img src="@screen/images/layer/路测设备/语音广播.svg" v-if="item.title.includes('语音广播')" />
-                    <img src="@screen/images/layer/路测设备/疲劳唤醒.svg" v-if="item.title.includes('疲劳唤醒')" />
-                  </div>
-                  <div class="numUnit">
-                    <span class="num">{{ item.total }}</span>
-                    <span class="unit">套</span>
-                  </div>
+              <div class="list-text">
+                <span class="title">在线：</span>
+                <div class="value value1">
+                  {{ item.pctOnl }}
                 </div>
-                <div class="line"></div>
-                <div class="right-list">
-                  <div class="list-text">
-                    <span class="title">在用：</span>
-                    <div class="value value4">
-                      {{ item.sumUseState }}
-                    </div>
-                  </div>
-                  <div class="list-text">
-                    <span class="title">在线：</span>
-                    <div class="value value1">
-                      {{ item.pctOnl }}
-                    </div>
-                  </div>
-                  <div class="list-text"><span class="title">离线：</span>
-                    <div class="value value2">
-                      {{ item.pctOffl }}
-                    </div>
-                  </div>
-                  <div class="list-text">
-                    <span class="title">丢包：</span>
-                    <div class="value value3">
-                      {{ item.pctLose }}
-                    </div>
-                  </div>
+              </div>
+              <div class="list-text">
+                <span class="title">离线：</span>
+                <div class="value value2">
+                  {{ item.pctOffl }}
+                </div>
+              </div>
+              <div class="list-text">
+                <span class="title">丢包：</span>
+                <div class="value value3">
+                  {{ item.pctLose }}
                 </div>
               </div>
+            </div>
           </div>
         </div>
-      
-    </div>
-  </template>
-  
-  <script>
-  export default {
-    name: '',
-    components: {
-        
-    },
-    props:{
-      dataList:{
-        type:Array,
-        default:()=>[],
-      }
-    },
-    data() {
-      return {
-      }
-    },
-    watch:{
+      </div>
+    </draggable>
+  </div>
+</template>
 
+<script>
+import draggable from "vuedraggable";
+export default {
+  name: "",
+  components: { draggable },
+  props: {
+    dataList: {
+      type: Array,
+      default: () => [],
     },
-    created() {
-        
-    },
-    methods: {
-        
-    },
-    mounted() {
-    },
-  }
-  </script>
-  
-  <style lang='scss' scoped>
-  .deviceSummary {
+  },
+  data() {
+    return {};
+  },
+  watch: {},
+  created() {},
+  methods: {
+    ____onDragend() {},
+  },
+  mounted() {},
+};
+</script>
+
+<style lang="scss" scoped>
+.deviceSummary {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin-right: 0px;
+  overflow-y: scroll;
+  .draggable {
+    width: 100%;
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
     margin-right: 0px;
     overflow-y: scroll;
-    >.item {
-      flex-basis:percentage(1/8);
-      width: 0;
-      margin: 0;
-      padding: 0 15px 15px 0;
-      height: 194px;
-      >.item_con{
-        width: 100%;
-        height: 100%;
-        display: flex;
-        position: relative;
-        flex-direction: column;
-        background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, #06425868 93%);
-        border-radius: 3px 3px 3px 3px;
+  }
+  .item {
+    flex-basis: percentage(1/8);
+    width: 0;
+    margin: 0;
+    padding: 0 15px 15px 0;
+    height: 194px;
+    > .item_con {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      flex-direction: column;
+      background: linear-gradient(180deg, rgba(6, 66, 88, 0) 0%, #06425868 93%);
+      border-radius: 3px 3px 3px 3px;
       .item-body {
         height: 90px;
         margin-top: 30px;
         display: flex;
         flex-direction: row;
         align-items: stretch;
-      
+
         .left-body {
           display: flex;
           width: 90px;
           flex-direction: column;
           justify-content: center;
           align-items: center;
-        
-          .icon{
+
+          .icon {
             border-radius: 50%;
-            border: 1px solid #00D1FF;
+            border: 1px solid #00d1ff;
             width: 30px;
             height: 30px;
-            padding:8px;
+            padding: 8px;
             box-sizing: content-box;
             text-align: center;
-            img{
+            img {
               width: 100%;
               height: 100%;
             }
-            i{ font-size: 26px; color: #00D1FF; line-height: 30px;}
+            i {
+              font-size: 26px;
+              color: #00d1ff;
+              line-height: 30px;
+            }
           }
-          .numUnit{
+          .numUnit {
             display: flex;
             flex-direction: row;
             justify-content: center;
@@ -152,7 +205,7 @@
               font-size: 19px;
               font-family: PangMenZhengDao;
               font-weight: 400;
-              color: #00D1FF;
+              color: #00d1ff;
             }
             .unit {
               margin-left: 3px;
@@ -160,17 +213,20 @@
               padding-top: 3px;
               font-family: PingFang SC, PingFang SC;
               font-weight: 500;
-              color: #FFFFFFF0;
+              color: #fffffff0;
             }
-
           }
-
         }
 
         .line {
           width: 2px;
           margin: 0 10px 0 5px;
-          background: linear-gradient(180deg, rgba(3, 60, 81, 0), rgba(0, 100, 137, 1), rgba(3, 60, 81, 0));
+          background: linear-gradient(
+            180deg,
+            rgba(3, 60, 81, 0),
+            rgba(0, 100, 137, 1),
+            rgba(3, 60, 81, 0)
+          );
         }
 
         .right-list {
@@ -187,38 +243,35 @@
             font-size: 12px;
             font-family: PingFang SC, PingFang SC;
             font-weight: 400;
-            color: #FFFFFF;
+            color: #ffffff;
 
             .title {
               float: left;
               width: 40px;
               text-align: left;
             }
-            .value{
+            .value {
               font-size: 14px;
               font-family: PangMenZhengDao;
               font-weight: 800;
             }
 
             .value1 {
-              color: #00EBC1ee;
+              color: #00ebc1ee;
             }
 
             .value2 {
-              color: #FFFFFFee;
+              color: #ffffffee;
             }
 
             .value3 {
-              color: #FFD15Cee;
+              color: #ffd15cee;
             }
             .value4 {
-              color: #0D0;
+              color: #0d0;
             }
           }
-
         }
-
-
       }
 
       .title-tool {
@@ -227,16 +280,19 @@
         justify-content: center;
         align-items: center;
         height: 36px;
-        background: linear-gradient(180deg, rgba(1, 139, 182, 0) 0%, #1FCAF160 100%);
+        background: linear-gradient(
+          180deg,
+          rgba(1, 139, 182, 0) 0%,
+          #1fcaf160 100%
+        );
         border-radius: 3px 3px 0px 0px;
 
         .text {
           font-size: 15px;
-          font-family: "Arial","PingFang","Microsoft YaHei";
+          font-family: "Arial", "PingFang", "Microsoft YaHei";
           font-weight: bold;
-          color: #FFFFFF;
+          color: #ffffff;
         }
-
       }
 
       .title-tool::after {
@@ -245,12 +301,14 @@
         bottom: 1px;
         width: 100%;
         height: 1px;
-        background: linear-gradient(90deg, rgba(81, 181, 255, 0) 3%, #51B5FF 49%, rgba(81, 181, 255, 0) 100%);
+        background: linear-gradient(
+          90deg,
+          rgba(81, 181, 255, 0) 3%,
+          #51b5ff 49%,
+          rgba(81, 181, 255, 0) 100%
+        );
       }
-  
-    }
     }
   }
-
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
index 73fd859b..61274347 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/trafficIndicators/index.vue
@@ -194,7 +194,7 @@ export default {
           value: "4",
         },
       ],
-      dateTime: "2024-01-01 00:00:00",
+      dateTime: moment().format("YYYY-MM-DD HH:mm:ss"),
       dataList: [],
       quarter: "",
       year: "",

From b56d466796fcda122228131001f67d0bdb5eeb1a Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Wed, 3 Apr 2024 17:27:57 +0800
Subject: [PATCH 08/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Eventfiltering/index.vue       | 13 ++++++++----
 .../components/Sitefiltering/index.vue        | 11 ++++++----
 .../components/Timefiltering/index.vue        |  5 ++++-
 .../components/deviceSummary/index.vue        | 20 ++++++++++++++++++-
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
index d1f51a98..21e8bfc2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
@@ -56,7 +56,7 @@ export default {
     return {
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       trafficIncidents: null,
       trafficIncidentsPie: null,
@@ -89,6 +89,7 @@ export default {
           key: "warningTime",
           required: true,
           type: "datePicker",
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           options: {
             valueFormat: "yyyy-MM-dd",
           },
@@ -107,6 +108,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -122,6 +124,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;
@@ -134,9 +137,9 @@ export default {
   async mounted() {
     setTimeout(() => {
       this.$nextTick(async () => {
-        (this.formData.warningTime =
-          moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
-          (this.trafficIncidents = echarts.init(this.$refs.trafficIncidents));
+        // (this.formData.warningTime =
+        //   moment().format("YYYY-MM-DD") + " 00:00:01"),
+        this.trafficIncidents = echarts.init(this.$refs.trafficIncidents);
         this.trafficIncidents.setOption(trafficIncidentsCharts);
         this.trafficIncidentsPie = echarts.init(this.$refs.trafficIncidentsPie);
         this.trafficIncidentsPie.setOption(trafficIncidentsChartsPie);
@@ -166,6 +169,7 @@ export default {
         drawRoundRect(context, 410, 406, 320, 24, 10, gr);
         drawRoundRect(context, 410, 440, 320, 24, 10, gr);
         drawRoundRect(context, 410, 474, 320, 24, 10, gr);
+        console.log("this.formData", this.formData);
         await this.getNonAutomaticWarningType(this.formData);
         // drawRoundRect(context, 410, 508, 320, 24, 10, gr);
       });
@@ -174,6 +178,7 @@ export default {
   methods: {
     getNonAutomaticWarningType(data) {
       let that = this;
+      console.log("data", data);
       return nonAutomaticWarningType(data).then((res) => {
         let newData = res.data;
         let seriesData = [];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
index 1f7d3ab9..6792a117 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
@@ -64,7 +64,7 @@ export default {
       trafficIncidentsPie: null,
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       searchFormList: [
         {
@@ -98,6 +98,7 @@ export default {
           options: {
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "day") {
               return true;
@@ -113,6 +114,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -128,6 +130,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;
@@ -155,9 +158,9 @@ export default {
     getWarningCharts() {
       setTimeout(() => {
         this.$nextTick(async () => {
-          (this.formData.warningTime =
-            moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
-            (this.trafficIncidents = echarts.init(this.$refs.trafficIncidents));
+          // (this.formData.warningTime =
+          //   moment(new Date()).format("YYYY-MM-DD") + " 00:00:01"),
+          this.trafficIncidents = echarts.init(this.$refs.trafficIncidents);
           this.trafficIncidents.setOption(trafficIncidentsCharts1);
           this.trafficIncidentsPie = echarts.init(
             this.$refs.trafficIncidentsPie
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
index 9c44505e..d984205b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/index.vue
@@ -33,7 +33,7 @@ export default {
       trafficIncidents: null,
       formData: {
         type: "day",
-        warningTime: "",
+        warningTime: moment().format("YYYY-MM-DD") + " 00:00:01",
       },
       searchFormList: [
         {
@@ -67,6 +67,7 @@ export default {
           options: {
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "day") {
               return true;
@@ -82,6 +83,7 @@ export default {
             type: "month",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "month") {
               return true;
@@ -97,6 +99,7 @@ export default {
             type: "year",
             valueFormat: "yyyy-MM-dd",
           },
+          default: moment().format("YYYY-MM-DD") + " 00:00:01",
           visible: (data) => {
             if (data.type == "year") {
               return true;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
index f5fe9dd4..64f65685 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
@@ -128,7 +128,25 @@ export default {
   watch: {},
   created() {},
   methods: {
-    ____onDragend() {},
+    ____onDragend(event) {
+      console.log("____onDragend", event);
+      let oldIndex = event.oldIndex; //移动初始位置
+      let newIndex = event.newIndex; //运动终止位置
+      let diff = Math.abs(newIndex - oldIndex); //插值绝对值
+      let index = this.dataList[oldIndex];
+      if (eval(oldIndex) > eval(newIndex)) {
+        for (let i = 0; i < diff; i++) {
+          this.dataList[oldIndex - i] = this.dataList[oldIndex - i - 1];
+        }
+        this.dataList[newIndex] = index;
+      } else {
+        for (let i = 0; i < diff; i++) {
+          this.dataList[oldIndex + i] = this.dataList[oldIndex + i + 1];
+        }
+        this.dataList[newIndex] = index;
+      }
+      console.log(789, this.dataList);
+    },
   },
   mounted() {},
 };

From 17c352ebfa234e1dd5092d22bf0f1288bedeef70 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Sun, 7 Apr 2024 15:04:53 +0800
Subject: [PATCH 09/21] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/MonthlyEquipment/index.js    |  9 +++
 .../components/deviceSummary/index.vue        | 30 ++++----
 .../statisticalAnalysis/index.vue             | 73 ++++++++++++-------
 .../components/flowstate/assets/charts.js     |  2 +-
 4 files changed, 70 insertions(+), 44 deletions(-)

diff --git a/ruoyi-ui/src/api/MonthlyEquipment/index.js b/ruoyi-ui/src/api/MonthlyEquipment/index.js
index 9921dfbb..f1a14095 100644
--- a/ruoyi-ui/src/api/MonthlyEquipment/index.js
+++ b/ruoyi-ui/src/api/MonthlyEquipment/index.js
@@ -53,3 +53,12 @@ export function getSystemStatusExport(query) {
     }
   );
 }
+
+// 拖拽排序
+
+export function getStatusRule(rule) {
+  return request({
+    url: "/system/status/rule?rule=" + rule,
+    method: "get",
+  });
+}
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
index 64f65685..b33ed278 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceSummary/index.vue
@@ -113,6 +113,7 @@
 
 <script>
 import draggable from "vuedraggable";
+import { getStatusRule } from "@/api/MonthlyEquipment";
 export default {
   name: "",
   components: { draggable },
@@ -125,27 +126,22 @@ export default {
   data() {
     return {};
   },
+  inject: ["initDataList"],
   watch: {},
   created() {},
   methods: {
-    ____onDragend(event) {
-      console.log("____onDragend", event);
-      let oldIndex = event.oldIndex; //移动初始位置
-      let newIndex = event.newIndex; //运动终止位置
-      let diff = Math.abs(newIndex - oldIndex); //插值绝对值
-      let index = this.dataList[oldIndex];
-      if (eval(oldIndex) > eval(newIndex)) {
-        for (let i = 0; i < diff; i++) {
-          this.dataList[oldIndex - i] = this.dataList[oldIndex - i - 1];
-        }
-        this.dataList[newIndex] = index;
-      } else {
-        for (let i = 0; i < diff; i++) {
-          this.dataList[oldIndex + i] = this.dataList[oldIndex + i + 1];
-        }
-        this.dataList[newIndex] = index;
-      }
+    ____onDragend() {
       console.log(789, this.dataList);
+      let data = [];
+      this.dataList.forEach((item, index) => {
+        data.push(item.title);
+      });
+      getStatusRule(data).then((res) => {
+        console.log(res);
+        if (res.code == 200) {
+          this.initDataList();
+        }
+      });
     },
   },
   mounted() {},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 3c30c3c0..10c4a6f9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -125,7 +125,7 @@ import {
   getSystemStatusTabList,
   getSystemStatusType,
   getSystemStatusExport,
-} from "../../../../../api/MonthlyEquipment";
+} from "@/api/MonthlyEquipment";
 // import { download } from "../../../../../utils/request.js";
 import Pagination from "@screen/components/Pagination.vue";
 import InputSearch from "@screen/components/InputSearch/index.vue";
@@ -180,11 +180,16 @@ export default {
       interval: null,
     };
   },
+  provide() {
+    return {
+      initDataList: this.initDevice,
+    };
+  },
   destroyed() {
     clearInterval(this.interval);
   },
   methods: {
-    handleSizeChange(size){
+    handleSizeChange(size) {
       this.pageSize = size;
       this.initData();
     },
@@ -295,28 +300,35 @@ export default {
               pctOnl: Math.floor(100 * Math.random()) + "%",
               pctOffl: "25%",
               pctLose: "15%",
-              sumUseState: "90%"
+              sumUseState: "90%",
             });
           });
           return;
         }
         let allList = [];
-        for (let key in res.data) {
-          let val = res.data[key];
-          let item = {
-            title: key,
-            total: val.sum,
-            pctOnl: val.sucessRate,
-            pctOffl: val.failRate,
-            pctLose: val.lostRate,
-            sumUseState: val.sumUseState
-          };
-          if (key.includes("全部设备")) {
-            allList.unshift(item);
-          } else {
-            allList.push(item);
+        let sort = res.data["排序规则"].rule.split(",");
+        sort.forEach((i) => {
+          for (let key in res.data) {
+            let val = res.data[key];
+            let item = {
+              title: key,
+              total: val.sum,
+              pctOnl: val.sucessRate,
+              pctOffl: val.failRate,
+              pctLose: val.lostRate,
+              sumUseState: val.sumUseState,
+            };
+            if (i === key) {
+              allList.push(item);
+            }
+            // if (key.includes("全部设备")) {
+            //   allList.unshift(item);
+            // } else {
+            // allList.push(item);
+            // }
           }
-        }
+        });
+
         this.equipments = allList;
       });
     },
@@ -431,7 +443,8 @@ export default {
   display: inline-flex;
   width: 100%;
   flex-direction: row;
-  flex:1; height: 0;
+  flex: 1;
+  height: 0;
 
   .tabs-lo {
     display: inline-flex;
@@ -537,16 +550,24 @@ export default {
 .full_tab {
   width: 100%;
   height: 100%;
-  display: flex; flex-direction: column; flex: 1;
-  ::v-deep .el-tabs__header{}
-  ::v-deep .el-tabs__content{ flex: 1;
-    .el-tab-pane{ width: 100%; height: 100%;}
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  ::v-deep .el-tabs__header {
+  }
+  ::v-deep .el-tabs__content {
+    flex: 1;
+    .el-tab-pane {
+      width: 100%;
+      height: 100%;
+    }
   }
 }
 
-.tab_con{ display: flex; flex-direction: column;}
-
-
+.tab_con {
+  display: flex;
+  flex-direction: column;
+}
 
 .topdiv {
   display: inline-flex;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
index 65450f3e..2dc7dcd1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js
@@ -55,7 +55,7 @@ var options = {
         " ",
         " ",
         " ",
-        " ",
+        // " ",
         // "枢纽",
         // "立交",
         // "立交",

From 0611e487d632057259daef1354e61d396f545d80 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Sun, 7 Apr 2024 15:28:05 +0800
Subject: [PATCH 10/21] =?UTF-8?q?fix=20#3196=20bug=20=20=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?lngLatMap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue               | 1 +
 .../pages/Home/components/RoadAndEvents/utils/map.js            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 cff1caf4..259b629c 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
@@ -182,6 +182,7 @@ export default {
   },
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
+    Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
   },
   methods: {
     selectedCompletedHandle(item) {
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 ab20e917..8049cd56 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
@@ -250,7 +250,7 @@ export class MarkerCluster {
       if (window.openInfoWindow) {
         // console.log("窗口位移结束", new Date());
         window.openInfoWindow = false;
-        // window.infoWindow?.open?.();
+        // !window.infoWindow.getIsOpen() && window.infoWindow?.open?.();
       }
     });
 

From 336702a70a5543dfb2b614ad0239e98e8e37b031 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Sun, 7 Apr 2024 16:45:32 +0800
Subject: [PATCH 11/21] fix bug

---
 .../pages/Home/components/RoadAndEvents/utils/map.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8049cd56..619bf64a 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
@@ -127,7 +127,7 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
-      if (data.length === 0 || data.length === 1) {
+      if (!data || data.length === 0 || data.length === 1) {
         return this.infoWindow.close();
       }
       const { latitude: lat, longitude: lng } = data[0].extData;

From 3f0c6be278b031c159178adfb8dcf64f5c34b0ba Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 14:50:06 +0800
Subject: [PATCH 12/21] =?UTF-8?q?fix=20bug=20=E9=A2=91=E9=81=93=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=90=8E=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=95=B0=E9=87=8F=E4=B8=8D=E5=AF=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue        | 1 +
 .../pages/Home/components/RoadAndEvents/utils/map.js     | 9 ++++++---
 2 files changed, 7 insertions(+), 3 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 259b629c..f062538e 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
@@ -183,6 +183,7 @@ export default {
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    window.renderData = undefined;
   },
   methods: {
     selectedCompletedHandle(item) {
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 619bf64a..8775cb68 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,7 +39,7 @@ export class MarkerCluster {
   markerCluster;
   infoWindow;
 
-  data = [];
+  data = []; //标注集合
 
   constructor() {}
 
@@ -115,7 +115,7 @@ export class MarkerCluster {
     window.totalPages = totalPages;
     let num = (page - 1) * pageSize;
     function renderData(page) {
-      if (page < 1 || page > totalPages) return;
+      if (!data || page < 1 || page > totalPages) return;
       window.page = page;
       const pageSize = window.pageSize;
       const dataContainer = document.getElementById("dataContainer");
@@ -127,7 +127,7 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
-      if (!data || data.length === 0 || data.length === 1) {
+      if (data.length === 0 || data.length === 1) {
         return this.infoWindow.close();
       }
       const { latitude: lat, longitude: lng } = data[0].extData;
@@ -391,6 +391,9 @@ export class MarkerCluster {
   setData() {
     this.markerCluster.setData(this.data);
   }
+  clear() {
+    this.data = [];
+  }
 }
 
 export function getContent(data) {

From 89651a665ccbcabb722a008b1ee04b8c64c2cd3e Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 14:56:11 +0800
Subject: [PATCH 13/21] =?UTF-8?q?feat=20=E7=BC=BA=E5=A4=B1=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A1=A5=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 f062538e..74a6d568 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
@@ -51,7 +51,7 @@ import Intermodulation from "./../Dialogs/Intermodulation/index.vue";
 import GuardrailCollision from "./../Dialogs/GuardrailCollision/index.vue";
 
 import FatigueWakesUp from "./../Dialogs/FatigueWakesUp/index.vue";
-import { addInGraphHandle } from "./utils/map"
+import { addInGraphHandle, markerClusterIns } from "./utils/map"
 import { lngLatMap } from "./utils/buttonEvent";
 
 export default {
@@ -183,6 +183,7 @@ export default {
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
+    markerClusterIns.clear();
     window.renderData = undefined;
   },
   methods: {

From f3d24af1a6d1f4425fcb07ede8070b3fd9a8e2ce Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Mon, 8 Apr 2024 16:07:40 +0800
Subject: [PATCH 14/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/common/PresetFormItems.js  | 43 +++++------
 .../pages/service/boardRecord/data.js         | 63 ++++++++++++++++
 .../pages/service/boardRecord/index.vue       | 72 +++++++++++++++----
 3 files changed, 137 insertions(+), 41 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js

diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index f906e716..0357a94f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -251,33 +251,22 @@ export const startEndStation = {
   },
 };
 
-// export const direction = {
-//   label: "方向:",
-//   key: "direction",
-//   required: true,
-//   type: "select",
-//   options: {
-//     options: [
-//       // { key: "济南方向", label: "济南方向" },
-//       // { key: "菏泽方向", label: "菏泽方向" },
-//     ],
-//   },
-// };
-
-export const direction = {
-  label: "路段方向:",
-  key: "direction",
-  type: "CheckboxGroup",
-  isAlone: true,
-  default: [],
-  options: {
-    options: [
-      { key: "1", label: "济南方向" },
-      { key: "3", label: "菏泽方向" },
-      { key: "2", label: "双向" },
-    ],
-  },
-};
+export function directionCreater(type){
+  return {
+    label: "路段方向:",
+    key: "direction",
+    type,  //CheckboxGroup 或 RadioGroup
+    isAlone: true,
+    default: [],
+    options: {
+      options: [
+        { key: "1", label: "菏泽方向" },
+        { key: "2", label: "双向" },
+        { key: "3", label: "济南方向" },
+      ],
+    },
+  };
+}
 
 export const problemDescription = {
   label: "问题描述:",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
new file mode 100644
index 00000000..b28328d2
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
@@ -0,0 +1,63 @@
+// import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
+import * as PresetFormItems from "@screen/common/PresetFormItems.js";
+// import { merge, cloneDeep } from "lodash";
+
+export const searchFormList = [
+  {
+    label: "时间范围:",
+    key: "daterange",
+    required: false,
+    type: "datePicker",
+    options: {
+      type: "daterange",
+      format: "yyyy-MM-dd HH:mm:ss",
+      valueFormat: "yyyy-MM-dd HH:mm:ss",
+    },
+  },
+  PresetFormItems.directionCreater("CheckboxGroup"),
+  {
+    label: "发布状态:",
+    key: "releaseStatus",
+    type: "checkboxGroup",
+    default: [],
+    options: {
+      options: [
+        {
+          key: "1",
+          label: "成功",
+        },
+        {
+          key: "0",
+          label: "失败",
+        },
+      ],
+    },
+  },
+  
+  // {
+  //   label: "内容:",
+  //   key: "releaseContent",
+  //   type: "input",
+  //   default: ""
+  // },
+  
+  // {
+  //   ...PresetFormItems.station,
+  //   label: "开始桩号:",
+  //   required: false,
+  // },
+  // merge(cloneDeep(PresetFormItems.station), {
+  //   options: {
+  //     options: [
+  //       {
+  //         key: "endStakeMark[0]",
+  //       },
+  //       {
+  //         key: "endStakeMark[1]",
+  //       },
+  //     ],
+  //   },
+  //   label: "结束桩号:",
+  //   required: false,
+  // }),
+];
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index bd10cfeb..5817c53e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -2,8 +2,7 @@
   <div class='board_record'>
     <!-- 搜索栏 -->
     <div class="filter">
-      <div>
-        <ButtonGradient @click="onRefresh" class="refresh-btn">
+        <ButtonGradient @click="onRefreshForm" class="refresh-btn">
           <template #prefix>
             <img src="./images/refresh.svg" />
           </template>
@@ -16,7 +15,14 @@
           新增
         </ButtonGradient> -->
 
-      </div>
+        <InputSearch
+          ref="searchComp"
+          style="width: 402px"
+          :formList="searchFormList"
+          :formConfigOptions="{ dFormData: { eventState: '0' } }"
+          @handleSearch="handleSearch"
+        />
+
     </div>
 
     <!-- 内容 -->
@@ -30,7 +36,7 @@
         <el-table-column
           prop="direction"
           label="方向"
-          width="120"
+          width="110"
           :formatter="formatterDirection" />
         <ElTableColumn label="内容" prop="releaseContent" width="500" header-align="center">
           <template slot-scope="scope">
@@ -41,9 +47,9 @@
             </el-carousel>
           </template>
         </ElTableColumn>
-        <ElTableColumn label="状态" prop="releaseStatus" width="120" :formatter="formatterStatus"/>
-        <ElTableColumn label="用户名" prop="releaseUserName" width="180" />
-        <ElTableColumn label="用户ID" prop="releaseUserId" width="180" />
+        <ElTableColumn label="状态" prop="releaseStatus" width="80" :formatter="formatterStatus"/>
+        <ElTableColumn label="用户名" prop="releaseUserName" width="120" />
+        <ElTableColumn label="用户ID" prop="releaseUserId" width="120" />
         <ElTableColumn label="用户IP" prop="releaseIp" width="200" />
        <!--
         <ElTableColumn label="操作" width="210">
@@ -73,6 +79,8 @@ import Table from '@screen/components/Table.vue';
 import request from "@/utils/request";
 import BoardRecordPreview from '@screen/components/infoBoard/BoardRecordPreview.vue'
 import {DirectionTypes} from '@screen/utils/enum.js';
+import InputSearch from "@screen/components/InputSearch/index.vue";
+import { searchFormList } from "./data";
 
 export default {
   name: 'boardRecord',
@@ -80,12 +88,14 @@ export default {
     ButtonGradient,
     Pagination,
     Table,
-    BoardRecordPreview
+    BoardRecordPreview,
+    InputSearch
   },
   data() {
     return {
       testData : {"STAY":"30","ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"32","CONTENT":"因改扩建施工 平阴南、梁山收费站出入口封闭","width":"768","height":"64","formatStyle":"2"},
       tableData: [],
+      searchFormList,
       isShowPhrases: false,
       isShowDisposal: false,
       total: 20,
@@ -102,6 +112,40 @@ export default {
     this.initData();
   },
   methods: {
+    onRefreshForm(){
+      this.searchData.pageNum = 1;
+      this.$refs.searchComp.handleResetForm();
+    },
+    handleSearch(data) {
+      let daterange = data.daterange;
+      console.log(data, "dataaaaaaaaaaaa");
+
+      // let dStakeMark = data.stakeMark;
+      // let dendStakeMark = data.endStakeMark;
+
+      // let stakeMark = dStakeMark[0] ? `K${dStakeMark[0]}+${dStakeMark[1]}` : "";
+      // let endStakeMark = dendStakeMark[0]
+      //   ? `K${dendStakeMark[0]}+${dendStakeMark[1]}`
+      //   : "";
+
+      let startTime = "";
+      let endTime = "";
+      if(daterange && daterange.length > 0){
+        startTime = daterange[0];
+        endTime = daterange[1];
+      }
+
+      this.searchData = {
+        ...this.searchData,
+        // releaseContent: data.releaseContent || "",
+        direction: data.direction || "",
+        startTime,
+        endTime,
+        // stakeMark: stakeMark,
+        // endStakeMark: endStakeMark,
+      };
+      this.initData();
+    },
     indexMethod(index) {
         return this.searchData.pageSize*(this.searchData.pageNum-1) + index + 1;
       },
@@ -122,11 +166,11 @@ export default {
         this.total = result.total;
       });
     },
-    onRefresh() {
-      this.tableData = [];
-      this.searchData.pageNum = 1;
-      this.initData();
-    },
+    // onRefresh() {
+    //   this.tableData = [];
+    //   this.searchData.pageNum = 1;
+    //   this.initData();
+    // },
     onSizeChange(pageSize) {
       this.tableData = [];
       this.searchData.pageSize = pageSize;
@@ -178,7 +222,7 @@ export default {
       padding: 7px 4px;
     }
   }
-  ::v-deep .el-table__cell div {
+  ::v-deep .el-table__cell div.cell {
     padding: 0 10px !important;
   }
 }

From 18c01a66e59d520e5675a2fbb5526b8b1291eeb2 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 16:09:55 +0800
Subject: [PATCH 15/21] =?UTF-8?q?feat=20=20max-width=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E5=B7=A8=E9=95=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormConfig/components/ElCheckboxGroup.vue | 26 ++++-------------
 .../Dialogs/PerceiveEvent/index.vue           |  2 +-
 .../EventDetailDialog/Carousel/index.vue      | 28 ++++---------------
 3 files changed, 12 insertions(+), 44 deletions(-)

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 c484c49e..ea360b39 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
@@ -1,25 +1,12 @@
 <template>
-  <ElCheckboxGroup
-    v-bind="$attrs"
-    v-on="$listeners"
-    class="ElCheckboxGroup"
-    :style="{ gap }"
-  >
-    <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] }}
+  <ElCheckboxGroup v-bind="$attrs" v-on="$listeners" class="ElCheckboxGroup" :style="{ gap }">
+    <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>
       <div v-if="showIcon">
-        <img
-          v-if="item.deviceState == '0' || item.deviceState == null"
-          src="@/assets/jihe/images/offline.svg"
-          class="state"
-        />
+        <img v-if="item.deviceState == '0' || item.deviceState == null" src="@/assets/jihe/images/offline.svg"
+          class="state" />
         <img v-else src="@/assets/jihe/images/online.svg" class="state" />
       </div>
     </ElCheckbox>
@@ -70,7 +57,6 @@ export default {
       display: flex;
       align-items: center;
       gap: 6px;
-      width: 87px;
 
       .el-checkbox__input {
         line-height: 0;
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 2a6194a2..92887ceb 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
@@ -5,7 +5,7 @@
       <div class="video-pic">
         <Video style="height: 100%; flex: 1" :showHeader="false" :url="dialogData.formData.videoList[0]"
           videoType="mp4" />
-        <Carousel style="flex: 1; height: 100%" :pictures="dialogData.formData.pictures" />
+        <Carousel style="flex: 1; height: 100%;max-width: 300px;" :pictures="dialogData.formData.pictures" />
       </div>
       <LineChart class="chart" />
       <Form class="form" v-loading="loading" v-model="data" ref="FormConfigRef" :formList="formList" column="1" />
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
index d99ae97e..8aff60c9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
@@ -2,12 +2,11 @@
   <div class="Carousel">
     <img src="./images/arrow.svg" @click="prevSlide" class="arrow" />
 
-    <VueSlickCarousel style="width: 100%" v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef"
-      class="vueSlickCarousel">
+    <VueSlickCarousel v-if="pictures.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
       <div v-for="(item, index) in pictures" :key="index" class="item">
         <!-- <img :src="require(`@screen/images/${item}`)" style="height: 100%"> -->
         <!-- <img :src="item" style="height: 100%"> -->
-        <el-image style="height: 100%;width:100%" :src="item" :preview-src-list="pictures">
+        <el-image style="height: 100%" :src="item" :preview-src-list="pictures">
         </el-image>
       </div>
     </VueSlickCarousel>
@@ -48,7 +47,7 @@ export default {
         infinite: true,
         arrows: false,
         speed: 600,
-        slidesToShow: 3,
+        slidesToShow: 1,
         slidesToScroll: 1,
         autoplay: true,
         autoplaySpeed: 1800,
@@ -77,37 +76,20 @@ export default {
   .vueSlickCarousel {
     flex: 1;
     overflow: hidden;
-    width: 100%;
 
     ::v-deep {
       .slick-list {
         height: 100%;
-        width: 100%;
-
-        .slick-track {
-          width: 100% !important;
-          height: 100% !important;
-
-          .slick-slide {
-            width: 100% !important;
-
-            div {
-              width: 100%;
-              height: 100%;
-            }
-          }
-
 
+        div {
+          height: 100%;
         }
-
-
       }
     }
 
     .item {
       img {
         height: 100%;
-        width: 100%;
       }
     }
   }

From e1a88712bfe1143caa46fd796eddedc47b586c3e Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 8 Apr 2024 17:08:23 +0800
Subject: [PATCH 16/21] =?UTF-8?q?feat=20=E5=BC=B9=E7=AA=97=E8=92=99?=
 =?UTF-8?q?=E5=B1=822100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
index 7a574411..6291baa9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@@ -113,7 +113,7 @@ export default {
   height: 100%;
   background: rgba(0, 0, 0, 0.36);
   border-radius: 0px 0px 0px 0px;
-  z-index: 1100;
+  z-index: 2100;
   // display: flex;
   // align-items: center;
   // justify-content: center;

From 8aef66384599565fe632ece2903119f6073fc522 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 8 Apr 2024 17:18:57 +0800
Subject: [PATCH 17/21] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/JiHeExpressway/common/PresetFormItems.js   | 12 ++++++------
 .../FormConfig/components/ElCheckboxGroup.vue        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
index f906e716..8bbe323c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/common/PresetFormItems.js
@@ -49,12 +49,12 @@ export const releaseChannel = {
   default: [],
   options: {
     options: [
-      { key: "1", label: "微博" },
-      { key: "3", label: "微信小程序" },
-      { key: "4", label: "服务网站" },
-      { key: "5", label: "情报板" },
-      { key: "6", label: "手机短信" },
-      { key: "7", label: "微信公众号" },
+      { key: "1", label: "微博", width: "87px" },
+      { key: "3", label: "微信小程序", width: "87px" },
+      { key: "4", label: "服务网站", width: "87px" },
+      { key: "5", label: "情报板", width: "87px" },
+      { key: "6", label: "手机短信", width: "87px" },
+      { key: "7", label: "微信公众号", width: "87px" },
     ],
   },
 };
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 c484c49e..9ed1fe86 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElCheckboxGroup.vue
@@ -10,6 +10,7 @@
       :disabled="item.disabled"
       :label="item[id] || item[label]"
       :key="item[id] || item[label]"
+      :style="{ width: [item.width ? item.width : 'auto'] }"
     >
       <slot :name="item[id] || item[label]" :data="item"
         >{{ item[label] }}
@@ -70,7 +71,6 @@ export default {
       display: flex;
       align-items: center;
       gap: 6px;
-      width: 87px;
 
       .el-checkbox__input {
         line-height: 0;

From 68601357160da2687ddd84459727c507b9117683 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Tue, 9 Apr 2024 15:21:49 +0800
Subject: [PATCH 18/21] =?UTF-8?q?=E5=8A=A0=E6=83=85=E6=8A=A5=E6=9D=BF?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/images/no_img.png           | Bin 0 -> 10485 bytes
 ruoyi-ui/src/assets/styles/JiHeExpressway.scss  |   5 +++++
 .../statisticalAnalysis/index.vue               |   5 +++--
 .../pages/service/boardRecord/data.js           |   4 ++--
 .../pages/service/boardRecord/index.vue         |   6 +++---
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 ruoyi-ui/src/assets/images/no_img.png

diff --git a/ruoyi-ui/src/assets/images/no_img.png b/ruoyi-ui/src/assets/images/no_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..34ab887dadc2b81146a60b60c4219db9c2470c00
GIT binary patch
literal 10485
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index 7db6541e..f68d1c59 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -286,5 +286,10 @@
         // background-color: #000 !important;
       }
     }
+    .el-image__placeholder{
+      background-color: #133242;
+      background-image: url("~@/assets/images/no_img.png");
+      background-size: contain;
+    }
 
 }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 10c4a6f9..267fb5f4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -290,8 +290,7 @@ export default {
     initDevice() {
       //设备在线离线率接口
 
-      getSystemStatusType().then((res) => {
-        if (IS_TESTING && (!res.data || res.msg == "暂无数据")) {
+      if (process.env.NODE_ENV == "development") {
           this.equipments = [];
           this.equipSeries.forEach((item) => {
             this.equipments.push({
@@ -305,6 +304,8 @@ export default {
           });
           return;
         }
+
+      getSystemStatusType().then((res) => {
         let allList = [];
         let sort = res.data["排序规则"].rule.split(",");
         sort.forEach((i) => {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
index b28328d2..10913a15 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js
@@ -14,11 +14,11 @@ export const searchFormList = [
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   },
-  PresetFormItems.directionCreater("CheckboxGroup"),
+  PresetFormItems.directionCreater("RadioGroup"),
   {
     label: "发布状态:",
     key: "releaseStatus",
-    type: "checkboxGroup",
+    type: "RadioGroup",
     default: [],
     options: {
       options: [
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
index 5817c53e..d9f8f51e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -17,14 +17,13 @@
 
         <InputSearch
           ref="searchComp"
-          style="width: 402px"
+          style="width: 480px"
           :formList="searchFormList"
           :formConfigOptions="{ dFormData: { eventState: '0' } }"
           @handleSearch="handleSearch"
         />
 
     </div>
-
     <!-- 内容 -->
     <div class="body">
       <Table :data="tableData" height="100%">
@@ -139,6 +138,7 @@ export default {
         ...this.searchData,
         // releaseContent: data.releaseContent || "",
         direction: data.direction || "",
+        releaseStatus: data.releaseStatus,
         startTime,
         endTime,
         // stakeMark: stakeMark,
@@ -153,7 +153,7 @@ export default {
         return DirectionTypes[row.direction];
       },
     formatterStatus(row, column) {
-        return ["","成功"][row.releaseStatus];
+      return ["失败", "成功"][row.releaseStatus];
       },
     initData() {
       request({

From 6a27feb82b628bc52f1665de997adcfdf9ee6a94 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Tue, 9 Apr 2024 16:59:22 +0800
Subject: [PATCH 19/21] =?UTF-8?q?bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Eventfiltering/trafficIncidentsCharts.js       | 4 +++-
 .../components/Sitefiltering/trafficIncidentsCharts.js        | 3 ++-
 .../components/Timefiltering/trafficIncidentsCharts.js        | 3 ++-
 .../trafficFlow/components/classification/index.vue           | 4 ++--
 .../perception/trafficFlow/components/flowstate/index.vue     | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsCharts.js
index f8c4fe7f..3a4a4ed1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsCharts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/trafficIncidentsCharts.js
@@ -50,6 +50,7 @@ var options = {
         fontSize: 18,
         align: "center",
       },
+      minInterval: 1,
       type: "value",
       axisLine: {
         show: false,
@@ -70,6 +71,7 @@ var options = {
         color: "#fff",
         fontSize: "18px",
         formatter: (value) => {
+          console.log(789789, value);
           return value;
         },
       },
@@ -78,7 +80,7 @@ var options = {
   series: [
     {
       //  name: '审限内结案率',
-      data: [5, 10, 20, 30],
+      data: [],
       type: "pictorialBar",
       symbol: "roundRect",
       symbolRepeat: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js
index f8c4fe7f..921656c8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/trafficIncidentsCharts.js
@@ -50,6 +50,7 @@ var options = {
         fontSize: 18,
         align: "center",
       },
+      minInterval: 1,
       type: "value",
       axisLine: {
         show: false,
@@ -78,7 +79,7 @@ var options = {
   series: [
     {
       //  name: '审限内结案率',
-      data: [5, 10, 20, 30],
+      data: [],
       type: "pictorialBar",
       symbol: "roundRect",
       symbolRepeat: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js
index f8c4fe7f..921656c8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Timefiltering/trafficIncidentsCharts.js
@@ -50,6 +50,7 @@ var options = {
         fontSize: 18,
         align: "center",
       },
+      minInterval: 1,
       type: "value",
       axisLine: {
         show: false,
@@ -78,7 +79,7 @@ var options = {
   series: [
     {
       //  name: '审限内结案率',
-      data: [5, 10, 20, 30],
+      data: [],
       type: "pictorialBar",
       symbol: "roundRect",
       symbolRepeat: true,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue
index 426dc368..c5539c06 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="classification">
-    <WgtTitle :title="'全路车流量状况'"></WgtTitle>
+    <WgtTitle :title="'在途车流量车型分类'"></WgtTitle>
     <div class="board">
       <!-- <div v-for="(item, index) in list" class="list">
           <div class="title">{{ item.label }}</div>
@@ -134,7 +134,7 @@ export default {
   flex-direction: column;
 
   .board {
-    flex:1;
+    flex: 1;
     width: 100%;
     padding: 0px 30px;
     background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue
index eae17a4d..9c7edf9f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="flowstate">
-    <WgtTitle title="在途车流量车型分类"></WgtTitle>
+    <WgtTitle title="全路车流量状况"></WgtTitle>
     <div class="board">
       <div class="tag1">方向：济南</div>
       <div class="tag2">方向：菏泽</div>

From 8d999fbc0c52ac1d5dfc51d59f0e579dfa177c6e Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Wed, 10 Apr 2024 16:05:38 +0800
Subject: [PATCH 20/21] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=86=E9=A2=91=E8=BD=AE=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EventDetailDialog/Carousel/index.vue      |  13 ++-
 .../event/event/EventDetailDialog/index.vue   | 103 +++++-------------
 .../pages/control/event/event/index.vue       |   5 +-
 3 files changed, 44 insertions(+), 77 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
index 8aff60c9..3b5479d4 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue
@@ -11,6 +11,12 @@
       </div>
     </VueSlickCarousel>
 
+    <VueSlickCarousel v-if="videos.length > 0" v-bind="settings" ref="CarouselRef" class="vueSlickCarousel">
+      <div v-for="(item, index) in  videos " :key="index" class="item">
+        <Video style="height: 100%;" :showHeader="false" :url="item || ''" videoType="mp4" />
+      </div>
+    </VueSlickCarousel>
+
     <img src="./images/arrow.svg" @click="nextSlide" class="arrow" />
   </div>
 </template>
@@ -21,10 +27,11 @@ import VueSlickCarousel from 'vue-slick-carousel'
 import 'vue-slick-carousel/dist/vue-slick-carousel.css'
 // optional style for arrows & dots
 import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css'
+import Video from "@screen/components/Video";
 
 export default {
   name: "Carousel",
-  components: { VueSlickCarousel },
+  components: { VueSlickCarousel,Video },
   props: {
     pictures: {
       type: Array,
@@ -39,6 +46,10 @@ export default {
         // "require('@screen/images/shareWith/weChat-active.svg')"
       ]
     },
+    videos: {
+      type: Array,
+      default: () => []
+    },
   },
   data() {
     return {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
index 4781411f..59cb6169 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue
@@ -1,89 +1,44 @@
 <template>
   <Dialog v-model="modelVisible" title="事件详情" width="890px" top="11%">
-    <div
-      class="EventDetail"
-      :style="{
-        height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
-      }"
-    >
+    <div class="EventDetail" :style="{
+    height: activeName == '-1' || activeName == '0' ? '380px' : '598px',
+  }">
       <Form :formList="formList" :dFormData="formData" label-width="100px" />
 
       <div class="video-pic">
-        <Video
-          style="height: 100%; width: 380px"
-          :showHeader="false"
-          :url="
-            formData.videoList && formData.videoList.length > 0
-              ? formData.videoList[0]
-              : ''
-          "
-          :camId="formData.upCamId"
-          :pileNum="formData.stakeMark"
-          rangeIndex="upCamera"
-          :videoType="formData.videoType"
-        />
-        <Video
-          v-if="activeName != '-1'"
-          style="height: 100%; width: 380px"
-          :showHeader="false"
-          :url="
-            formData.videoList && formData.videoList.length > 0
-              ? formData.videoList[1]
-              : ''
-          "
-          :camId="formData.downCamId"
-          :pileNum="formData.stakeMark"
-          rangeIndex="downCamera"
-          :videoType="formData.videoType"
-        />
 
-        <Carousel v-else style="flex: 1" :pictures="formData.pictures" />
+        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[0] : ''" :camId="formData.upCamId" :pileNum="formData.stakeMark" rangeIndex="upCamera"
+          :videoType="formData.videoType" />
+
+        <Video v-if="activeName != '-1'" style="height: 100%; width: 380px" :showHeader="false" :url="formData.videoList && formData.videoList.length > 0
+    ? formData.videoList[1] : ''" :camId="formData.downCamId" :pileNum="formData.stakeMark" rangeIndex="downCamera"
+          :videoType="formData.videoType" />
+
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :videos="formData.videoList" :pictures="[]"/>
+        <Carousel v-if="activeName == '-1'" style="flex: 1" :pictures="formData.pictures" :videos="[]"/>
+
       </div>
       <!-- <div>{{ formData.videoList[0] }}</div> -->
-      <TimeLine1
-        v-if="activeName == '1' || activeName == '2'"
-        :data="timeLine1List"
-      />
-      <TimeLine2
-        v-if="activeName == '1' || activeName == '2'"
-        :data="timeLine2List"
-        style="flex: 1"
-      />
+      <TimeLine1 v-if="activeName == '1' || activeName == '2'" :data="timeLine1List" />
+      <TimeLine2 v-if="activeName == '1' || activeName == '2'" :data="timeLine2List" style="flex: 1" />
     </div>
 
     <!-- 确认弹窗 -->
-    <EventPlanDialog
-      :visible="isShowDialog"
-      :info="info"
-      :eventFormData="formData"
-      :activeName="activeName"
-      @reInitData="
-        () => {
-          this.$emit('update:value', false);
-          this.$emit('queryData', true);
-        }
-      "
-      @close="onCloseAddNew"
-    />
+    <EventPlanDialog :visible="isShowDialog" :info="info" :eventFormData="formData" :activeName="activeName"
+      @reInitData="() => {
+    this.$emit('update:value', false);
+    this.$emit('queryData', true);
+  }
+    " @close="onCloseAddNew" />
 
     <template #footer>
-      <Button
-        v-if="activeName == '-1' || activeName == '0'"
-        style="padding: 0 24px"
-        @click.native="onDelete"
-        >误报</Button
-      >
-      <Button
-        :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
-        @click.native="modelVisible = false"
-        >取消</Button
-      >
-      <Button
-        v-if="activeName == '-1' || activeName == '0'"
-        style="padding: 0 24px"
-        @click.native="onSubmit"
-        >确认</Button
-      >
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
+        @click.native="onDelete">误报</Button>
+      <Button :style="{ backgroundColor: '#C9C9C9', padding: '0 24px' }"
+        @click.native="modelVisible = false">取消</Button>
+      <Button v-if="activeName == '-1' || activeName == '0'" style="padding: 0 24px"
+        @click.native="onSubmit">确认</Button>
     </template>
   </Dialog>
 </template>
@@ -124,7 +79,7 @@ export default {
     activeName: String,
     formData: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   data() {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
index 89fea858..cf1666aa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
@@ -294,8 +294,9 @@ export default {
             data.visibility = otherConfig.visibility;
 
             data.pictures = otherConfig.pictures || [];
-            data.videoList = otherConfig.videoList || []
-            // data.videoList = otherConfig.videoList || ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
+            data.videoList = otherConfig.videoList || [];
+            // data.videoList = ['https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4',
+            // 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/mp4/xgplayer-demo-480p.mp4']
           }
           data.videoType = "mp4";
           this.detailDialogFormData = data;

From a20a38cca6d4be83b9184c1b2b3740a330d357bd Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Wed, 10 Apr 2024 16:20:40 +0800
Subject: [PATCH 21/21] =?UTF-8?q?feat=20=20enum=E4=BC=98=E5=8C=96=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E9=87=8D=E5=A4=8D=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../event/plan/addAndEditDialog/index.vue     |  71 +++-------
 .../src/views/JiHeExpressway/utils/enum.js    | 127 ++----------------
 2 files changed, 30 insertions(+), 168 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
index 4e4f6b20..653eed22 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/plan/addAndEditDialog/index.vue
@@ -4,47 +4,24 @@
       <ElForm :model="formData" inline :rules="rules" ref="ruleForm">
         <div class="first">
           <el-form-item prop="eventCategory">
-            <el-radio-group
-              v-model="formData.eventCategory"
-              @input="changeRadio"
-            >
+            <el-radio-group v-model="formData.eventCategory" @input="changeRadio">
               <el-radio-button :label="1">交通事件</el-radio-button>
               <el-radio-button :label="2">感知事件</el-radio-button>
             </el-radio-group>
           </el-form-item>
           <el-form-item required label="预案名称:" prop="planName">
-            <el-input
-              v-model="formData.planName"
-              placeholder="请输入预案名称"
-            ></el-input>
+            <el-input v-model="formData.planName" placeholder="请输入预案名称"></el-input>
           </el-form-item>
           <el-form-item required label="事件类型:" prop="eventType">
-            <el-select
-              v-model="formData.eventType"
-              placeholder="请选择事件类型"
-              @change="changeEventType"
-            >
-              <el-option
-                v-for="item in eventOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="formData.eventType" placeholder="请选择事件类型" @change="changeEventType">
+              <el-option v-for="item in eventOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="触发类型:" prop="triggerMechanism">
-            <el-select
-              v-model="formData.triggerMechanism"
-              placeholder="请选择触发类型"
-            >
-              <el-option
-                v-for="item in mechanismOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
+            <el-select v-model="formData.triggerMechanism" placeholder="请选择触发类型">
+              <el-option v-for="item in mechanismOptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -56,11 +33,7 @@
               <div class="text"><i style="color: red">*</i>执行操作:</div>
             </el-col>
             <el-col :span="22">
-              <FormTable
-                ref="secondFormTable"
-                :tableData="secondFormData"
-                :type="1"
-              ></FormTable>
+              <FormTable ref="secondFormTable" :tableData="secondFormData" :type="1"></FormTable>
             </el-col>
           </el-row>
         </div>
@@ -70,11 +43,7 @@
               <div class="text"><i style="color: red">*</i>恢复操作:</div>
             </el-col>
             <el-col :span="22">
-              <FormTable
-                ref="thirdFormTable"
-                :tableData="thirdFormData"
-                :type="2"
-              ></FormTable>
+              <FormTable ref="thirdFormTable" :tableData="thirdFormData" :type="2"></FormTable>
             </el-col>
           </el-row>
         </div>
@@ -82,17 +51,9 @@
     </div>
 
     <template #footer>
-      <Button
-        style="background: #c9c9c9; padding: 0 24px"
-        @click.native="(modelVisible = false), (submitting = false)"
-        >取消</Button
-      >
-      <Button
-        style="padding: 0 24px"
-        @click.native="handleSubmit"
-        :loading="submitting"
-        >保存</Button
-      >
+      <Button style="background: #c9c9c9; padding: 0 24px"
+        @click.native="(modelVisible = false), (submitting = false)">取消</Button>
+      <Button style="padding: 0 24px" @click.native="handleSubmit" :loading="submitting">保存</Button>
     </template>
   </Dialog>
 </template>
@@ -111,7 +72,7 @@ import {
   gzmsMap,
   eventSubClassMap,
   trafficKV,
-  perceptionKV,
+  WarningTypeList as perceptionKV,
 } from "@screen/utils/enum.js";
 
 const typeMap = {
@@ -141,7 +102,7 @@ export default {
     visible: Boolean,
     detail: {
       type: Object,
-      default: () => {},
+      default: () => { },
     },
   },
   data() {
@@ -201,7 +162,7 @@ export default {
       },
     };
   },
-  mounted() {},
+  mounted() { },
   computed: {
     modelVisible: {
       get() {
@@ -212,7 +173,7 @@ export default {
             this.eventOptions = typeMap[this.detail.eventCategory];
             this.mechanismOptions =
               eventSubClassMap[this.detail.eventCategory || 1][
-                this.detail.eventType
+              this.detail.eventType
               ];
             this.initData(this.detail.id);
           } else {
@@ -327,7 +288,7 @@ export default {
       this.eventOptions = typeMap[value];
       this.changeEventType(1);
     },
-    handleChange() {},
+    handleChange() { },
     formatData(it, value = 1, id = "") {
       let data = { ...it, actionType: value, emergencyPlansId: id };
       if (
diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
index c96bd6bb..a04a0945 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js
@@ -163,21 +163,7 @@ export const WarningType = {
   99: "其他事件",
 };
 
-// 交通事件主类
-export const trafficType = {
-  1: "交通事故",
-  2: "车辆故障",
-  3: "交通管制",
-  4: "交通拥堵",
-  5: "非法上路",
-  6: "路障清除",
-  7: "施工建设",
-  8: "服务区异常",
-  9: "设施设备隐患",
-  10: "异常天气",
-  11: "其他事件",
-};
-
+//========= 感知事件 主类（key vulue） [{value: 1, label: '交通拥堵'}]=========
 export const WarningTypeList = Object.keys(WarningType).map((key) => {
   return {
     value: key * 1,
@@ -185,6 +171,11 @@ export const WarningTypeList = Object.keys(WarningType).map((key) => {
   };
 });
 
+// 交通事件主类  {1: "交通事故" } 格式
+export const trafficType = Object.keys(EventTopics).reduce((prev, now) => {
+  return { ...prev, [EventTopics[now]]: now };
+}, {});
+
 // 感知事件主类的子类(上方) warningSubclass
 export const WarningSubclass = {
   1: {
@@ -262,104 +253,14 @@ export const WarningSubclass = {
   },
 };
 
-//========= 交通事件 主类（key vulue）=========
-export const trafficKV = [
-  {
-    value: 1,
-    label: "交通事故",
-  },
-  {
-    value: 2,
-    label: "车辆故障",
-  },
-  {
-    value: 3,
-    label: "交通管制",
-  },
-  {
-    value: 4,
-    label: "交通拥堵",
-  },
-  {
-    value: 5,
-    label: "非法上路",
-  },
-  {
-    value: 6,
-    label: "路障清除",
-  },
-  {
-    value: 7,
-    label: "施工建设",
-  },
-  {
-    value: 8,
-    label: "服务区异常",
-  },
-  {
-    value: 9,
-    label: "设施设备隐患",
-  },
-  {
-    value: 10,
-    label: "异常天气",
-  },
-  {
-    value: 11,
-    label: "其他事件",
-  },
-];
-//========= 感知事件 主类（key vulue）=========
-export const perceptionKV = [
-  {
-    value: 1,
-    label: "交通拥堵",
-  },
-  {
-    value: 2,
-    label: "行人",
-  },
-  {
-    value: 3,
-    label: "非机动车",
-  },
-  {
-    value: 4,
-    label: "停车",
-  },
-  {
-    value: 5,
-    label: "违规驾驶",
-  },
-  {
-    value: 6,
-    label: "路障",
-  },
-  {
-    value: 7,
-    label: "道路施工",
-  },
-  {
-    value: 8,
-    label: "异常天气",
-  },
-  {
-    value: 9,
-    label: "护栏碰撞",
-  },
-  {
-    value: 10,
-    label: "交通事故",
-  },
-  {
-    value: 11,
-    label: "车辆故障",
-  },
-  {
-    value: 99,
-    label: "其他事件",
-  },
-];
+//========= 交通事件 主类（key vulue） =========
+export const trafficKV = Object.keys(trafficType).map((key) => {
+  return {
+    value: key * 1,
+    label: trafficType[key],
+  };
+});
+
 //交通事件、感知事件 子类（key vulue）预案使用
 export const eventSubClassMap = {
   1: {