From 474edded1752d1ada003936622bea8ed53b916f8 Mon Sep 17 00:00:00 2001
From: zhangzhang <1747194829@qq.com>
Date: Tue, 7 May 2024 15:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E6=B0=94=E9=A2=84=E6=8A=A5api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/router/routerCreater.js          |   2 +-
 .../components/sortFaceForecast/index.vue     |   9 +-
 .../components/weatherForecast/index.vue      | 142 ++++++++++++------
 .../components/weaterData/index.vue           |   4 +-
 .../components/infoWarning/index.vue          |   1 -
 .../components/infowWarningList/index.vue     |   1 -
 .../components/AddNEditDialog.vue             |   2 -
 .../components/Card.vue                       |   9 +-
 8 files changed, 105 insertions(+), 65 deletions(-)

diff --git a/ruoyi-ui/src/router/routerCreater.js b/ruoyi-ui/src/router/routerCreater.js
index 132a42d4..b8f03c60 100644
--- a/ruoyi-ui/src/router/routerCreater.js
+++ b/ruoyi-ui/src/router/routerCreater.js
@@ -44,7 +44,7 @@ function processNode(node) {
     if (!item.component) {
       temp.component = compX;
     } else {
-      console.log(item.component);
+      // console.log(item.component);
       temp.component = (resolve) =>
         require(["@/views/JiHeExpressway/pages/" + item.component], resolve); //views/visualization/pages/${item.component}
     }
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
index 39990f7f..7a7ae814 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/sortFaceForecast/index.vue
@@ -50,8 +50,8 @@
                 <span class="text">{{ item.precip || "--" }}mm</span>
               </div>
               <div class="item">
-                <span class="title">能见度等级：</span>
-                <span class="text">{{ item.vis || "--" }}级</span>
+                <span class="title">能见度：</span>
+                <span class="text">{{ item.vis || "--" }}km</span>
               </div>
               <!-- <div class="item">
                 <span class="title">能见度等级：</span>
@@ -530,11 +530,7 @@ export default {
     // 按小时查询天气
     getHourlyWeatherFacts(id) {
       getHourlyWeather().then((response) => {
-        console.log("response", response);
-        console.log("this.selectIndex", this.selectIndex);
-
         let obj = response.data;
-        console.log("obj", obj);
         let data = [];
         for (let key in obj) {
           //   if (key === "hourlyWeather1") {
@@ -562,7 +558,6 @@ export default {
           newData.push(item[id - 1]);
         });
         this.weatherList = newData;
-        console.log("data", newData);
       });
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
index c80496fb..64a79bce 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherForecast/index.vue
@@ -4,37 +4,84 @@
     <div class="board">
       <div class="showRoad">
         <div class="weaterIcon">
-          <img src="./assets/weather.png" />
+          <!-- <img src="./assets/weather.png" /> -->
           <div>
-            {{ weaterType }}
+            {{ cityWeather.text ? cityWeather.text : "-" }}
           </div>
         </div>
         <div class="weaterNum">
-          <div class="num">{{ weaterNum }}°</div>
+          <div class="num">
+            {{ cityWeather.temp ? cityWeather.temp : "-" }}°
+          </div>
           <div class="maxMin">
-            {{ weaterMaxMin }}
+            {{ cityWeather.windDir ? cityWeather.windDir : "-"
+            }}{{ cityWeather.windScale ? cityWeather.windScale : "-" }}级
           </div>
         </div>
-        <div class="windType">
+        <!-- <div class="windType">
           <div class="Warnings">{{ windWarnings }}</div>
           <div class="windTypeStr">
             {{ windType }}
           </div>
-        </div>
+        </div> -->
         <div class="line"></div>
         <div class="cityType">
           <img src="./assets/cityPosition.png" />
           <div class="cityText">
-            {{ city }}
+            <el-select
+              v-model="city"
+              placeholder="请选择"
+              @change="handleChange"
+            >
+              <el-option
+                v-for="item in regionList"
+                :key="item.regionName"
+                :label="item.regionName"
+                :value="item.regionName"
+              >
+              </el-option>
+            </el-select>
           </div>
         </div>
         <div class="temperature">
-          <div class="temperItem" v-for="(it, index) in temperatures">
+          <div class="temperItem">
+            <div class="text">
+              <img src="./assets/polygon.png" /><span>体感温度</span>
+            </div>
+            <div class="val">
+              {{ cityWeather.feelsLike ? cityWeather.feelsLike : "-" }}℃
+            </div>
+          </div>
+          <div class="temperItem">
+            <div class="text">
+              <img src="./assets/polygon.png" /><span>湿度</span>
+            </div>
+            <div class="val">
+              {{ cityWeather.humidity ? cityWeather.humidity : "-" }}%
+            </div>
+          </div>
+          <div class="temperItem">
             <div class="text">
-              <img src="./assets/polygon.png" /><span>{{ it.text }}</span>
+              <img src="./assets/polygon.png" /><span>降雨量</span>
             </div>
             <div class="val">
-              {{ it.value }}
+              {{ cityWeather.precip ? cityWeather.precip : "-" }}mm
+            </div>
+          </div>
+          <div class="temperItem">
+            <div class="text">
+              <img src="./assets/polygon.png" /><span>能见度</span>
+            </div>
+            <div class="val">
+              {{ cityWeather.vis ? cityWeather.vis : "-" }}km
+            </div>
+          </div>
+          <div class="temperItem">
+            <div class="text">
+              <img src="./assets/polygon.png" /><span>压力</span>
+            </div>
+            <div class="val">
+              {{ cityWeather.pressure ? cityWeather.pressure : "-" }}hPa
             </div>
           </div>
         </div>
@@ -45,6 +92,10 @@
 
 <script>
 import WgtTitle from "../../../widgets/title";
+import {
+  getRegionList,
+  getWeatherFacts,
+} from "@/api/perception/meteorologyCheck";
 
 export default {
   name: "MonthStatistics",
@@ -53,36 +104,35 @@ export default {
   },
   data() {
     return {
-      weaterNum: "21",
-      weaterMaxMin: "12 / 23°",
-      weaterType: "睛转小雨",
-      windWarnings: "大风预警",
-      windType: "东北风三级",
-      city: "济南",
-      temperatures: [
-        {
-          text: "体感",
-          value: "-14℃",
-        },
-        {
-          text: "PM2.5",
-          value: "90",
-        },
-        {
-          text: "湿度",
-          value: "94%",
-        },
-        {
-          text: "紫外线",
-          value: "3",
-        },
-      ],
+      regionList: [],
+      city: "长清区",
+      cityWeather: {},
     };
   },
 
   created() {},
-  methods: {},
+  methods: {
+    initData() {
+      getRegionList().then((res) => {
+        this.regionList = res.rows;
+        this.handleChange();
+      });
+    },
+    handleChange() {
+      getWeatherFacts().then((response) => {
+        console.log("response", response.data);
+        for (let key in response.data) {
+          debugger;
+          if (response.data[key].name == this.city) {
+            this.cityWeather = response.data[key];
+            console.log("this.cityWeather", this.cityWeather);
+          }
+        }
+      });
+    },
+  },
   mounted() {
+    this.initData();
     setTimeout(() => {
       this.$nextTick(() => {});
     });
@@ -139,7 +189,7 @@ export default {
         }
 
         > div {
-          font-size: 12px;
+          font-size: 22px;
           font-family: PingFang SC, PingFang SC;
           font-weight: 500;
           color: #ffffff;
@@ -222,11 +272,11 @@ export default {
 
       .cityType {
         display: inline-flex;
-        width: 60px;
+        width: 100px;
         height: 80px;
         justify-content: center;
         align-items: center;
-        margin-right: 27px;
+        margin-right: 40px;
 
         img {
           width: 38px;
@@ -245,7 +295,7 @@ export default {
       .temperature {
         display: inline-flex;
         flex-direction: row;
-        width: 349px;
+        width: 430px;
         height: 66px;
         background: transparent;
         opacity: 1;
@@ -257,6 +307,9 @@ export default {
           )
           1 1;
         border-radius: 8px;
+        img {
+          width: 7px;
+        }
 
         > div {
           display: inline-flex;
@@ -272,7 +325,7 @@ export default {
             font-weight: 500;
             > span {
               opacity: 0.5;
-              margin-left: 10px;
+              margin-left: 5px;
             }
           }
 
@@ -282,16 +335,15 @@ export default {
             font-family: PingFang SC, PingFang SC;
             font-weight: 500;
             color: #ffffff;
-            position: relative;
-            left: 10px;
+            // position: relative;
+            // left: 10px;
           }
         }
       }
     }
   }
 }
-.charts {
-  height: 180px;
-  width: 100%;
+::v-deep input.el-input__inner {
+  font-size: 12px;
 }
 </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 201d64af..127a77b2 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
@@ -132,9 +132,7 @@ export default {
   },
   watch: {
     data: {
-      handler(newVal) {
-        console.log(newVal);
-      },
+      handler(newVal) {},
       deep: true,
     },
   },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
index 96b0203d..82d19d5b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
@@ -135,7 +135,6 @@ export default {
   methods: {
     getWarningData() {
       getMeteorologicalEarlyWarning().then((res) => {
-        console.log("气象预警", res.data);
         let data = [];
         for (let key in res.data) {
           if (res.data[key].length > 0) {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
index 45ec4c02..84ff843b 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue
@@ -56,7 +56,6 @@ export default {
     },
     getWarningType() {
       getListVisibility().then((res) => {
-        console.log("获取预警类型", res.rows);
         this.tableData = res.rows;
       });
     },
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
index 5d6f3276..9809cd94 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@@ -245,8 +245,6 @@ export default {
           });
         }
       });
-
-      console.log("新增", this.formData);
     },
   },
 };
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
index e08d87e2..d3bffcc3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/Card.vue
@@ -80,9 +80,9 @@ export default {
 
       // this.$emit("handleDelete", item);
     },
-    initData() {
-      console.log("初始化数据", this.data);
-    },
+    // initData() {
+    //   console.log("初始化数据", this.data);
+    // },
     handleChangeSwitcher(val) {
       let data = {
         id: this.data.id,
@@ -91,11 +91,10 @@ export default {
       updateEnabledChannels(data).then(() => {
         this.$parent.handleSearch();
       });
-      console.log(88888, val);
     },
   },
   mounted() {
-    this.initData();
+    // this.initData();
   },
   watch: {
     data: {