Browse Source

首页 事件提交

wangqin
Joe 1 year ago
parent
commit
23000b9dd6
  1. 15
      ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue
  2. 17
      ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常.svg
  3. 17
      ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常_active.svg
  4. 17
      ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常_fault.svg
  5. 5
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Broadcast/components/BroadcastReleases.vue
  6. 113
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/HomeFilter/index.vue
  7. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/index.vue
  8. 58
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
  9. 26
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/httpList.js
  10. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/layerImages.js
  11. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
  12. 25
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/index.vue
  13. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js
  14. 36
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
  15. 12
      ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss
  16. 14
      ruoyi-ui/src/views/JiHeExpressway/utils/enum.js

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

@ -8,7 +8,7 @@
<div style="width: 100%">
<slot>
<Form v-if="formList && formList.length" labelWidth="120px" class="form" ref="FormConfigRef" :formList="formList"
<Form v-if="formList && formList.length" class="form" ref="FormConfigRef" :formList="formList"
v-bind="getFormConfigOptions" />
<ElEmpty v-else description="暂无搜索内容"></ElEmpty>
</slot>
@ -86,19 +86,6 @@ export default {
}
</script>
<style lang='scss'>
div.el-popper.global-input-search-popover {
background: #064258;
.footer {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 9px;
margin-top: 15px;
}
}
</style>
<style lang='scss' scoped>
.InputSearch {
height: 26px;

17
ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常.svg

@ -0,0 +1,17 @@
<svg width="28" height="29" viewBox="0 0 28 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M19.985 12.2515C20.2268 11.8753 20.4082 11.5742 20.65 11.198C20.9522 10.6712 21.3754 10.3702 21.8591 10.2949C22.1009 10.2197 22.4031 10.1444 22.5845 9.91863C22.7054 9.84338 22.7659 9.69287 22.8263 9.54236C22.8868 9.39185 22.9472 9.16609 23.0681 9.01558C23.3704 8.33829 23.6727 7.661 23.975 7.05896C24.0354 6.9837 23.975 6.83319 23.9145 6.75794C23.8541 6.68269 23.7936 6.75794 23.7331 6.83319L23.6727 6.90845C23.31 7.43523 22.8868 8.03727 22.5241 8.56405C22.4636 8.63931 22.4031 8.71456 22.2822 8.63931C22.1613 8.63931 22.1613 8.56405 22.2218 8.41354C22.2822 8.33829 22.2822 8.26303 22.3427 8.18778C22.7054 7.661 23.0681 7.13421 23.4309 6.68269C23.4913 6.60743 23.4913 6.53218 23.4309 6.38167C23.3704 6.30641 23.31 6.30641 23.2495 6.38167C23.1286 6.53218 23.0681 6.68269 22.9472 6.83319C22.645 7.28472 22.3427 7.661 22.1009 8.11252C22.0404 8.18778 21.8591 8.26303 21.7986 8.18778C21.7382 8.03727 21.7986 8.03727 21.8591 7.88676C21.8591 7.88676 21.8591 7.8115 21.9195 7.8115C22.2218 7.35998 22.5845 6.90845 22.8868 6.38167C22.9472 6.30641 23.0077 6.23116 23.0681 6.08065C23.0681 6.00539 23.0077 6.00539 23.0077 5.93014C22.9472 5.85488 22.8868 5.85488 22.8263 5.93014C22.4636 6.45692 22.1009 6.9837 21.7986 7.58574C21.5568 7.96201 21.4359 8.03727 21.315 7.96201C21.1941 7.96201 21.1941 7.88676 21.2545 7.73625C21.315 7.661 21.3754 7.58574 21.3754 7.51049L22.4636 6.1559C22.5845 6.00539 22.5845 6.00539 22.4636 5.85488C22.4636 5.85488 22.4636 5.77963 22.4031 5.77963C22.3427 5.62912 22.2822 5.62912 22.1613 5.77963C22.1613 5.85488 22.1613 5.93014 22.1009 5.93014C21.4359 6.60743 20.7709 7.20947 20.1059 7.88676C20.0454 7.88676 20.0454 7.96201 20.0454 8.03727C20.0454 8.4888 19.985 8.86507 19.985 9.3166C19.985 9.61762 19.9245 9.84338 19.8036 9.99389C19.5618 10.2949 19.3804 10.6712 19.1386 11.0475C19.3804 11.499 19.6827 11.8753 19.985 12.2515C19.985 12.3268 19.985 12.3268 19.985 12.2515ZM21.1924 15.3334C18.351 11.0439 17.5047 10.2197 14.6633 5.85488C14.6029 5.85488 14.6029 5.77963 14.5424 5.77963H14.3023C14.1209 5.77963 14 5.93014 14 6.1559V7.88676C14 7.96201 14 8.03727 14.0605 8.11252C14.8464 9.24134 15.6323 10.4454 16.4182 11.5742C16.5995 11.8753 16.8414 12.1763 17.0227 12.4773C17.1436 12.402 17.2041 12.3268 17.325 12.3268C17.4459 12.2515 17.5668 12.2515 17.6877 12.2515C17.8691 12.2515 17.9295 12.3268 17.99 12.4773C17.99 12.5525 18.0504 12.5525 18.0504 12.6278C19.5013 15.0359 18.8968 13.9036 20.3477 16.3117C20.4686 16.5375 20.65 16.688 20.8313 16.7633C21.1336 16.9138 21.0311 16.5592 21.3333 16.3334C21.5147 15.9571 21.4342 15.6344 21.1924 15.3334Z" fill="#0FD4FF"/>
<path id="Vector_2" d="M18.203 13.6112C18.0655 13.382 17.928 13.2292 17.7218 13.0001L17.653 13.0765C16.2094 15.0626 14.7658 17.1251 13.3222 19.1112C13.2535 19.1876 13.2535 19.264 13.1847 19.3404V19.5695C13.3222 20.1042 13.6659 20.257 14.0784 20.3334H14.3534C14.5596 20.3334 14.6971 20.1806 14.7658 19.9515C15.3158 19.1112 15.9344 18.2709 16.4844 17.4306C17.1718 16.4376 17.8593 15.3681 18.6154 14.3751C18.6842 14.2987 18.6842 14.2223 18.6154 14.1459C18.5467 13.9931 18.4092 13.8404 18.203 13.6112ZM10.9849 6.6598C10.2288 5.9723 9.1976 5.66675 7.20405 5.66675H2.66699V6.27786C3.97311 6.27786 4.1106 6.43064 4.1106 7.80564V18.1945C4.1106 19.6459 3.97311 19.7223 2.66699 19.7223V20.3334H7.27279V19.7223C5.6917 19.7223 5.62295 19.5695 5.62295 18.1945V13.764H7.06656C8.92263 13.764 12.2223 13.5348 12.2223 9.63897C12.1536 8.34036 11.7411 7.3473 10.9849 6.6598ZM7.06656 13.0001H5.62295V7.65286C5.62295 6.6598 5.6917 6.43064 6.03541 6.43064H6.99782C8.30394 6.43064 9.1976 6.6598 9.74755 7.19453C10.2975 7.72925 10.5725 8.56953 10.5725 9.56258C10.6412 12.4654 8.85389 13.0001 7.06656 13.0001Z" fill="#0FD4FF"/>
<g id="Frame">
<path id="Vector_3" d="M21.9795 14.7578C22.0872 14.5658 22.4005 14.5658 22.5082 14.7578L25.5389 20.1615C25.5649 20.2079 25.5783 20.2599 25.5778 20.3127C25.5773 20.3656 25.5629 20.4174 25.536 20.4633C25.5102 20.5086 25.4724 20.5463 25.4266 20.5728C25.3807 20.5992 25.3284 20.6134 25.2751 20.6138H19.2136C19.1602 20.6134 19.1079 20.5992 19.0621 20.5728C19.0162 20.5463 18.9784 20.5086 18.9526 20.4633C18.9259 20.4173 18.9116 20.3655 18.9111 20.3127C18.9106 20.26 18.9239 20.2079 18.9498 20.1615L21.9795 14.7578ZM22.2443 18.7676C22.118 18.7676 21.9969 18.8162 21.9076 18.9028C21.8183 18.9894 21.7681 19.1067 21.7681 19.2292C21.7681 19.3516 21.8183 19.469 21.9076 19.5555C21.9969 19.6421 22.118 19.6907 22.2443 19.6907C22.3706 19.6907 22.4918 19.6421 22.5811 19.5555C22.6704 19.469 22.7206 19.3516 22.7206 19.2292C22.7206 19.1067 22.6704 18.9894 22.5811 18.9028C22.4918 18.8162 22.3706 18.7676 22.2443 18.7676ZM22.2443 16.4599C22.1818 16.4599 22.1199 16.4719 22.0621 16.4951C22.0043 16.5183 21.9518 16.5522 21.9076 16.5951C21.8634 16.638 21.8283 16.6888 21.8043 16.7448C21.7804 16.8008 21.7681 16.8609 21.7681 16.9215V17.8445C21.7681 17.9669 21.8183 18.0843 21.9076 18.1709C21.9969 18.2575 22.118 18.3061 22.2443 18.3061C22.3706 18.3061 22.4918 18.2575 22.5811 18.1709C22.6704 18.0843 22.7206 17.9669 22.7206 17.8445V16.9215C22.7206 16.8609 22.7082 16.8008 22.6843 16.7448C22.6604 16.6888 22.6253 16.638 22.5811 16.5951C22.5369 16.5522 22.4844 16.5183 22.4266 16.4951C22.3688 16.4719 22.3069 16.4599 22.2443 16.4599Z" fill="#0FD4FF"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.6 KiB

17
ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常_active.svg

@ -0,0 +1,17 @@
<svg width="28" height="29" viewBox="0 0 28 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M19.985 12.2515C20.2268 11.8753 20.4082 11.5742 20.65 11.198C20.9522 10.6712 21.3754 10.3702 21.8591 10.2949C22.1009 10.2197 22.4031 10.1444 22.5845 9.91863C22.7054 9.84338 22.7659 9.69287 22.8263 9.54236C22.8868 9.39185 22.9472 9.16609 23.0681 9.01558C23.3704 8.33829 23.6727 7.661 23.975 7.05896C24.0354 6.9837 23.975 6.83319 23.9145 6.75794C23.8541 6.68269 23.7936 6.75794 23.7331 6.83319L23.6727 6.90845C23.31 7.43523 22.8868 8.03727 22.5241 8.56405C22.4636 8.63931 22.4031 8.71456 22.2822 8.63931C22.1613 8.63931 22.1613 8.56405 22.2218 8.41354C22.2822 8.33829 22.2822 8.26303 22.3427 8.18778C22.7054 7.661 23.0681 7.13421 23.4309 6.68269C23.4913 6.60743 23.4913 6.53218 23.4309 6.38167C23.3704 6.30641 23.31 6.30641 23.2495 6.38167C23.1286 6.53218 23.0681 6.68269 22.9472 6.83319C22.645 7.28472 22.3427 7.661 22.1009 8.11252C22.0404 8.18778 21.8591 8.26303 21.7986 8.18778C21.7382 8.03727 21.7986 8.03727 21.8591 7.88676C21.8591 7.88676 21.8591 7.8115 21.9195 7.8115C22.2218 7.35998 22.5845 6.90845 22.8868 6.38167C22.9472 6.30641 23.0077 6.23116 23.0681 6.08065C23.0681 6.00539 23.0077 6.00539 23.0077 5.93014C22.9472 5.85488 22.8868 5.85488 22.8263 5.93014C22.4636 6.45692 22.1009 6.9837 21.7986 7.58574C21.5568 7.96201 21.4359 8.03727 21.315 7.96201C21.1941 7.96201 21.1941 7.88676 21.2545 7.73625C21.315 7.661 21.3754 7.58574 21.3754 7.51049L22.4636 6.1559C22.5845 6.00539 22.5845 6.00539 22.4636 5.85488C22.4636 5.85488 22.4636 5.77963 22.4031 5.77963C22.3427 5.62912 22.2822 5.62912 22.1613 5.77963C22.1613 5.85488 22.1613 5.93014 22.1009 5.93014C21.4359 6.60743 20.7709 7.20947 20.1059 7.88676C20.0454 7.88676 20.0454 7.96201 20.0454 8.03727C20.0454 8.4888 19.985 8.86507 19.985 9.3166C19.985 9.61762 19.9245 9.84338 19.8036 9.99389C19.5618 10.2949 19.3804 10.6712 19.1386 11.0475C19.3804 11.499 19.6827 11.8753 19.985 12.2515C19.985 12.3268 19.985 12.3268 19.985 12.2515ZM21.1924 15.3334C18.351 11.0439 17.5047 10.2197 14.6633 5.85488C14.6029 5.85488 14.6029 5.77963 14.5424 5.77963H14.3023C14.1209 5.77963 14 5.93014 14 6.1559V7.88676C14 7.96201 14 8.03727 14.0605 8.11252C14.8464 9.24134 15.6323 10.4454 16.4182 11.5742C16.5995 11.8753 16.8414 12.1763 17.0227 12.4773C17.1436 12.402 17.2041 12.3268 17.325 12.3268C17.4459 12.2515 17.5668 12.2515 17.6877 12.2515C17.8691 12.2515 17.9295 12.3268 17.99 12.4773C17.99 12.5525 18.0504 12.5525 18.0504 12.6278C19.5013 15.0359 18.8968 13.9036 20.3477 16.3117C20.4686 16.5375 20.65 16.688 20.8313 16.7633C21.1336 16.9138 21.0311 16.5592 21.3333 16.3334C21.5147 15.9571 21.4342 15.6344 21.1924 15.3334Z" fill="#FFDB82"/>
<path id="Vector_2" d="M18.203 13.6112C18.0655 13.382 17.928 13.2292 17.7218 13.0001L17.653 13.0765C16.2094 15.0626 14.7658 17.1251 13.3222 19.1112C13.2535 19.1876 13.2535 19.264 13.1847 19.3404V19.5695C13.3222 20.1042 13.6659 20.257 14.0784 20.3334H14.3534C14.5596 20.3334 14.6971 20.1806 14.7658 19.9515C15.3158 19.1112 15.9344 18.2709 16.4844 17.4306C17.1718 16.4376 17.8593 15.3681 18.6154 14.3751C18.6842 14.2987 18.6842 14.2223 18.6154 14.1459C18.5467 13.9931 18.4092 13.8404 18.203 13.6112ZM10.9849 6.6598C10.2288 5.9723 9.1976 5.66675 7.20405 5.66675H2.66699V6.27786C3.97311 6.27786 4.1106 6.43064 4.1106 7.80564V18.1945C4.1106 19.6459 3.97311 19.7223 2.66699 19.7223V20.3334H7.27279V19.7223C5.6917 19.7223 5.62295 19.5695 5.62295 18.1945V13.764H7.06656C8.92263 13.764 12.2223 13.5348 12.2223 9.63897C12.1536 8.34036 11.7411 7.3473 10.9849 6.6598ZM7.06656 13.0001H5.62295V7.65286C5.62295 6.6598 5.6917 6.43064 6.03541 6.43064H6.99782C8.30394 6.43064 9.1976 6.6598 9.74755 7.19453C10.2975 7.72925 10.5725 8.56953 10.5725 9.56258C10.6412 12.4654 8.85389 13.0001 7.06656 13.0001Z" fill="#FFDB82"/>
<g id="Frame">
<path id="Vector_3" d="M21.9795 14.7578C22.0872 14.5658 22.4005 14.5658 22.5082 14.7578L25.5389 20.1615C25.5649 20.2079 25.5783 20.2599 25.5778 20.3127C25.5773 20.3656 25.5629 20.4174 25.536 20.4633C25.5102 20.5086 25.4724 20.5463 25.4266 20.5728C25.3807 20.5992 25.3284 20.6134 25.2751 20.6138H19.2136C19.1602 20.6134 19.1079 20.5992 19.0621 20.5728C19.0162 20.5463 18.9784 20.5086 18.9526 20.4633C18.9259 20.4173 18.9116 20.3655 18.9111 20.3127C18.9106 20.26 18.9239 20.2079 18.9498 20.1615L21.9795 14.7578ZM22.2443 18.7676C22.118 18.7676 21.9969 18.8162 21.9076 18.9028C21.8183 18.9894 21.7681 19.1067 21.7681 19.2292C21.7681 19.3516 21.8183 19.469 21.9076 19.5555C21.9969 19.6421 22.118 19.6907 22.2443 19.6907C22.3706 19.6907 22.4918 19.6421 22.5811 19.5555C22.6704 19.469 22.7206 19.3516 22.7206 19.2292C22.7206 19.1067 22.6704 18.9894 22.5811 18.9028C22.4918 18.8162 22.3706 18.7676 22.2443 18.7676ZM22.2443 16.4599C22.1818 16.4599 22.1199 16.4719 22.0621 16.4951C22.0043 16.5183 21.9518 16.5522 21.9076 16.5951C21.8634 16.638 21.8283 16.6888 21.8043 16.7448C21.7804 16.8008 21.7681 16.8609 21.7681 16.9215V17.8445C21.7681 17.9669 21.8183 18.0843 21.9076 18.1709C21.9969 18.2575 22.118 18.3061 22.2443 18.3061C22.3706 18.3061 22.4918 18.2575 22.5811 18.1709C22.6704 18.0843 22.7206 17.9669 22.7206 17.8445V16.9215C22.7206 16.8609 22.7082 16.8008 22.6843 16.7448C22.6604 16.6888 22.6253 16.638 22.5811 16.5951C22.5369 16.5522 22.4844 16.5183 22.4266 16.4951C22.3688 16.4719 22.3069 16.4599 22.2443 16.4599Z" fill="#FFDB82"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.6 KiB

17
ruoyi-ui/src/views/JiHeExpressway/images/layer/事件专题/服务区异常_fault.svg

@ -0,0 +1,17 @@
<svg width="28" height="29" viewBox="0 0 28 29" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#233;&#161;&#181;&#233;&#157;&#162;-1">
<g id="&#233;&#166;&#150;&#233;&#161;&#181;-&#229;&#185;&#179;&#233;&#157;&#162;3">
<g id="&#231;&#188;&#150;&#231;&#187;&#132;-16&#229;&#164;&#135;&#228;&#187;&#189;">
<g id="1">
<g id="&#232;&#183;&#175;&#233;&#157;&#162;&#231;&#138;&#182;&#230;&#128;&#129;">
<path id="Vector" d="M19.985 12.2515C20.2268 11.8753 20.4082 11.5742 20.65 11.198C20.9522 10.6712 21.3754 10.3702 21.8591 10.2949C22.1009 10.2197 22.4031 10.1444 22.5845 9.91863C22.7054 9.84338 22.7659 9.69287 22.8263 9.54236C22.8868 9.39185 22.9472 9.16609 23.0681 9.01558C23.3704 8.33829 23.6727 7.661 23.975 7.05896C24.0354 6.9837 23.975 6.83319 23.9145 6.75794C23.8541 6.68269 23.7936 6.75794 23.7331 6.83319L23.6727 6.90845C23.31 7.43523 22.8868 8.03727 22.5241 8.56405C22.4636 8.63931 22.4031 8.71456 22.2822 8.63931C22.1613 8.63931 22.1613 8.56405 22.2218 8.41354C22.2822 8.33829 22.2822 8.26303 22.3427 8.18778C22.7054 7.661 23.0681 7.13421 23.4309 6.68269C23.4913 6.60743 23.4913 6.53218 23.4309 6.38167C23.3704 6.30641 23.31 6.30641 23.2495 6.38167C23.1286 6.53218 23.0681 6.68269 22.9472 6.83319C22.645 7.28472 22.3427 7.661 22.1009 8.11252C22.0404 8.18778 21.8591 8.26303 21.7986 8.18778C21.7382 8.03727 21.7986 8.03727 21.8591 7.88676C21.8591 7.88676 21.8591 7.8115 21.9195 7.8115C22.2218 7.35998 22.5845 6.90845 22.8868 6.38167C22.9472 6.30641 23.0077 6.23116 23.0681 6.08065C23.0681 6.00539 23.0077 6.00539 23.0077 5.93014C22.9472 5.85488 22.8868 5.85488 22.8263 5.93014C22.4636 6.45692 22.1009 6.9837 21.7986 7.58574C21.5568 7.96201 21.4359 8.03727 21.315 7.96201C21.1941 7.96201 21.1941 7.88676 21.2545 7.73625C21.315 7.661 21.3754 7.58574 21.3754 7.51049L22.4636 6.1559C22.5845 6.00539 22.5845 6.00539 22.4636 5.85488C22.4636 5.85488 22.4636 5.77963 22.4031 5.77963C22.3427 5.62912 22.2822 5.62912 22.1613 5.77963C22.1613 5.85488 22.1613 5.93014 22.1009 5.93014C21.4359 6.60743 20.7709 7.20947 20.1059 7.88676C20.0454 7.88676 20.0454 7.96201 20.0454 8.03727C20.0454 8.4888 19.985 8.86507 19.985 9.3166C19.985 9.61762 19.9245 9.84338 19.8036 9.99389C19.5618 10.2949 19.3804 10.6712 19.1386 11.0475C19.3804 11.499 19.6827 11.8753 19.985 12.2515C19.985 12.3268 19.985 12.3268 19.985 12.2515ZM21.1924 15.3334C18.351 11.0439 17.5047 10.2197 14.6633 5.85488C14.6029 5.85488 14.6029 5.77963 14.5424 5.77963H14.3023C14.1209 5.77963 14 5.93014 14 6.1559V7.88676C14 7.96201 14 8.03727 14.0605 8.11252C14.8464 9.24134 15.6323 10.4454 16.4182 11.5742C16.5995 11.8753 16.8414 12.1763 17.0227 12.4773C17.1436 12.402 17.2041 12.3268 17.325 12.3268C17.4459 12.2515 17.5668 12.2515 17.6877 12.2515C17.8691 12.2515 17.9295 12.3268 17.99 12.4773C17.99 12.5525 18.0504 12.5525 18.0504 12.6278C19.5013 15.0359 18.8968 13.9036 20.3477 16.3117C20.4686 16.5375 20.65 16.688 20.8313 16.7633C21.1336 16.9138 21.0311 16.5592 21.3333 16.3334C21.5147 15.9571 21.4342 15.6344 21.1924 15.3334Z" fill="#FF5F5F"/>
<path id="Vector_2" d="M18.203 13.6112C18.0655 13.382 17.928 13.2292 17.7218 13.0001L17.653 13.0765C16.2094 15.0626 14.7658 17.1251 13.3222 19.1112C13.2535 19.1876 13.2535 19.264 13.1847 19.3404V19.5695C13.3222 20.1042 13.6659 20.257 14.0784 20.3334H14.3534C14.5596 20.3334 14.6971 20.1806 14.7658 19.9515C15.3158 19.1112 15.9344 18.2709 16.4844 17.4306C17.1718 16.4376 17.8593 15.3681 18.6154 14.3751C18.6842 14.2987 18.6842 14.2223 18.6154 14.1459C18.5467 13.9931 18.4092 13.8404 18.203 13.6112ZM10.9849 6.6598C10.2288 5.9723 9.1976 5.66675 7.20405 5.66675H2.66699V6.27786C3.97311 6.27786 4.1106 6.43064 4.1106 7.80564V18.1945C4.1106 19.6459 3.97311 19.7223 2.66699 19.7223V20.3334H7.27279V19.7223C5.6917 19.7223 5.62295 19.5695 5.62295 18.1945V13.764H7.06656C8.92263 13.764 12.2223 13.5348 12.2223 9.63897C12.1536 8.34036 11.7411 7.3473 10.9849 6.6598ZM7.06656 13.0001H5.62295V7.65286C5.62295 6.6598 5.6917 6.43064 6.03541 6.43064H6.99782C8.30394 6.43064 9.1976 6.6598 9.74755 7.19453C10.2975 7.72925 10.5725 8.56953 10.5725 9.56258C10.6412 12.4654 8.85389 13.0001 7.06656 13.0001Z" fill="#FF5F5F"/>
<g id="Frame">
<path id="Vector_3" d="M21.9795 14.7578C22.0872 14.5658 22.4005 14.5658 22.5082 14.7578L25.5389 20.1615C25.5649 20.2079 25.5783 20.2599 25.5778 20.3127C25.5773 20.3656 25.5629 20.4174 25.536 20.4633C25.5102 20.5086 25.4724 20.5463 25.4266 20.5728C25.3807 20.5992 25.3284 20.6134 25.2751 20.6138H19.2136C19.1602 20.6134 19.1079 20.5992 19.0621 20.5728C19.0162 20.5463 18.9784 20.5086 18.9526 20.4633C18.9259 20.4173 18.9116 20.3655 18.9111 20.3127C18.9106 20.26 18.9239 20.2079 18.9498 20.1615L21.9795 14.7578ZM22.2443 18.7676C22.118 18.7676 21.9969 18.8162 21.9076 18.9028C21.8183 18.9894 21.7681 19.1067 21.7681 19.2292C21.7681 19.3516 21.8183 19.469 21.9076 19.5555C21.9969 19.6421 22.118 19.6907 22.2443 19.6907C22.3706 19.6907 22.4918 19.6421 22.5811 19.5555C22.6704 19.469 22.7206 19.3516 22.7206 19.2292C22.7206 19.1067 22.6704 18.9894 22.5811 18.9028C22.4918 18.8162 22.3706 18.7676 22.2443 18.7676ZM22.2443 16.4599C22.1818 16.4599 22.1199 16.4719 22.0621 16.4951C22.0043 16.5183 21.9518 16.5522 21.9076 16.5951C21.8634 16.638 21.8283 16.6888 21.8043 16.7448C21.7804 16.8008 21.7681 16.8609 21.7681 16.9215V17.8445C21.7681 17.9669 21.8183 18.0843 21.9076 18.1709C21.9969 18.2575 22.118 18.3061 22.2443 18.3061C22.3706 18.3061 22.4918 18.2575 22.5811 18.1709C22.6704 18.0843 22.7206 17.9669 22.7206 17.8445V16.9215C22.7206 16.8609 22.7082 16.8008 22.6843 16.7448C22.6604 16.6888 22.6253 16.638 22.5811 16.5951C22.5369 16.5522 22.4844 16.5183 22.4266 16.4951C22.3688 16.4719 22.3069 16.4599 22.2443 16.4599Z" fill="#FF5F5F"/>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.6 KiB

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

@ -44,6 +44,7 @@ import Form from '@screen/components/FormConfig';
import Video from "@screen/components/Video"
import CheckboxGroup from "@screen/components/FormConfig/components/ElCheckboxGroup.vue"
import request from "@/utils/request";
import { getDeviceList } from "@screen/pages/Home/components/RoadAndEvents/utils/httpList.js";
import { Message } from "element-ui";
@ -115,10 +116,10 @@ export default {
.then(data => {
console.log(data);
if (data.code == '200') {
Message.success("广播发布成功!");
Message.success("广播设置成功!");
this.modelVisible = false;
} else {
Message.error("广播发布失败!");
Message.error("广播设置失败!");
}
})
.finally(() => {

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

@ -0,0 +1,113 @@
<template>
<div class='HomeFilter'>
<ElPopover trigger="click" :visibleArrow="false" placement="left" popper-class="global-input-search-popover">
<Button :class="['btn', { 'btn-active': true }]" slot="reference">
<img src="@screen/images/home-filter/filter.svg">
</Button>
<div class="body">
<div class="title">
设备筛选
</div>
<Form labelWidth="72px" column="1" class="form" ref="FormConfigRef" :formList="formList" />
<div class="footer">
<Button style="background-color: rgba(0, 179, 204, .3);" @click.native="handleResetForm">
重置
</Button>
<Button @click.native="handleSearch">
搜索
</Button>
</div>
</div>
</ElPopover>
</div>
</template>
<script>
import Button from '@screen/components/Buttons/Button.vue';
import Form from '@screen/components/FormConfig';
import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
export default {
name: 'HomeFilter',
components: {
Button,
Form
},
data() {
return {
formList: [
{
...PresetFormItems.station,
key: "23",
required: false,
label: "起始桩号"
},
{
...PresetFormItems.station,
key: "s",
required: false,
label: "结束桩号"
},
{
label: "车道占用:",
key: "key027",
type: "CheckboxGroup",
isAlone: true,
default: [],
options: {
options: [
{ key: "weChat", label: "行1" },
{ key: "message", label: "行2" },
{ key: "website", label: "行3" },
{ key: "weibo", label: "行4" },
{ key: "weibo2", label: "应急车道" },
],
},
}
]
}
}
}
</script>
<style lang='scss'>
div.el-popper.global-input-search-popover {
background: rgba(6, 66, 88, 0.8);
border: 1px solid rgba(42, 217, 253, 0.6);
position: relative;
padding-top: 36px;
transform: translateY(24px);
.body {
.title {
background: linear-gradient(90deg, #237E9B 0%, rgba(23, 145, 184, 0) 100%);
padding: 3px 9px;
position: absolute;
top: 0;
left: 0;
width: 100%;
}
}
}
</style>
<style lang='scss' scoped>
.HomeFilter {
.btn {
padding: 9px;
background: linear-gradient(180deg, #152E3C 0%, #163A45 100%);
border-radius: 4px;
overflow: hidden;
height: unset;
border: 1px solid rgba(40, 144, 167, 1);
}
.btn-active {
background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
}
}
</style>

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

@ -214,7 +214,7 @@ export default {
margin-bottom: 6px;
display: grid;
grid-template-columns: repeat(5, 1fr);
// grid-template-rows: repeat(3, 1fr);
grid-auto-rows: 78px;
flex: 1;
max-height: 100%;
overflow: auto;

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

@ -1,6 +1,7 @@
import { getDeviceList } from "./httpList";
import { getDeviceList, getEventTopicList } from "./httpList";
import { delay } from "@screen/utils/common";
import { Message } from "element-ui";
import { EventTopics } from "@screen/utils/enum.js";
import { setMarkToMap } from "./map";
@ -43,12 +44,13 @@ export const DeviceForMap = {
};
export function getHandleDeviceType(item) {
if (DeviceForMap[item.title]) return "地图设备/map";
if (DeviceForMap[item.title]) return "地图路测设备/map";
if (EventTopics[item.title]) return "地图事件专题/map";
}
export const eventMap = {
// 需要在地图显示的
async "地图设备/map"(item) {
// 设备 需要在地图显示的
async "地图路测设备/map"(item) {
const config = DeviceForMap[item.title];
const loadingMessage = Message.info({
@ -68,9 +70,9 @@ export const eventMap = {
if (!data) return;
eventMap[`地图设备/map_close`](item);
eventMap[`地图路测设备/map_close`](item);
cacheRemoveFunc[`地图设备/${item.title}`] = await setMarkToMap.call(
cacheRemoveFunc[`地图路测设备/${item.title}`] = await setMarkToMap.call(
this,
item,
data,
@ -86,7 +88,47 @@ export const eventMap = {
config.options
);
},
"地图设备/map_close"(item) {
cacheRemoveFunc[`地图设备/${item.title}`]?.();
"地图路测设备/map_close"(item) {
cacheRemoveFunc[`地图路测设备/${item.title}`]?.();
},
// 事件 需要在地图显示的
async "地图事件专题/map"(item) {
const loadingMessage = Message.info({
message: `${item.title}事件位置加载中...`,
duration: 0,
customClass: "loading-message",
iconClass: "el-icon-loading",
});
const data = await getEventTopicList(EventTopics[item.title])
.then(async (data) => {
await delay(600);
return data;
})
.catch(() => {})
.finally(() => loadingMessage.close());
if (!data) return;
eventMap[`地图事件专题/map_close`](item);
cacheRemoveFunc[`地图事件专题/${item.title}`] = await setMarkToMap.call(
this,
item,
data,
(extData) => {
this.dialogConfig = {
component: null,
data: {
...extData,
parseOtherConfig: JSON.parse(extData.otherConfig || "{}"),
},
};
}
// config.options
);
},
"地图事件专题/map_close"(item) {
cacheRemoveFunc[`地图事件专题/${item.title}`]?.();
},
};

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

@ -248,3 +248,29 @@ export function getProduct(productId) {
});
});
}
/**
* @param {number} eventType
*/
export function getEventTopicList(eventType) {
return new Promise((resolve, reject) => {
if (!eventType) return reject();
request({
url: `/business/trafficIncidents/getEventList/${eventType}`,
method: "get",
})
.then(({ code, data }) => {
if (code != 200) {
reject();
return Message.error(`${DeviceTypeMap[deviceType]}事件加载失败!`);
}
resolve(data);
})
.catch(() => {
Message.error(`${DeviceTypeMap[deviceType]}事件加载失败!`);
reject();
});
});
}

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

@ -1,3 +1,5 @@
import { EventTopics } from "@screen/utils/enum.js";
export function getLayerData() {
const layerData = require.context(
"@screen/images/layer",
@ -10,6 +12,11 @@ export function getLayerData() {
layerData.keys().forEach((item) => {
const [_, topic, title] = item.match(/[^/]+/g);
switch (topic) {
case "事件专题":
if (!EventTopics[title.match(/[^._]+/)[0]]) return;
break;
}
if (!layerDatas[topic]) {
resultData.push(
(layerDatas[topic] = {
@ -19,6 +26,7 @@ export function getLayerData() {
})
);
}
layerDatas[topic].children.push({
id: item,
title: title.replace(".svg", ""),

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

@ -63,11 +63,7 @@ export async function setMarkerCluster(map, points, markerFun) {
const offset = new AMap.Pixel(0, 0);
context.marker.setContent(content);
context.marker.setAnchor("bottom-center");
console.log(
"%c [ context.marker ]-62-「map.js」",
"font-size:15px; background:#7d477f; color:#c18bc3;",
context.marker
);
context.marker.setOffset(offset);
context.marker.setExtData(extData);
@ -172,7 +168,11 @@ export async function setMarkToMap(
markerClick
);
mapIns.setFitView([...markerCluster.U], false, [0, 0, 0, 0], 10);
mapIns.setZoom(10);
setTimeout(() => {
mapIns.setFitView([...markerCluster.U], false, [0, 0, 0, 0], 10);
}, 150);
return () => markerCluster.setMap(null);
}

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

@ -13,13 +13,7 @@
<!-- 右侧 -->
<div class="content-r">
<div class="filter">
<ElPopover trigger="click" disabled placement="left">
<Button class="btn" slot="reference">
<img src="@screen/images/home-filter/filter.svg">
</Button>
</ElPopover>
</div>
<HomeFilter class="filter" />
<ConditionStatistics class="right card-menu" />
</div>
</section>
@ -42,6 +36,7 @@ import Thumbnail from "./components/Thumbnail/index.vue";
import ConditionStatistics from "./components/ConditionStatistics/index.vue";
import RoadAndEvents from "./components/RoadAndEvents/index.vue";
import AMapContainer from "./components/AMapContainer/index.vue";
import HomeFilter from "./components/HomeFilter/index.vue";
import Button from '@screen/components/Buttons/Button.vue';
// import InfoBoard from "./components/InfoBoard"
@ -54,7 +49,8 @@ export default {
Thumbnail,
RoadAndEvents,
AMapContainer,
Button
Button,
HomeFilter
// InfoBoard
},
data() {
@ -142,19 +138,6 @@ export default {
display: flex;
gap: 9px;
.btn {
padding: 9px;
background: linear-gradient(180deg, #152E3C 0%, #163A45 100%);
border-radius: 4px;
overflow: hidden;
height: unset;
border: 1px solid rgba(40, 144, 167, 1);
}
.btn-active {
background: linear-gradient(180deg, #005C79 0%, #009BCC 100%);
}
.filter {
display: flex;
flex-direction: column;

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

@ -1,22 +1,22 @@
import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
export const tabMap = {
AlarmEvents: {
"-1": {
state: 5,
textColor: "#007FF4",
text: "去确认",
},
EventsConfirmed: {
0: {
state: 5,
textColor: "#007FF4",
text: "去确认",
},
DisposingEvents: {
1: {
state: 4,
textColor: "#007FF4",
text: "去处置",
},
IncidentDisposed: {
2: {
state: 3,
textColor: "#007FF4",
text: "处置记录",

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

@ -29,7 +29,7 @@
</div>
<!-- 内容 -->
<div class="body">
<div class="body" v-loading>
<RoadStateCard v-for="(item, index) in data" :key="index" v-bind="getStateCardBind(item)"
@firstBtnClick="firstBtnClick" />
</div>
@ -56,6 +56,7 @@ import InputSearch from '@screen/components/InputSearch/index.vue';
import EventDetailDialog from "./EventDetailDialog/index";
import FormEvent from "./FormEvent/index";
import { tabMap, searchFormList } from "./data";
import request from "@/utils/request";
function getRandomData(min = 1, max = 15) {
return Math.floor(Math.random() * (max - min + 1)) + min
@ -83,45 +84,60 @@ export default {
},
data() {
return {
data: getMockData(),
data: [],
searchFormList,
activeName: "AlarmEvents",
activeName: "-1",
panels: [
{
label: "告警事件(20)",
key: "AlarmEvents"
key: "-1"
},
{
label: "待确认事件(125)",
key: "EventsConfirmed"
key: "0"
},
{
label: "处置中事件(230)",
key: "DisposingEvents"
key: "1"
},
{
label: "已处置事件(76)",
key: "IncidentDisposed"
key: "2"
},
],
eventDetailDialogVisible: false,
isShowAddNew: false
isShowAddNew: false,
searchData: {
pageSize: 15,
pageNo: 1,
eventState: null
}
}
},
methods: {
handleSelect(activeName) {
this.activeName = activeName;
this.data = getMockData();
this.searchData.eventState = activeName == '-1' ? null : activeName;
// this.data = getMockData();
},
getStateCardBind(item) {
const { state, textColor, text } = tabMap[this.activeName]
return {
cardData: { ...item, state },
lastBtnColor: textColor,
lastBtnText: text
}
},
getData() {
request({
url: `/dc/system/event/list`,
method: "get",
// params: this.searchData
})
},
onAddNew() {
this.isShowAddNew = true;
},

12
ruoyi-ui/src/views/JiHeExpressway/scss/el-reset.scss

@ -482,3 +482,15 @@ body {
}
}
}
div.el-popper.global-input-search-popover {
background: #064258;
.footer {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 9px;
margin-top: 15px;
}
}

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

@ -71,3 +71,17 @@ export const CameraControlTypeEnum = {
text: "枪机",
},
};
export const EventTopics = {
交通事故: 1,
车辆故障: 2,
交通管制: 3,
交通拥堵: 4,
非法上路: 5,
路障清除: 6,
施工建设: 7,
服务区异常: 8,
设施设备隐患: 9,
异常天气: 10,
其他事件: 11,
};

Loading…
Cancel
Save