太阳能板，修改为离网光伏供电

ruoyi-ui/codehelp_files.md

@@ -269,7 +269,7 @@
 │  │      UPS.png
 │  │      view.png
 │  │      一类交通量.png
-│  │      太阳能板.png
+│  │      离网光伏供电.png
 │  │      扫码报警B.png
 │  │      护栏碰撞预警系统.png
 │  │      护栏碰撞预警系统B.png
@@ -453,9 +453,9 @@
 │  │  │      合流区.svg
 │  │  │      合流区_active.svg
 │  │  │      合流区_fault.svg
-│  │  │      太阳能板.svg
+│  │  │      离网光伏供电.svg
-│  │  │      太阳能板_active.svg
+│  │  │      离网光伏供电_active.svg
-│  │  │      太阳能板_fault.svg
+│  │  │      离网光伏供电_fault.svg
 │  │  │      情报板.svg
 │  │  │      情报板_active.svg
 │  │  │      情报板_fault.svg
@@ -545,8 +545,8 @@
 │  │  │      交调_fault.svg
 │  │  │      合流区_active.svg
 │  │  │      合流区_fault.svg
-│  │  │      太阳能板_active.svg
+│  │  │      离网光伏供电_active.svg
-│  │  │      太阳能板_fault.svg
+│  │  │      离网光伏供电_fault.svg
 │  │  │      情报板_active.svg
 │  │  │      情报板_fault.svg
 │  │  │      护栏碰撞_active.svg
@@ -639,7 +639,7 @@
 │  │      大学城收费站.jpg
 │  │      孝里收费站.jpg
 │  │      
-│  ├─solar //太阳能板报表图
+│  ├─solar //离网光伏供电报表图
 │  │      CO2.png
 │  │      coal.png
 │  │      error.png
@@ -1289,7 +1289,7 @@
 │  │      │  │          DeviceParams.vue
 │  │      │  │          DeviceParamsMulti.vue
 │  │      │  │          
-│  │      │  ├─SolarEnergy // 太阳能板
+│  │      │  ├─SolarEnergy // 离网光伏供电
 │  │      │  │  │  data.js
 │  │      │  │  │  index.vue
 │  │      │  │  │  
@@ -1526,7 +1526,7 @@
 │  │  │              t17.svg
 │  │  │              t18.svg
 │  │  │              
-│  │  └─solar // 太阳能板管理
+│  │  └─solar // 离网光伏供电管理
 │  │          index.vue
 │  │          index_v1.vue
 │  │          

ruoyi-ui/src/common/menuData.js

