修复设备图标-安全文件搜索等相关调整

ruoyi-ui/package.json

@@ -62,7 +62,7 @@
     "fuse.js": "6.4.3",
     "gis-map-admin": "^0.9.2",
     "gis-map-tunnel": "^0.1.3",
-    "gis-map-universal": "^0.3.4",
+    "gis-map-universal": "^0.3.5",
     "highlight.js": "9.18.5",
     "html-docx-js": "^0.3.1",
     "imports-loader": "^0.8.0",

ruoyi-ui/src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'DC-Pro-Token'
+const TokenKey = 'DC-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue

@@ -23,6 +23,7 @@
           v-model="value"
           :placeholder="placeholder"
           clearable
+          @clear="handleSearch"
           @keyup.enter.native="handleSearch"
         ></ElInput>
         <img src="./search.svg" v-show="!disable" @click="onOpenPop" />
@@ -162,13 +163,12 @@ export default {
         this.value = "";
       }
       console.log(this.$refs.FormConfigRef?.formData , "重置前");
-      // this.visible = true;
+      
       this.$refs.FormConfigRef?.reset();
       this.$refs.FormConfigRef?.$refs.ElFormRef.resetFields();
-      // this.$refs.PopoverRef.doClose();
       
       const param = cloneDeep(this.$refs.FormConfigRef?.formData);
-      if (this.types === "input") {
+      if (param && this.types === "input") {
         param[this.params] = null
       }
       console.log(this.$refs.FormConfigRef?.formData , "重置后");

ruoyi-ui/src/views/JiHeExpressway/components/broadcast/broadcastEditor.vue

@@ -42,7 +42,7 @@
           </el-row>
         </el-form-item>
         <el-form-item label="详细内容" prop="content">
-          <el-input type="textarea" :rows="6" placeholder="详细内容" v-model="dataForm.content"></el-input>
+          <el-input type="textarea" maxlength="250" :rows="6" placeholder="详细内容" v-model="dataForm.content"></el-input>
         </el-form-item>
       </el-form>
     </el-card>

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue

@@ -71,6 +71,7 @@
               <el-input
                 type="textarea"
                 :rows="6"
+                maxlength="250" 
                 placeholder="详细内容"
                 v-model="dataForm.content"
               ></el-input>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_active.svg

@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2630)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2630)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2630)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M29.0755 13.432C25.3864 11.4904 17.1023 11.5552 13.4133 13.432C12.7014 13.8203 12.1836 14.597 12.1836 15.4383V18.0919C12.1836 18.7391 12.5072 19.3863 13.025 19.7098C13.0897 19.7098 13.0897 19.7746 13.1544 19.7746C13.4133 19.9687 13.6074 20.2276 13.6721 20.6159C14.1252 24.0461 17.2965 26.7643 21.2444 26.7643C25.1923 26.7643 28.4283 24.0461 28.8166 20.5512C28.8813 20.2276 29.0755 19.904 29.3343 19.7098H29.3991C29.9815 19.3215 30.3051 18.6743 30.3051 18.0271V15.4383C30.3051 14.597 29.8521 13.8203 29.0755 13.432ZM21.2444 25.3405C20.0147 25.3405 18.785 24.8227 18.3967 24.1755V20.4865C18.6556 19.1921 19.8852 18.2213 21.2444 18.2213C22.6035 18.2213 23.7684 19.1921 24.0273 20.4865V24.2402C23.7037 24.8874 22.474 25.3405 21.2444 25.3405ZM28.8813 17.2505C26.0984 15.5678 16.3257 15.5678 13.6074 17.2505C13.5427 16.8622 13.6074 15.7619 13.6074 15.1795C13.6074 14.9853 13.7369 14.7911 13.931 14.6617C17.4259 12.979 25.7748 13.1084 28.6224 14.7264C28.8166 14.8559 28.8813 14.9853 28.8813 15.2442V17.2505Z" fill="#FFDB82"/>
+<path d="M19.8135 22.3702C19.8135 22.7821 19.9635 23.1772 20.2305 23.4685C20.4975 23.7598 20.8597 23.9234 21.2373 23.9234C21.6149 23.9234 21.9771 23.7598 22.2441 23.4685C22.5111 23.1772 22.6611 22.7821 22.6611 22.3702C22.6611 21.9582 22.5111 21.5631 22.2441 21.2718C21.9771 20.9805 21.6149 20.8169 21.2373 20.8169C20.8597 20.8169 20.4975 20.9805 20.2305 21.2718C19.9635 21.5631 19.8135 21.9582 19.8135 22.3702Z" fill="#FFDB82"/>
+<path d="M28.7532 25.0811C28.5571 24.9989 28.3378 24.9916 28.1368 25.0606C27.9357 25.1295 27.767 25.2699 27.6627 25.455C27.5632 25.6386 27.5384 25.8535 27.5935 26.0549C27.6485 26.2563 27.7791 26.4288 27.9582 26.5363C28.5399 26.8345 28.683 27.0699 28.6904 27.1152C28.6387 27.6517 25.8557 28.9102 20.6942 28.9102C15.6066 28.9102 12.7479 27.6369 12.6999 27.1152C12.7036 27.0727 12.8347 26.8474 13.3961 26.5529C13.4901 26.502 13.5731 26.433 13.6402 26.3498C13.7073 26.2666 13.7573 26.1709 13.7872 26.0683C13.817 25.9656 13.8263 25.8581 13.8143 25.7519C13.8023 25.6457 13.7694 25.5429 13.7174 25.4495C13.6073 25.2598 13.4292 25.1189 13.2193 25.0555C13.0093 24.9921 12.783 25.0108 12.5863 25.1078C11.2752 25.793 11 26.5778 11 27.1152C11 29.479 16.0248 30.5547 20.6933 30.5547C25.3645 30.5547 30.3902 29.479 30.3902 27.1152C30.3902 26.5704 30.1059 25.7736 28.7532 25.0811Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2630" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2630"/>
+</filter>
+<filter id="filter1_i_1302_2630" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2630"/>
+</filter>
+<filter id="filter2_i_1302_2630" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2630"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ballc_fault.svg

