From 81a45f82f359ff6a804b2903b49ceae6107f28c3 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 14:51:20 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix=20=203181=E6=97=A0=E6=B3=95=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=9B=BE=E6=A0=87bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/RoadAndEvents/index.vue    |  5 ++++-
 .../RoadAndEvents/utils/buttonEvent.js         | 18 ++++++++++++------
 2 files changed, 16 insertions(+), 7 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 44487c11..2ddc379e 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
@@ -234,7 +234,10 @@ export default {
 
       console.log("%c [ key ]-102-「index.vue」", "font-size:15px; background:#9d63e9; color:#e1a7ff;", key);
 
-      if (!eventMap[`${key}${status ? "_close" : ""}`]) return this.$emit("onClickItem", item);
+      if (!eventMap[`${key}${status ? "_close" : ""}`]) {
+        this.emitter.emit("selectedCompleted", item);
+        return this.$emit("onClickItem", item);
+      }
       console.log(`${key}${status ? "_close" : ""}`, this.filterData, isDefault)
 
       await eventMap[`${key}${status ? "_close" : ""}`]?.call(this, item, this.filterData, isDefault, this.cb);
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..5b637d2d 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
@@ -144,9 +144,11 @@ export const eventMap = {
 
     loadingMessage?.close();
 
-    if (!data) return;
-    if (!data.length && !isDefault)
+    if (!data) return this.emitter.emit("selectedCompleted", item);
+    if (!data.length && !isDefault) {
+      this.emitter.emit("selectedCompleted", item);
       return Message.warning(`未查询到${item.title}设备!`);
+    }
 
     eventMap[`地图路测设备/map_close`](item);
     const cbCall = () =>
@@ -200,10 +202,12 @@ export const eventMap = {
 
     loadingMessage?.close();
 
-    if (!data) return;
+    if (!data) return this.emitter.emit("selectedCompleted", item);
 
-    if (!data.length && !isDefault)
+    if (!data.length && !isDefault) {
+      this.emitter.emit("selectedCompleted", item);
       return Message.warning(`没有${item.title}事件数据!`);
+    }
 
     eventMap[`地图事件专题/map_close`](item);
     const cbCall = () => cb?.(item, { deviceType: `事件专题_${deviceType}` });
@@ -257,10 +261,12 @@ export const eventMap = {
       .catch(() => {});
 
     loadingMessage?.close();
-    if (!data) return;
+    if (!data) return this.emitter.emit("selectedCompleted", item);
 
-    if (!data?.length && !isDefault)
+    if (!data?.length && !isDefault) {
+      this.emitter.emit("selectedCompleted", item);
       return Message.warning(`没有${item.title}数据!`);
+    }
 
     eventMap[`事件专题/感知事件_close`](item);
     const cbCall = () => cb?.(item, { deviceType: `感知事件_${warningState}` });

From 6c1b6339333c91bfe1836c82bbd38ba05923cc72 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 16:05:36 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix=20=20=E9=87=8D=E5=8F=A0=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=9C=AA=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue         | 5 ++++-
 .../Home/components/RoadAndEvents/utils/buttonEvent.js    | 1 +
 .../pages/Home/components/RoadAndEvents/utils/map.js      | 8 +++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
index 2ddc379e..9f36b8bb 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
@@ -227,7 +227,10 @@ export default {
 
       const status = item.status;
 
-      if (!status) { this.nowSelected = item.title; this.nowSelectedCompleted = false; }
+      if (!status) { //开启
+        this.nowSelected = item.title;
+        this.nowSelectedCompleted = false;
+      }
       else if (this.nowSelected === item.title && this.nowSelectedCompleted === false) return;
 
       item.status = item.status ? "" : "_active";
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 5b637d2d..ef317ae9 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
@@ -344,4 +344,5 @@ function removeDataPreHandle(markers) {
     }
   };
   lngLatMapHandle(markers, cb);
+  window.renderData?.(window.page); //移除后,重新渲染弹出框更新数据
 }
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 3a364cb8..e5c69034 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,6 +127,12 @@ export class MarkerCluster {
       const startIndex = (page - 1) * pageSize;
       const endIndex = startIndex + pageSize;
       let num = (page - 1) * pageSize;
+      if (data.length === 0 || data.length === 1) {
+        return this.infoWindow.close();
+      }
+      const { latitude: lat, longitude: lng } = data[0].extData;
+      const lngLatStr = `${parseFloat(lng)}/${parseFloat(lat)}`; //更新清除节点后的数据
+      data = lngLatMap[lngLatStr];
       // 截取当前页的数据
       const currentPageData = data.slice(startIndex, endIndex);
       window.currentPageData = currentPageData;
@@ -146,7 +152,7 @@ export class MarkerCluster {
         .join("");
       // 渲染当前页数据
       dataContainer.innerHTML = itemsTpl;
-      dataPage.innerHTML = `第${page}页`;
+      dataPage && (dataPage.innerHTML = `第${page}页`);
       bindItemClick();
     }
 

From 718cbdcf67440cf5190213c9f099be3fd6e9a946 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 1 Apr 2024 16:32:15 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/components/Card1/index.vue |  56 ++--
 .../components/ModifyDutyInformationTable.vue |  11 +-
 .../event/event/EventDetailDialog/index.vue   |   2 +-
 .../components/railwayDay/assets/charts.js    |   2 +-
 .../TemperatureTrend/assets/charts.js         |   5 +-
 .../components/TemperatureTrend/index.vue     | 157 +++++----
 .../visibilityTrends/assets/charts.js         |   5 +-
 .../components/visibilityTrends/index.vue     | 152 +++++----
 .../components/weaterData/index.vue           | 297 +++++++++---------
 .../components/weatherInfoQuery/index.vue     |  64 +++-
 10 files changed, 419 insertions(+), 332 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
index d8b9148d..f218b3fc 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Card1/index.vue
@@ -1,32 +1,34 @@
 <template>
-  <BorderRadiusImage
-    class="Card"
-    borderRadius="2px"
-    borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))"
-    borderWidth="2px"
-  >
-    <div class="info" :style="{ gap }">
-      <p v-for="(item, index) in keyMap" :key="index">
-        <span>{{ item.label }}: </span>
-        <span>
-          <slot :name="`form-${item.key}`" :data="cardData">
-            {{ getValue(item.key) }}{{ item.suffix }}
-          </slot>
-        </span>
-      </p>
-    </div>
+  <div @click="onClick">
+    <BorderRadiusImage
+      class="Card"
+      borderRadius="2px"
+      borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))"
+      borderWidth="2px"
+    >
+      <div class="info" :style="{ gap }">
+        <p v-for="(item, index) in keyMap" :key="index">
+          <span>{{ item.label }}: </span>
+          <span>
+            <slot :name="`form-${item.key}`" :data="cardData">
+              {{ getValue(item.key) }}{{ item.suffix }}
+            </slot>
+          </span>
+        </p>
+      </div>
 
