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

7 months ago · 5eb03e4dbb
14 changed files with 467 additions and 169 deletions
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue
@ -1,23 +1,41 @@
 <template>
  <Teleport>
    <Transition name="fade">
-      <div :class="['mask-layer', { 'none-mask': noneMask }]" v-if="modelVisible">
+      <div
-        <BackgroundClip class="dialog"
+        :class="['mask-layer', { 'none-mask': noneMask }]"
        v-if="modelVisible"
      >
        <BackgroundClip
          class="dialog"
          clipPath="polygon(calc(100% - var(--clip-width)) 0, 100% var(--clip-width), 100% 100%, var(--clip-width) 100%, 0 calc(100% - var(--clip-width)), 0 0)"
          borderColor="linear-gradient(180deg, rgba(78, 174, 204, .9), rgba(78, 174, 204, 0))"
          bgColor="linear-gradient(180deg, rgba(14, 69, 92, 0.9) 0%, rgba(20, 89, 119, 0.9) 100%)"
-          ref="DialogContentRef" :width="width" :top="top" :right="right">
+          ref="DialogContentRef"
          :width="width"
          :top="top"
          :right="right"
        >
          <div class="dialog-title">
-            <img class="title-icon" src="@screen/images/dialog/title-icon.svg" />
+            <img
              class="title-icon"
              src="@screen/images/dialog/title-icon.svg"
            />
            <span>{{ title }}</span>
-            <img class="icon-close" @click.stop="close()" src="@screen/images/dialog/icon-close.svg" />
+            <img
              class="icon-close"
              @click.stop="close()"
              src="@screen/images/dialog/icon-close.svg"
            />
          </div>
          <div class="dialog-content">
            <slot />
          </div>
-          <img class="bottom-right" src="@screen/images/dialog/right-bottom.svg" />
+          <img
            class="bottom-right"
            src="@screen/images/dialog/right-bottom.svg"
          />
          <div class="footer" v-if="$slots.footer">
            <slot name="footer"></slot>