@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2631)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2631)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2631)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M29.0755 13.432C25.3864 11.4904 17.1023 11.5552 13.4133 13.432C12.7014 13.8203 12.1836 14.597 12.1836 15.4383V18.0919C12.1836 18.7391 12.5072 19.3863 13.025 19.7098C13.0897 19.7098 13.0897 19.7746 13.1544 19.7746C13.4133 19.9687 13.6074 20.2276 13.6721 20.6159C14.1252 24.0461 17.2965 26.7643 21.2444 26.7643C25.1923 26.7643 28.4283 24.0461 28.8166 20.5512C28.8813 20.2276 29.0755 19.904 29.3343 19.7098H29.3991C29.9815 19.3215 30.3051 18.6743 30.3051 18.0271V15.4383C30.3051 14.597 29.8521 13.8203 29.0755 13.432ZM21.2444 25.3405C20.0147 25.3405 18.785 24.8227 18.3967 24.1755V20.4865C18.6556 19.1921 19.8852 18.2213 21.2444 18.2213C22.6035 18.2213 23.7684 19.1921 24.0273 20.4865V24.2402C23.7037 24.8874 22.474 25.3405 21.2444 25.3405ZM28.8813 17.2505C26.0984 15.5678 16.3257 15.5678 13.6074 17.2505C13.5427 16.8622 13.6074 15.7619 13.6074 15.1795C13.6074 14.9853 13.7369 14.7911 13.931 14.6617C17.4259 12.979 25.7748 13.1084 28.6224 14.7264C28.8166 14.8559 28.8813 14.9853 28.8813 15.2442V17.2505Z" fill="#FF5F5F"/>
+<path d="M19.8135 22.3702C19.8135 22.7821 19.9635 23.1772 20.2305 23.4685C20.4975 23.7598 20.8597 23.9234 21.2373 23.9234C21.6149 23.9234 21.9771 23.7598 22.2441 23.4685C22.5111 23.1772 22.6611 22.7821 22.6611 22.3702C22.6611 21.9582 22.5111 21.5631 22.2441 21.2718C21.9771 20.9805 21.6149 20.8169 21.2373 20.8169C20.8597 20.8169 20.4975 20.9805 20.2305 21.2718C19.9635 21.5631 19.8135 21.9582 19.8135 22.3702Z" fill="#FF5F5F"/>
+<path d="M28.7532 25.0811C28.5571 24.9989 28.3378 24.9916 28.1368 25.0606C27.9357 25.1295 27.767 25.2699 27.6627 25.455C27.5632 25.6386 27.5384 25.8535 27.5935 26.0549C27.6485 26.2563 27.7791 26.4288 27.9582 26.5363C28.5399 26.8345 28.683 27.0699 28.6904 27.1152C28.6387 27.6517 25.8557 28.9102 20.6942 28.9102C15.6066 28.9102 12.7479 27.6369 12.6999 27.1152C12.7036 27.0727 12.8347 26.8474 13.3961 26.5529C13.4901 26.502 13.5731 26.433 13.6402 26.3498C13.7073 26.2666 13.7573 26.1709 13.7872 26.0683C13.817 25.9656 13.8263 25.8581 13.8143 25.7519C13.8023 25.6457 13.7694 25.5429 13.7174 25.4495C13.6073 25.2598 13.4292 25.1189 13.2193 25.0555C13.0093 24.9921 12.783 25.0108 12.5863 25.1078C11.2752 25.793 11 26.5778 11 27.1152C11 29.479 16.0248 30.5547 20.6933 30.5547C25.3645 30.5547 30.3902 29.479 30.3902 27.1152C30.3902 26.5704 30.1059 25.7736 28.7532 25.0811Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2631" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2631"/>
+</filter>
+<filter id="filter1_i_1302_2631" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2631"/>
+</filter>
+<filter id="filter2_i_1302_2631" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2631"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_active.svg

@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2625)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2625)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2625)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M21.622 13.2583C14.6686 13.2583 11.1934 14.7919 11.1934 17.1621C11.1934 18.6856 11.1761 18.8273 12.2599 19.3649L12.6907 20.7225H12.8522C14.0481 18.2894 17.3315 17.5758 21.364 17.5758C25.3966 17.5758 28.9393 18.2894 30.0231 20.7234H30.039L30.4626 19.4109C31.4237 18.513 31.5361 18.6251 31.5361 17.1623C31.5361 16.0829 30.9854 13.2586 21.622 13.2586V13.2583Z" fill="#FFDB82"/>
+<path d="M21.2015 19.0962C16.9325 19.0962 13.6494 19.3605 13.6494 23.6296C13.6494 27.8986 17.1101 31.359 21.3788 31.359C25.6476 31.359 29.1085 27.898 29.1085 23.6296C29.1085 19.3611 25.4694 19.0962 21.2015 19.0962ZM21.3788 27.7681C20.7629 27.7681 20.1607 27.5855 19.6486 27.2433C19.1364 26.9011 18.7372 26.4147 18.5014 25.8456C18.2656 25.2766 18.2039 24.6504 18.324 24.0462C18.4441 23.4421 18.7406 22.8871 19.1761 22.4515C19.6115 22.0158 20.1664 21.7191 20.7705 21.5988C21.3746 21.4785 22.0008 21.54 22.57 21.7756C23.1391 22.0112 23.6256 22.4102 23.968 22.9222C24.3104 23.4343 24.4933 24.0364 24.4935 24.6523C24.4934 25.4784 24.1652 26.2706 23.5811 26.8546C22.997 27.4387 22.2049 27.7669 21.3788 27.767V27.7681Z" fill="#FFDB82"/>
+<path d="M20.1709 24.5959C20.1709 24.8318 20.2408 25.0623 20.3718 25.2584C20.5028 25.4545 20.689 25.6074 20.9069 25.6977C21.1248 25.7879 21.3645 25.8116 21.5959 25.7657C21.8272 25.7197 22.0397 25.6062 22.2065 25.4395C22.3733 25.2728 22.487 25.0604 22.5331 24.8291C22.5792 24.5978 22.5557 24.358 22.4655 24.1401C22.3754 23.9222 22.2227 23.7359 22.0267 23.6047C21.8307 23.4736 21.6002 23.4035 21.3643 23.4033C21.2076 23.4032 21.0525 23.434 20.9077 23.4939C20.7629 23.5537 20.6313 23.6416 20.5205 23.7523C20.4097 23.8631 20.3217 23.9946 20.2618 24.1393C20.2018 24.2841 20.1709 24.4392 20.1709 24.5959Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2625" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2625"/>
+</filter>
+<filter id="filter1_i_1302_2625" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2625"/>
+</filter>
+<filter id="filter2_i_1302_2625" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2625"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balld_fault.svg

@@ -0,0 +1,52 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2624)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2624)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2624)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M21.622 13.2583C14.6686 13.2583 11.1934 14.7919 11.1934 17.1621C11.1934 18.6856 11.1761 18.8273 12.2599 19.3649L12.6907 20.7225H12.8522C14.0481 18.2894 17.3315 17.5758 21.364 17.5758C25.3966 17.5758 28.9393 18.2894 30.0231 20.7234H30.039L30.4626 19.4109C31.4237 18.513 31.5361 18.6251 31.5361 17.1623C31.5361 16.0829 30.9854 13.2586 21.622 13.2586V13.2583Z" fill="#FF5F5F"/>
+<path d="M21.2015 19.0962C16.9325 19.0962 13.6494 19.3605 13.6494 23.6296C13.6494 27.8986 17.1101 31.359 21.3788 31.359C25.6476 31.359 29.1085 27.898 29.1085 23.6296C29.1085 19.3611 25.4694 19.0962 21.2015 19.0962ZM21.3788 27.7681C20.7629 27.7681 20.1607 27.5855 19.6486 27.2433C19.1364 26.9011 18.7372 26.4147 18.5014 25.8456C18.2656 25.2766 18.2039 24.6504 18.324 24.0462C18.4441 23.4421 18.7406 22.8871 19.1761 22.4515C19.6115 22.0158 20.1664 21.7191 20.7705 21.5988C21.3746 21.4785 22.0008 21.54 22.57 21.7756C23.1391 22.0112 23.6256 22.4102 23.968 22.9222C24.3104 23.4343 24.4933 24.0364 24.4935 24.6523C24.4934 25.4784 24.1652 26.2706 23.5811 26.8546C22.997 27.4387 22.2049 27.7669 21.3788 27.767V27.7681Z" fill="#FF5F5F"/>
+<path d="M20.1709 24.5959C20.1709 24.8318 20.2408 25.0623 20.3718 25.2584C20.5028 25.4545 20.689 25.6074 20.9069 25.6977C21.1248 25.7879 21.3645 25.8116 21.5959 25.7657C21.8272 25.7197 22.0397 25.6062 22.2065 25.4395C22.3733 25.2728 22.487 25.0604 22.5331 24.8291C22.5792 24.5978 22.5557 24.358 22.4655 24.1401C22.3754 23.9222 22.2227 23.7359 22.0267 23.6047C21.8307 23.4736 21.6002 23.4035 21.3643 23.4033C21.2076 23.4032 21.0525 23.434 20.9077 23.4939C20.7629 23.5537 20.6313 23.6416 20.5205 23.7523C20.4097 23.8631 20.3217 23.9946 20.2618 24.1393C20.2018 24.2841 20.1709 24.4392 20.1709 24.5959Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2624" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2624"/>
+</filter>
+<filter id="filter1_i_1302_2624" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2624"/>
+</filter>
+<filter id="filter2_i_1302_2624" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2624"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_active.svg