-    <div class="bottom" v-if="hasBtn">
-      <slot name="button">
-        <Button>
-          {{ buttonText }}
-        </Button>
-      </slot>
-    </div>
-    <!-- <div class="status" :style="{ background: 'linear-gradient(123deg, #00B3CC 0%, rgba(0, 179, 204, 0) 100%)' }">
+      <div class="bottom" v-if="hasBtn">
+        <slot name="button">
+          <Button>
+            {{ buttonText }}
+          </Button>
+        </slot>
+      </div>
+      <!-- <div class="status" :style="{ background: 'linear-gradient(123deg, #00B3CC 0%, rgba(0, 179, 204, 0) 100%)' }">
       <span class="text">正常</span>
     </div> -->
-  </BorderRadiusImage>
+    </BorderRadiusImage>
+  </div>
 </template>
 
 <script>
@@ -107,6 +109,10 @@ export default {
     getValue(key) {
       return pathGet(this.cardData, key) ?? "-";
     },
+
+    onClick() {
+      this.$emit("click", this.data);
+    },
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
index 332f538e..574ba73f 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
@@ -32,7 +32,7 @@
               <p
                 v-for="(item, index) in dayShift"
                 :key="`${item.id}_${index}`"
-                @click="removeDutyPerson(item,'dayShift')"
+                @click="removeDutyPerson(item, 'dayShift')"
               >
                 {{ item.name }}
               </p>
@@ -46,7 +46,7 @@
               <p
                 v-for="(item, index) in graveyardShift"
                 :key="`${index}_${item.id}`"
-                @click="removeDutyPerson(item,'graveyardShift')"
+                @click="removeDutyPerson(item, 'graveyardShift')"
               >
                 {{ item.name }}
               </p>
@@ -139,7 +139,7 @@ export default {
       },
       set(bool) {
         //关闭弹窗组件,清空数据
-        if(!bool) {
+        if (!bool) {
           this.dayShift = [];
           this.graveyardShift = [];
           this.peopleList = [];
@@ -184,7 +184,7 @@ export default {
       this[this.active].push(item);
     },
     removeDutyPerson(item, activeCheck) {
-      if(activeCheck != this.active) return;
+      if (activeCheck != this.active) return;
 
       const index = this[this.active].findIndex(
         (_item) => _item.id === item.id
@@ -393,7 +393,8 @@ export default {
 <style lang="scss" scoped>
 .ModifyDutyInformationTable {
   width: 947px;
-  height: 658px;
+  // height: 658px;
+  height: 570px;
   color: #fff;
   display: flex;
   flex-direction: column;
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 bf7c63bf..0fa76476 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,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="事件详情" width="880px" top="15%">
+  <Dialog v-model="modelVisible" title="事件详情" width="890px" top="15%">
     <div
       class="EventDetail"
       :style="{
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
index ce5a0d1c..f53f1dee 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js
@@ -58,7 +58,7 @@ var options = {
   grid: {
     top: "15%", //上边距
     right: "0", //右边距
-    left: "15px", //左边距
+    left: "30px", //左边距
     bottom: "0%", //下边距
     containLabel: true,
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js
index 16c8f473..116b6d41 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/assets/charts.js
@@ -108,10 +108,7 @@ var options = {
       showSymbol: false,
       smooth: true, // 是否曲线
       name: "实时数据", // 图例对应类别
-      data: [
-        12, 12, 23, 23, 30, 12, 26, 28, 31, 23, 25, 12, 18, 18, 18, 18, 23, 21,
-        20, 20, 20, 20, 20, 22, 22, 12, 12, 12,
-      ], // 纵坐标数据
+      data: [], // 纵坐标数据
       lineStyle: {
         color: "#FFD15C",
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue
index 3da60804..f3c1a32b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue
@@ -1,75 +1,98 @@
 <template>
-    <div class='congestion'>
-      <WgtTitle :title="'气温变化趋势'"></WgtTitle>
-      <div class="board">
-        <div class="charts" id="temperatureTrend"></div>
-       </div>
+  <div class="congestion">
+    <WgtTitle :title="'气温变化趋势'"></WgtTitle>
+    <div class="board">
+      <div class="charts" id="temperatureTrend"></div>
     </div>
-  </template>
-  
-  <script>
-  
-  import WgtTitle from '../../../../../widgets/title'
-  import * as echarts from "echarts";
-  import chartsStatistics from "./assets/charts";
-  export default {
-    name: 'temperatureTrend',
-    components: {
-      WgtTitle
+  </div>
+</template>
+
+<script>
+import WgtTitle from "../../../../../widgets/title";
+import * as echarts from "echarts";
+import temperatureCharts from "./assets/charts";
+import {
+  getListLatest,
+  getDeviceNameListLatest,
+  getIdDevices,
+} from "@/api/perception/meteorologyCheck";
+export default {
+  name: "temperatureTrend",
+  components: {
+    WgtTitle,
+  },
+  props: {
+    data: {
+      type: Array,
     },
-    data() {
-      return {
-        myChart:null,
-      }
-    },
-  
-    created() {
-      
-    },
-    methods: {
-      reiszeChart(){
-        this.$nextTick(() => {
-          if ( this.myChart ) {
-            this.myChart.resize();
-          }
+  },
+  watch: {
+    data: {
+      handler(data) {
+        let newData = [];
+        data.forEach((item) => {
+          newData.push(item.avgVisibility);
         });
-      }
-    },
-    update(){
-     
+        temperatureCharts.series[0].data = newData;
+        this.myChart.setOption(temperatureCharts);
+      },
+      deep: true,
     },
-    mounted() {
-      setTimeout(() => {
-        this.$nextTick(() => {
-          this.myChart = echarts.init(document.getElementById('temperatureTrend'));
-          this.myChart.setOption(chartsStatistics);
-        });
+  },
+  data() {
+    return {
+      myChart: null,
+    };
+  },
+
+  created() {},
+  methods: {
+    reiszeChart() {
+      this.$nextTick(() => {
+        if (this.myChart) {
+          this.myChart.resize();
+        }
       });
     },
+  },
+  update() {},
+  mounted() {
+    setTimeout(() => {
+      this.$nextTick(() => {
+        this.myChart = echarts.init(
+          document.getElementById("temperatureTrend")
+        );
+        this.myChart.setOption(temperatureCharts);
+      });
+    });
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.congestion {
+  display: flex;
+  flex-direction: column;
+  .board {
+    flex: 1;
+    padding: 0px 20px;
+    background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+    border: 1px solid;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
   }
-  </script>
-  
-  <style lang='scss' scoped>
-  .congestion {
-    display: flex; flex-direction: column;
-    .board{
-      flex: 1;
-      padding: 0px 20px;
-      background: linear-gradient(180deg, rgba(6,66,88,0.2) 0%, #064258 100%);
-      border-radius: 5px 5px 5px 5px;
-      opacity: 1;
-      border: 1px solid;
-      border-image: linear-gradient(360deg, rgba(55, 231, 255,0.3), rgba(55, 231, 255, 0)) 1 1;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-     
-    }
-  }
-      .charts {
-        height:200px;
-        width: 100%;
-      }
-  
-  </style>
-  
\ No newline at end of file
+}
+.charts {
+  height: 200px;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
index f44f97da..2e6bf6dd 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js
@@ -107,10 +107,7 @@ var options = {
       showSymbol: false,
       smooth: true, // 是否曲线
       name: "实时数据", // 图例对应类别
-      data: [
-        12, 12, 23, 23, 30, 12, 26, 28, 31, 23, 25, 12, 18, 18, 18, 18, 23, 21,
-        20, 20, 20, 20, 20, 22, 22, 12, 12, 12,
-      ], // 纵坐标数据
+      data: [], // 纵坐标数据
       lineStyle: {
         color: "#0783FA",
       },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue
index c7c0cd00..15769caa 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue
@@ -1,74 +1,94 @@
 <template>
-    <div class='congestion'>
-      <WgtTitle :title="'能见度变化趋势'"></WgtTitle>
-      <div class="board">
-        <div class="charts" id="VisibilityTrends"></div>
-       </div>
+  <div class="congestion">
+    <WgtTitle :title="'能见度变化趋势'"></WgtTitle>
+    <div class="board">
+      <div class="charts" id="VisibilityTrends"></div>
     </div>
-  </template>
-  
-  <script>
-  
-  import WgtTitle from '../../../../../widgets/title'
-  import * as echarts from "echarts";
-  import chartsStatistics from "./assets/charts";
-  export default {
-    name: 'VisibilityTrends',
-    components: {
-      WgtTitle
+  </div>
+</template>
+
+<script>
+import WgtTitle from "../../../../../widgets/title";
+import * as echarts from "echarts";
+import visibilityCharts from "./assets/charts";
+export default {
+  name: "VisibilityTrends",
+  components: {
+    WgtTitle,
+  },
+  props: {
+    data: {
+      type: Array,
     },
-    data() {
-      return {
-        myChart:null,
-      }
-    },
-  
-    created() {
-      
-    },
-    methods: {
-      reiszeChart(){
-    
-        this.$nextTick(() => {
-          if ( this.myChart ) {
-            this.myChart.resize();
-          }
+  },
+  watch: {
+    data: {
+      handler(data) {
+        let newData = [];
+        data.forEach((item) => {
+          newData.push(item.avgTemperature);
         });
-      }
-    },
-    update(){
-      
+        visibilityCharts.series[0].data = newData;
+        this.myChart.setOption(visibilityCharts);
+      },
+      deep: true,
     },
-    mounted() {
-      setTimeout(() => {
-        this.$nextTick(() => {
-          this.myChart = echarts.init(document.getElementById('VisibilityTrends'));
-          this.myChart.setOption(chartsStatistics);
-        });
+  },
+  data() {
+    return {
+      myChart: null,
+    };
+  },
+
+  created() {},
+  methods: {
+    reiszeChart() {
+      this.$nextTick(() => {
+        if (this.myChart) {
+          this.myChart.resize();
+        }
       });
     },
+  },
+  update() {},
+  mounted() {
+    setTimeout(() => {
+      this.$nextTick(() => {
+        this.myChart = echarts.init(
+          document.getElementById("VisibilityTrends")
+        );
+        this.myChart.setOption(visibilityCharts);
+      });
+    });
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.congestion {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  .board {
+    flex: 1;
+    padding: 0px 20px;
+    background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+    border: 1px solid;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: stretch;
   }
-  </script>
-  
-  <style lang='scss' scoped>
-  .congestion {
-  display: flex; flex-direction: column; align-items: stretch;
-    .board{
-      flex: 1;
-      padding: 0px 20px;
-      background: linear-gradient(180deg, rgba(6,66,88,0.2) 0%, #064258 100%);
-      border-radius: 5px 5px 5px 5px;
-      opacity: 1;
-      border: 1px solid;
-      border-image: linear-gradient(360deg, rgba(55, 231, 255,0.3), rgba(55, 231, 255, 0)) 1 1;
-      display: flex; flex-direction: column;
-      justify-content: center;
-      align-items: stretch; 
-    }
-  }
-      .charts {
-        height:200px;
-      }
-  
-  </style>
-  
\ No newline at end of file
+}
+.charts {
+  height: 200px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
index 872f3130..4a61f985 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue
@@ -1,156 +1,167 @@
 <template>
-    <div class='congestion'>
-      <WgtTitle :title="'气象监测数据'"></WgtTitle>
-      <div class="board">
-        <div class="showRoad">
-            <div :class="it.type?it.type+' item':'item'" v-for="(it,index) in dataList" >
-                <span class="label" >{{ it.text }}</span>
-                <span class="text" >{{ it.value }}</span>
-            </div>
+  <div class="congestion">
+    <WgtTitle :title="'气象监测数据'"></WgtTitle>
+    <div class="board">
+      <div class="showRoad">
+        <div class="item">
+          <span class="label">温度：</span>
+          <span class="text">{{
+            data.temperature ? data.temperature + "℃" : "-"
+          }}</span>
         </div>
-       </div>
+        <div class="item">
+          <span class="label">湿度：</span>
+          <span class="text">{{
+            data.humidity ? data.humidity + "mm" : "-"
+          }}</span>
+        </div>
+        <div class="item">
+          <span class="label">风向：</span>
+          <span class="text">{{
+            data.windDirection ? data.windDirection + "°" : "-"
+          }}</span>
+        </div>
+        <div class="item">
+          <span class="label">风速：</span>
+          <span class="text">{{
+            data.windSpeed ? data.windSpeed + "级" : "-"
+          }}</span>
+        </div>
+        <div class="item">
+          <span class="label">能见度：</span>
+          <span class="text">{{
+            data.visibilityType ? data.visibilityType + "级" : "-"
+          }}</span>
+        </div>
+        <!-- <div class="item">
+          <span class="label">能见度类型：</span>
+          <span class="text">{{ data.visibilityType }}</span>
+        </div> -->
+        <!-- <div class="item">
+          <span class="label">降雨类型：</span>
+          <span class="text">{{
+            data.recipitationType ? data.recipitationType : "-"
+          }}</span>
+        </div> -->
+        <div class="item">
+          <span class="label">降雨量：</span>
+          <span class="text">{{
+            data.rainfall ? data.rainfall + "mm" : "-"
+          }}</span>
+        </div>
+        <div class="item">
+          <span class="label">路面温度：</span>
+          <span class="text">{{
+            data.remoteRoadSurfaceTemperature
+              ? data.remoteRoadSurfaceTemperature + "℃"
+              : "-"
+          }}</span>
+        </div>
+        <div class="item">
+          <span class="label"> 气压：</span>
+          <span class="text">{{
+            data.atmosphericPressure ? data.atmosphericPressure + "Pa" : "-"
+          }}</span>
+        </div>
+      </div>
     </div>
-  </template>
-  
-  <script>
-  
-  import WgtTitle from '../../../../../widgets/title'
- 
-  export default {
-    name: 'MonthStatistics',
-    components: {
-      WgtTitle
-    },
-    data() {
-      return {
-        myChart:null,
-        dataList:[
-            {
-                text:"天气状态：",
-                value:"无降水",
-                class:"km"
-            },
-            {
-                text:"风速：",
-                value:"55m/s",
-                class:"km"
-            },
-            {
-                text:"天气温度：",
-                value:"23°C",
-                class:"km"
-            },
-            {
-                text:"风向：",
-                value:"东南风",
-                class:"km"
-            },
-            {
-                text:"路面温度：",
-                value:"23°C",
-                class:"km"
-            }, {
-                text:"风级：",
-                value:"2级",
-                class:"km"
-            }, {
-                text:"空气湿度：",
-                value:"79.40%",
-                class:"km"
-            }, {
-                text:"道路危险等级：",
-                value:"0级",
-                class:"km"
-            }, {
-                text:"能见度：",
-                value:"2610.00m",
-                class:"km"
-            }, {
-                text:"能见度：",
-                value:"0.00m",
-                class:"km"
-            }, {
-                text:"能见度：",
-                value:"0.00m",
-                class:"km"
-            }, {
-                text:"能见度：",
-                value:"0.00m",
-                class:"km"
-            }
-        ]
-      }
-    },
-  
-    created() {
-      
-    },
-    methods: {
-     
+  </div>
+</template>
+
+<script>
+import WgtTitle from "../../../../../widgets/title";
+
+export default {
+  name: "MonthStatistics",
+  components: {
+    WgtTitle,
+  },
+  props: {
+    data: {
+      type: Object,
+      default: () => {},
     },
-    mounted() {
-      setTimeout(() => {
-        this.$nextTick(() => {
-         
-        });
-      });
+  },
+  watch: {
+    data: {
+      handler(newVal) {
+        console.log(newVal);
+      },
+      deep: true,
     },
-  }
-  </script>
-  
-  <style lang='scss' scoped>
-  .congestion {
-    width: 100%; display: flex;
-    .board{
-      flex: 1;
-      width: 100%;
-      padding: 0px 20px;
-      background: linear-gradient(180deg, rgba(6,66,88,0.2) 0%, #064258 100%);
-      border-radius: 5px 5px 5px 5px;
-      opacity: 1;
-      border: 1px solid;
-      border-image: linear-gradient(360deg, rgba(55, 231, 255,0.3), rgba(55, 231, 255, 0)) 1 1;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      flex-direction: row;
-      overflow: auto;
+  },
+  data() {
+    return {
+      myChart: null,
+      dataList: [],
+    };
+  },
+  created() {},
+  methods: {},
+  mounted() {
+    setTimeout(() => {
+      this.$nextTick(() => {});
+    });
+  },
+};
+</script>
 
-      .showRoad {
-        display: flex;
-        flex-wrap: wrap;
+<style lang="scss" scoped>
+.congestion {
+  width: 100%;
+  display: flex;
+  .board {
+    flex: 1;
+    width: 100%;
+    padding: 0px 20px;
+    background: linear-gradient(180deg, rgba(6, 66, 88, 0.2) 0%, #064258 100%);
+    border-radius: 5px 5px 5px 5px;
+    opacity: 1;
+    border: 1px solid;
+    border-image: linear-gradient(
+        360deg,
+        rgba(55, 231, 255, 0.3),
+        rgba(55, 231, 255, 0)
+      )
+      1 1;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    flex-direction: row;
+    overflow: auto;
 
-        > .item {
-            display: inline-flex;
-            width:50%;
-            height:23px;
-            margin-top:12px;
-            flex-direction: row;
+    .showRoad {
+      display: flex;
+      flex-wrap: wrap;
 
-            > span.label {
-               width:50%;
-               height:25px;
-               font-size: 12px;
-                font-family: PingFang SC, PingFang SC;
-                font-weight: 400;
-                color: #00B3CC;
-            }
+      > .item {
+        display: inline-flex;
+        width: 50%;
+        height: 23px;
+        margin-top: 12px;
+        flex-direction: row;
 
-            >span.text {
-                font-size: 14px;
-                font-family: PingFang SC, PingFang SC;
-                font-weight: 400;
-                color: #FFFFFF; 
-            }
+        > span.label {
+          width: 50%;
+          height: 25px;
+          font-size: 12px;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 400;
+          color: #00b3cc;
         }
-      }
 
+        > span.text {
+          font-size: 14px;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 400;
+          color: #ffffff;
+        }
+      }
     }
   }
-      .charts {
-        height:180px;
-        width: 100%;
-      }
-  
-  </style>
-  
\ No newline at end of file
+}
+.charts {
+  height: 180px;
+  width: 100%;
+}
+</style>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
index 469ff15c..a0c27b3c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/index.vue
@@ -2,24 +2,40 @@
   <div class="congestion">
     <div class="queryList">
       <Card
-        v-for="(item, index) in data"
+        v-for="(item, index) in dataList"
         :cardData="item"
         :keyMap="keyMap"
         :hasBtn="false"
         :gap="'10px'"
         :key="index"
+        @click="handleClick(item)"
       >
-        <!-- <template #form-start="{ data }">
+        <template #form-direction="{ data }">
           <div class="endSpecial">
-            {{ data.start }} <img src="./assets/weater.png" />
+            {{
+              data.direction == 1
+                ? "菏泽方向"
+                : data.direction == 2
+                ? "双向"
+                : "济南方向"
+            }}
           </div>
-        </template> -->
+        </template>
+        <template #form-deviceState="{ data }">
+          <div class="endSpecial">
+            {{ data.deviceState == 1 ? "在线" : "离线" }}
+          </div>
+        </template>
       </Card>
     </div>
     <div class="queryCharts">
-      <WeateData class="charts-l" />
-      <TemperatureTrend ref="temper" class="charts-ms" />
-      <VisibilityTrends ref="visibility" class="charts-ms" />
+      <WeateData class="charts-l" :data="dataItem" />
+      <TemperatureTrend ref="temper" class="charts-ms" :data="weatherData" />
+      <VisibilityTrends
+        ref="visibility"
+        class="charts-ms"
+        :data="weatherData"
+      />
     </div>
   </div>
 </template>
@@ -48,27 +64,30 @@ export default {
       keyMap: [
         {
           label: "设备名称",
-          key: "name",
+          key: "deviceName",
         },
         {
           label: "设备位置",
-          key: "name",
+          key: "stakeMark",
         },
         {
           label: "所属方向",
-          key: "rote",
+          key: "direction",
         },
         {
           label: "采集时间",
-          key: "time",
+          key: "createTime",
         },
         {
-          label: "气象状态",
-          key: "start",
+          label: "设备状态",
+          key: "deviceState",
         },
       ],
+      deviceName: "",
       selectIndex: 0,
       dataList: [],
+      dataItem: {},
+      weatherData: [],
       data: Array.from({ length: 10 }).map(() => ({
         name: "气象监测器1",
         rote: "济南方向",
@@ -85,15 +104,27 @@ export default {
       this.selectIndex = index;
     },
     resizeChart() {
-      //  console.log(this.$refs.temper);
       this.$refs.temper.reiszeChart();
       this.$refs.visibility.reiszeChart();
     },
     getList() {
       getListLatest().then((res) => {
-        console.log("_____________", res);
+        this.dataList = res.rows;
+        this.dataItem = res.rows[0];
+        this.deviceName = res.rows[0].deviceName;
+        this.getWeather();
       });
     },
+    getWeather() {
+      getDeviceNameListLatest(this.deviceName).then((res) => {
+        this.weatherData = res.rows;
+      });
+    },
+    handleClick(item) {
+      this.dataItem = item;
+      this.deviceName = item.deviceName;
+      this.getWeather();
+    },
   },
   mounted() {
     this.getList();
@@ -104,7 +135,7 @@ export default {
 <style lang="scss" scoped>
 .endSpecial {
   position: relative;
-  top: -10px;
+  // top: -10px;
 
   > img {
     display: inline-flex;
@@ -147,6 +178,7 @@ export default {
       height: 203px;
       margin-top: 10px;
       margin-left: 20px;
+      cursor: pointer;
     }
 
     > div:nth-child(5n + 1) {

From 22b2af35411d506c9b56961ca5507a556854de9b Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Mon, 1 Apr 2024 17:50:50 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/styles/JiHeExpressway.scss     |   2 +-
 ruoyi-ui/src/common/menuData.js               |   6 +
 .../components/BroadcastReleases.vue          |   2 +-
 .../Camera/components/CameraControlDialog.vue |   2 +-
 .../Dialogs/CongestedRoadSections/index.vue   |   2 +-
 .../components/DeviceControlDialog.vue        |   2 +-
 .../Dialogs/GuardrailCollision/index.vue      |   2 +-
 .../Dialogs/HighwayDetails/index.vue          |   2 +-
 .../Dialogs/Intermodulation/index.vue         |   2 +-
 .../components/DeviceControlDialog.vue        |   2 +-
 .../components/Dialogs/SmartDevice/index.vue  |   2 +-
 .../Dialogs/WakeUpLightCurtainInfo/index.vue  |   2 +-
 .../Dialogs/WeatherForecast/index.vue         |   2 +-
 .../statisticalAnalysis/index.vue             |  14 +-
 .../pages/service/board/index.vue             |  52 +++--
 .../service/boardRecord/images/refresh.svg    |  22 +++
 .../pages/service/boardRecord/index.vue       | 186 ++++++++++++++++++
 17 files changed, 272 insertions(+), 32 deletions(-)
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/images/refresh.svg
 create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

diff --git a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
index 0395d767..7db6541e 100644
--- a/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
+++ b/ruoyi-ui/src/assets/styles/JiHeExpressway.scss
@@ -278,7 +278,7 @@
     }
 
     .el-picker-panel{
-      .today div a,.today div span{
+      .today div a,.today div span, .today a{
         color: #ff0 !important;
         font-weight: bold !important;
       }
diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index f58ac82d..70e7f16d 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -177,6 +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: "sensitive",
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
index 3f9c9790..019b76c1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="广播发布" width="550px">
+  <Dialog v-model="modelVisible" title="广播发布" width="850px">
     <div class="BroadcastReleases">
       <div class="body">
         <div class="left">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
index 63d1140b..80c0ae0d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/components/CameraControlDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="相机控制" noneMask width="550px">
+  <Dialog v-model="modelVisible" title="相机控制" noneMask width="600px">
     <div class="CameraControlDialog">
       <div class="direction">
         <div class="control-container top" @click="controlClick(21)">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/CongestedRoadSections/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/CongestedRoadSections/index.vue
index 0f2ee0fa..84b84ab2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/CongestedRoadSections/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/CongestedRoadSections/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog class="CongestedRoadSections" width="550px">
+  <Dialog class="CongestedRoadSections" width="600px">
     <div class="video-presentations">
       <div class="video-item"></div>
       <div class="video-item"></div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
index 5ebcd419..a34a4490 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/DrivingGuidance/components/DeviceControlDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="设备操作" width="550px">
+  <Dialog v-model="modelVisible" title="设备操作" width="600px">
     <div class="DeviceControlDialog">
       <Form
         v-model="formData"
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
index f04836cb..ef3fe2e2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/GuardrailCollision/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="obverseVisible" title="护栏碰撞弹窗" width="550px">
+  <Dialog v-model="obverseVisible" title="护栏碰撞弹窗" width="600px">
     <Video class="video-stream" :pileNum="dialogData.stakeMark" />
 
     <div class="GuardrailCollision">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/HighwayDetails/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/HighwayDetails/index.vue
index d674a6f7..89c57cf9 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/HighwayDetails/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/HighwayDetails/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog class="HighwayDetails" width="550px">
+  <Dialog class="HighwayDetails" width="600px">
     <div class="video-presentations">
       <div class="video-item"></div>
       <div class="video-item"></div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
index 27e0f656..042cfe2e 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Intermodulation/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="obverseVisible" title="一类交调站弹窗" width="550px">
+  <Dialog v-model="obverseVisible" title="一类交调站弹窗" width="600px">
     <Video class="video-stream" :pileNum="dialogData.stakeMark" />
 
     <div class="Intermodulation">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
index dd73bbda..200357eb 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/components/DeviceControlDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" title="设备操作" width="550px">
+  <Dialog v-model="modelVisible" title="设备操作" width="600px">
     <div class="DeviceControlDialog">
       <DeviceParams :dialogData="dialogData" />
     </div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
index 88c498fc..29feb81b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SmartDevice/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="obverseVisible" title="智能设备箱" width="550px">
+  <Dialog v-model="obverseVisible" title="智能设备箱" width="600px">
     <Video class="video-stream" :pileNum="dialogData.stakeMark" />
 
     <div class="SmartDevice">
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WakeUpLightCurtainInfo/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WakeUpLightCurtainInfo/index.vue
index 82924b52..78d0f6c2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WakeUpLightCurtainInfo/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WakeUpLightCurtainInfo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog class="WakeUpLightCurtainInfo" width="550px">
+  <Dialog class="WakeUpLightCurtainInfo" width="600px">
     <div class="operation-btn">
       <div class="photo-btn">图像</div>
       <div class="video-btn">视频</div>
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WeatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WeatherForecast/index.vue
index 07492e62..01d99b8c 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WeatherForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/WeatherForecast/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog class="WeatherForecast" width="550px"> s </Dialog>
+  <Dialog class="WeatherForecast" width="600px"> s </Dialog>
 </template>
 
 <script>
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 5b557a6d..3c30c3c0 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -104,6 +104,7 @@
               :current-page.sync="pageIndex"
               layout="total, sizes, prev, pager, next"
               :total="pageTotal"
+              @size-change="handleSizeChange"
             >
             </Pagination>
           </div>
@@ -153,7 +154,7 @@ export default {
       typeQuery: "", //高清网络枪型固定摄像机
       pageTotal: 0,
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 30,
       searchFormList,
       equipSeries: [
         "高清网络球形摄像机",
@@ -183,6 +184,10 @@ export default {
     clearInterval(this.interval);
   },
   methods: {
+    handleSizeChange(size){
+      this.pageSize = size;
+      this.initData();
+    },
     initData() {
       this.startTime = moment().startOf("month").format("YYYY-MM-DD HH:mm:ss");
       this.time = moment().format("YYYY-MM-DD HH:mm:ss");
@@ -379,24 +384,23 @@ export default {
       });
     },
     //查询列表
-    initQueryTable(pageIndex, pageSize = 30) {
+    initQueryTable(pageIndex) {
       this.setStatus("02", "doing");
       getSystemStatusTabList({
         startTime: this.startTime,
         time: this.time,
         type: this.typeQuery,
         pageNum: pageIndex,
-        pageSize: pageSize,
+        pageSize: this.pageSize,
       }).then((res) => {
         if (res.code == 200) {
           // if (res.rows && res.rows.length > 0) {
           this.setStatus("02", "finish");
           this.pageIndex = pageIndex;
-          this.pageSize = pageSize;
           this.pageTotal = res.total;
           this.tableData = res.rows;
           this.tableData.forEach((it, index) => {
-            it.order = (pageIndex - 1) * pageSize + index + 1;
+            it.order = (pageIndex - 1) * this.pageSize + index + 1;
           });
           // } else {
           //   this.setStatus("02", "empty");
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index 47fbe238..0bd82fde 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -123,22 +123,23 @@
           </div>
         </div> -->
         <div class="partCon">
-          <!-- {{ selectedBdMsg }} -->
           <vuescroll :ops="scrollOptions" class="templateBox" v-if="selectedBdMsg.length > 0"
             :class="{ hide: isHideCtt }">
-            <div v-for="(itm, indx) in selectedBdMsg" :key="indx" class="tplItem">
-              <!-- 模板内容 -->
-              <BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
-              <!-- 操作按钮 -->
-              <div class="infoBtnBox">
-                <el-tooltip content="编辑" placement="top">
-                  <p @click="____onEditBoardItem(itm, indx)" class="btn btnEdit"></p>
-                </el-tooltip>
-                <el-tooltip content="删除" placement="top">
-                  <p @click="____onDeleteBoardItem(indx)" class="btn btnDelete"></p>
-                </el-tooltip>
+            <draggable tag="div" :list="selectedBdMsg" @end="____onDragend" ghostClass="ghost_class" dragClass="drag_class" chosenClass="chosen_class">
+              <div v-for="(itm, indx) in selectedBdMsg" :key="indx" class="tplItem">
+                <!-- 模板内容 -->
+                <BoardPreview class="boardPreview" :boardWH="selectedSize" :tpl="itm"></BoardPreview>
+                <!-- 操作按钮 -->
+                <div class="infoBtnBox">
+                  <el-tooltip content="编辑" placement="top">
+                    <p @click="____onEditBoardItem(itm, indx)" class="btn btnEdit"></p>
+                  </el-tooltip>
+                  <el-tooltip content="删除" placement="top">
+                    <p @click="____onDeleteBoardItem(indx)" class="btn btnDelete"></p>
+                  </el-tooltip>
+                </div>
               </div>
-            </div>
+            </draggable>
           </vuescroll>
           <Empty v-else text="请从设备回读或从模板添加信息..." style="padding-top: 100px"></Empty>
         </div>
@@ -216,6 +217,7 @@
   </div>
 </template>
 <script>
+import draggable from "vuedraggable";
 import Sortable from "sortablejs";
 import editInfo from "./editInfo";
 import {
@@ -247,6 +249,7 @@ export default {
   name: "Device",
   mixins: [InfoBoard],
   components: {
+    draggable,
     WgtTitle,
     BoardInfoEditor,
     editInfo,
@@ -545,6 +548,9 @@ export default {
         tpl,
       };
     },
+    ____onDragend(evt){
+      // console.log(evt, this.selectedBdMsg , "拖拽结束+++=======")
+    },
     ____onEditBoardItem(tpl, index) {
       // type : board template
       // mode : edit add toDevice toTemplate
@@ -1043,7 +1049,7 @@ export default {
           padding-bottom: 10px;
 
           .boardPreview {
-            border: 2px solid #004c64;
+            border: 2px solid #004c64; background-color: #133242;
             // width: 560px;
             // height:80px;
             flex: 1;
@@ -1055,7 +1061,7 @@ export default {
             display: flex;
             margin-left: 10px;
             /* // border: solid 1px #05afe3; */
-            border: 2px solid #004c64;
+            border: 2px solid #004c64; background-color: #133242;
             display: flex;
             justify-content: space-around;
             align-items: center;
@@ -1100,6 +1106,22 @@ export default {
           }
         }
 
+        .tplItem.ghost_class {
+          .boardPreview, .infoBtnBox{
+            border-color:#F00;
+          }
+        }
+        .tplItem.chosen_class {
+          .boardPreview, .infoBtnBox{
+            border-color:#0A0;
+          }
+        }
+        .tplItem.drag_class {
+          .boardPreview, .infoBtnBox{
+            border-color:#FF0;
+          }
+        }
+
         .el-collapse {
           max-height: 100% !important;
           overflow: auto;
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/images/refresh.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/images/refresh.svg
new file mode 100644
index 00000000..e31a5500
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/images/refresh.svg
@@ -0,0 +1,22 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814398">
+<g id="Group 1142814396">
+<path id="Rectangle 1304" d="M1.0437 2.41495L4.5636 2.01738L4.91112 6.00562" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835">
+<mask id="path-2-inside-1_290_77" fill="white">
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z"/>
+</mask>
+<path d="M4.29579 2.52494C4.09359 2.27296 3.71712 2.25216 3.51748 2.50144C2.86315 3.31847 2.39514 4.30903 2.15904 5.38649C1.87758 6.67096 1.93836 8.02122 2.3337 9.26652C2.72904 10.5118 3.44118 11.5962 4.38007 12.3826C5.16561 13.0406 6.08036 13.4652 7.0411 13.6229C7.35243 13.674 7.61901 13.4293 7.63212 13.1145C7.64523 12.7997 7.39954 12.5346 7.08935 12.4765C6.32757 12.3339 5.60349 11.9884 4.97813 11.4646C4.19938 10.8124 3.6087 9.91289 3.28078 8.87998C2.95287 7.84706 2.90245 6.72709 3.13591 5.66169C3.33404 4.75752 3.72906 3.92712 4.28182 3.24492C4.4503 3.03698 4.46523 2.7361 4.29579 2.52494Z" stroke="white" stroke-width="2" mask="url(#path-2-inside-1_290_77)"/>
+</g>
+</g>
+<g id="Group 1142814397">
+<path id="Rectangle 1304_2" d="M15.0437 11.585L11.5238 11.9826L11.1763 7.99438" stroke="white" stroke-linecap="round"/>
+<g id="Ellipse 835_2">
+<mask id="path-4-inside-2_290_77" fill="white">
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z"/>
+</mask>
+<path d="M11.7916 11.4751C11.9938 11.727 12.3703 11.7478 12.5699 11.4986C13.2242 10.6815 13.6923 9.69097 13.9284 8.61351C14.2098 7.32904 14.149 5.97878 13.7537 4.73348C13.3584 3.48817 12.6462 2.40376 11.7073 1.61737C10.9218 0.95942 10.007 0.534814 9.0463 0.377109C8.73497 0.326006 8.46839 0.570722 8.45528 0.885536C8.44218 1.20035 8.68786 1.46544 8.99805 1.5235C9.75983 1.6661 10.4839 2.01159 11.1093 2.53538C11.888 3.18765 12.4787 4.08711 12.8066 5.12002C13.1345 6.15294 13.1849 7.27291 12.9515 8.33831C12.7534 9.24248 12.3583 10.0729 11.8056 10.7551C11.6371 10.963 11.6222 11.2639 11.7916 11.4751Z" stroke="white" stroke-width="2" mask="url(#path-4-inside-2_290_77)"/>
+</g>
+</g>
+</g>
+</svg>
\ 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
new file mode 100644
index 00000000..a6218c69
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue
@@ -0,0 +1,186 @@
+<template>
+  <div class='board_record'>
+
+    <!-- 搜索栏 -->
+    <div class="filter">
+      <div>
+        <ButtonGradient @click="onRefresh" class="refresh-btn">
+          <template #prefix>
+            <img src="./images/refresh.svg" />
+          </template>
+          刷新
+        </ButtonGradient>
+        <!-- <ButtonGradient>
+          <template #prefix>
+            <img src="@screen/images/insert.svg" />
+          </template>
+          新增
+        </ButtonGradient> -->
+
+      </div>
+    </div>
+
+    <!-- 内容 -->
+    <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" />
+        <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>
+
+    <!-- 分页 -->
+    <div class="footer">
+      <Pagination @current-change="initData" @size-change="onSizeChange" width="'100%'" :page-sizes="[10, 20, 30, 40, 50]"
+        :page-size="searchData.pageSize" :current-page.sync="searchData.pageNum" layout="total, sizes, prev, pager, next"
+        :total="total">
+      </Pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+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";
+
+export default {
+  name: 'boardRecord',
+  components: {
+    ButtonGradient,
+    Pagination,
+    Table
+  },
+  data() {
+    return {
+      tableData: [],
+      isShowPhrases: false,
+      isShowDisposal: false,
+      total: 20,
+      eventType: 1,
+      searchData: {
+        pageSize: 20,
+        pageNum: 1,
+      },
+      phrasesData: [],
+      process: []
+    }
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    initData() {
+      request({
+        url: `/business/dcEventType/list`,
+        method: "get",
+        params: this.searchData,
+      }).then((result) => {
+        if (result.code != 200) return Message.error(result?.msg);
+        this.tableData = result.rows;
+        this.total = result.total;
+      });
+    },
+    onRefresh() {
+      this.tableData = [];
+      setTimeout(() => {
+        this.initData();
+      }, 100);
+    },
+    onSizeChange(pageSize) {
+      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;
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.board_record {
+  padding: 21px;
+
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  z-index: 6;
+  width: 100%;
+  height: 100%;
+
+  .filter {
+    height: 60px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    >div {
+      display: flex;
+      gap: 6px;
+    }
+  }
+
+  .body {
+    flex: 1;
+    position: relative;
+    overflow: hidden;
+
+    .content {
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      overflow: auto;
+    }
+  }
+
+  .footer {
+    margin-top: 15px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>

From aa57f41ee1e34b38d2a946023209f1aa21b76be0 Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 17:58:25 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix=20=E5=8F=8C=E5=87=BB=E6=89=8D?=
 =?UTF-8?q?=E8=83=BD=E5=87=BA=E5=8F=91=E5=BC=B9=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/components/RoadAndEvents/utils/map.js     | 14 ++++++++++++--
 .../pages/Home/components/Thumbnail/index.vue      |  2 +-
 2 files changed, 13 insertions(+), 3 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 e5c69034..ff81bccc 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
@@ -202,7 +202,7 @@ export class MarkerCluster {
     </div>`);
     window.infoWindow = this.infoWindow;
     this.infoWindow.open(map, currentPageData[0].lnglat);
-
+    window.openInfoWindow = true;
     this.infoWindow.dom.querySelector(".info-close").onclick = () =>
       this.infoWindow.close();
 
@@ -237,11 +237,21 @@ export class MarkerCluster {
     let hasClick = false;
 
     const reset = () => {
-      this.infoWindow?.close?.();
+      if (!window.openInfoWindow) {
+        this.infoWindow?.close?.();
+      }
     };
 
     map.on("zoomstart", reset);
     map.on("mapmove", reset);
+    map.on("moveend", async () => {
+      if (window.openInfoWindow) {
+        console.log("窗口位移结束");
+        window.openInfoWindow = false;
+        await new Promise((resolve) => setTimeout(resolve, 340));
+        window.infoWindow?.open?.();
+      }
+    });
 
     const markerCluster = new AMap.MarkerCluster(map, [], {
       // gridSize: 15,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
index 978a89a2..b91a768d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Thumbnail/index.vue
@@ -13,7 +13,7 @@ import { actualLocationList, canvasList } from "./data.js";
 const mouseenterDebounceFunc = debounce(({ node }) => {
   if (["custom-html"].indexOf(node.shape) >= 0) {
     node.setZIndex(100);
-    console.log(node);
+    // console.log(node);
   }
 }, 0);
 const mouseleaveDebounceFunc = debounce(({ node }) => {

From 83d36e987d4bba6762605dc52a76478a0fa0f12c Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 18:06:22 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat=20=20=E5=A2=9E=E5=8A=A0=E5=BB=B6?=
 =?UTF-8?q?=E8=BF=9F840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/utils/map.js           | 3 ++-
 1 file changed, 2 insertions(+), 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 ff81bccc..a0b120d9 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,6 +238,7 @@ export class MarkerCluster {
 
     const reset = () => {
       if (!window.openInfoWindow) {
+        // console.log(window.openInfoWindow, "rest");
         this.infoWindow?.close?.();
       }
     };
@@ -248,7 +249,7 @@ export class MarkerCluster {
       if (window.openInfoWindow) {
         console.log("窗口位移结束");
         window.openInfoWindow = false;
-        await new Promise((resolve) => setTimeout(resolve, 340));
+        await new Promise((resolve) => setTimeout(resolve, 840));
         window.infoWindow?.open?.();
       }
     });

From 739ac56a49abf6ee47ee66bebab0b9fd4527ec5d Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 2 Apr 2024 11:37:45 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=20x=E8=BD=B4=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/postTrendsMonth/assets/charts.js                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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..4ea30c4e 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
@@ -49,7 +49,7 @@ let options = {
       },
     },
     axisLabel: {
-      interval: 0,
+      interval: 1,
       align: "center",
       rotate: "1",
       margin: "20",

From c17ac70da27142b6188bfa22a17170f96bf18dc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=9C=8B?= <lbp608@126.com>
Date: Tue, 2 Apr 2024 14:45:47 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E5=80=BC=E7=8F=AD=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=B9=E7=AA=97=EF=BC=8C=E6=9C=AA=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8A=E6=AC=A1=E6=89=93=E5=BC=80=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ModifyDutyInformationTable.vue | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
index 332f538e..7b81d0e1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/components/ModifyDutyInformationTable.vue
@@ -61,7 +61,7 @@
     <template #footer>
       <Button
         :style="{ backgroundColor: '#0E708B' }"
-        @click.native="$emit('close')"
+        @click.native="closeWindow()"
       >
         取消</Button
       >
@@ -138,14 +138,7 @@ export default {
         return this.visible;
       },
       set(bool) {
-        //关闭弹窗组件,清空数据
-        if(!bool) {
-          this.dayShift = [];
-          this.graveyardShift = [];
-          this.peopleList = [];
-        }
-
-        this.$emit("close", bool);
+        this.closeWindow();
       },
     },
     getActive() {
@@ -157,6 +150,7 @@ export default {
     visible: {
       immediate: true,
       async handler(bool) {
+        this.clearData();
         if (!bool) return;
 
         this.dayShift = [...(this.data?.dayShift || [])];
@@ -235,11 +229,9 @@ export default {
           },
         })
           .then((result) => {
-            console.log("result.data:", result.data);
             this.dayShift = result.data.filter(
               (item) => item.scheduling === "1"
             );
-            console.log("this.dayShift11:", this.dayShift);
             this.graveyardShift = result.data.filter(
               (item) => item.scheduling === "2"
             );
@@ -386,7 +378,16 @@ export default {
         }
       }
     },
-  },
+    closeWindow(bool){
+      this.$emit("close", false);
+    },
+    clearData(){
+      //关闭弹窗组件,清空数据
+      this.dayShift = [];
+      this.graveyardShift = [];
+      this.peopleList = [];
+    }
+  }
 };
 </script>
 

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 09/11] =?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 10/11] =?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 11/11] =?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?.();
       }
     });