@ -86,9 +104,9 @@ export default {
    },
  },
  methods: {
-    close(){
+    close() {
-      console.log('------')
+      console.log("------");
-      this.modelVisible = false
+      this.modelVisible = false;
    },
    updateDialogVisible(bool) {
      this.modelVisible = bool;
@ -195,7 +213,7 @@ export default {
  .dialog-content {
    padding: 9px 21px 27px 21px;
-    max-height: 75vh;
+    max-height: 95vh;
    overflow-y: auto;
  }
@ -215,7 +233,7 @@ export default {
    padding: 0 27px;
    ::v-deep {
-      >div {
+      > div {
        min-width: 96px;
      }
    }
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点.svg
+++ b/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">
+<svg width="17" height="24" viewBox="0 0 17 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
+<g id="Group 1321314628">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
+<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"/>
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
+<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"/>
-<g id="1">
+<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 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>
 </g>
 </svg>
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_active.svg
+++ b/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">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
+<g id="Group 1321314632">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
+<g id="Frame 427319037">
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
+<g id="Group 1321314628">
-<g id="1">
+<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"/>
-<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
+<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="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="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"/>
 <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>
 </g>
 </g>
 </g>
--- a/ruoyi-ui/src/views/JiHeExpressway/images/layer/路网设施/清障驻点_fault.svg
+++ b/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">
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
+<g id="Group 1321314633">
-<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
+<g id="Frame 427319037">
-<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
+<g id="Group 1321314628">
-<g id="1">
+<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"/>
-<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
+<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="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="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"/>
 <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>
 </g>
 </g>
 </g>
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/RoadNetworkFacilities/index.vue
+++ b/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: 260px;
    }
  }
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/SolarEnergy/components/DeviceParams.vue
@ -55,8 +55,11 @@ export default {
    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 => {
+    Promise.all([this.getAc()]).then(async (res) => {
      console.log('res', res)
      if (res[0].code == 500) {
        await this.getAc();
      }
      request({
        url: `/business/device/properties/latest/${this.dialogData.iotDeviceId}`,
        method: "get",
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/device/topology/index.vue
@ -443,7 +443,7 @@ export default {
  position: absolute;
  display: flex;
  justify-content: space-around;
-  height: 310px;
+  height: 307px;
  padding: 0 20px;
  overflow-y: hidden;
  overflow-x: auto;
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/DialogVisible/index.vue
@ -37,7 +37,7 @@
        </div>
      </el-tab-pane>
      <el-tab-pane label="初报" name="second">
-        <div class="file" ref="file">
+        <div class="file" ref="file" id="export-box">
          <div class="file-box">
            <el-form>
              <div class="file-title">重要事件</div>
@ -103,6 +103,234 @@
      </el-tab-pane>
      <el-tab-pane label="续报" name="third"> </el-tab-pane>
      <el-tab-pane label="终报" name="fourth"> </el-tab-pane>
      <Dialog style="" v-model="showDocx" width="1085px" top="60px">
        <div class="docx-wrapper">
          <section
            ref="initFile"
            class="docx"
            style="
              padding: 72pt 90.15pt;
              width: 595.3pt;
              min-height: 741.9pt;
              column-count: 1;
              column-gap: 36pt;
            "
          >
            <article>
              <p
                style="
                  line-height: 1;
                  text-align: center;
                  vertical-align: baseline;
                  margin-bottom: 10px;
                "
              >
                <span
                  lang="en-US"
                  style="
                    font-family: 方正小标宋简体;
                    color: rgb(255, 0, 0);
                    min-height: 44pt;
                    font-size: 44pt;
                    font-weight: bold;
                  "
                  >重要事件</span
                >
              </p>
              <p
                style="
                  margin-bottom: 2pt;
                  min-height: 15pt;
                  line-height: 15pt;
                  text-align: center;
                  vertical-align: baseline;
                "
              >
                <span
                  lang="null"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    min-height: 10.5pt;
                    font-size: 10.5pt;
                  "
                  >报送单位：</span
                ><span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    min-height: 10.5pt;
                    font-size: 10.5pt;
                  "
                  >山东高速青岛发展有限公司运营管理事业部 </span
                ><span
                  lang="null"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    min-height: 10.5pt;
                    font-size: 10.5pt;
                  "
                  >报送时间：</span
                ><span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    min-height: 10.5pt;
                    font-size: 10.5pt;
                  "
                  >2024年05月09日15时40分</span
                >
              </p>
              <p
                style="
                  margin-bottom: 1pt;
                  min-height: 10pt;
                  line-height: 10pt;
                  text-align: center;
                  vertical-align: baseline;
                "
              >
                <span
                  style="
                    font-family: 'Times New Roman';
                    font-weight: bold;
                    color: rgb(255, 0, 0);
                    min-height: 22pt;
                    font-size: 22pt;
                  "
                  >——————————————————</span
                >
              </p>
              <p
                style="
                  margin-bottom: 6pt;
                  min-height: 25pt;
                  line-height: 25pt;
                  text-align: center;
                  vertical-align: baseline;
                "
              >
                <span
                  lang="en-US"
                  style="
                    font-family: 方正小标宋简体;
                    min-height: 22pt;
                    font-size: 22pt;
                    font-weight: bold;
                  "
                  >关于G15沈海高速K502+222交通事故的初报</span
                >
              </p>
              <p
                style="
                  text-indent: 0pt;
                  text-align: left;
                  vertical-align: baseline;
                "
              >
                <span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    color: black;
                    min-height: 16pt;
                    font-size: 16pt;
                  "
                  >智慧管理中心：</span
                >
              </p>
              <p
                style="
                  line-height: 1.5;
                  text-indent: 0pt;
                  vertical-align: baseline;
                "
              >
                <span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    color: black;
                    min-height: 16pt;
                    font-size: 16pt;
                  "
                >
                  2024年05月09日11时02分，G15沈海高速K502+222沈阳方向发生侧翻事故，行1车道、行2车道、应急车道正常通行，无压车。</span
                ><span><br /></span
                ><span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    color: black;
                    min-height: 16pt;
                    font-size: 16pt;
                  "
                >
                  未到达现场的情况：路管、交警、消防、医疗等单位正在赶往现场，具体情况稍后报告。</span
                >
              </p>
              <p style="vertical-align: baseline"><span id="_GoBack"></span></p>
              <p style="vertical-align: baseline"></p>
              <p style="vertical-align: baseline"></p>
              <p style="vertical-align: baseline"></p>
              <p
                style="
                  line-height: 1;
                  text-indent: 0pt;
                  vertical-align: baseline;
                "
              ></p>
              <p style="vertical-align: baseline"></p>
              <p
                style="
                  margin-bottom: 1pt;
                  min-height: 10pt;
                  line-height: 10pt;
                  text-align: center;
                  vertical-align: baseline;
                "
              >
                <span
                  style="
                    font-family: 'Times New Roman';
                    font-weight: bold;
                    color: rgb(255, 0, 0);
                    min-height: 22pt;
                    font-size: 22pt;
                  "
                  >——————————————————</span
                >
              </p>
              <p
                class="docx-num-0-0"
                style="
                  margin-top: 0pt;
                  text-align: center;
                  vertical-align: baseline;
                "
              >
                <span
                  lang="en-US"
                  style="
                    font-family: 仿宋_GB2312;
                    font-weight: normal;
                    min-height: 14pt;
                    font-size: 14pt;
                  "
                  >填报人:智慧高速菜单 联系电话:18678866677 签发人：郭璐明</span
                >
              </p>
            </article>
          </section>
          <button @click="handleDownload">下载</button>
        </div>
      </Dialog>
    </el-tabs>
  </Dialog>
 </template>
@ -144,6 +372,7 @@ export default {
  data() {
    return {
      // formList,
      showDocx: false,
      fData: {},
      formConfigList: [],
      reportList,
@ -345,16 +574,19 @@ export default {
      });
    },
    handlePreview() {
-      const fileContent = this.$refs.file.innerHTML;
+      this.showDocx = true;
-      console.log(77777);
+    },
-      console.log(fileContent);
+    handleDownload() {
-      // 将HTML转换为DOCX
+      console.log("下载");
      // 获取HTML内容
      const fileContent = this.$refs.initFile.innerHTML;
      // // 将HTML转换为DOCX
      const doc = htmlDocx.asBlob(fileContent);
-
+      // // 下载生成的文档
-      // 下载生成的文档
+      FileSaver.saveAs(doc, "初报.docx");
      FileSaver.saveAs(doc, "document.docx");
    },
  },
  mounted() {
    this.initData();
    this.getReportData();
@ -513,9 +745,50 @@ export default {
 }
 .footer {
  display: flex;
  width: 35%;
  margin: auto;
  margin-top: 30px;
  justify-content: space-around;
  // display: flex;
  // flex-flow: row-reverse;
  div {
    margin-left: 20px;
  }
 }
 ::v-deep .el-tabs__content {
  overflow: auto;
  position: relative;
 }
 .docx-wrapper {
  background: #fff;
  padding: 30px;
  display: flex;
  flex-flow: column;
  align-items: center;
  > section.docx {
    background: white;
    box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
    margin-bottom: 30px;
  }
  .docx p,
  p.docx_1 span {
    font-family: var(--docx-minorHAnsi-font);
    color: #00000a;
    min-height: 11pt;
    font-size: 11pt;
  }
  button {
    cursor: pointer;
    width: 100px;
    height: 35px;
    line-height: 35px;
    color: #fff;
    background: #00b3cc;
    border-radius: 48px;
    display: flex;
    justify-content: center;
    align-items: center;
    border: none;
  }
 }
 </style>
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/commandDispatch/Cards/DisposalProcess/index.vue
@ -212,7 +212,7 @@ export default {
            time: item.operationTime
              ? new Date(item.operationTime).toLocaleString()
              : null,
-            name: item.operator,
+            name: item.operatorName,
            desc: item.context,
            source: item.source,
            // posts: '淄博发展公司管理员'
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Eventfiltering/index.vue
@ -158,17 +158,17 @@ export default {
        gr.addColorStop(1, "rgba(92,197,255,0)");
        gr.addColorStop(0, "rgba(92,197,255,0.5)");
        context.lineWidth = 1; // 设置线段宽度
-        drawRoundRect(context, 410, 134, 380, 24, 12, gr);
+        drawRoundRect(context, 410, 128, 380, 24, 12, gr);
-        drawRoundRect(context, 410, 168, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 162, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 202, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 196, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 236, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 230, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 270, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 264, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 304, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 298, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 338, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 332, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 372, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 366, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 406, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 400, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 440, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 434, 320, 24, 10, gr);
-        drawRoundRect(context, 410, 474, 320, 24, 10, gr);
+        drawRoundRect(context, 410, 468, 320, 24, 10, gr);
        console.log("this.formData", this.formData);
        await this.getNonAutomaticWarningType(this.formData);
        // drawRoundRect(context, 410, 508, 320, 24, 10, gr);
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/statistic/components/Sitefiltering/index.vue
@ -181,16 +181,16 @@ export default {
          gr.addColorStop(1, "rgba(92,197,255,0)");
          gr.addColorStop(0, "rgba(92,197,255,0.5)");
          context.lineWidth = 1; // 设置线段宽度
-          drawRoundRect(context, 385, 134, 320, 24, 12, gr);
+          drawRoundRect(context, 385, 128, 320, 24, 12, gr);
-          drawRoundRect(context, 385, 168, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 162, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 202, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 196, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 236, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 230, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 270, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 264, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 304, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 298, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 338, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 332, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 372, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 366, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 406, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 400, 320, 24, 10, gr);
-          drawRoundRect(context, 385, 440, 320, 24, 10, gr);
+          drawRoundRect(context, 385, 434, 320, 24, 10, gr);
          // drawRoundRect(context, 385, 474, 320, 24, 10, gr);
          // drawRoundRect(context, 385, 510, 320, 24, 10, gr);
          await this.getNonAutomaticWarningFacility(this.formData);
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/meteorologyCheck/components/weatherWarning/components/infoWarning/index.vue
@ -123,21 +123,21 @@ export default {
          val === "Blue" &&
          ["White", "Blue", "Green"].includes(item.severityColor)
        ) {
-          item.severityColorText = "蓝色";
+          // item.severityColorText = "蓝色";
          this.warningList.push(item);
        } else if (
          val === "Red" &&
          ["Red", "Black"].includes(item.severityColor)
        ) {
-          item.severityColorText = "红色";
+          // item.severityColorText = "红色";
          this.warningList.push(item);
        } else if (val === "Yellow" && item.severityColor === "Yellow") {
-          item.severityColorText = "黄色";
+          // item.severityColorText = "黄色";
          this.warningList.push(item);
        } else if (val === "Orange" && item.severityColor === "Orange") {
-          item.severityColorText = "橙色";
+          // item.severityColorText = "橙色";
          this.warningList.push(item);
-        } else if (!["Blue", "Red", "Yellow", "Orange"].includes(val)) {
+        } else if (val === "all") {
          // 确保只有当val不是预定义颜色时才推送
          this.warningList.push(item);
        }
@ -157,6 +157,18 @@ export default {
          }
        }
        this.warningData = data;
        this.warningData.forEach((item) => {
          if (["White", "Blue", "Green"].includes(item.severityColor)) {
            item.severityColorText = "蓝色";
          } else if (["Red", "Black"].includes(item.severityColor)) {
            item.severityColorText = "红色";
          } else if (item.severityColor === "Yellow") {
            item.severityColorText = "黄色";
          } else if (item.severityColor === "Orange") {
            item.severityColorText = "橙色";
          }
        });
        this.warningList = this.warningData;
      });
    },
@ -207,6 +219,7 @@ export default {
      flex-direction: column;
      width: 100%;
      height: calc(100% - 40px);
      overflow-y: auto;
      > div::after {
        content: "";
@ -317,6 +330,7 @@ export default {
          .right-text {
            color: #fff;
            overflow-y: auto;
          }
        }
      }
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/changesIndicators/assets/charts3.js
@ -180,32 +180,32 @@ let options = {
      },
      data: data2,
    },
-    {
+    // {
-      name: null,
+    //   name: null,
-      type: "scatter",
+    //   type: "scatter",
-      emphasis: {
+    //   emphasis: {
-        scale: false,
+    //     scale: false,
-      },
+    //   },
-      symbol:
+    //   symbol:
-        "image://data:image/png;base64,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",
+    //     "image://data:image/png;base64,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",
-      symbolSize: [20, 20],
+    //   symbolSize: [20, 20],
-      symbolOffset: ["-115%", 0],
+    //   symbolOffset: ["-115%", 0],
-      itemStyle: {
+    //   itemStyle: {
-        color: "#E2BA74",
+    //     color: "#E2BA74",
-        shadowColor: "#E2BA74",
+    //     shadowColor: "#E2BA74",
-        shadowBlur: 5,
+    //     shadowBlur: 5,
-        borderWidth: 1,
+    //     borderWidth: 1,
-        opacity: 1,
+    //     opacity: 1,
-      },
+    //   },
-      z: 1,
+    //   z: 1,
-      zlevel: 10,
+    //   zlevel: 10,
-      left: "-100%",
+    //   left: "-100%",
-      data: data2,
+    //   data: data2,
-      animationDelay: 100,
+    //   animationDelay: 100,
-      tooltip: {
+    //   tooltip: {
-        show: false,
+    //     show: false,
-      },
+    //   },
-    },
+    // },
    // 下半截柱状图linear-gradient(180deg, #61D8FF 0%, #003B4E 100%); linear-gradient(180deg, #06D7B1 0%, #003B4E 100%)
    {
      name: "交通特征",
@ -267,32 +267,32 @@ let options = {
      data: data1,
    },
    // 进度条的小圆圈
-    {
+    // {
-      name: "",
+    //   name: "",
-      type: "scatter",
+    //   type: "scatter",
-      emphasis: {
+    //   emphasis: {
-        scale: false,
+    //     scale: false,
-      },
+    //   },
-      symbol:
+    //   symbol:
-        "image://data:image/png;base64,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",
+    //     "image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAACCpJREFUSEuFl+uPXVUZxn/rus9lru200zt2SrEJjQSlDWAipv2AGtQYouGDJhpDofgnmNhTv/pFjAItaGL8QtRojCbEaJXEBKUU4YNtKNCW0tqm6XRmembOZe91M2vP9AKWspJ9zsneZ69nvc9a7/M+r+BjRkpJ3HcYfRHGo2BaSFaX0DJgiAgnqbSkKyLdpmL2vW9zKQEizytE/nnLUT//4EiCBEnA3R3MwnpmnGZrCpj8PwWE/HFthGs3l28k6JM4r5ucu/Qt+jcji5sW8n/AnU6SnQOw5hlmMGyXAusDSMEVZZgLA+baLYbvnaWfgTasRzvPWDKMkdiYJGMikWJkkAQn557gnOgg6JBSyiQss1ADZzqFyN9wEMTTz7JTSrZiQQbmUuTdEcu8n0fE9vI7Nw/ZI7EJdI/Ugwk822NktRBElTiz/yLHOwdI+c1r4CuTLNPbOYj42SbuiYktIhGs4h0rOVtVSOeRl5cQq5ori+0jmARR5jdhboIwnVk/TbJ3EKvIHZXnziTRInJu9iJvpgP1DtZ7fyPig4jJ9dxtJTNJMhAVbyrJUmgi3AIqBmRMyGQRowaxCLTL5UX0JFFOEicrUneRaCYIZpa4MMFIK3FviDR15PT+fRzv1CHWVCfR6SB+PMVmbbmHQBwWvDrm6FUaFTwy9FAtjYoRWShU0ojBCtfCk5pA2SDIAVG3CL1A0J5gNDEa2t6xG4GSieNPXeRMpyNiDTz9I1p+nAcQtIXjrcYU75eXUe0W2vVQzqOjQkWJKgpkf4BsKMQQaGTQSGgZkoyEqsSbSXxvjmA24ovzhDjOljKyQwbcFsFfju3DC1ISU7/gruTYIRVzxSLHygLlNco7dENggkVHgRoBM4zI5FBJIawF54j5EMlEqIE1XoMzFt8f4m0T3zxN6G1kV0pMWsPbF74j3hL5RK97nr0+0haCoxauZoqrq5iGxCwW6DGNjRqtEiYJlHaoSiJwdQ4n4Yle4qXEK4HLwAs9nBrBWYGznlC1GE9DdktBuSVwREwdSusR7EqCpVHNKwOFKq9gQgttI0UwaOOxQWIVmAO72P3QJva1DXdJweii4/W35/njk3/nDwqcB6cNlRvijKMajuJMHz++FXf1v+yuo068IiZfSDtVZAbPycaQ94fjaNdAF32sr7BaY2WiyMAvPsxT2yZ4/FYaeGqB5x/7M8+oSBU0VZCUaoArCyp7BTeyFtd1bDOwDclpsfZwejBE1sjAq0bTHZbopsTMG2yOuGUpgsf+dA+P7lrLgY/S3qxDfzrNkz88xr8GjrLdpPQVZemoTMS11uGG80wowa4AV8Waw+mLMWJl4Ijsk6oxtAdjGxS6qqNuSEPxt6/xwqjlM7cBZtFxbM9v2BcjQ92kXOwxVJYq73kTnLXYJcfnjKQSU4fTV1JETK/ipStDTDVAuxI73qRYcthmpOkNxbHHeP12oPlZSHTv/y2fD31KM8LQl5SFpBzM4+YncVzET2/gC0GSxNRz6csJ5JVVvLRhHj0AUxisU1gdKFyO2NM4+k1ezofpY8DTfS9yX0wMtViOeFxT1fvcxY8W+IU2D6tEuk51FLyc6cjAzdE6cqtKGj5RSCiOfJ2fjxV8+rZUVxzb83ser4ElZRhSWks1LKnm5vCfmkFcGLL3GtUPAeMkXss5XB+ucUw5xPocdaTIEf/gAe5/ZIZDtztcb8xy8Mm/8rsgKL2kdCWl1HiTgT1uqs2E0uxKgVkx/WzaGRQzEU61ljhdp1OJtjmFwFxPp0Tx4pfY/5Hp1OX5R1/iGamp6pQqKUtLpRZxRUF1uYXf6NjiFTtE4JTYcChNVYIHhWD+8kaOTh9HN6cwVyp0obH1yVbYWGGUwj63h69un+SRTHuMLC053vnHBQ5//yivNsCFLB6BSmcF6+GGAVesxl1awK9u8lkhaBM4Jvh1smsW2BsFVgx5bcOQq+cL1JxGjQiMddggMKbA6IjOkpl1m4DIimkUyRuCKAlZMn2gUi1c2cdJg8+SOXsVn2lOkt0kelce50hdJFYf5pNCcJeILLQLjg5mUXU+N9DNCu0HmGjQVi6DpoQka3UFaJLIVyI4h897WvZwExrfN/hcHtst/ELJbi2ZsIqTF74rTtZlkZ9g11j2RoXJZdEqzrlJpJ9HtRpo36/rsra5SkXksAG2QolAwpDKXJ2yGVipUKbE99qErNHmMrHazOYU2aEC/anAP098TywtAydY+0tmYuBuPEFFXsvuI9udXB6DQo0EZDciGxKFRqTqhvcSGTRfitiPBHWTEega2saxW0p0EXlj30XOdzorFqg2eyvWR0pmVGIoh/xbFvSy9bnkkBNdVBxFpuEN63NNTUSDtNQjZv+1oIhrFDG7jwxqHfcKuWx9Lj3Bfz5k9mqvmS2oWHPN7EW8Dbxrm5x9r42YHiKDQ8beitkrVjx7m8QcyDZJzRFVjyTHSLHNHQPYJhNaWM7Nvs+bdERcduw3m70Vv5n919Mb2Slha16OZNnezpbMbfLI2EVcWA8bgAvZV68oirVEzsLSeiZF4M6oWK0FEcOZ/Wc5nunNgB8Avq5GKYk6jg5i/SY2x8j2AK1cRFAsisR5EouqSzfr7rvAJwLNpRbNKFiVPKukYVU29AJcI/H2uX2crluaD7UzHzDn9V5f854J1v2KVnBsUoHNSJoh1hzlKa53JnVLc5OOCoFPklNrRzlz4gSe2shnh5Wbhhu91C16pxudxfJ8y/RMHWKdiqxOijEH41aiM6CI+NwvaZiViUsTk3RPfENUWR9WTsEtG7f/ARqeIzUaHVUWAAAAAElFTkSuQmCC",
-      symbolSize: [20, 20],
+    //   symbolSize: [20, 20],
-      symbolOffset: ["1%", 0],
+    //   symbolOffset: ["1%", 0],
-      itemStyle: {
+    //   itemStyle: {
-        color: "#FFF",
+    //     color: "#FFF",
-        shadowColor: "#00E4BB53",
+    //     shadowColor: "#00E4BB53",
-        shadowBlur: 5,
+    //     shadowBlur: 5,
-        borderWidth: 1,
+    //     borderWidth: 1,
-        opacity: 1,
+    //     opacity: 1,
-      },
+    //   },
-      z: 2,
+    //   z: 2,
-      zlevel: 10,
+    //   zlevel: 10,
-      left: 10,
+    //   left: 10,
-      data: data1,
+    //   data: data1,
-      animationDelay: 500,
+    //   animationDelay: 500,
-      tooltip: {
+    //   tooltip: {
-        show: false,
+    //     show: false,
-      },
+    //   },
-    },
+    // },
    {
      name: "拥挤度",
      type: "bar",
@ -351,32 +351,32 @@ let options = {
      },
      data: data2,
    },
-    {
+    // {
-      name: "",
+    //   name: "",
-      type: "scatter",
+    //   type: "scatter",
-      emphasis: {
+    //   emphasis: {
-        scale: false,
+    //     scale: false,
-      },
+    //   },
-      symbol:
+    //   symbol:
-        "image://data:image/png;base64,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",
+    //     "image://data:image/png;base64,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",
-      symbolSize: [20, 20],
+    //   symbolSize: [20, 20],
-      symbolOffset: ["110%", 0],
+    //   symbolOffset: ["110%", 0],
-      itemStyle: {
+    //   itemStyle: {
-        color: "#FCBE39",
+    //     color: "#FCBE39",
-        shadowColor: "#FCBE3953",
+    //     shadowColor: "#FCBE3953",
-        shadowBlur: 5,
+    //     shadowBlur: 5,
-        borderWidth: 1,
+    //     borderWidth: 1,
-        opacity: 1,
+    //     opacity: 1,
-      },
+    //   },
-      z: 1,
+    //   z: 1,
-      zlevel: 10,
+    //   zlevel: 10,
-      left: "-100%",
+    //   left: "-100%",
-      data: data2,
+    //   data: data2,
-      animationDelay: 100,
+    //   animationDelay: 100,
-      tooltip: {
+    //   tooltip: {
-        show: false,
+    //     show: false,
-      },
+    //   },
-    },
+    // },
  ],
 };
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/components/AddNEditDialog.vue
@ -216,6 +216,7 @@ export default {
          this.formList[0].options.disabled = true;
        } else {
          this.formData = null;
          this.formList[0].options.disabled = false;
        }
      },
      immediate: true,
@ -230,19 +231,24 @@ export default {
      // }
      this.$refs.FormConfigRef.validate().then((data) => {
        this.submitting = true;
-        let params = {
+
-          ...this.formData,
+        if (this.data && this.data.id) {
-          id: this.data.id,
+          let params = {
-          publishChannels: publishChannels.toString(),
+            ...this.formData,
-        };
+            id: this.data.id,
-        if (this.data.id) {
+            publishChannels: this.formData.publishChannels.toString(),
          };
          editChannels(params).then((res) => {
            this.modelVisible = false;
            this.submitting = false;
            this.$parent.handleSearch();
          });
        } else {
-          addChannels(this.formData).then((res) => {
+          let params = {
            ...this.formData,
            publishChannels: this.formData.publishChannels.toString(),
          };
          addChannels(params).then((res) => {
            this.modelVisible = false;
            this.submitting = false;
            this.$parent.handleSearch();