From 529ab58b8add922b1b7dcdb1cdeac48b5afd5a70 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Mon, 1 Apr 2024 09:38:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E5=81=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/weatherInfoQuery/index.vue        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 bdf9e1a5..469ff15c 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,7 +2,7 @@
   <div class="congestion">
     <div class="queryList">
       <Card
-        v-for="(item, index) in dataList"
+        v-for="(item, index) in data"
         :cardData="item"
         :keyMap="keyMap"
         :hasBtn="false"
@@ -69,13 +69,13 @@ export default {
       ],
       selectIndex: 0,
       dataList: [],
-      // data: Array.from({ length: 10 }).map(() => ({
-      //   name: "气象监测器1",
-      //   rote: "济南方向",
-      //   arrdeass: "K59+256",
-      //   time: "2024.01.04 13:00:00",
-      //   start: "晴转多云",
-      // })),
+      data: Array.from({ length: 10 }).map(() => ({
+        name: "气象监测器1",
+        rote: "济南方向",
+        arrdeass: "K59+256",
+        time: "2024.01.04 13:00:00",
+        start: "晴转多云",
+      })),
     };
   },
 

From 655549c75a677eef6580a7895be9032baa6e723f Mon Sep 17 00:00:00 2001
From: zhoule <zz221011@163.com>
Date: Mon, 1 Apr 2024 11:33:36 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/JiHeExpressway/pages/control/event/event/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7608e4bc..89fea858 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
@@ -231,7 +231,7 @@ export default {
       if (this.activeName == '-1') {
         url = '/business/warning/export'
       } else {
-        url = '/dc/system/event/export';
+        url = '/dc/system/event/export?eventState=' + this.searchData.eventState;
       }
       let loadingInstance = Loading.service({
         fullscreen: true,

From d2b73ebe589e4df8b23abf862ea4fad470fb6b2a Mon Sep 17 00:00:00 2001
From: qingzhengli <1204552371@qq.com>
Date: Mon, 1 Apr 2024 11:39:22 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix=20=E7=BC=A9=E7=95=A5=E5=9B=BE=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E9=9D=9E=E4=BA=8B=E4=BB=B6=E4=B8=93=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Home/components/RoadAndEvents/index.vue      |  3 +--
 .../pages/Home/components/RoadAndEvents/utils/map.js   | 10 ++++++----
 2 files changed, 7 insertions(+), 6 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 9ff12937..44487c11 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
@@ -148,7 +148,7 @@ export default {
         await Promise.allSettled((this.tabContentData || []).map(item => this.handleDeviceImmediate(item, true)))
         Object.keys(lngLatMap).forEach(key => {
           addInGraphHandle(lngLatMap[key]);
-        })
+        });
       }
     }
   },
@@ -227,7 +227,6 @@ export default {
 
       const status = item.status;
 
-      console.log(item, "item");
       if (!status) { this.nowSelected = item.title; this.nowSelectedCompleted = false; }
       else if (this.nowSelected === item.title && this.nowSelectedCompleted === false) return;
 
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 8787de0d..c426b68c 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
@@ -2,7 +2,7 @@ import { loadAMap } from "@screen/pages/Home/components/AMapContainer/loadAMap.j
 // import { Message } from "element-ui";
 import Vue from "vue";
 import { lngLatMap } from "./buttonEvent";
-import { upperFirst } from "lodash";
+import { upperFirst, filter } from "lodash";
 /**
  * @typedef {Object} Point
  * @property {number} weight - The weight of the item.
@@ -27,6 +27,7 @@ const normalBg = require(`@screen/images/mapBg/active.svg`);
 const faultTitleBg = require(`@screen/images/mapBg/fault_title.svg`);
 const normalTitleBg = require(`@screen/images/mapBg/active_title.svg`);
 
+const eventRegex = "./事件专题";
 /**
  * 聚合点
  */
@@ -483,9 +484,9 @@ export function marksAddInGraph(data) {
 export function addInGraphHandle(data) {
   const graphInstance = window.graphInstance;
   const extData = data[0].extData;
-  console.log(extData, "extData");
+  // console.log(extData, "extData11111");
   const { item: eventItem } = data[0].config;
-  if (eventItem.id.match("./事件专题")) {
+  if (eventItem.id.match(eventRegex)) {
     let { stakeMark, lang, direction } = extData;
     stakeMark = upperFirst(stakeMark); //统一格式 大写K
     const distance =
@@ -515,11 +516,12 @@ export function addInGraphHandle(data) {
       });
       // }, 0);
     }
-    console.log(lang, "lang");
+    // console.log(lang, "lang");
   }
 }
 
 function getDataConf(data, extData) {
+  data = data.filter((item) => item.config.item.id.match(eventRegex));
   let dataConf;
   const nowBg = getState(data) ? normalBg : faultBg;
   if (data.length === 1) {

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 4/6] =?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 5/6] =?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 6/6] =?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) {