@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2627)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2627)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2627)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M15 25.3125H27C27 22.4688 24.7714 20.1125 21.9429 19.7062V18H16.7143V18.8125H20.2286V19.625C17.3143 20.0312 15 22.3875 15 25.3125ZM20.9143 31C23.6571 31 25.8857 28.8875 25.8857 26.2875H15.9429C15.9429 28.8875 18.1714 31 20.9143 31ZM20.9143 27.1C21.7714 27.1 22.5429 27.75 22.5429 28.6438C22.5429 29.4563 21.8571 30.1875 20.9143 30.1875C19.9714 30.1875 19.2857 29.5375 19.2857 28.6438C19.3714 27.75 20.0571 27.1 20.9143 27.1Z" fill="#FF5F5F"/>
+<path d="M30.4286 15H11.5714C10.7071 15 10 15.54 10 16.2V19.8C10 20.46 10.7071 21 11.5714 21H13.2295C14.3632 18.5548 17.4095 15.6 21 15.6C24.5905 15.6 27.6368 18.5548 28.7705 21H30.4286C31.2929 21 32 20.46 32 19.8V16.2C32 15.54 31.2929 15 30.4286 15Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2627" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2627"/>
+</filter>
+<filter id="filter1_i_1302_2627" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2627"/>
+</filter>
+<filter id="filter2_i_1302_2627" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2627"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/balle_fault.svg

@@ -0,0 +1,51 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2626)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2626)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2626)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M15 25.3125H27C27 22.4688 24.7714 20.1125 21.9429 19.7062V18H16.7143V18.8125H20.2286V19.625C17.3143 20.0312 15 22.3875 15 25.3125ZM20.9143 31C23.6571 31 25.8857 28.8875 25.8857 26.2875H15.9429C15.9429 28.8875 18.1714 31 20.9143 31ZM20.9143 27.1C21.7714 27.1 22.5429 27.75 22.5429 28.6438C22.5429 29.4563 21.8571 30.1875 20.9143 30.1875C19.9714 30.1875 19.2857 29.5375 19.2857 28.6438C19.3714 27.75 20.0571 27.1 20.9143 27.1Z" fill="#FFDB82"/>
+<path d="M30.4286 15H11.5714C10.7071 15 10 15.54 10 16.2V19.8C10 20.46 10.7071 21 11.5714 21H13.2295C14.3632 18.5548 17.4095 15.6 21 15.6C24.5905 15.6 27.6368 18.5548 28.7705 21H30.4286C31.2929 21 32 20.46 32 19.8V16.2C32 15.54 31.2929 15 30.4286 15Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2626" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2626"/>
+</filter>
+<filter id="filter1_i_1302_2626" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2626"/>
+</filter>
+<filter id="filter2_i_1302_2626" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2626"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_active.svg

@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2633)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2633)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2633)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M28.3793 11.6226L30.3486 19.7495C30.3486 20.1129 30.2378 20.4684 30.0296 20.7729C29.8215 21.0774 29.5249 21.3178 29.176 21.4648C28.8272 21.6118 28.4409 21.6591 28.0643 21.601C27.6877 21.5428 27.337 21.3818 27.0547 21.1374L26.4101 11.6226H28.3793ZM25.7865 11.6226L26.4298 21.1293C26.0671 21.4486 25.5912 21.6257 25.0973 21.625C24.6042 21.6255 24.1289 21.4492 23.7661 21.1311L23.6085 11.6226H25.7865ZM22.9521 11.6226L23.1103 21.1618C22.7522 21.4611 22.2917 21.6258 21.8152 21.625C21.4542 21.625 21.1148 21.5325 20.824 21.3699L20.8227 11.6226H22.9515H22.9521ZM20.167 11.6226V21.3781C19.8695 21.5404 19.5324 21.6255 19.1896 21.625C18.6933 21.625 18.2404 21.45 17.8945 21.1624L18.0527 11.6226H20.167ZM17.3963 11.6226L17.24 21.1299C16.8773 21.449 16.4014 21.6258 15.9075 21.625C15.4272 21.6256 14.9634 21.4583 14.6039 21.1549L15.2183 11.6226H17.3956H17.3963ZM14.5954 11.6226L13.9849 21.1061C13.706 21.3596 13.3551 21.5295 12.9757 21.5948C12.5963 21.6601 12.2052 21.6179 11.8508 21.4735C11.4963 21.329 11.1942 21.0887 10.9819 20.7822C10.7695 20.4758 10.6563 20.1167 10.6562 19.7495L12.6248 11.6226H14.5947H14.5954ZM13.939 21.7713L13.9383 29.1268H12.6255V22.2502C13.1309 22.2502 13.5911 22.0689 13.939 21.7713ZM27.0665 21.7725C27.4144 22.0695 27.8752 22.2502 28.3793 22.2502V29.1268H27.0665V21.7725ZM26.4101 29.1268H29.0357V30.3771H26.4101V29.1268ZM11.9691 29.1268H14.5947V30.3771H11.9691V29.1268Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2633" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2633"/>
+</filter>
+<filter id="filter1_i_1302_2633" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2633"/>
+</filter>
+<filter id="filter2_i_1302_2633" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2633"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardb_fault.svg

@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2632)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2632)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2632)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M28.3793 11.6226L30.3486 19.7495C30.3486 20.1129 30.2378 20.4684 30.0296 20.7729C29.8215 21.0774 29.5249 21.3178 29.176 21.4648C28.8272 21.6118 28.4409 21.6591 28.0643 21.601C27.6877 21.5428 27.337 21.3818 27.0547 21.1374L26.4101 11.6226H28.3793ZM25.7865 11.6226L26.4298 21.1293C26.0671 21.4486 25.5912 21.6257 25.0973 21.625C24.6042 21.6255 24.1289 21.4492 23.7661 21.1311L23.6085 11.6226H25.7865ZM22.9521 11.6226L23.1103 21.1618C22.7522 21.4611 22.2917 21.6258 21.8152 21.625C21.4542 21.625 21.1148 21.5325 20.824 21.3699L20.8227 11.6226H22.9515H22.9521ZM20.167 11.6226V21.3781C19.8695 21.5404 19.5324 21.6255 19.1896 21.625C18.6933 21.625 18.2404 21.45 17.8945 21.1624L18.0527 11.6226H20.167ZM17.3963 11.6226L17.24 21.1299C16.8773 21.449 16.4014 21.6258 15.9075 21.625C15.4272 21.6256 14.9634 21.4583 14.6039 21.1549L15.2183 11.6226H17.3956H17.3963ZM14.5954 11.6226L13.9849 21.1061C13.706 21.3596 13.3551 21.5295 12.9757 21.5948C12.5963 21.6601 12.2052 21.6179 11.8508 21.4735C11.4963 21.329 11.1942 21.0887 10.9819 20.7822C10.7695 20.4758 10.6563 20.1167 10.6562 19.7495L12.6248 11.6226H14.5947H14.5954ZM13.939 21.7713L13.9383 29.1268H12.6255V22.2502C13.1309 22.2502 13.5911 22.0689 13.939 21.7713ZM27.0665 21.7725C27.4144 22.0695 27.8752 22.2502 28.3793 22.2502V29.1268H27.0665V21.7725ZM26.4101 29.1268H29.0357V30.3771H26.4101V29.1268ZM11.9691 29.1268H14.5947V30.3771H11.9691V29.1268Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2632" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2632"/>
+</filter>
+<filter id="filter1_i_1302_2632" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2632"/>
+</filter>
+<filter id="filter2_i_1302_2632" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2632"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_active.svg

