Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/common/menuData.js

@@ -113,18 +113,6 @@ export default [
             path: "/control/device/strategy",
             name: "controlDeviceStrategy",
             component: "control/device/strategy/index.vue",
-          },
-          {
-            title: "网络拓扑",
-            name: "controlDeviceTopology",
-            path: "/control/device/topology",
-            component: "control/device/topology/index.vue"
-          },
-          {
-            title: "设备管理",
-            name: "controlDeviceMange",
-            path: "/control/device/manage",
-            component: "control/device/manage/index.vue"
           }
         ],
       },
@@ -163,14 +151,8 @@ export default [
       {
         title:"收费运营",
         name:"fee",
-        children:[
-          {
-            title: "统计分析",
-            name: "feeStatistic",
-            path: "/maintain/fee/statistic",
-            component: "maintenanceOperations/chargeableOperations/index.vue",
-          }
-        ]
+        path: "/maintain/fee",
+        component: "maintenanceOperations/chargeableOperations/index.vue"
       },{
         title:"智能养护",
         name:"smart",
@@ -179,7 +161,19 @@ export default [
            title: "统计分析",
            name: "smartStatistic",
            path: "/maintain/smart/statistic",
-           component: "maintenanceOperations/statisticalAnalysis/index.vue",
+           component: "maintenanceOperations/smart/statisticalAnalysis/index.vue",
+          },
+          {
+            title: "网络拓扑",
+            name: "smartTopology",
+            path: "/maintain/smart/topology",
+            component: "maintenanceOperations/smart/topology/index.vue"
+          },
+          {
+            title: "设备管理",
+            name: "smartDeviceMange",
+            path: "/maintain/smart/manage",
+            component: "maintenanceOperations/smart/manage/index.vue"
           }
         ]
       }, {

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

@@ -68,8 +68,14 @@ export default {
   computed: {
   },
   mounted() {
+    //添加全局事件监听
+    this.$root.$on('refresh-event', this.getMainData);
     this.getMainData();
   },
+  beforeDestroy() {
+    // 在实例销毁前移除事件监听，防止内存泄漏
+    this.$root.$off('refresh-event', this.getMainData);
+  },
   methods: {
     onChangeTab(tab, event) {
       console.log(tab, event);

ruoyi-ui/src/views/JiHeExpressway/components/WarningNotify.vue

@@ -35,15 +35,16 @@ export default {
     showNotify(para){
       let _this = this;
       let eventType = ["trafficAccident", "vehicleBroken", "trafficControl", "trafficJam", "illegalVehicle", "barrierClear", "construction", "serviceAreaAbnormal", "equipmentTrouble", "abnormalWeather", "otherEvent"];
+      let time = para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warningTime;
       let obj = {
         content: para.content.content,
-        time: para.subEvent == "0" ? para.content.event.occurrenceTime : para.content.event.warning_time,
+        time,
         // moment().format("yyyy-MM-DD hh:mm"),
         type: para.subEvent == '1' ? "signal" : eventType[para.content.event.eventType*1-1],
         level: ["danger", "info"][para.subEvent*1],
         duration: para.subEvent == "0" ? 0 : 4000
       }
-
+      this.speak(time + '' + para.content.content);
       _this.notifications[_this.notifyIndex] = _this.$notify({
         title: '',
         dangerouslyUseHTMLString: true,
@@ -124,6 +125,25 @@ export default {
         ),
       });
       _this.notifyIndex++;
+    },
+    speak(text){
+      // 创建SpeechSynthesisUtterance实例  
+      const utterance = new SpeechSynthesisUtterance(text);
+
+      // 设置语音的语言  
+      utterance.lang = 'zh-CN'; // 中文简体  
+
+      // 设置语音的音量（0到1之间）  
+      utterance.volume = 10;
+
+      // 设置语音的语速（1是正常语速）  
+      utterance.rate = 1;
+
+      // 设置语音的音调（可以是"default", "female", "male"）  
+      utterance.pitch = 1;
+
+      // 使用SpeechSynthesis接口播放语音  
+      window.speechSynthesis.speak(utterance);  
     }
   },
   mounted() {

ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg

@@ -1,15 +1,7 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
-<g id="1">
-<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#0FD4FF"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#0FD4FF"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#0FD4FF"/>
-</g>
-</g>
-</g>
-</g>
+<svg width="17" height="24" viewBox="0 0 17 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321314628">
+<path id="Vector" opacity="0.7" d="M2.125 21.25C2.125 21.8136 2.79665 22.3541 3.99219 22.7526C5.18774 23.1511 6.80924 23.375 8.5 23.375C10.1908 23.375 11.8123 23.1511 13.0078 22.7526C14.2033 22.3541 14.875 21.8136 14.875 21.25C14.875 20.6864 14.2033 20.1459 13.0078 19.7474C11.8123 19.3489 10.1908 19.125 8.5 19.125C6.80924 19.125 5.18774 19.3489 3.99219 19.7474C2.79665 20.1459 2.125 20.6864 2.125 21.25Z" fill="#0FD4FF"/>
+<path id="Vector_2" opacity="0.9" d="M4.25 20.7188C4.25 21.1414 4.69777 21.5468 5.4948 21.8457C6.29183 22.1446 7.37283 22.3125 8.5 22.3125C9.62717 22.3125 10.7082 22.1446 11.5052 21.8457C12.3022 21.5468 12.75 21.1414 12.75 20.7188C12.75 20.2961 12.3022 19.8907 11.5052 19.5918C10.7082 19.2929 9.62717 19.125 8.5 19.125C7.37283 19.125 6.29183 19.2929 5.4948 19.5918C4.69777 19.8907 4.25 20.2961 4.25 20.7188Z" fill="#0FD4FF"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M8.16004 0H8.84004C10.6319 0.000952005 12.3723 0.592908 13.7862 1.68228C14.4192 2.16048 14.9788 2.7273 15.4472 3.36471C15.8276 3.88644 16.1437 4.45104 16.389 5.04684C16.6134 5.58828 16.7775 6.15225 16.8779 6.72898C16.9567 7.17341 16.9973 7.62374 17 8.07494V8.41154V8.61005C16.998 9.10815 16.9485 9.60495 16.8521 10.0938C16.7423 10.6718 16.5684 11.2359 16.333 11.776C16.0698 12.374 15.7353 12.9389 15.3367 13.4584H15.3355C14.8515 14.1003 14.2734 14.6673 13.6204 15.1405L3.3806 15.1407C2.72719 14.6672 2.14918 14.1001 1.66425 13.4582C1.26527 12.9388 0.931729 12.3741 0.668391 11.776C0.432989 11.2358 0.258243 10.6718 0.1479 10.0938C0.051454 9.60523 0.00193337 9.10871 0 8.61089V8.41154V8.07494C0.00267935 7.62374 0.0439436 7.17341 0.122721 6.72898C0.22314 6.15225 0.386848 5.58828 0.611287 5.04684C0.856546 4.45104 1.17273 3.88644 1.55311 3.36471C2.02149 2.7273 2.58084 2.16048 3.21389 1.68228C4.62773 0.592908 6.36817 0.000952005 8.16004 0ZM3.3806 15.1407H13.6172C13.5898 15.1605 13.5637 15.1815 13.5375 15.2024L13.5375 15.2025C13.5027 15.2303 13.468 15.2582 13.4302 15.2837L11.884 16.8229H11.8764L10.1834 18.5051H6.80716L5.12416 16.8228H5.13061L3.64665 15.34C3.5931 15.3048 3.54345 15.2658 3.49371 15.2267C3.45661 15.1975 3.41946 15.1683 3.3806 15.1407ZM10.1883 18.5052L8.49515 20.1875L6.81215 18.5052H10.1883ZM4.40681 7.56789H7.65675C8.11865 7.56789 8.49354 7.95254 8.49354 8.42645V13.8692H4.40681V10.0845L3.08893 9.24561L4.40681 7.56789ZM7.64779 5.46221C7.64779 6.15798 7.0976 6.72247 6.41947 6.72247C5.74133 6.72247 5.19115 6.15798 5.19115 5.46221V4.26891C5.19115 3.76874 5.58651 3.36441 6.07272 3.36441H7.64779V5.46221ZM10.4704 8.25579H12.9385L14.2116 10.0845L12.9372 10.9286V13.8692H9.29707V9.45959C9.29707 8.79533 9.82294 8.25579 10.4704 8.25579ZM12.2386 6.37984C12.2386 6.99947 11.7486 7.50226 11.1447 7.50226C10.5407 7.50226 10.0507 6.99947 10.0507 6.37984V5.3165C10.0507 4.87147 10.4026 4.51046 10.8363 4.51046H12.2386V6.37984Z" fill="#0FD4FF"/>
 </g>
 </svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg

@@ -1,14 +1,10 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
-<g id="1">
-<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FFDB82"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FFDB82"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FFDB82"/>
-</g>
-</g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321314632">
+<g id="Frame 427319037">
+<g id="Group 1321314628">
+<path id="Vector" opacity="0.7" d="M9.125 26.25C9.125 26.8136 9.79665 27.3541 10.9922 27.7526C12.1877 28.1511 13.8092 28.375 15.5 28.375C17.1908 28.375 18.8123 28.1511 20.0078 27.7526C21.2033 27.3541 21.875 26.8136 21.875 26.25C21.875 25.6864 21.2033 25.1459 20.0078 24.7474C18.8123 24.3489 17.1908 24.125 15.5 24.125C13.8092 24.125 12.1877 24.3489 10.9922 24.7474C9.79665 25.1459 9.125 25.6864 9.125 26.25Z" fill="#FFDB82"/>
+<path id="Vector_2" opacity="0.9" d="M11.25 25.7188C11.25 26.1414 11.6978 26.5468 12.4948 26.8457C13.2918 27.1446 14.3728 27.3125 15.5 27.3125C16.6272 27.3125 17.7082 27.1446 18.5052 26.8457C19.3022 26.5468 19.75 26.1414 19.75 25.7188C19.75 25.2961 19.3022 24.8907 18.5052 24.5918C17.7082 24.2929 16.6272 24.125 15.5 24.125C14.3728 24.125 13.2918 24.2929 12.4948 24.5918C11.6978 24.8907 11.25 25.2961 11.25 25.7188Z" fill="#FFDB82"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M15.16 5H15.84C17.6319 5.00095 19.3723 5.59291 20.7862 6.68228C21.4192 7.16048 21.9788 7.7273 22.4472 8.36471C22.8276 8.88644 23.1437 9.45104 23.389 10.0468C23.6134 10.5883 23.7775 11.1523 23.8779 11.729C23.9567 12.1734 23.9973 12.6237 24 13.0749V13.4115V13.6101C23.998 14.1081 23.9485 14.6049 23.8521 15.0938C23.7423 15.6718 23.5684 16.2359 23.333 16.776C23.0698 17.374 22.7353 17.9389 22.3367 18.4584H22.3355C21.8515 19.1003 21.2734 19.6673 20.6204 20.1405L10.3806 20.1407C9.72719 19.6672 9.14918 19.1001 8.66425 18.4582C8.26527 17.9388 7.93173 17.3741 7.66839 16.776C7.43299 16.2358 7.25824 15.6718 7.1479 15.0938C7.05145 14.6052 7.00193 14.1087 7 13.6109V13.4115V13.0749C7.00268 12.6237 7.04394 12.1734 7.12272 11.729C7.22314 11.1523 7.38685 10.5883 7.61129 10.0468C7.85655 9.45104 8.17273 8.88644 8.55311 8.36471C9.02149 7.7273 9.58084 7.16048 10.2139 6.68228C11.6277 5.59291 13.3682 5.00095 15.16 5ZM10.3806 20.1407H20.6172C20.5898 20.1605 20.5637 20.1815 20.5375 20.2024L20.5375 20.2025C20.5027 20.2303 20.468 20.2582 20.4302 20.2837L18.884 21.8229H18.8764L17.1834 23.5051H13.8072L12.1242 21.8228H12.1306L10.6467 20.34C10.5931 20.3048 10.5434 20.2658 10.4937 20.2267C10.4566 20.1975 10.4195 20.1683 10.3806 20.1407ZM17.1883 23.5052L15.4951 25.1875L13.8121 23.5052H17.1883ZM11.4068 12.5679H14.6567C15.1186 12.5679 15.4935 12.9525 15.4935 13.4264V18.8692H11.4068V15.0845L10.0889 14.2456L11.4068 12.5679ZM14.6478 10.4622C14.6478 11.158 14.0976 11.7225 13.4195 11.7225C12.7413 11.7225 12.1911 11.158 12.1911 10.4622V9.26891C12.1911 8.76874 12.5865 8.36441 13.0727 8.36441H14.6478V10.4622ZM17.4704 13.2558H19.9385L21.2116 15.0845L19.9372 15.9286V18.8692H16.2971V14.4596C16.2971 13.7953 16.8229 13.2558 17.4704 13.2558ZM19.2386 11.3798C19.2386 11.9995 18.7486 12.5023 18.1447 12.5023C17.5407 12.5023 17.0507 11.9995 17.0507 11.3798V10.3165C17.0507 9.87147 17.4026 9.51046 17.8363 9.51046H19.2386V11.3798Z" fill="#FFDB82"/>
 </g>
 </g>
 </g>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg

@@ -1,14 +1,10 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
-<g id="1">
-<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
-<path id="Vector" d="M12.5715 12.1523C12.4608 12.1523 12.3516 12.1523 12.2423 12.1441C12.4192 12.2741 12.5498 12.4556 12.6154 12.6627C12.6811 12.8699 12.6784 13.0922 12.6079 13.2978C12.5374 13.5034 12.4025 13.6819 12.2226 13.8077C12.0427 13.9336 11.827 14.0004 11.6061 13.9987C11.3971 14.0004 11.1923 13.9408 11.0179 13.8275C10.8435 13.7143 10.7074 13.5525 10.6271 13.3629C10.5468 13.1733 10.5258 12.9644 10.5669 12.7631C10.6081 12.5617 10.7094 12.3769 10.8579 12.2324C10.9591 12.1351 11.079 12.0584 11.2106 12.0069C10.0831 11.7714 9.03993 11.2447 8.18873 10.4811H2.40641C2.39844 10.4811 2.39058 10.4792 2.3835 10.4757C2.37641 10.4721 2.37031 10.4669 2.3657 10.4605C2.36109 10.4541 2.35812 10.4467 2.35702 10.4389C2.35592 10.4312 2.35673 10.4233 2.35939 10.4159L3.42015 7.46622C3.43121 7.43496 3.45058 7.41322 3.45473 7.39148C3.45515 7.38819 3.45608 7.38498 3.45748 7.38197L3.47823 7.34121C3.83091 6.67682 4.14761 6.20672 4.9207 6.20672H6.0852C6.07362 6.06116 6.06762 5.91523 6.06721 5.76923C6.06791 5.51218 6.08407 5.25539 6.11562 5.00022H4.94146C4.60115 4.99586 4.26328 5.05726 3.94708 5.18092L3.91526 5.19044C3.53793 5.33738 3.20883 5.58315 2.96376 5.90102C2.85194 6.03371 2.7498 6.174 2.65812 6.32084C2.51983 6.53687 2.41194 6.72845 2.33726 6.86432C2.11183 7.25969 1.32215 9.71752 1.32215 9.71752C0.500643 10.2827 0.00829767 11.102 0 11.9335V15.6889C0.00140318 16.2575 0.216221 16.8055 0.603326 17.2282C0.99043 17.6509 1.52262 17.9184 2.098 17.9796C2.58639 18.0428 3.08277 17.9583 3.52107 17.7374C3.95937 17.5166 4.31878 17.1698 4.55145 16.7432C4.55561 16.7353 4.56197 16.7286 4.56979 16.724C4.57762 16.7195 4.5866 16.7172 4.5957 16.7174L7.50001 16.7283L10.4043 16.7174C10.4134 16.7173 10.4223 16.7197 10.4301 16.7243C10.4379 16.7288 10.4443 16.7354 10.4485 16.7432C10.6812 17.1698 11.0406 17.5166 11.4789 17.7375C11.9172 17.9583 12.4136 18.0428 12.902 17.9796C13.4777 17.9169 14.0098 17.6481 14.3968 17.2246C14.7837 16.8011 14.9984 16.2525 15 15.6835V11.9335C14.9981 11.854 14.9921 11.7747 14.982 11.6958C14.2156 11.9978 13.3973 12.1527 12.5715 12.1523ZM4.37028 13.3601C4.28308 13.5653 4.13096 13.7375 3.93643 13.8511C3.7419 13.9647 3.5153 14.0138 3.29016 13.9911C3.06502 13.9684 2.8533 13.8751 2.68634 13.725C2.51937 13.5749 2.40603 13.376 2.3631 13.1577C2.32016 12.9394 2.3499 12.7133 2.44792 12.5129C2.54594 12.3125 2.70703 12.1484 2.90735 12.0449C3.10767 11.9414 3.33658 11.904 3.5602 11.9383C3.78382 11.9726 3.99028 12.0767 4.149 12.2352C4.29436 12.3805 4.39286 12.5648 4.43222 12.7649C4.47157 12.965 4.45003 13.172 4.37028 13.3601Z" fill="#FF5F5F"/>
-<path id="Vector_2" d="M12.5 0C11.4122 0 10.3488 0.293245 9.44437 0.842652C8.5399 1.39206 7.83495 2.17295 7.41867 3.08658C7.00238 4.00021 6.89346 5.00555 7.10568 5.97545C7.3179 6.94536 7.84173 7.83627 8.61091 8.53553C9.3801 9.23479 10.3601 9.711 11.427 9.90392C12.4939 10.0969 13.5998 9.99783 14.6048 9.6194C15.6098 9.24096 16.4687 8.6001 17.0731 7.77785C17.6774 6.9556 18 5.98891 18 5C18 3.67392 17.4205 2.40215 16.3891 1.46447C15.3576 0.52679 13.9587 4.45199e-06 12.5 0L12.5 0ZM14.7669 4.91486C14.5895 5.09552 14.3722 5.24008 14.1291 5.33905C13.886 5.43803 13.6226 5.48919 13.3562 5.48919H11.5903V7.35134C11.5872 7.49734 11.5205 7.63625 11.4048 7.73759C11.2891 7.83893 11.134 7.89441 10.9734 7.89187H10.358V2.10675H13.2953C13.7585 2.09711 14.2098 2.24074 14.5653 2.51094C14.9207 2.78113 15.1561 3.1595 15.2277 3.57567C15.2606 3.81586 15.2364 4.05966 15.1569 4.29066C15.0775 4.52166 14.9445 4.7345 14.7669 4.91486Z" fill="#FF5F5F"/>
-<path id="Vector_3" d="M13.193 3.00005H11V3.9997H13.1598C13.3488 4.00375 13.5343 3.96644 13.6847 3.89411C13.8351 3.82178 13.9412 3.71888 13.9849 3.60287C13.9963 3.56883 14.0013 3.53406 13.9997 3.49929C13.9992 3.43303 13.9779 3.36748 13.937 3.30644C13.8961 3.2454 13.8365 3.19007 13.7615 3.14365C13.6865 3.09722 13.5976 3.06063 13.5 3.03599C13.4025 3.01134 13.2981 2.99913 13.193 3.00005Z" fill="#FF5F5F"/>
-</g>
-</g>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1321314633">
+<g id="Frame 427319037">
+<g id="Group 1321314628">
+<path id="Vector" opacity="0.7" d="M9.125 26.25C9.125 26.8136 9.79665 27.3541 10.9922 27.7526C12.1877 28.1511 13.8092 28.375 15.5 28.375C17.1908 28.375 18.8123 28.1511 20.0078 27.7526C21.2033 27.3541 21.875 26.8136 21.875 26.25C21.875 25.6864 21.2033 25.1459 20.0078 24.7474C18.8123 24.3489 17.1908 24.125 15.5 24.125C13.8092 24.125 12.1877 24.3489 10.9922 24.7474C9.79665 25.1459 9.125 25.6864 9.125 26.25Z" fill="#FF5F5F"/>
+<path id="Vector_2" opacity="0.9" d="M11.25 25.7188C11.25 26.1414 11.6978 26.5468 12.4948 26.8457C13.2918 27.1446 14.3728 27.3125 15.5 27.3125C16.6272 27.3125 17.7082 27.1446 18.5052 26.8457C19.3022 26.5468 19.75 26.1414 19.75 25.7188C19.75 25.2961 19.3022 24.8907 18.5052 24.5918C17.7082 24.2929 16.6272 24.125 15.5 24.125C14.3728 24.125 13.2918 24.2929 12.4948 24.5918C11.6978 24.8907 11.25 25.2961 11.25 25.7188Z" fill="#FF5F5F"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M15.16 5H15.84C17.6319 5.00095 19.3723 5.59291 20.7862 6.68228C21.4192 7.16048 21.9788 7.7273 22.4472 8.36471C22.8276 8.88644 23.1437 9.45104 23.389 10.0468C23.6134 10.5883 23.7775 11.1523 23.8779 11.729C23.9567 12.1734 23.9973 12.6237 24 13.0749V13.4115V13.6101C23.998 14.1081 23.9485 14.6049 23.8521 15.0938C23.7423 15.6718 23.5684 16.2359 23.333 16.776C23.0698 17.374 22.7353 17.9389 22.3367 18.4584H22.3355C21.8515 19.1003 21.2734 19.6673 20.6204 20.1405L10.3806 20.1407C9.72719 19.6672 9.14918 19.1001 8.66425 18.4582C8.26527 17.9388 7.93173 17.3741 7.66839 16.776C7.43299 16.2358 7.25824 15.6718 7.1479 15.0938C7.05145 14.6052 7.00193 14.1087 7 13.6109V13.4115V13.0749C7.00268 12.6237 7.04394 12.1734 7.12272 11.729C7.22314 11.1523 7.38685 10.5883 7.61129 10.0468C7.85655 9.45104 8.17273 8.88644 8.55311 8.36471C9.02149 7.7273 9.58084 7.16048 10.2139 6.68228C11.6277 5.59291 13.3682 5.00095 15.16 5ZM10.3806 20.1407H20.6172C20.5898 20.1605 20.5637 20.1815 20.5375 20.2024L20.5375 20.2025C20.5027 20.2303 20.468 20.2582 20.4302 20.2837L18.884 21.8229H18.8764L17.1834 23.5051H13.8072L12.1242 21.8228H12.1306L10.6467 20.34C10.5931 20.3048 10.5434 20.2658 10.4937 20.2267C10.4566 20.1975 10.4195 20.1683 10.3806 20.1407ZM17.1883 23.5052L15.4951 25.1875L13.8121 23.5052H17.1883ZM11.4068 12.5679H14.6567C15.1186 12.5679 15.4935 12.9525 15.4935 13.4264V18.8692H11.4068V15.0845L10.0889 14.2456L11.4068 12.5679ZM14.6478 10.4622C14.6478 11.158 14.0976 11.7225 13.4195 11.7225C12.7413 11.7225 12.1911 11.158 12.1911 10.4622V9.26891C12.1911 8.76874 12.5865 8.36441 13.0727 8.36441H14.6478V10.4622ZM17.4704 13.2558H19.9385L21.2116 15.0845L19.9372 15.9286V18.8692H16.2971V14.4596C16.2971 13.7953 16.8229 13.2558 17.4704 13.2558ZM19.2386 11.3798C19.2386 11.9995 18.7486 12.5023 18.1447 12.5023C17.5407 12.5023 17.0507 11.9995 17.0507 11.3798V10.3165C17.0507 9.87147 17.4026 9.51046 17.8363 9.51046H19.2386V11.3798Z" fill="#FF5F5F"/>
 </g>
 </g>
 </g>

ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active.svg

@@ -1,11 +1,9 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="Group 1142814973">
-<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
-<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#231;&#159;&#173;&#228;&#191;&#161;">
+<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
 <g id="Group 1142814681">
-<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
-</g>
+<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
 </g>
 </g>
 </svg>

ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active2.svg

@@ -1,9 +0,0 @@
-<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#231;&#159;&#173;&#228;&#191;&#161;">
-<rect id="Rectangle 3688" width="22" height="22" rx="6" fill="#A2C847"/>
-<g id="Group 1142814681">
-<path id="Vector 553" d="M6.5 16.5325V13.5H12.1408L7.28922 16.9404C6.95812 17.1751 6.5 16.9384 6.5 16.5325Z" fill="white"/>
-<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M5.5 5C4.67157 5 4 5.67157 4 6.5V13.5C4 14.3284 4.67157 15 5.5 15H16.5C17.3284 15 18 14.3284 18 13.5V6.5C18 5.67157 17.3284 5 16.5 5H5.5ZM7.5 11C8.05228 11 8.5 10.5523 8.5 10C8.5 9.44772 8.05228 9 7.5 9C6.94772 9 6.5 9.44772 6.5 10C6.5 10.5523 6.94772 11 7.5 11ZM12 10C12 10.5523 11.5523 11 11 11C10.4477 11 10 10.5523 10 10C10 9.44772 10.4477 9 11 9C11.5523 9 12 9.44772 12 10ZM14.5 11C15.0523 11 15.5 10.5523 15.5 10C15.5 9.44772 15.0523 9 14.5 9C13.9477 9 13.5 9.44772 13.5 10C13.5 10.5523 13.9477 11 14.5 11Z" fill="white"/>
-</g>
-</g>
-</svg>

ruoyi-ui/src/views/JiHeExpressway/images/shareWith/message-active3.svg

@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814973">
+<g id="&#195;&#167;&#194;&#159;&#194;&#173;&#195;&#164;&#194;&#191;&#194;&#161;-&#195;&#167;&#194;&#129;&#194;&#176;">
+<path id="Rectangle 3688" d="M11.6364 0H4.36364C1.95367 0 0 1.95367 0 4.36364V11.6364C0 14.0463 1.95367 16 4.36364 16H11.6364C14.0463 16 16 14.0463 16 11.6364V4.36364C16 1.95367 14.0463 0 11.6364 0Z" fill="#03C3FF"/>
+<g id="Group 1142814681">
+<path id="Vector 553" d="M4.72705 12.0228V9.81738H8.82945L5.30103 12.3195C5.06023 12.4902 4.72705 12.318 4.72705 12.0228Z" fill="white"/>
+<path id="Subtract" fill-rule="evenodd" clip-rule="evenodd" d="M4.00009 3.63574C3.39759 3.63574 2.90918 4.12416 2.90918 4.72665V9.81756C2.90918 10.42 3.39759 10.9085 4.00009 10.9085H12.0001C12.6026 10.9085 13.091 10.42 13.091 9.81756V4.72665C13.091 4.12416 12.6026 3.63574 12.0001 3.63574H4.00009ZM5.45463 7.99938C5.85629 7.99938 6.18191 7.67378 6.18191 7.27211C6.18191 6.87045 5.85629 6.54483 5.45463 6.54483C5.05298 6.54483 4.72736 6.87045 4.72736 7.27211C4.72736 7.67378 5.05298 7.99938 5.45463 7.99938ZM8.72736 7.27211C8.72736 7.67378 8.40176 7.99938 8.00009 7.99938C7.59842 7.99938 7.27282 7.67378 7.27282 7.27211C7.27282 6.87045 7.59842 6.54483 8.00009 6.54483C8.40176 6.54483 8.72736 6.87045 8.72736 7.27211ZM10.5455 7.99938C10.9472 7.99938 11.2728 7.67378 11.2728 7.27211C11.2728 6.87045 10.9472 6.54483 10.5455 6.54483C10.1439 6.54483 9.81827 6.87045 9.81827 7.27211C9.81827 7.67378 10.1439 7.99938 10.5455 7.99938Z" fill="white"/>
+</g>
+</g>
+</g>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/weather/150.svg

@@ -0,0 +1,90 @@
+<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814243">
+<g id="XMLID_24_">
+<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
+<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
+<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
+<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
+<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
+<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
+<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
+<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
+<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
+<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
+<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
+<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
+<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
+</g>
+<g id="XMLID_20_">
+<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
+<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
+<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0.06"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/weather/151.svg

@@ -0,0 +1,90 @@
+<svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 1142814243">
+<g id="XMLID_24_">
+<path id="XMLID_37_" d="M21.8761 17.2234C25.2547 17.2234 27.9935 14.3924 27.9935 10.9003C27.9935 7.4081 25.2547 4.57715 21.8761 4.57715C18.4976 4.57715 15.7588 7.4081 15.7588 10.9003C15.7588 14.3924 18.4976 17.2234 21.8761 17.2234Z" fill="url(#paint0_linear_193_810)"/>
+<path id="XMLID_36_" fill-rule="evenodd" clip-rule="evenodd" d="M22.2731 3.16156H21.4798C21.4188 3.16156 21.373 3.11437 21.373 3.05145V0.110104C21.373 0.0471874 21.4188 0 21.4798 0H22.2731C22.3341 0 22.3799 0.0471874 22.3799 0.110104V3.03572C22.3799 3.11437 22.3341 3.16156 22.2731 3.16156Z" fill="url(#paint1_linear_193_810)"/>
+<path id="XMLID_35_" fill-rule="evenodd" clip-rule="evenodd" d="M18.0778 4.21498C17.8337 4.35654 17.5286 4.2779 17.376 4.02623L16.3539 2.20165C16.2166 1.94998 16.2929 1.6354 16.537 1.47811C16.7811 1.33655 17.0862 1.41519 17.2387 1.66686L18.2608 3.49144C18.3981 3.74311 18.3219 4.07342 18.0778 4.21498Z" fill="url(#paint2_linear_193_810)"/>
+<path id="XMLID_34_" fill-rule="evenodd" clip-rule="evenodd" d="M15.2857 7.09388C15.1484 7.34555 14.828 7.42419 14.5839 7.28263L12.8143 6.22878C12.5703 6.08722 12.494 5.75691 12.6313 5.50524C12.7686 5.25357 13.0889 5.17493 13.333 5.31649L15.1026 6.37034C15.3467 6.52763 15.4382 6.84221 15.2857 7.09388Z" fill="url(#paint3_linear_193_810)"/>
+<path id="XMLID_33_" fill-rule="evenodd" clip-rule="evenodd" d="M14.3401 10.5854V11.4034C14.3401 11.4663 14.2943 11.5135 14.2333 11.5135H11.3958C11.3348 11.5135 11.2891 11.4663 11.2891 11.4034V10.5854C11.2891 10.5225 11.3348 10.4753 11.3958 10.4753H14.2333C14.2943 10.4753 14.3401 10.5225 14.3401 10.5854Z" fill="url(#paint4_linear_193_810)"/>
+<path id="XMLID_32_" fill-rule="evenodd" clip-rule="evenodd" d="M15.4078 14.8793C15.5451 15.1309 15.4688 15.4455 15.2247 15.6028L13.4551 16.6567C13.211 16.7982 12.9059 16.7196 12.7533 16.4679C12.6161 16.2162 12.6923 15.9017 12.9364 15.7444L14.706 14.6905C14.9501 14.549 15.2552 14.6276 15.4078 14.8793Z" fill="url(#paint5_linear_193_810)"/>
+<path id="XMLID_31_" fill-rule="evenodd" clip-rule="evenodd" d="M18.1998 17.6956C18.4439 17.8371 18.5202 18.1674 18.3829 18.4191L17.3608 20.2437C17.2235 20.4953 16.9031 20.574 16.6591 20.4324C16.415 20.2909 16.3387 19.9605 16.476 19.7089L17.4981 17.8843C17.6507 17.6326 17.9558 17.5383 18.1998 17.6956Z" fill="url(#paint6_linear_193_810)"/>
+<path id="XMLID_30_" fill-rule="evenodd" clip-rule="evenodd" d="M21.5867 18.6699H22.38C22.441 18.6699 22.4868 18.7171 22.4868 18.78V21.7056C22.4868 21.7686 22.441 21.8157 22.38 21.8157H21.5867C21.5257 21.8157 21.4799 21.7686 21.4799 21.7056V18.78C21.4647 18.7328 21.5257 18.6699 21.5867 18.6699Z" fill="url(#paint7_linear_193_810)"/>
+<path id="XMLID_29_" fill-rule="evenodd" clip-rule="evenodd" d="M25.7362 17.585C25.9802 17.4435 26.2853 17.5221 26.4379 17.7738L27.46 19.5984C27.5973 19.85 27.521 20.1646 27.2769 20.3219C27.0329 20.4635 26.7278 20.3848 26.5752 20.1332L25.5531 18.3086C25.4005 18.0412 25.4921 17.7266 25.7362 17.585Z" fill="url(#paint8_linear_193_810)"/>
+<path id="XMLID_28_" fill-rule="evenodd" clip-rule="evenodd" d="M28.4506 14.6908C28.5879 14.4391 28.9083 14.3605 29.1524 14.502L30.922 15.5559C31.1661 15.6975 31.2423 16.0278 31.105 16.2794C30.9677 16.5311 30.6474 16.6097 30.4033 16.4682L28.6337 15.4143C28.3896 15.257 28.3133 14.9425 28.4506 14.6908Z" fill="url(#paint9_linear_193_810)"/>
+<path id="XMLID_27_" fill-rule="evenodd" clip-rule="evenodd" d="M29.3965 11.1839V10.366C29.3965 10.303 29.4422 10.2559 29.5033 10.2559H32.3407C32.4018 10.2559 32.4475 10.303 32.4475 10.366V11.1839C32.4475 11.2468 32.4018 11.294 32.3407 11.294H29.5033C29.4575 11.3097 29.3965 11.2468 29.3965 11.1839Z" fill="url(#paint10_linear_193_810)"/>
+<path id="XMLID_26_" fill-rule="evenodd" clip-rule="evenodd" d="M28.2836 6.92103C28.1463 6.66936 28.2226 6.35478 28.4667 6.19749L30.2363 5.14364C30.4804 5.00208 30.7855 5.08072 30.938 5.33239C31.0753 5.58405 30.9991 5.89864 30.755 6.05593L28.9854 7.10978C28.726 7.25134 28.4209 7.1727 28.2836 6.92103Z" fill="url(#paint11_linear_193_810)"/>
+<path id="XMLID_25_" fill-rule="evenodd" clip-rule="evenodd" d="M25.4462 4.15199C25.2021 4.01043 25.1258 3.68012 25.2631 3.42845L26.2852 1.60387C26.4225 1.35221 26.7429 1.27356 26.987 1.41512C27.231 1.55668 27.3073 1.887 27.17 2.13866L26.1479 3.96324C25.9954 4.21491 25.6903 4.30928 25.4462 4.15199Z" fill="url(#paint12_linear_193_810)"/>
+</g>
+<g id="XMLID_20_">
+<path id="XMLID_23_" fill-rule="evenodd" clip-rule="evenodd" d="M23.2035 9.97202C22.6696 9.97202 22.1661 10.0192 21.6627 10.1136C20.7779 6.68463 17.9099 4.16797 14.508 4.16797C10.923 4.16797 7.93298 6.95203 7.21598 10.6641C3.4937 10.8371 0.53418 14.2032 0.53418 18.3242C0.53418 22.5711 3.66151 26 7.52109 26H23.2035C27.8411 26 31.5939 22.4138 31.5939 17.9781C31.5939 13.5425 27.8411 9.97202 23.2035 9.97202Z" fill="url(#paint13_linear_193_810)"/>
+<path id="XMLID_22_" fill-rule="evenodd" clip-rule="evenodd" d="M8.19271 12.3945C8.81818 9.09139 11.4879 6.60619 14.6915 6.60619C17.7273 6.60619 20.2749 8.83972 21.0681 11.8912C21.5106 11.8125 21.9682 11.7653 22.4411 11.7653C26.3007 11.7653 29.4738 14.5651 29.8704 18.1514C29.9009 17.8997 29.9162 17.648 29.9162 17.3964C29.9162 13.4484 26.5753 10.2553 22.4411 10.2553C21.9682 10.2553 21.5106 10.3025 21.0681 10.3812C20.2749 7.32973 17.7273 5.09619 14.6915 5.09619C11.5031 5.09619 8.83343 7.58139 8.19271 10.8845C4.88232 11.0418 2.24316 14.0303 2.24316 17.711C2.24316 17.9626 2.25842 18.2143 2.28893 18.466C2.60929 15.1471 5.11115 12.5361 8.19271 12.3945Z" fill="url(#paint14_linear_193_810)"/>
+<path id="XMLID_21_" fill-rule="evenodd" clip-rule="evenodd" d="M8.95504 12.3628C8.72621 12.3628 8.49738 12.3785 8.26855 12.41C11.2586 12.8032 13.5774 15.603 13.5774 19.0005C13.5774 20.5891 13.0587 22.0519 12.2197 23.2002C13.5621 22.0991 14.4317 20.3532 14.4317 18.3871C14.4317 15.0682 11.9756 12.3628 8.95504 12.3628Z" fill="url(#paint15_linear_193_810)"/>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_193_810" x1="15.7571" y1="10.9044" x2="27.9836" y2="10.9044" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint1_linear_193_810" x1="21.36" y1="1.57976" x2="22.3788" y2="1.57976" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint2_linear_193_810" x1="16.8603" y1="3.10924" x2="17.7585" y2="2.60629" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint3_linear_193_810" x1="13.7082" y1="6.76682" x2="14.2436" y2="5.86754" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint4_linear_193_810" x1="12.8094" y1="11.5294" x2="12.8094" y2="10.4763" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint5_linear_193_810" x1="14.3236" y1="16.1296" x2="13.7883" y2="15.2303" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint6_linear_193_810" x1="17.8762" y1="19.3326" x2="16.978" y2="18.8297" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint7_linear_193_810" x1="22.489" y1="20.2561" x2="21.4701" y2="20.2561" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint8_linear_193_810" x1="26.9324" y1="18.6903" x2="26.0343" y2="19.1933" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint9_linear_193_810" x1="30.0321" y1="15.0258" x2="29.4968" y2="15.9251" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint10_linear_193_810" x1="30.9308" y1="10.2521" x2="30.9308" y2="11.3053" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint11_linear_193_810" x1="29.3489" y1="5.67813" x2="29.8842" y2="6.57741" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint12_linear_193_810" x1="25.7655" y1="2.52874" x2="26.6637" y2="3.03168" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F4CB65"/>
+<stop offset="1" stop-color="#FB6452"/>
+</linearGradient>
+<linearGradient id="paint13_linear_193_810" x1="16.0701" y1="26.0075" x2="16.0701" y2="4.17108" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3DE8FF"/>
+<stop offset="1" stop-color="#00A8C4"/>
+</linearGradient>
+<linearGradient id="paint14_linear_193_810" x1="16.0705" y1="5.1052" x2="16.0705" y2="18.47" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+<linearGradient id="paint15_linear_193_810" x1="11.3532" y1="12.3705" x2="11.3532" y2="23.2042" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0.06"/>
+<stop offset="1" stop-color="#B6D1FF" stop-opacity="0.6"/>
+</linearGradient>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue

@@ -1,8 +1,8 @@
 <template>
   <Dialog v-model="modelVisible" title="广播发布" width="850px">
     <div class="BroadcastReleases">
-      <BroadcastParam v-model="modelVisible" :pileNum="pileNum" :otherConfig="otherConfig" />
-      <!-- <div class="body">
+      <!-- <BroadcastParam v-model="modelVisible" :pileNum="pileNum" :otherConfig="otherConfig" /> -->
+      <div class="body">
         <div class="left">
           <div class="title">路测广播列表</div>
           <CheckboxGroup class="checkbox-group" gap="9px" :showIcon="true" v-model="checkList" :options="musicList"
@@ -31,7 +31,7 @@
     </Button>
   </div>
 </div>
-</div> -->
+</div>
     </div>
   </Dialog>
 </template>
@@ -85,6 +85,7 @@ export default {
   },
   created() {
     getDeviceList(5).then((data) => {
+    console.log('-00--------------',data)
       if (Array.isArray(data))
         this.musicList = data.map((item) => ({
           ...item,

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

@@ -227,6 +227,8 @@ export default {
               },
               "special"
             );
+            //触发全局监听事件
+            this.$root.$emit('refresh-event');
             // markerClusterIns.setData();
           });
         });

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

@@ -95,7 +95,7 @@ export default {
     justify-content: center;
 
     >div.video-stream {
-      height: 255px;
+      height: 286px;
     }
   }
 

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

@@ -50,32 +50,75 @@ export default {
       }
     }
   },
-  created() {
+  async created() {
     // this.devicesList = devicesFormList;
     this.devicesList = [];
     let devs = [];
     // Promise.all([this.getAc('A1'), this.getAc('A2'), this.getAc('A3'), this.getAc('A4'), this.getAc('A5'), this.getAc('A6')]).then(res => {
-    Promise.all([this.getAc()]).then(res => {
-      console.log('res', res)
-      request({
-        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
-        method: "get",
-      }).then(result => {
-        if (result.code != 200) return Message.error("操作失败");
-        result.data.forEach(item => {
-          if (item.propertyName) {
-            devs.push({
-              label: item.propertyName,
-              key: item.property,
-              gridColumn: 3,
-            });
-            this.devicesData[item.property] = item.formatValue;
-          }
 
-        });
-        this.devicesList = devs;
+    await request({
+      url: `/business/device/batchFunctions`,
+      method: "post",
+      data: {
+        devices: [{
+          iotDeviceId: this.dialogData.iotDeviceId,
+          id: this.dialogData.id,
+          deviceType: 15
+        }],
+        functions: [
+          {
+            functionId: "A1",
+            params: {}
+          }, {
+            functionId: "A2",
+            params: {}
+          }, {
+            functionId: "A3",
+            params: {}
+          }, {
+            functionId: "A4",
+            params: {}
+          }, {
+            functionId: "A5",
+            params: {}
+          }, {
+            functionId: "A6",
+            params: {}
+          }
+        ],
+        // parameter: {}
+      }
+    }).then(res => {
+      console.log('res', res)
+      if (res.msg == 500) {
+        this.getAc();
+      }
+    })
+      .catch((err) => {
+        console.log('err', err)
+        this.getAc();
       })
+    // console.log('res', res)
+    // if (res.code == 500) {
+    //   await this.getAc();
+    // }
+    request({
+      url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
+      method: "get",
+    }).then(result => {
+      if (result.code != 200) return Message.error("操作失败");
+      result.data.forEach(item => {
+        if (item.propertyName) {
+          devs.push({
+            label: item.propertyName,
+            key: item.property,
+            gridColumn: 3,
+          });
+          this.devicesData[item.property] = item.formatValue;
+        }
 
+      });
+      this.devicesList = devs;
     })
   },
   methods: {

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

@@ -139,7 +139,7 @@ export default {
   methods: {
     handleClickTabs() { },
     goDispatch() {
-      this.$router.push(`/control/event/commandDispatch`);
+      this.$router.push(`/control/event/commandDispatch?id=${this.dialogData.id}`);
     },
     goStrategy() {
       this.$router.push(`/control/device/strategy`);
@@ -164,11 +164,14 @@ export default {
             url: `dc/system/event/${this.dialogData.id}`,
             method: "delete",
           }).then((result) => {
-            if (result.code == 200) Message.success("成功！");
-            else Message.error(result?.msg);
+            if (result.code == 200) this.$message.success("成功！");
+            else this.$message.error(result?.msg);
 
             this.$emit('traffic-relieve', this.data);
+            //触发全局监听事件
+            this.$root.$emit('refresh-event');
           });
+
         })
         .catch(() => { });
     },

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

@@ -18,6 +18,10 @@
     </div>
 
     <div class="bottom">
+      <!-- <div class="cleared-btn" @click="handleRefresh">
+        <img src="@screen/images/clearLayer.svg" />
+        <span>更新图层</span>
+      </div> -->
       <div class="cleared-btn" @click="handleCleared">
         <img src="@screen/images/clearLayer.svg" />
         <span>清空图层</span>
@@ -185,12 +189,17 @@ export default {
     }
 
     getMinMapLayers();
+    this.$root.$on('delete-event', this.handleRefresh);
+
   },
   beforeDestroy() {
     this.emitter.off("selectedCompleted", this.selectedCompletedHandle);
     Object.keys(lngLatMap).forEach(key => delete lngLatMap[key]);
     markerClusterIns.clear();
     window.renderData = undefined;
+
+    this.$root.$off('delete-event', this.handleRefresh);
+
   },
   methods: {
     selectedCompletedHandle(item) {
@@ -258,13 +267,21 @@ export default {
     handleDevice: debounce(async function (item) {
       await this.handleDeviceImmediate(item);
     }, 360),
+    async handleRefresh(){
+      const tab = _.filter(this.tabContentData,{status:'_active'})
+      try{
+        this.handleCleared();
+      } catch(e){
+      }
+      tab.forEach(async item=>{
+        await this.handleDeviceImmediate(item,true);
+      })
+    },
     handleCleared() {
       const { mapIns } = this.getMap();
-
       this.layerData.forEach(({ children }) => {
         children.forEach(item => item.status = "")
       });
-
       if (!mapIns) return;
 
       for (const key in cacheRemoveFunc) {

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

@@ -328,13 +328,14 @@ export const eventMap = {
   // 感知事件
   async "事件专题/感知事件"(item, filterData, isDefault, cb) {
     let loadingMessage;
-
-    loadingMessage = Message.info({
-      message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
-      duration: 0,
-      customClass: "loading-message",
-      iconClass: "el-icon-loading",
-    });
+    if(!isDefault){
+      loadingMessage = Message.info({
+        message: `${item.title}位置${!isDefault?'加载':'更新'}中...`,
+        duration: 0,
+        customClass: "loading-message",
+        iconClass: "el-icon-loading",
+      });
+    }
     // if (!isDefault) {
      
     // } 

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

@@ -213,22 +213,25 @@ export function getDeviceList(deviceType, options) {
     }
     let newEndStakeMark = [];
     let newStartStakeMark = [];
-
-    options.endStakeMark.forEach((item) => {
-      newEndStakeMark.push(String(item));
-    });
-    options.startStakeMark.forEach((item) => {
-      newStartStakeMark.push(String(item));
-    });
+    if(options && options.endStakeMark){
+      options.endStakeMark.forEach((item) => {
+        newEndStakeMark.push(String(item));
+      });
+    }
+    if(options && options.startStakeMark){
+      options.startStakeMark.forEach((item) => {
+        newStartStakeMark.push(String(item));
+      });
+    }
     let data = {
       deviceType: deviceType,
       endStakeMark: newEndStakeMark,
       startStakeMark: newStartStakeMark,
     };
-    if (options.childType && options.childType.split("-")[0] === deviceType) {
+    if (options && options.childType && options.childType.split("-")[0] === deviceType) {
       data.childType = options.childType;
     }
-    if (options.deviceState && options.deviceState !== "") {
+    if (options && options.deviceState && options.deviceState !== "") {
       data["deviceState"] = options.deviceState;
     }
     request(

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

@@ -116,9 +116,11 @@ import {
 // import { provideMixin } from "./../../mixin";
 import { timeLine2List } from "./data";
 import request from "@/utils/request";
+import { provideMixin } from "./../../mixin"
 
 export default {
   name: "DisposalProcess",
+  mixins: [provideMixin],
   inject: ["adpScale"],
   // mixins: [provideMixin],
   components: {
@@ -180,7 +182,7 @@ export default {
     },
 
     // 处置过程节点
-    getProcess(eventId) {
+    getProcess() {
       getProcessNode(this.eventId).then((result) => {
         console.log("处置过程节点", result);
         if (result.code != 200) return [];
@@ -301,8 +303,13 @@ export default {
     },
   },
   async mounted() {
-    this.getProcess();
-    await this.disposalRecords(this.eventId);
+    const self = this;
+    setTimeout(async () => {
+      self.eventId = self.detailData.id;
+      self.getProcess();
+      await self.disposalRecords(self.eventId);
+    }, 500);
+    
   },
 };
 </script>

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/EventInformation/components/EditEventInformationDialog/index.vue

@@ -19,104 +19,6 @@ import request from "@/utils/request";
 import { tabConfigList } from "./data.js";
 import { Message } from "element-ui";
 
-const eventInfo = {
-  id: "60f022d95a7c4b6cada2d780246543d8",
-  deptId: null,
-  deptName: null,
-  stakeMark: "k103+900",
-  endStakeMark: null,
-  direction: "菏泽方向",
-  userId: 1,
-  startTime: null,
-  endTime: null,
-  estimatedEndTime: "2024-02-22 10:44:27",
-  eventLevel: 1,
-  eventType: 1,
-  stringEventType: "交通事故",
-  eventSubclass: "其他事故",
-  eventCause: "其他事故",
-  description: "其他事故",
-  eventState: 0,
-  eventSource: null,
-  stringEventSource: "96659",
-  eventNature: null,
-  eventSourceTips: null,
-  inTunnel: null,
-  roadId: null,
-  occurrenceTime: "2024-02-22 10:44:18",
-  isPerceived: 0,
-  lang: "2,3",
-  roadName: "济菏高速",
-  organizationName: "研发部门",
-  processConfigList: [
-    {
-      "id": 8,
-      "eventType": 1,
-      "nodeNode": "1",
-      "processNode": "接警记录",
-      "commonPhrases": ""
-    },
-  ],
-  eventTitle: "发生其他事故事故",
-  dimension: null,
-  longitude: null,
-  dcEventMap: null,
-  dcEventAbnormalWeather: null,
-  dcEventAccident: {
-    searchValue: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    remark: null,
-    params: {},
-    id: "60f022d95a7c4b6cada2d780246543d8",
-    reporterName: "王兴琳",
-    reporterPhoneNumber: "19806119906",
-    locationType: 1,
-    trafficJam: 100,
-    weatherCondition: 1,
-    impactLevel: 2,
-    isReverseCargo: 1,
-    isMaintenance: 1,
-    policeContact: "96659",
-    towingServiceContact: "19806119906",
-    congestionAhead: 0,
-    atIntersection: 0,
-    onCurve: 1,
-    spillageItem: "抛洒物",
-    vehicleOwnerPhone: "19806119906",
-    smallCar: 10,
-    trucks: 0,
-    buses: 0,
-    tankers: 0,
-    minorInjuries: 1,
-    seriousInjuries: null,
-    fatalities: null,
-    isPrivate: null,
-    facilityId: null,
-    rampId: null,
-    location: null,
-    dcEvent: null
-  },
-  dcEventConstruction: null,
-  dcEventServiceArea: null,
-  dcEventTrafficCongestion: null,
-  dcEventVehicleAccident: null,
-  dcEventTrafficControl: null,
-  nickName: "管理员",
-  stringEventState: "待确认",
-  commonPhrases: null,
-  nodeNode: null,
-  eventName: "交通事故",
-  processNode: null,
-  updateTime: null,
-  createTime: "2024-02-22 10:49:34",
-  remark: null,
-  subclass: "1-5",
-  linkId: null
-};
-
 export default {
   name: "EditEventInformationDialog",
   components: {
@@ -176,6 +78,9 @@ export default {
         // console.log('numbers', numbers);
         info.stakeMark = numbers;
       }
+      if (typeof info.lang == 'string') {
+        info.lang = info.lang.split(',');
+      }
       this.fData = info;
 
       let configList = tabConfigList.find(item => item.label == this.fData.eventName)

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

@@ -40,10 +40,10 @@ export default {
     ...components,
   },
   props: {
-    detailId: {
-      type: [String, Number],
-      default: "162cb8824ea141f3a96a74ad81c22796",
-    },
+    // detailId: {
+    //   type: [String, Number],
+    //   default: "162cb8824ea141f3a96a74ad81c22796",
+    // },
   },
   provide() {
     return {
@@ -59,10 +59,18 @@ export default {
       provideData: {
         detail: null,
       },
+      detailId: ''
     };
   },
   created() {
+    let h = window.location.href.split('=');
+    if(h.length === 2){
+      this.detailId = window.location.href.split('=')[1];
+    } else {
+      this.detailId = 'b825c7bbf4de43cdb8f689e270adf7a1';
+    }
     this.getDetail();
+    
   },
   methods: {
     getDetail() {
@@ -87,7 +95,7 @@ export default {
             delete gridArea.TrafficControl;
             if (["设备设施隐患", "非法上路"].includes(result.data.eventName)) {
               // 第三列变化
-              gridArea["RealTimeVideo"] = "1 / 3 / span 17 / 3";
+              gridArea["RealTimeVideo"] = "1 / 3 / span 16 / 3";
               delete gridArea.ReleaseInformation;
             }
 
@@ -97,6 +105,7 @@ export default {
         .catch((err) => {});
     },
     handleFullHeight(key, opacityKey) {
+      // 还原图标
       if (this.gridAreaMap[key] !== originGridArea[key]) {
         this.gridAreaMap[key] = originGridArea[key];
         if (this.$refs[opacityKey]?.[0]) {
@@ -109,7 +118,6 @@ export default {
           this.$refs[opacityKey][0].$el.style.opacity = 0;
           this.$refs[opacityKey][0].$el.style.pointerEvents = "none";
         }
-
         this.gridAreaMap[key] = originGridArea[key].replace(
           /[0-9]+/g,
           (num) => {
@@ -121,6 +129,7 @@ export default {
             }
           }
         );
+        this.gridAreaMap["DisposalProcess"] = "1 / 2 / span 33 / 2";
       }
     },
   },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue

@@ -262,6 +262,8 @@ export default {
               else Message.error(result?.msg);
               this.modelVisible = false;
               this.$emit("queryData", true);
+              //触发全局监听事件
+              this.$root.$emit('delete-event');
             });
           } else {
             request({
@@ -272,6 +274,8 @@ export default {
               else Message.error(result?.msg);
               this.modelVisible = false;
               this.$emit("queryData", true);
+              //触发全局监听事件
+              this.$root.$emit('delete-event');
             });
           }
         });

ruoyi-ui/src/views/JiHeExpressway/pages/datav/roadNet/sensors.vue

@@ -194,7 +194,7 @@ export default {
             })
 
             let subItems = [
-                "可变新消息标志",
+                "可变信息标志",
                 "气象检测器",
                 "一类交通量调查站",
                 "枪机",
@@ -216,7 +216,7 @@ export default {
 
             // const sub01 = createSub(0, 0, '气象检测器')
             // const sub02 = createSub(0, 100, '一类交通量调查站')
-            // const sub03 = createSub(0, 200, '可变新消息标志')
+            // const sub03 = createSub(0, 200, '可变信息标志')
 
             // link(main, sub02, [
             //     {

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

@@ -14,33 +14,40 @@
 </style> -->
 <template>
     <div class='comp_box'>
-        <iframe class="iframe" :src="alarmUrl" frameborder="0"></iframe>
+        <iframe class="iframe" :src="url" frameborder="0"></iframe>
     </div>
 </template>
 
 <script>
 
 import { getConfigKey } from "@/api/system/config.js";
-
+import request from "@/utils/request";
 export default {
     name: 'InDevelopment',
     components: {
     },
-    props: {
-        text: {
-            type: String,
-            default: "暂无数据"
-        },
-        alarmUrl: {
-            type: String,
-            default: "",
+    data(){
+        return {
+            url:""
         }
     },
+    props: {
+    },
     mounted() {
-        // this.alarmUrl = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
-        getConfigKey("dc.gisAndBim").then((res) => {
-            this.alarmUrl = res.msg
-        });
+        // this.url = "http://10.0.86.37:81/?HoveringMouse=true&LightMode=false";
+        // getConfigKey("AESEncryption").then((res) => {
+        //     alert(res.msg)
+        //     this.url = res.msg
+        // });
+        request({
+            url: `/AESEncryption`,
+            method: "get",
+        }).then((res) => {
+            this.url = res.msg
+            console.log(res, "AESEncryption获取iframe url成功。。。")
+        }).catch(err => {
+            console.log(err, "AESEncryption获取iframe url失败。。。")
+        });;
     }
 }
 </script>

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue → ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/deviceUptime/index.vue

@@ -9,7 +9,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/charts";
 let chartsStatistics = chartOptions.options;

ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue → ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/smart/statisticalAnalysis/components/monthlyEquipment/index.vue

@@ -13,7 +13,7 @@
 </template>
   
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import EllipseData from "./EllipseData.vue"
 export default {
   name: 'MonthlyEquipment',

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

@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import WgtTitle from "../../../../perception/widgets/title";
+import WgtTitle from "../../../../../perception/widgets/title";
 import * as echarts from "echarts";
 import chartOptions from "./assets/barCharts";
 

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

@@ -7,7 +7,7 @@
           <div
             class="img"
             :style="{
-              backgroundImage: `url(${require(`@screen/images/weather/${cityWeather.icon}.svg`)})`,
+              backgroundImage: `url(${require(`@screen/images/weather/${(cityWeather.icon && weatherIcon.indexOf(cityWeather.icon.toString()) !== -1)?cityWeather.icon:'100'}.svg`)})`,
             }"
           ></div>
           <div>
@@ -96,6 +96,7 @@
 </template>
 
 <script>
+
 import WgtTitle from "../../../widgets/title";
 import {
   getRegionList,
@@ -112,6 +113,9 @@ export default {
       regionList: [],
       city: "长清区",
       cityWeather: {},
+      weatherIcon:[
+        '0','100','101','104','150','151','302','306','307'
+      ]
     };
   },
 

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/data.js

@@ -14,20 +14,20 @@ export const searchFormList = [
       valueFormat: "yyyy-MM-dd HH:mm:ss",
     },
   },
-  PresetFormItems.directionCreater("RadioGroup"),
+  // PresetFormItems.directionCreater("RadioGroup"),
   {
     label: "发布状态:",
-    key: "releaseStatus",
+    key: "status",
     type: "RadioGroup",
     default: [],
     options: {
       options: [
         {
-          key: "1",
+          key: 0,
           label: "成功",
         },
         {
-          key: "0",
+          key: 1,
           label: "失败",
         },
       ],

ruoyi-ui/src/views/JiHeExpressway/pages/service/boardRecord/index.vue

@@ -26,7 +26,7 @@
           header-align="center" />
         <ElTableColumn label="发布时间" prop="operTime" width="280" align="center" header-align="center">
           <template slot-scope="scope">
-            {{ moment(scope.row.operTime).format("yyyy/MM/DD hh:mm") }}
+            {{ moment(scope.row.operTime).format("yyyy/MM/DD HH:mm") }}
           </template>
         </ElTableColumn>
         <ElTableColumn label="设备ID" prop="dcDeviceId" width="120" align="center" header-align="center">
@@ -34,6 +34,11 @@
             {{ JSON.parse(scope.row.dcDeviceId).join("、") }}
           </template>
         </ElTableColumn>
+        <!-- <ElTableColumn label="方向" prop="direction" width="160" align="center" header-align="center">
+          <template slot-scope="scope">
+            {{ DirectionTypes[scope.row.direction] }}
+          </template>
+        </ElTableColumn> -->
         <ElTableColumn label="设备名称" prop="dcDeviceName" align="center" header-align="center">
           <template slot-scope="scope">
             {{ scope.row.dcDeviceName.replace(/^\[/,'').replace(/\]$/,'') }}
@@ -58,7 +63,7 @@
         </ElTableColumn>
         <ElTableColumn label="发布结果" prop="status" width="140" align="center" header-align="center">
           <template slot-scope="scope">
-            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 1"></i>
+            <i class="el-icon-success" style="font-size: 24px; color:#0c0;" v-if="scope.row.status == 0"></i>
             <i class="el-icon-error" style="font-size: 24px; color:#BBB;" v-else></i>
           </template>
         </ElTableColumn>
@@ -97,6 +102,7 @@ export default {
   },
   data() {
     return {
+      DirectionTypes,
       moment,
       testData : {"STAY":"30","ACTION":"1","SPEED":"0","COLOR":"ffff00","FONT":"3","FONT_SIZE":"32","CONTENT":"因改扩建施工 平阴南、梁山收费站出入口封闭","width":"768","height":"64","formatStyle":"2"},
       tableData: [],
@@ -145,7 +151,7 @@ export default {
         ...this.searchData,
         // releaseContent: data.releaseContent || "",
         direction: data.direction || "",
-        releaseStatus: data.releaseStatus,
+        status: data.status,
         startTime,
         endTime,
         // stakeMark: stakeMark,

ruoyi-ui/vue.config.js

@@ -53,8 +53,8 @@ module.exports = {
         // target: `http://10.168.69.255:8087`, //正晨后台 连现场物联 刘文阁
         // target: `http://10.168.78.135:8087`,  //王钦
         // target: `http://10.168.66.196:8087`, //正晨后台 连现场物联 刘文阁2
-        target: `http://10.168.68.42:8087`, //王思祥
-        // target: `http://10.168.72.174:8087`, //赵祥龙
+        // target: `http://10.168.68.42:8087`, //王思祥
+        target: `http://10.168.72.174:8087`, //赵祥龙
         // target: `http://10.168.65.156:8097`, //孟
         // target: `http://10.168.56.165:8087`, //王家宝
         // target: `http://10.168.77.128:8087`, //王兴琳