完善气象预警

ruoyi-ui/src/api/MonthlyEquipment/index.js

@@ -55,10 +55,17 @@ export function getSystemStatusExport(query) {
 }
 
 // 拖拽排序
-
 export function getStatusRule(rule) {
   return request({
     url: "/system/status/rule?rule=" + rule,
     method: "get",
   });
 }
+
+// 拖拽排序
+export function getStatusSection() {
+  return request({
+    url: "/system/status/section",
+    method: "get",
+  });
+}

ruoyi-ui/src/api/perception/meteorologyCheck.js

@@ -55,3 +55,11 @@ export function getIdDevices(id) {
     method: "get",
   });
 }
+
+// 查询气象预警筛选类别
+export function getListVisibility() {
+  return request({
+    url: "/dc/system/meteorologicalDetector/listVisibility",
+    method: "get",
+  });
+}

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue

@@ -134,12 +134,12 @@ export default {
         chemicalsStatus: "",
         fireStatus: "",
       },
-      fromDept: "济青济南运管中心",
+      fromDept: "齐鲁高速股份有限公司",
       createTime: "2024年04月24日17时22分",
       title: "关于G20青银高速K305+208交通事故的续报1",
       toDept: "智慧管理中心",
       content: "路管等单位及清障救援车辆已到达现场。预计结束时间为12时44分。",
-      createName: "智慧高速菜单",
+      createName: "张三",
       phoneNumber: "18678866677",
       issued: "康传刚",
       // submitting: false,

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/onLineBarCharts/index.vue

@@ -40,11 +40,14 @@ export default {
         }
         let xData = [];
         let valueData = [];
-        console.log("newD", newD);
+        for (let key in newD) {
-        newD.forEach((element) => {
+          xData.push(key);
-          xData.push(element.title);
+          valueData.push(newD[key].sucessRate.replace("%", ""));
-          valueData.push(+element.pctOnl.replace("%", ""));
+        }
-        });
+        // newD.forEach((element) => {
+        //   xData.push(element.title);
+        //   valueData.push(+element.pctOnl.replace("%", ""));
+        // });
         // newD.forEach((element) => {
         //   value.push(+element.pctOnl.replace("%", ""));
         //   indicator.push({ name: element.title, max: 100 });

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue

@@ -8,7 +8,7 @@
         ></DeviceSummary>
         <div class="bottomTabs">
           <DeviceUptime :dataList="equipments" class="tabs-lo" />
-          <OnLineBarCharts :dataList="equipments" class="tabs-mo" />
+          <OnLineBarCharts :dataList="sectionData" class="tabs-mo" />
           <!-- <MonthlyEquipment class="tabs-mo" :dataList="equipments" /> -->
         </div>
       </el-tab-pane>
@@ -128,6 +128,7 @@ import {
   getSystemStatusTabList,
   getSystemStatusType,
   getSystemStatusExport,
+  getStatusSection,
 } from "@/api/MonthlyEquipment";
 // import { download } from "../../../../../utils/request.js";
 import Pagination from "@screen/components/Pagination.vue";