@@ -195,7 +195,7 @@ export default [
             component: "maintenanceOperations/smart/abnormal/index.vue",
           },
           {
-            title: "太阳能板",
+            title: "离网光伏供电",
             name: "solar",
             path: "/maintain/solar",
             component: "maintenanceOperations/solar/index.vue",

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/WarningList.vue

@@ -191,7 +191,18 @@ export default {
             if (result.code != 200) return;
             result.rows.forEach(item => {
               item.remark = item.warningDescription
+              if (item.warningType === '1') {
+                item.stringEventType = '交通流预警';
+              } else if (item.warningType === '2') {
+                item.stringEventType = '气象预警';
+              } else if (item.warningType === '3') {
+                item.stringEventType = '交通流异常预警';
+              } else {
+                item.stringEventType = '未知预警类型'; // 可选：处理未知的 warningType
+              }
+/*
               item.stringEventType = item.warningType === '1'?'交通流预警':'气象预警';
+*/
               if(item.warningType === '2'){
                 item.icon = '气象检测器'
               }
@@ -314,7 +325,7 @@ export default {
     height: 28px;
     p {
       color: #FF5F5F;
-      font-size: 15px;
+      font-size: 13px;
       margin-right: 3px;
     }
 

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/ConfluenceArea/index.vue

@@ -42,7 +42,7 @@ import {
 import { dialogDelayVisible } from "./../mixin";
 import { resolve } from "@antv/x6/lib/registry/node-anchor/util";
 
-// 太阳能板
+// 离网光伏供电
 export default {
   name: "ConfluenceArea",
   mixins: [dialogDelayVisible],

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <Dialog v-model="obverseVisible" title="太阳能板" width="550px">
+  <Dialog v-model="obverseVisible" title="离网光伏供电" width="550px">
-    <Video class="video-stream" :camId="camId" img="太阳能板" />
+    <Video class="video-stream" :camId="camId" img="离网光伏供电" />
 
     <div class="SolarEnergy">
       <ElTabs v-model="activeName" class="tabs">
@@ -47,7 +47,7 @@ import {
 import { dialogDelayVisible } from "./../mixin";
 import { resolve } from "@antv/x6/lib/registry/node-anchor/util";
 
-// 太阳能板
+// 离网光伏供电
 export default {
   name: "SolarEnergy",
   mixins: [dialogDelayVisible],

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@@ -113,7 +113,7 @@ export const DeviceForMap = {
     deviceType: "10",
     dialog: "FatigueWakesUp",
   },
-  太阳能板: {
+  离网光伏供电: {
     deviceType: "15",
     dialog: "SolarEnergy",
   },

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/record/index.vue

@@ -165,7 +165,7 @@ export default {
             10: "疲劳唤醒",
             12: "行车诱导",
             13: "设备箱",
-            15: "太阳能板",
+            15: "离网光伏供电",
             16: "远端机"
           }
           if (result.code != 200) return;

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

@@ -11,7 +11,7 @@
               placeholder="请选择设备类型"
             >
               <el-option
-                v-for="item in [{label:'智能设备箱',value:13},{label:'太阳能板',value:15},{label:'远端机',value:16},{label:'气象检测器',value:3},{label:'一体机柜',value:17}]"
+                v-for="item in [{label:'智能设备箱',value:13},{label:'离网光伏供电',value:15},{label:'远端机',value:16},{label:'气象检测器',value:3},{label:'一体机柜',value:17}]"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/analysis/components/deviceSummary/index.vue

@@ -91,8 +91,8 @@
                   v-if="item.title.includes('疲劳唤醒')"
                 />
                 <img
-                  src="@screen/images/layer/路测设备/太阳能板.svg"
+                  src="@screen/images/layer/路测设备/离网光伏供电.svg"
-                  v-if="item.title.includes('太阳能板')"
+                  v-if="item.title.includes('离网光伏供电')"
                 />
                 <img
                   src="@screen/images/layer/路测设备/远端机.svg"

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/query/data.js

@@ -93,7 +93,7 @@ export const deviceType = [
   },
   {
     value: "15",
-    label: "太阳能板",
+    label: "离网光伏供电",
     color: "#4e5417",
   },
   {

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

@@ -1,5 +1,6 @@
 <template>
   <div class="solar">
+
     <gisMap2d ref="gisMap2dsolar" style="width:100vw;height:100vh"
     :mapZoom = "mapZoom"
     :mapCenter="mapCenter"
@@ -8,6 +9,7 @@
     radarSliderRight="14%"
     mapBoxHeight="100vh" @clickPointEvent="clickPointEvent" widgetBoxDisplay="none"></gisMap2d>
     <div class="solar_left">
+
       <div>
         <Bg2 class="content-l-t">
           <div class="focuse-header">
@@ -65,6 +67,7 @@
           </div>
         </Bg2>
       </div>
+
       <div>
         <Bg2 class="content-l-t">
           <div class="focuse-header">
@@ -124,7 +127,7 @@
 </template>
 
 <script>
-
+import homeLeftIcons from "./../../Home/components/homeLeftIcons/index.vue";
 import Vue from "vue";
 import { gisMap2d } from 'gis-map-universal'
 import Bg2 from "@screen/components/Decorations/bg-2.vue"
@@ -135,6 +138,7 @@ import SolarEnergy from "./../../Home/components/Dialogs/SolarEnergy/index.vue";
 const lnglat = [117.16515148266497,35.2797674572588]
 export default {
   components: {
+    homeLeftIcons,
     Bg2,
     gisMap2d,
     SolarEnergy,
@@ -191,8 +195,8 @@ export default {
           }
         }).then(result => {
           const aryPoints = [];
-          const sa = require(`@screen/images/layerb/路测设备/太阳能板_active.svg`)
+          const sa = require(`@screen/images/layerb/路测设备/离网光伏供电_active.svg`)
-          const sb = require(`@screen/images/layerb/路测设备/太阳能板_fault.svg`)
+          const sb = require(`@screen/images/layerb/路测设备/离网光伏供电_fault.svg`)
           for(let i of result.data){
             aryPoints.push({
               type: 'event', //类型。例如：交通事件、故障停车、摄像机等 【必传字段】
@@ -475,7 +479,16 @@ export default {
     height: 100%;
     gap: 10px;
   }
-
+  .home-left-icons {
+    display: flex;
+    gap: 50px; /* 项之间的间距为10px*/
+    flex-direction: row;
+    z-index: 0;
+    margin-left: 20px;
+    .item {
+      padding-top: 35px;
+    }
+  }
   .solar_right {
     position: absolute;
     right: 20px;

ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

@@ -993,7 +993,7 @@ export const deviceTypeOptions = [
   },
   {
     value: 15,
-    label: "太阳能板",
+    label: "离网光伏供电",
   },
   {
     value: 16,