@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2629)">
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" fill="black"/>
+</g>
+<path d="M21 41.796C32.0457 41.796 41 32.6635 41 21.398C41 10.1325 32.0457 1 21 1C9.9543 1 1 10.1325 1 21.398C1 32.6635 9.9543 41.796 21 41.796Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2629)">
+<path d="M20.6348 51L25.6348 43.3507H15.6348L20.6348 51Z" fill="black"/>
+</g>
+<path d="M21.002 51L26.002 43.3507H16.002L21.002 51Z" stroke="#BEA019" stroke-width="0.6"/>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" fill="#BEA019"/>
+<g filter="url(#filter2_i_1302_2629)">
+<path d="M21.1523 37.9715C30.127 37.9715 37.4023 30.5513 37.4023 21.3981C37.4023 12.2449 30.127 4.82471 21.1523 4.82471C12.1777 4.82471 4.90234 12.2449 4.90234 21.3981C4.90234 30.5513 12.1777 37.9715 21.1523 37.9715Z" fill="black"/>
+</g>
+<path d="M20.999 37.9715C29.9736 37.9715 37.249 30.5513 37.249 21.3981C37.249 12.2449 29.9736 4.82471 20.999 4.82471C12.0244 4.82471 4.74902 12.2449 4.74902 21.3981C4.74902 30.5513 12.0244 37.9715 20.999 37.9715Z" stroke="#D4C47F" stroke-width="1.2"/>
+<path d="M29.9375 13.25C30.1198 13.25 30.2947 13.3158 30.4236 13.4331C30.5526 13.5503 30.625 13.7092 30.625 13.875V20.125C30.625 20.2908 30.5526 20.4497 30.4236 20.5669C30.2947 20.6842 30.1198 20.75 29.9375 20.75H12.75V13.875C12.75 13.7092 12.8224 13.5503 12.9514 13.4331C13.0803 13.3158 13.2552 13.25 13.4375 13.25H29.9375ZM17.5625 15.82H14.8125V18.32H17.5625V15.82ZM23.0625 15.75H20.3125V18.25H23.0625V15.75ZM28.5625 15.75H25.8125V18.25H28.5625V15.75ZM15.5 20.75H12.75V30.125C12.75 30.2908 12.8224 30.4497 12.9514 30.5669C13.0803 30.6842 13.2552 30.75 13.4375 30.75H14.8125C14.9948 30.75 15.1697 30.6842 15.2986 30.5669C15.4276 30.4497 15.5 30.2908 15.5 30.125V20.75Z" fill="#FFDB82"/>
+<defs>
+<filter id="filter0_i_1302_2629" x="1" y="1" width="40" height="40.7959" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2629"/>
+</filter>
+<filter id="filter1_i_1302_2629" x="15.6348" y="43.3506" width="10" height="7.64941" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.745098 0 0 0 0 0.627451 0 0 0 0 0.0980392 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2629"/>
+</filter>
+<filter id="filter2_i_1302_2629" x="4.90234" y="4.82471" width="32.5" height="33.147" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.831373 0 0 0 0 0.768627 0 0 0 0 0.498039 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2629"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/deviceType/boardc_fault.svg

@@ -0,0 +1,50 @@
+<svg width="42" height="52" viewBox="0 0 42 52" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="white"/>
+<g filter="url(#filter0_i_1302_2628)">
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" fill="black"/>
+</g>
+<path d="M21 40.9997C32.0457 40.9997 41 32.0455 41 20.9998C41 9.95424 32.0457 1 21 1C9.9543 1 1 9.95424 1 20.9998C1 32.0455 9.9543 40.9997 21 40.9997Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 51L26 43.5001H16L21 51Z" fill="white"/>
+<g filter="url(#filter1_i_1302_2628)">
+<path d="M20.7061 51L25.7061 43.5001H15.7061L20.7061 51Z" fill="black"/>
+</g>
+<path d="M21 51L26 43.5001H16L21 51Z" stroke="#D20000" stroke-width="0.6"/>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" fill="#D20000"/>
+<g filter="url(#filter2_i_1302_2628)">
+<path d="M21.1719 37.2497C30.1465 37.2497 37.4219 29.9744 37.4219 20.9999C37.4219 12.0253 30.1465 4.75 21.1719 4.75C12.1972 4.75 4.92188 12.0253 4.92188 20.9999C4.92188 29.9744 12.1972 37.2497 21.1719 37.2497Z" fill="black"/>
+</g>
+<path d="M21 37.2497C29.9746 37.2497 37.25 29.9744 37.25 20.9999C37.25 12.0253 29.9746 4.75 21 4.75C12.0254 4.75 4.75 12.0253 4.75 20.9999C4.75 29.9744 12.0254 37.2497 21 37.2497Z" stroke="#FF2020" stroke-width="1.2"/>
+<path d="M29.9375 13.25C30.1198 13.25 30.2947 13.3158 30.4236 13.4331C30.5526 13.5503 30.625 13.7092 30.625 13.875V20.125C30.625 20.2908 30.5526 20.4497 30.4236 20.5669C30.2947 20.6842 30.1198 20.75 29.9375 20.75H12.75V13.875C12.75 13.7092 12.8224 13.5503 12.9514 13.4331C13.0803 13.3158 13.2552 13.25 13.4375 13.25H29.9375ZM17.5625 15.82H14.8125V18.32H17.5625V15.82ZM23.0625 15.75H20.3125V18.25H23.0625V15.75ZM28.5625 15.75H25.8125V18.25H28.5625V15.75ZM15.5 20.75H12.75V30.125C12.75 30.2908 12.8224 30.4497 12.9514 30.5669C13.0803 30.6842 13.2552 30.75 13.4375 30.75H14.8125C14.9948 30.75 15.1697 30.6842 15.2986 30.5669C15.4276 30.4497 15.5 30.2908 15.5 30.125V20.75Z" fill="#FF5F5F"/>
+<defs>
+<filter id="filter0_i_1302_2628" x="1" y="1" width="40" height="39.9995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2628"/>
+</filter>
+<filter id="filter1_i_1302_2628" x="15.7061" y="43.5" width="10" height="7.5" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="2.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.823529 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2628"/>
+</filter>
+<filter id="filter2_i_1302_2628" x="4.92188" y="4.75" width="32.5" height="32.4995" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="5.4"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.12549 0 0 0 0 0.12549 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_1302_2628"/>
+</filter>
+</defs>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/180全景摄像机.svg