@@ -182,6 +183,7 @@ export default {
       activeName: "first",
       tableData: [],
       interval: null,
+      sectionData: [],
     };
   },
   provide() {
@@ -193,6 +195,11 @@ export default {
     clearInterval(this.interval);
   },
   methods: {
+    getSection() {
+      getStatusSection().then((res) => {
+        this.sectionData = res.data;
+      });
+    },
     handleSizeChange(size) {
       this.pageSize = size;
       this.initData();
@@ -242,7 +249,6 @@ export default {
       this.initQueryTable(1);
     },
     handleSearch(data) {
-      console.log(777, data);
       this.typeQuery = data.type;
       this.startTime = moment(data.time[0]).format("YYYY-MM-DD HH:mm:ss");
       this.time = moment(data.time[1]).format("YYYY-MM-DD HH:mm:ss");
@@ -273,7 +279,6 @@ export default {
         type: this.typeQuery,
       })
         .then((res) => {
-          console.log(res);
           const url = window.URL.createObjectURL(new Blob([res]));
           let link = document.createElement("a");
           link.style.display = "none";
@@ -312,7 +317,6 @@ export default {
       getSystemStatusType().then((res) => {
         let allList = [];
         let sort = res.data["排序规则"].rule.split(",");
-        console.log("sort", sort);
         sort.forEach((i) => {
           for (let key in res.data) {
             let val = res.data[key];
@@ -365,9 +369,6 @@ export default {
         type: this.typeQuery,
       }).then((res) => {
         if (res.code == 200) {
-          console.log("res.data", res.data);
-          // if (res.data && Object.keys(res.data).length > 0) {
-          console.log("res.data", res.data);
           this.setStatus("01", "finish");
           let origin = res.data;
           let startStamp = +moment(this.startTime).startOf("day").format("x");
@@ -429,6 +430,7 @@ export default {
   },
   async mounted() {
     await this.initData();
+    this.getSection();
   },
 };
 </script>

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/TemperatureTrend/index.vue

@@ -30,10 +30,14 @@ export default {
     data: {
       handler(data) {
         let newData = [];
+        // let xData = [];
+        console.log("data77777", data);
         data.forEach((item) => {
-          newData.push(item.avgVisibility);
+          newData.push(item.avgTemperature);
+          // xData.push(item.timeSlot);
         });
         temperatureCharts.series[0].data = newData;
+        // temperatureCharts.xAxis.data = newData;
         this.myChart.setOption(temperatureCharts);
       },
       deep: true,

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/assets/charts.js

@@ -5,7 +5,7 @@ var options = {
     show: true,
     trigger: "axis",
     valueFormatter: function (value) {
-      return value + " M";
+      return value + " km";
     },
   },
   grid: {

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/visibilityTrends/index.vue

@@ -26,7 +26,7 @@ export default {
       handler(data) {
         let newData = [];
         data.forEach((item) => {
-          newData.push(item.avgTemperature);
+          newData.push(item.avgVisibility);
         });
         visibilityCharts.series[0].data = newData;
         this.myChart.setOption(visibilityCharts);

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherInfoQuery/components/weaterData/index.vue

@@ -28,11 +28,17 @@
           }}</span>
         </div>
         <div class="item">
-          <span class="label">能见度：</span>
+          <span class="label">能见度等级：</span>
           <span class="text">{{
             data.visibilityType ? data.visibilityType + "级" : "-"
           }}</span>
         </div>
+        <div class="item">
+          <span class="label">能见度：</span>
+          <span class="text">{{
+            data.visibility ? data.visibility + "km" : "-"
+          }}</span>
+        </div>
         <!-- <div class="item">
           <span class="label">能见度类型：</span>
           <span class="text">{{ data.visibilityType }}</span>
@@ -43,12 +49,44 @@
             data.recipitationType ? data.recipitationType : "-"
           }}</span>
         </div> -->
+        <div class="item">
+          <span class="label">下雨类型：</span>
+          <span class="text">{{
+            data.rainfall == 0
+              ? "无降"
+              : data.rainfall == 1
+              ? "雨"
+              : data.rainfall == 2
+              ? "雪"
+              : data.rainfall == 3
+              ? "毛毛雨"
+              : "雨夹雪"
+          }}</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.remoteRoadSurfaceStatus == "00"
+              ? "干燥"
+              : data.rainfall == "01"
+              ? "潮湿"
+              : data.rainfall == "02"
+              ? "积水"
+              : data.rainfall == "03"
+              ? "结冰"
+              : data.rainfall == "04"
+              ? "积雪"
+              : data.rainfall == "05"
+              ? "冰水混合物"
+              : "泥泞"
+          }}</span>
+        </div>
         <div class="item">
           <span class="label">路面温度：</span>
           <span class="text">{{
@@ -63,6 +101,12 @@
             data.atmosphericPressure ? data.atmosphericPressure + "Pa" : "-"
           }}</span>
         </div>
+        <div class="item">
+          <span class="label"> 水膜厚度：</span>
+          <span class="text">{{
+            data.waterFilmlceSnowValue ? data.waterFilmlceSnowValue + "mm" : "-"
+          }}</span>
+        </div>
       </div>
     </div>
   </div>

ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infowWarningList/index.vue

@@ -1,116 +1,75 @@
 <template>
-  <div class='congestion'>
+  <div class="congestion">
     <WgtTitle :title="'能见度异常信息'"></WgtTitle>
     <div class="board">
       <div class="weaterMain">
-        <el-table :border="false" :data="tableData" height="670" style="width: 100%">
+        <el-table
-          <el-table-column prop="nem" label="" width="30">
+          :border="false"
+          :data="tableData"
+          height="670"
+          style="width: 100%"
+        >
+          <el-table-column prop="nem" label="" width="30"> </el-table-column>
+          <el-table-column prop="stakeMark" label="桩号范围" width="230">
           </el-table-column>
-          <el-table-column prop="address" label="桩号范围" width="230">
+          <el-table-column
-          </el-table-column>
+            prop="visibility"
-          <el-table-column prop="name" label="能见度" class-name="showClass" width="250">
+            label="能见度"
+            class-name="showClass"
+            width="250"
+          >
             <template slot-scope="scope">
-              <span class="showClass">{{ scope.row.name }}</span>
+              <span class="showClass">{{ scope.row.visibility }}km</span>
             </template>
           </el-table-column>
-          <el-table-column prop="date" label="发生时间" width="230">
+          <el-table-column prop="createTime" label="发生时间" width="230">
           </el-table-column>
         </el-table>
       </div>
     </div>
   </div>
 </template>
-  
+
 <script>
-import Card from "@screen/components/Card1/index.vue"
+import Card from "@screen/components/Card1/index.vue";
-import WgtTitle from '../../../../../widgets/title'
+import WgtTitle from "../../../../../widgets/title";
+import {
+  getMeteorologicalEarlyWarning,
+  getListVisibility,
+} from "@/api/perception/meteorologyCheck";
 
 export default {
-  name: 'infoWarning',
+  name: "infoWarning",
   components: {
-    WgtTitle
+    WgtTitle,
   },
   data() {
     return {
-      tableData: [{
+      tableData: [],
-        date: '2023-12-31 13:00:00',
+    };
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      }, {
-        date: '2023-12-31 13:00:00',
-        name: '2640.78m',
-        address: 'K100+000-K110+000'
-      },
-      ]
-    }
   },
 
-  created() {
+  created() {},
-
-  },
   methods: {
     selectItem(index) {
       this.selectIndex = index;
     },
+    getWarningType() {
+      getListVisibility().then((res) => {
+        console.log("获取预警类型", res.rows);
+        this.tableData = res.rows;
+      });
+    },
   },
   mounted() {
-
+    this.getWarningType();
-    setTimeout(() => {
-      this.$nextTick(() => {
-
-      });
-    });
   },
-}
+};
 </script>
-  
+
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .showClass {
-  color: #00EBC1;
+  color: #00ebc1;
 }
 
 ::v-deep .el-table .cell {
@@ -119,7 +78,7 @@ export default {
 
 ::v-deep .el-table .el-table__header-wrapper th {
   background-color: #064258 !important;
-  color: #00D1FF;
+  color: #00d1ff;
   border-color: #064258 !important;
   border: 0px !important;
   font-size: 12px !important;
@@ -138,11 +97,11 @@ export default {
 
 ::v-deep .el-table tr:hover td {
   background: #1b2528 !important;
-  color: #00D1FF;
+  color: #00d1ff;
 }
 
 ::v-deep .el-table tr:nth-child(odd) td {
-  background-color: #13272F;
+  background-color: #13272f;
   border: 0px !important;
 }
 
@@ -175,15 +134,13 @@ export default {
     flex-direction: column;
     margin-top: 20px;
 
-
-
     .warningList {
       display: inline-flex;
       flex-direction: column;
       width: 100%;
       height: calc(100% - 40px);
 
-      >div {
+      > div {
         display: inline-flex;
         width: 100%;
         height: 138px;
@@ -191,16 +148,21 @@ export default {
         border-radius: 2px 2px 2px 2px;
         opacity: 1;
         border: 1px solid;
-        border-image: linear-gradient(360deg, rgba(55, 231, 255, 1), rgba(55, 231, 255, 0)) 1 1;
+        border-image: linear-gradient(
+            360deg,
+            rgba(55, 231, 255, 1),
+            rgba(55, 231, 255, 0)
+          )
+          1 1;
         overflow: hidden;
         margin-top: 20px;
         padding: 23px 29px;
         font-size: 14px;
         font-family: PingFang SC, PingFang SC;
         font-weight: 400;
-        color: #37E7FF;
+        color: #37e7ff;
 
-        >.left-w {
+        > .left-w {
           display: inline-flex;
           width: 40%;
           height: 100%;
@@ -213,7 +175,7 @@ export default {
             height: 30px;
             flex-direction: row;
 
-            >.value {
+            > .value {
               color: #fff;
             }
 
@@ -221,13 +183,12 @@ export default {
               font-size: 14px;
               font-family: PangMenZhengDao;
               font-weight: 400;
-              color: #F4A125
+              color: #f4a125;
             }
-
           }
         }
 
-        >.right-w {
+        > .right-w {
           margin-left: 30px;
           display: inline-flex;
           width: 100%;
@@ -242,7 +203,6 @@ export default {
             color: #fff;
           }
         }
-
       }
     }
 
@@ -252,12 +212,11 @@ export default {
       width: 100%;
       height: 40px;
 
-
       .buttons {
         width: 100%;
         height: 38px;
 
-        >div {
+        > div {
           display: inline-flex;
           width: 10%;
           height: 35px;
@@ -266,36 +225,56 @@ export default {
           font-size: 12px;
           font-family: PangMenZhengDao;
           font-weight: 800;
-          color: #FFFFFF;
+          color: #ffffff;
           z-index: 9;
         }
 
-        >div::after {
+        > div::after {
           content: "";
           position: absolute;
           display: inline-flex;
           width: 55px;
           height: 36px;
-          background: linear-gradient(180deg, #6557D7 0%, rgba(101, 87, 216, 0) 100%);
+          background: linear-gradient(
+            180deg,
+            #6557d7 0%,
+            rgba(101, 87, 216, 0) 100%
+          );
           border-radius: 50%;
           opacity: 1;
           z-index: -1;
         }
 
         .redSel::after {
-          background: linear-gradient(180deg, #E73A14 0%, rgba(240, 92, 9, 0) 100%);
+          background: linear-gradient(
+            180deg,
+            #e73a14 0%,
+            rgba(240, 92, 9, 0) 100%
+          );
         }
 
         .yelSel::after {
-          background: linear-gradient(180deg, #FFFA79 0%, rgba(255, 208, 137, 0) 100%);
+          background: linear-gradient(
+            180deg,
+            #fffa79 0%,
+            rgba(255, 208, 137, 0) 100%
+          );
         }
 
         .bluSel::after {
-          background: linear-gradient(180deg, #121ADE 0%, rgba(40, 18, 228, 0) 100%);
+          background: linear-gradient(
+            180deg,
+            #121ade 0%,
+            rgba(40, 18, 228, 0) 100%
+          );
         }
 
         .orgSel::after {
-          background: linear-gradient(180deg, #FFA623 0%, rgba(255, 173, 53, 0) 100%);
+          background: linear-gradient(
+            180deg,
+            #ffa623 0%,
+            rgba(255, 173, 53, 0) 100%
+          );
         }
       }
 
@@ -306,7 +285,12 @@ export default {
         left: 0px;
         width: 100%;
         height: 2px;
-        background: linear-gradient(90deg, rgba(189, 255, 246, 0) 0%, #BDFFF6 52%, rgba(189, 255, 246, 0) 100%);
+        background: linear-gradient(
+          90deg,
+          rgba(189, 255, 246, 0) 0%,
+          #bdfff6 52%,
+          rgba(189, 255, 246, 0) 100%
+        );
         border-radius: 0px 0px 0px 0px;
         opacity: 1;
       }
@@ -318,7 +302,12 @@ export default {
         left: 0px;
         width: 100%;
         height: 2px;
-        background: linear-gradient(90deg, rgba(189, 255, 246, 0) 0%, #BDFFF6 52%, rgba(189, 255, 246, 0) 100%);
+        background: linear-gradient(
+          90deg,
+          rgba(189, 255, 246, 0) 0%,
+          #bdfff6 52%,
+          rgba(189, 255, 246, 0) 100%
+        );
         border-radius: 0px 0px 0px 0px;
         opacity: 1;
       }
@@ -328,21 +317,25 @@ export default {
         display: inline-flex;
         width: 277px;
         height: 38px;
-        background: linear-gradient(269deg, rgba(55, 231, 255, 0) 6%, rgba(55, 231, 255, 0.6) 50%, rgba(55, 231, 255, 0) 92%);
+        background: linear-gradient(
+          269deg,
+          rgba(55, 231, 255, 0) 6%,
+          rgba(55, 231, 255, 0.6) 50%,
+          rgba(55, 231, 255, 0) 92%
+        );
         border-radius: 0px 0px 0px 0px;
         opacity: 1;
         justify-content: center;
         align-items: center;
 
-        >span.text {
+        > span.text {
           display: inline-flex;
           font-size: 16px;
           font-family: PangMenZhengDao;
           font-weight: 400;
-          color: #FFFFFF;
+          color: #ffffff;
         }
 
-
         .num {
           display: inline-flex;
           justify-content: center;
@@ -350,11 +343,10 @@ export default {
           font-size: 22px;
           font-family: PangMenZhengDao;
           font-weight: 400;
-          color: #D9001B;
+          color: #d9001b;
         }
       }
     }
-
   }
 }
 
@@ -363,4 +355,3 @@ export default {
   width: 100%;
 }
 </style>
-