@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10220">
+<g id="Group 1142815265">
+<path id="Vector" d="M16.622 8.2583C9.66855 8.2583 6.19338 9.79192 6.19338 12.1621C6.19338 13.6856 6.17609 13.8273 7.25994 14.3649L7.69074 15.7225H7.85219C9.04813 13.2894 12.3315 12.5758 16.364 12.5758C20.3966 12.5758 23.9393 13.2894 25.0231 15.7234H25.039L25.4626 14.4109C26.4237 13.513 26.5361 13.6251 26.5361 12.1623C26.5361 11.0829 25.9854 8.25858 16.622 8.25858V8.2583Z" fill="#0FD4FF"/>
+<path id="Vector_2" d="M16.2015 14.0962C11.9325 14.0962 8.64941 14.3605 8.64941 18.6296C8.64941 22.8986 12.1101 26.359 16.3788 26.359C20.6476 26.359 24.1085 22.898 24.1085 18.6296C24.1085 14.3611 20.4694 14.0962 16.2015 14.0962ZM16.3788 22.7681C15.7629 22.7681 15.1607 22.5855 14.6486 22.2433C14.1364 21.9011 13.7372 21.4147 13.5014 20.8456C13.2656 20.2766 13.2039 19.6504 13.324 19.0462C13.4441 18.4421 13.7406 17.8871 14.1761 17.4515C14.6115 17.0158 15.1664 16.7191 15.7705 16.5988C16.3746 16.4785 17.0008 16.54 17.57 16.7756C18.1391 17.0112 18.6256 17.4102 18.968 17.9223C19.3104 18.4343 19.4933 19.0364 19.4935 19.6523C19.4934 20.4784 19.1652 21.2706 18.5811 21.8546C17.997 22.4387 17.2049 22.7669 16.3788 22.767V22.7681Z" fill="#0FD4FF"/>
+<path id="Vector_3" d="M15.1709 19.5959C15.1709 19.8318 15.2408 20.0623 15.3718 20.2584C15.5028 20.4545 15.689 20.6074 15.9069 20.6977C16.1248 20.7879 16.3645 20.8116 16.5959 20.7657C16.8272 20.7197 17.0397 20.6062 17.2065 20.4395C17.3733 20.2728 17.487 20.0604 17.5331 19.8291C17.5792 19.5978 17.5557 19.358 17.4655 19.1401C17.3754 18.9222 17.2227 18.7359 17.0267 18.6047C16.8307 18.4736 16.6002 18.4035 16.3643 18.4033C16.2076 18.4032 16.0525 18.434 15.9077 18.4939C15.7629 18.5537 15.6313 18.6416 15.5205 18.7523C15.4097 18.8631 15.3217 18.9946 15.2618 19.1393C15.2018 19.2841 15.1709 19.4392 15.1709 19.5959Z" fill="#0FD4FF"/>
+</g>
+</g>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/360全景摄像机.svg

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10219">
+<g id="Group 1142815256">
+<g id="Group 1142815245">
+<path id="Vector" d="M24.0755 8.43203C20.3864 6.49043 12.1023 6.55515 8.41327 8.43203C7.70135 8.82035 7.18359 9.59698 7.18359 10.4383V13.0919C7.18359 13.7391 7.50719 14.3863 8.02495 14.7098C8.08967 14.7098 8.08967 14.7746 8.15439 14.7746C8.41327 14.9687 8.60743 15.2276 8.67215 15.6159C9.12519 19.0461 12.2965 21.7643 16.2444 21.7643C20.1923 21.7643 23.4283 19.0461 23.8166 15.5512C23.8813 15.2276 24.0755 14.904 24.3343 14.7098H24.3991C24.9815 14.3215 25.3051 13.6743 25.3051 13.0271V10.4383C25.3051 9.59698 24.8521 8.82035 24.0755 8.43203ZM16.2444 20.3405C15.0147 20.3405 13.785 19.8227 13.3967 19.1755V15.4865C13.6556 14.1921 14.8852 13.2213 16.2444 13.2213C17.6035 13.2213 18.7684 14.1921 19.0273 15.4865V19.2402C18.7037 19.8874 17.474 20.3405 16.2444 20.3405ZM23.8813 12.2505C21.0984 10.5678 11.3257 10.5678 8.60743 12.2505C8.54271 11.8622 8.60743 10.7619 8.60743 10.1795C8.60743 9.9853 8.73687 9.79114 8.93103 9.6617C12.4259 7.97899 20.7748 8.10843 23.6224 9.72642C23.8166 9.85586 23.8813 9.9853 23.8813 10.2442V12.2505Z" fill="#0FD4FF"/>
+<path id="Vector_2" d="M14.8135 17.3702C14.8135 17.7821 14.9635 18.1772 15.2305 18.4685C15.4975 18.7598 15.8597 18.9234 16.2373 18.9234C16.6149 18.9234 16.9771 18.7598 17.2441 18.4685C17.5111 18.1772 17.6611 17.7821 17.6611 17.3702C17.6611 16.9582 17.5111 16.5631 17.2441 16.2718C16.9771 15.9805 16.6149 15.8169 16.2373 15.8169C15.8597 15.8169 15.4975 15.9805 15.2305 16.2718C14.9635 16.5631 14.8135 16.9582 14.8135 17.3702Z" fill="#0FD4FF"/>
+</g>
+<path id="Vector_3" d="M23.7532 20.0811C23.5571 19.9989 23.3378 19.9916 23.1368 20.0606C22.9357 20.1295 22.767 20.2699 22.6627 20.455C22.5632 20.6386 22.5384 20.8535 22.5935 21.0549C22.6485 21.2563 22.7791 21.4288 22.9582 21.5363C23.5399 21.8345 23.683 22.0699 23.6904 22.1152C23.6387 22.6517 20.8557 23.9102 15.6942 23.9102C10.6066 23.9102 7.74789 22.6369 7.69988 22.1152C7.70357 22.0727 7.83469 21.8474 8.39608 21.5529C8.49008 21.502 8.57305 21.433 8.64018 21.3498C8.70731 21.2666 8.75727 21.1709 8.78715 21.0683C8.81704 20.9656 8.82626 20.8581 8.81429 20.7519C8.80232 20.6457 8.76939 20.5429 8.7174 20.4495C8.6073 20.2598 8.42925 20.1189 8.21926 20.0555C8.00927 19.9921 7.78303 20.0108 7.58631 20.1078C6.27516 20.793 6 21.5778 6 22.1152C6 24.479 11.0248 25.5547 15.6933 25.5547C20.3645 25.5547 25.3902 24.479 25.3902 22.1152C25.3902 21.5704 25.1059 20.7736 23.7532 20.0811Z" fill="#0FD4FF"/>
+</g>
+</g>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/桥下球机.svg

@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 427319030">
+<g id="Group 1142815378">
+<path id="Vector" d="M11 18.3125H23C23 15.4688 20.7714 13.1125 17.9429 12.7062V11H12.7143V11.8125H16.2286V12.625C13.3143 13.0312 11 15.3875 11 18.3125ZM16.9143 24C19.6571 24 21.8857 21.8875 21.8857 19.2875H11.9429C11.9429 21.8875 14.1714 24 16.9143 24ZM16.9143 20.1C17.7714 20.1 18.5429 20.75 18.5429 21.6438C18.5429 22.4563 17.8571 23.1875 16.9143 23.1875C15.9714 23.1875 15.2857 22.5375 15.2857 21.6438C15.3714 20.75 16.0571 20.1 16.9143 20.1Z" fill="#0FD4FF"/>
+<path id="Vector_2" d="M26.4286 8H7.57143C6.70714 8 6 8.54 6 9.2V12.8C6 13.46 6.70714 14 7.57143 14H9.22953C10.3632 11.5548 13.4095 8.6 17 8.6C20.5905 8.6 23.6368 11.5548 24.7705 14H26.4286C27.2929 14 28 13.46 28 12.8V9.2C28 8.54 27.2929 8 26.4286 8Z" fill="#0FD4FF"/>
+</g>
+</g>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/站前悬臂式可变信息标志.svg

@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10222">
+<g id="Frame">
+<path id="Vector" d="M24.9375 8.25C25.1198 8.25 25.2947 8.31585 25.4236 8.43306C25.5526 8.55027 25.625 8.70924 25.625 8.875V15.125C25.625 15.2908 25.5526 15.4497 25.4236 15.5669C25.2947 15.6842 25.1198 15.75 24.9375 15.75H7.75V8.875C7.75 8.70924 7.82243 8.55027 7.95136 8.43306C8.0803 8.31585 8.25516 8.25 8.4375 8.25H24.9375ZM12.5625 10.82H9.8125V13.32H12.5625V10.82ZM18.0625 10.75H15.3125V13.25H18.0625V10.75ZM23.5625 10.75H20.8125V13.25H23.5625V10.75ZM10.5 15.75H7.75V25.125C7.75 25.2908 7.82243 25.4497 7.95136 25.5669C8.0803 25.6842 8.25516 25.75 8.4375 25.75H9.8125C9.99484 25.75 10.1697 25.6842 10.2986 25.5669C10.4276 25.4497 10.5 25.2908 10.5 25.125V15.75Z" fill="#0FD4FF"/>
+</g>
+</g>
+</svg>

ruoyi-ui/src/views/JiHeExpressway/images/layer/路测设备/雨棚可变信息标志.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 10221">
+<path id="Vector" d="M23.3793 6.62256L25.3486 14.7495C25.3486 15.1129 25.2378 15.4684 25.0296 15.7729C24.8215 16.0774 24.5249 16.3178 24.176 16.4648C23.8272 16.6118 23.4409 16.6591 23.0643 16.601C22.6877 16.5428 22.337 16.3818 22.0547 16.1374L21.4101 6.62256H23.3793ZM20.7865 6.62256L21.4298 16.1293C21.0671 16.4486 20.5912 16.6257 20.0973 16.625C19.6042 16.6255 19.1289 16.4492 18.7661 16.1311L18.6085 6.62256H20.7865ZM17.9521 6.62256L18.1103 16.1618C17.7522 16.4611 17.2917 16.6258 16.8152 16.625C16.4542 16.625 16.1148 16.5325 15.824 16.3699L15.8227 6.62256H17.9515H17.9521ZM15.167 6.62256V16.3781C14.8695 16.5404 14.5324 16.6255 14.1896 16.625C13.6933 16.625 13.2404 16.45 12.8945 16.1624L13.0527 6.62256H15.167ZM12.3963 6.62256L12.24 16.1299C11.8773 16.449 11.4014 16.6258 10.9075 16.625C10.4272 16.6256 9.96337 16.4583 9.6039 16.1549L10.2183 6.62256H12.3956H12.3963ZM9.59537 6.62256L8.98491 16.1061C8.70599 16.3596 8.35508 16.5295 7.97571 16.5948C7.59634 16.6601 7.20518 16.6179 6.85075 16.4735C6.49632 16.329 6.19421 16.0887 5.98187 15.7822C5.76953 15.4758 5.65631 15.1167 5.65625 14.7495L7.62482 6.62256H9.59471H9.59537ZM8.93896 16.7713L8.9383 24.1268H7.62548V17.2502C8.13092 17.2502 8.59106 17.0689 8.93896 16.7713ZM22.0665 16.7725C22.4144 17.0695 22.8752 17.2502 23.3793 17.2502V24.1268H22.0665V16.7725ZM21.4101 24.1268H24.0357V25.3771H21.4101V24.1268ZM6.96907 24.1268H9.59471V25.3771H6.96907V24.1268Z" fill="#0FD4FF"/>
+</g>
+</svg>

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

@@ -1,11 +1,11 @@
 <template>
   <div class="BMapContainer">
     <gisMap2d ref="gisMap2d"
-    :mapZoom = "mapZoom"
+    :mapZoom = "15"
     :mapCenter="mapCenter"
 
     radarSliderBottom="33%"
-      radarSliderRight="14%"
+    radarSliderRight="14%"
     :mapBoxHeight="height" @clickPointEvent="clickPointEvent" widgetBoxDisplay="none"></gisMap2d>
   </div>
 </template>
@@ -21,8 +21,8 @@ export default {
   data() {
     return {
       mapBoxHeight: '100vh',
-      mapZoom: '7.5',   // 默认值'7.5'   String类型
-         mapCenter: [116.329514, 35.505288], //默认值[118.75, 36.46] Array类型
+      mapZoom: '15',   // 默认值'7.5'   String类型
+         mapCenter: [110.329514, 35.505288], //默认值[118.75, 36.46] Array类型
 
     };
   },

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

@@ -100,7 +100,7 @@ export default {
         {
           label: '温度',
           key: `temperature`,
-          text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} °C` : '-',
+          text: deviceInfo.formatValue['temperature'] ? `${deviceInfo.formatValue['temperature']} ` : '-',
           gridColumn: 2
         },
         {
@@ -112,7 +112,7 @@ export default {
         {
           label: '湿度',
           key: `humidity`,
-          text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} %` : '-',
+          text: deviceInfo.formatValue['humidity'] ? `${deviceInfo.formatValue['humidity']} ` : '-',
           gridColumn: 2
         },
         {

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

@@ -575,7 +575,7 @@ export default {
           let pop = document.getElementsByClassName('el-popover')
           for(let i of pop){
             if(i.getAttribute('aria-hidden') === 'false'){
-              i.style['z-index'] = '2001'  
+              i.style['z-index'] = '1000'  
             }
           }
         }, 100);

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

@@ -13,8 +13,19 @@ import Vue from "vue";
 import { markerClusterIns, getContent, getLatAndLng } from "./map";
 const cameraIcon = {
   // 球机
-  "00": require("@screen/images/deviceType/ballb_active.svg"),
-  "01": require("@screen/images/deviceType/ballb_fault.svg"),
+  "b0": require("@screen/images/deviceType/ballb_active.svg"),
+  "b1": require("@screen/images/deviceType/ballb_fault.svg"),
+  "c0": require("@screen/images/deviceType/ballc_active.svg"),
+  "c1": require("@screen/images/deviceType/ballc_fault.svg"),
+  "d0": require("@screen/images/deviceType/balld_active.svg"),
+  "d1": require("@screen/images/deviceType/balld_fault.svg"),
+};
+const boardIcon = {
+  // 雨棚
+  "b0": require("@screen/images/deviceType/boardb_active.svg"),
+  "b1": require("@screen/images/deviceType/boardb_fault.svg"),
+  "c0": require("@screen/images/deviceType/boardc_active.svg"),
+  "c1": require("@screen/images/deviceType/boardc_fault.svg"),
 };
 
 export const cacheRemoveFunc = {};
@@ -29,8 +40,17 @@ export const DeviceForMap = {
          * 0 球机 可控
          * 1 枪机 不可控
          */
-        const type = JSON.parse(item.otherConfig || "{}")?.ptzCtrl || 1;
-
+        let type = 1;
+        const ctype = item.childType;
+        if(ctype && ctype === '1-2'){
+          type = 'b'
+        } else if(ctype && ctype === '1-4'){
+          type = 'c'
+        } else if(ctype && ctype === '1-5'){
+          type = 'd'
+        } else if(ctype && ctype === '1-3'){
+          type = 'e'
+        }
         return cameraIcon[`${type}${+!bool}`];
       },
     },
@@ -42,6 +62,19 @@ export const DeviceForMap = {
   情报板: {
     deviceType: "2",
     dialog: "InfoBoard",
+    options: {
+      iconCallback(bool, item) {
+        let type = 1;
+        const ctype = item.childType;
+        // const ctype = JSON.parse(item.otherConfig || "{}")?.childType;
+        if(ctype && ctype === '2-3'){
+          type = 'b'
+        } else if(ctype && (ctype === '2-4'||ctype === '2-2')){
+          type = 'c'
+        } 
+        return boardIcon[`${type}${+!bool}`];
+      },
+    },
   },
   语音广播: {
     deviceType: "5",

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/AddNEditDialog.vue

@@ -2,7 +2,6 @@
   <Dialog
     v-model="modelVisible"
     top="10%"
-    style="z-index: 2049;"
     :title="propData.id ? '管理' : '新增'"
     width="1000px"
   >
@@ -243,6 +242,7 @@ export default {
       });
     },
     onAddTaskGroup() {
+      this.editingTime = '0:0';
       this.isShowTimeEdit = true;
     },
     onModifyTime(taskG) {
@@ -282,23 +282,21 @@ export default {
     },
     onSubmitTime(time) {
       this.isShowTimeEdit = false;
+      let aryTime = time.split(':')
+      if(aryTime.length >= 2){
+        if(aryTime[0].length === 1){
+          aryTime[0] = '0'+aryTime[0]
+        }
+        if(aryTime[1].length === 1){
+          aryTime[1] = '0'+aryTime[1]
+        }
+      }
+      let _time = aryTime.join(':');
       if (Object.keys(this.selectedTaskGroup).length > 0) {
-        let aryTime = time.split(':')
-          if(aryTime.length === 3){
-            if(aryTime[0].length === 1){
-              aryTime[0] = '0'+aryTime[0]
-            }
-            if(aryTime[1].length === 1){
-              aryTime[1] = '0'+aryTime[1]
-            }
-            if(aryTime[2].length === 1){
-              aryTime[2] = '0'+aryTime[1]
-            }
-          }
-        this.selectedTaskGroup.time = aryTime.join(':');
+        this.selectedTaskGroup.time = _time;
         this.selectedTaskGroup = {};
       } else {
-        this.taskGroupsEditing.push({ time, tasks: [] });
+        this.taskGroupsEditing.push({ time: _time, tasks: [] });
       }
 
       let detailedConfiguration = [];
@@ -360,13 +358,14 @@ export default {
             if (result.code != 200) return;
             this.taskGroupsEditing.forEach((item) => {
               let aryTime = item.time.split(':')
-              if(aryTime.length === 3){
+              
+              if(aryTime.length >= 2){
+                if(aryTime[0].length === 1){
+                  aryTime[0] = '0'+aryTime[0]
+                }
                 if(aryTime[1].length === 1){
                   aryTime[1] = '0'+aryTime[1]
                 }
-                if(aryTime[2].length === 1){
-                  aryTime[2] = '0'+aryTime[1]
-                }
               }
               item.time = aryTime.join(':')
               let arr = _.filter(result.data, (itm) => {
@@ -374,7 +373,6 @@ export default {
               });
               this.$set(item, "tasksEdit", arr);
               // item.tasksEdit = arr;
-              console.log(this.taskGroupsEditing,333344)
             });
           });
       }

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/taskEditDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="modelVisible" :title="(this.mode==='edit')?'修改':'新增'" width="600px" label-width="120px" style="z-index: 2050;">
+  <Dialog v-model="modelVisible" :title="(this.mode==='edit')?'修改':'新增'" width="600px" label-width="120px" >
     <el-form>
       <el-form-item label="设备类型">
         <!-- <el-radio-group v-model="searchData.deviceType" @input="onChange">

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/components/timeEditDialog.vue

@@ -1,8 +1,8 @@
 <template>
-  <Dialog v-model="modelVisible" title="触发时间设置" width="400px" label-width="120px"  style="z-index: 2050;">
+  <Dialog v-model="modelVisible" title="触发时间设置" width="400px" label-width="120px"  >
     <el-form>
       <el-form-item label="时(支持cron表达式)">
-        <el-input-number :min="0" :max="24" v-model="editData.hour"></el-input-number>
+        <el-input-number :min="0" :max="23" v-model="editData.hour"></el-input-number>
       </el-form-item>
       <el-form-item label="分(支持cron表达式)">
         <el-input-number  :min="0" :max="59"  v-model="editData.minute"></el-input-number>
@@ -64,6 +64,14 @@ export default {
   },
   methods: {
     onSubmit(){
+      if(this.editData.hour === undefined || this.editData.hour === null  || this.editData.hour === ''){
+        this.$message.warning('请输入时')
+        return;
+      }
+      if(this.editData.minute=== undefined || this.editData.minute === null   ||  this.editData.minute === ''){
+        this.$message.warning('请输入分')
+        return;
+      }
       let time = [this.editData.hour, this.editData.minute, "00"].join(":");
       this.$emit("onSubmit", time)
     },

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/componentsAdd/AddDialog.vue

@@ -297,7 +297,6 @@ export default {
       }
       let _time = aryTime.join(':');
       if (Object.keys(this.selectedTaskGroup).length > 0) {
-        
         this.selectedTaskGroup.time = _time;
         this.selectedTaskGroup = {};
       } else {

ruoyi-ui/src/views/JiHeExpressway/pages/control/device/strategy/componentsAdd/timeEditDialog.vue

@@ -2,7 +2,7 @@
   <Dialog v-model="modelVisible" title="触发时间设置" width="400px" label-width="120px">
     <el-form>
       <el-form-item label="时(支持cron表达式)">
-        <el-input-number :min="0" :max="24" v-model="editData.hour"></el-input-number>
+        <el-input-number :min="0" :max="23" v-model="editData.hour"></el-input-number>
       </el-form-item>
       <el-form-item label="分(支持cron表达式)">
         <el-input-number  :min="0" :max="59"  v-model="editData.minute"></el-input-number>
@@ -64,6 +64,14 @@ export default {
   },
   methods: {
     onSubmit(){
+      if(this.editData.hour === ''){
+        this.$message.warning('请输入时')
+        return;
+      }
+      if(this.editData.minute === ''){
+        this.$message.warning('请输入分')
+        return;
+      }
       let time = [this.editData.hour, this.editData.minute, "00"].join(":");
       this.$emit("onSubmit", time)
     },

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

@@ -198,16 +198,33 @@ export default {
             const icon_f = require(`@screen/images/layerb/路测设备/摄像机_fault.svg`);
             const iconb = require(`@screen/images/deviceType/ballb_active.svg`);
             const iconb_f = require(`@screen/images/deviceType/ballb_fault.svg`);
+            const iconc = require(`@screen/images/deviceType/ballc_active.svg`);
+            const iconc_f = require(`@screen/images/deviceType/ballc_fault.svg`);
+            const icond = require(`@screen/images/deviceType/balld_active.svg`);
+            const icond_f = require(`@screen/images/deviceType/balld_fault.svg`);
+            const icone = require(`@screen/images/deviceType/balle_active.svg`);
+            const icone_f = require(`@screen/images/deviceType/balle_fault.svg`);
             const points = [];
             list.forEach((e) => {
                 if(e.otherConfig){
                   e.parseOtherConfig = JSON.parse(e.otherConfig)
                 }
+
+                let iconUrl = (e.useState ? icon : icon_f);
+                if(e.childType==='1-2'){
+                  iconUrl = (e.useState ? iconb : iconb_f);
+                } else if(e.childType==='1-3'){
+                  iconUrl = (e.useState ? icone : icone_f);
+                } else if(e.childType==='1-4'){
+                  iconUrl = (e.useState ? iconc : iconc_f);
+                } else if(e.childType==='1-5'){
+                  iconUrl = (e.useState ? icond : icond_f);
+                }
                 points.push({
                   type: 'event',
                   longitude: parseFloat(e.longitude),
                   latitude: parseFloat(e.latitude), 
-                  iconUrl: e.childType==='1-1'?(e.useState ? icon : icon_f):(e.useState ? iconb : iconb_f),
+                  iconUrl: iconUrl,
                   otherInfo: {
                     ext: null,
                     name: e.deviceName,
@@ -294,13 +311,25 @@ export default {
             const map2d = this.$refs.MapContainerRef.getMapInstance();
             const icon = require(`@screen/images/layerb/路测设备/情报板_active.svg`);
             const icon_f = require(`@screen/images/layerb/路测设备/情报板_fault.svg`);
+            const iconb = require(`@screen/images/deviceType/boardb_active.svg`);
+            const iconb_f = require(`@screen/images/deviceType/boardb_fault.svg`);
+            const iconc = require(`@screen/images/deviceType/boardc_active.svg`);
+            const iconc_f = require(`@screen/images/deviceType/boardc_fault.svg`);
             const points = [];
             result.data.forEach((e) => {
+                let iconUrl = (e.useState ? icon : icon_f);
+                if(e.childType==='2-3'){
+                  iconUrl = (e.useState ? iconb : iconb_f);
+                } else if(e.childType==='2-2' || e.childType==='2-4'){
+                  iconUrl = (e.useState ? iconc : iconc_f);
+                } 
+
                 points.push({
                   type: 'event',
                   longitude: parseFloat(e.longitude),
                   latitude: parseFloat(e.latitude), 
-                  iconUrl: e.useState ? icon : icon_f,
+                  // iconUrl: e.useState ? icon : icon_f,
+                  iconUrl: iconUrl,
                   otherInfo: {
                     ext: null,
                     name: e.deviceName,

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

@@ -173,6 +173,9 @@ export default {
       }).then(async (res) => {
         this.statsDialogAction = res.data.existence;
         if(res.data.existence === 0){
+          if(this.detailData.eventState === 2){
+            return;
+          }
           const result = await request({
             url: "/business/warning/intelligentSource",
             method: "post",

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js

@@ -164,7 +164,7 @@ export const gjSearchFormList = [
           label: "济南方向",
         },
         {
-          key: "2",
+          key: "",
           label: "双向",
         },
       ],
@@ -335,7 +335,7 @@ export const gzSearchFormList = [
           label: "济南方向",
         },
         {
-          key: "2",
+          key: "",
           label: "双向",
         },
       ],

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

@@ -111,7 +111,7 @@ export default {
       activeName: "-1",
       panels: [
         {
-          label: "告警事件",
+          label: "感知事件",
           key: "-1"
         },
         {

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

@@ -12,7 +12,7 @@
           />
         </div>
 
-        <div style="padding-bottom: 100px;">
+        <div style="padding-bottom: 50px;overflow-y: auto;">
           <div v-for="(item, index) in tableData" :key="item.id" class="rowBlock">
             <div style="flex:1">
               <ScopeTable :tableInfo="item"  @onchange="onChange" :index="index"></ScopeTable>
@@ -419,7 +419,7 @@ export default {
 .EventAddPlanDialog {
   gap: 9px;
   width: 100%;
-  height: 310px;
+  height: 400px;
   display: flex;
   flex-direction: column;
 

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

@@ -72,7 +72,7 @@
       <div class="right-bottom" >
         <div id="chartList" class="chartList"></div>
         <div class="right-table">
-          <Table :data="tableData" style="width: 75vw">
+          <Table :data="tableData" style="width: 99%">
             <ElTableColumn label="名称" prop="name" width="240"  align="center" />
             <ElTableColumn label="采集时间" prop="timestamp" width="100"   align="center"  />
             <ElTableColumn v-for="(item,index) of tableCols" :label="item.label" :prop="item.value" align="center" />

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

@@ -23,9 +23,17 @@
                   src="@screen/images/layer/路测设备/毫米波雷达.svg"
                   v-if="item.title.includes('雷达')"
                 />
+                <img
+                  src="@screen/images/layer/路测设备/雨棚可变信息标志.svg"
+                  v-if="item.title.includes('雨棚可变信息标志')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/站前悬臂式可变信息标志.svg"
+                  v-if="item.title.includes('站前可变信息标志')"
+                />
                 <img
                   src="@screen/images/layer/路测设备/情报板.svg"
-                  v-if="item.title.includes('可变信息标志')"
+                  v-if="item.title.includes('门架式可变信息标志')"
                 />
                 <img
                   src="@screen/images/layer/路测设备/摄像机.svg"
@@ -36,8 +44,11 @@
                   v-if="item.title.includes('设备箱')"
                 />
                 <img
+                  src="@screen/images/layer/路测设备/桥下球机.svg"
+                  v-if="item.title.includes('桥下高清')"
+                /><img
                   src="@screen/images/deviceType/ball.svg"
-                  v-if="item.title.includes('球形摄像机')"
+                  v-else-if="item.title.includes('网络球形摄像机')"
                 />
                 <img
                   src="@screen/images/layer/路测设备/合流区.svg"
@@ -52,8 +63,12 @@
                   v-if="item.title.includes('碰撞')"
                 />
                 <img
-                  src="@screen/images/deviceType/ball.svg"
-                  v-if="item.title.includes('全景摄像机')"
+                  src="@screen/images/layer/路测设备/360全景摄像机.svg"
+                  v-if="item.title.includes('360°全景摄像机')"
+                />
+                <img
+                  src="@screen/images/layer/路测设备/180全景摄像机.svg"
+                  v-if="item.title.includes('180°全景摄像机')"
                 />
                 <img
                   src="@screen/images/layer/路测设备/交调.svg"

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

@@ -8,9 +8,6 @@
       <div class="right-div">
         <InputSearch 
         ref="searchComp"
-        params="deviceName"
-        placeholder="请输入设备名称，回车搜索"
-        type="input"
         :formList="searchFormList" @handleSearch="handleSearch"  />
       </div>
     </div>
@@ -290,11 +287,13 @@ export default {
     },
 
     onRefreshData() {
+      
+      this.$refs.searchComp.handleResetForm();
+
       this.searchData.pageNum = 1;
       this.tableData = [];
-      this.$refs.searchComp.handleResetForm();
-      // this.initQueryChart();
-      // this.initQueryTable();
+      this.initQueryChart();
+      this.initQueryTable();
     },
     handleSearch(data) {
       this.startTime = moment(data.time[0]).format("YYYY-MM-DD") + ' 00:00:00';

ruoyi-ui/src/views/JiHeExpressway/pages/safe/files/index.vue

@@ -17,8 +17,13 @@
       </ButtonGradient>
       </div>
       
-      <InputSearch ref="searchComp" style="width: 480px" :formList="searchFormList"
-        :formConfigOptions="{ dFormData: { eventState: '0' } }" @handleSearch="handleSearch" />
+      <InputSearch ref="searchComp" 
+        style="width: 480px" 
+        :disable="true"
+        params="fileName" 
+        type="input"
+        placeholder="请输入文件名称，回车搜索"
+         @handleSearch="handleSearch" />
 
     </div>
     <!-- 内容 -->

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

@@ -461,7 +461,7 @@ export default {
       }
     },
     ____refreshPageData() {
-      this.$refs["tplList"].____refreshData();
+      this.$refs["tpl_list"].____refreshData();
       // if (para.type == "template") {
 
       //   this.____getAllTemplate().then((res) => {

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

@@ -205,10 +205,7 @@ export default {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
       };
-      // params = {
-      //   pageSize: 1000000,
-      //   pageNum: 1
-      // };
+      
       return params;
     },
     async handleDelete(data) {
@@ -244,15 +241,9 @@ export default {
       this.getData();
     },
     onReset(){
-      if (this.searchData){
-        this.searchData.word = undefined;
-      }
-      // console.log(this.$refs["form"] , "__-=========");
       this.$refs["form"].handleResetForm();
-      // this.getData();
     },
     async getData() {
-      // const closeLoading = setLoading();
       this.isLoading = true;
 
       await delay(100);

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

@@ -975,7 +975,7 @@ export const deviceTypeOptions = [
   },
   {
     value: 12,
-    label: "行车诱导",
+    label: "智能行车诱导",
     timingControl: true,
   },
   {

ruoyi-ui/vue.config.js

@@ -37,12 +37,13 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://127.0.0.1:8087`,
+        target:`http://10.0.111.11:8097`,
         // target: `http://10.168.66.196: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.79.46:8089`, //王家宝
-        target: `http://10.168.77.128:8087`, //王兴琳
+        // target: `http://10.168.77.128:8087`, //王兴琳
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",