Browse Source

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

wangqin
qingzhengli 11 months ago
parent
commit
17cfd5e08c
  1. 10
      ruoyi-ui/src/api/manualWarning/index.js
  2. 13
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/data.js
  3. 19
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/confirmed.svg
  4. 19
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/falsePositives.svg
  5. 19
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/processed.svg
  6. 19
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/processing.svg
  7. 19
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/toBeConfirmed.svg
  8. 240
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue
  9. BIN
      ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/test.png
  10. 8
      ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue
  11. 81
      ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js
  12. 79
      ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue
  13. 6
      ruoyi-ui/vue.config.js

10
ruoyi-ui/src/api/manualWarning/index.js

@ -0,0 +1,10 @@
import request from "@/utils/request";
// 查询非机预警列表
export function perceivedEventsList(data) {
return request({
url: "/perceivedEvents/warning/perceivedEventsList",
method: "post",
data,
});
}

13
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/data.js

@ -0,0 +1,13 @@
// 关系 对照的 图片
export const statusMap = {
// 已确认
1: "confirmed",
// 误报
2: "falsePositives",
// 已处理
3: "processed",
// 处理中
4: "processing",
// 待确认
5: "toBeConfirmed",
};

19
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/confirmed.svg

@ -0,0 +1,19 @@
<svg width="70" height="67" viewBox="0 0 70 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814579">
<path id="Rectangle 3543" d="M4.84212 -0.412891C4.06408 -1.19693 4.07152 -2.46063 4.85875 -3.23545L18.4343 -16.597C19.2215 -17.3718 20.4904 -17.3643 21.2684 -16.5803L86.0581 48.7085C86.8361 49.4926 86.8287 50.7563 86.0414 51.5311L72.4659 64.8926C71.6787 65.6674 70.4098 65.6599 69.6317 64.8759L4.84212 -0.412891Z" fill="url(#paint0_linear_308_2325)"/>
<path id="Rectangle 3545" d="M0.9289 -4.35623C0.656093 -4.63114 0.658701 -5.07424 0.934728 -5.34592C1.21076 -5.61759 1.65567 -5.61497 1.92848 -5.34006L71.5462 64.814C71.819 65.0889 71.8164 65.532 71.5404 65.8037C71.2643 66.0754 70.8194 66.0727 70.5466 65.7978L0.9289 -4.35623Z" fill="url(#paint1_linear_308_2325)"/>
<path id="&#229;&#183;&#178;&#231;&#161;&#174;&#232;&#174;&#164;" d="M37.9155 16.2976L31.7268 10.0527L28.7813 12.9478C28.342 13.3796 28.339 13.834 28.7924 14.2915L33.7394 19.2834C33.9759 19.5221 34.2329 19.6621 34.5006 19.6934C34.8774 19.7157 35.6445 19.2169 36.8019 18.197L37.2721 19.109C35.9355 20.2265 35.0291 20.7836 34.533 20.8001C34.1065 20.7875 33.6715 20.5673 33.2376 20.1692L27.8964 14.7796C27.0981 13.9741 27.1233 13.1641 27.942 12.3594L33.1838 7.20717L33.8934 7.92315L32.4157 9.37559L37.8851 14.8945L40.491 12.3331L33.9179 5.70045L34.6168 5.01348L41.9093 12.3721L37.9155 16.2976ZM44.9572 24.0794L43.9388 25.0804C43.8589 25.1589 43.7592 25.2373 43.6694 25.3256L44.9505 26.6183L46.2285 25.3622L44.9572 24.0794ZM42.9911 25.8942C41.9343 26.6973 40.8796 27.1844 39.7872 27.355L39.7441 26.3767C40.9557 26.1673 42.1206 25.513 43.2386 24.4534L46.5135 21.2345C46.2259 21.2227 45.9383 21.2109 45.6805 21.1895L45.7662 20.2219C47.1938 20.3696 48.683 20.1818 50.224 19.6683L50.7542 20.5016C50.446 20.6083 50.1379 20.6952 49.8396 20.792L52.2146 23.1885L51.7054 23.689C50.9705 23.8225 50.2954 23.8971 49.7002 23.8932L51.3558 25.5638L45.3751 31.4423C44.9258 31.8839 44.44 31.851 43.9374 31.3439L43.2081 30.608L43.6896 29.8011C43.916 30.0693 44.1227 30.3177 44.3395 30.5364C44.5366 30.7353 44.7449 30.7268 44.9446 30.5305L46.2826 29.2155L44.962 27.883L42.7555 30.0518L42.1149 29.4055L44.3215 27.2366L42.9911 25.8942ZM48.9316 23.1176C49.5169 23.1115 50.1323 23.0563 50.7876 22.9618L48.866 21.0227C48.2502 21.1372 47.6446 21.2024 47.0592 21.2282L48.9316 23.1176ZM46.9116 28.5972L48.1896 27.341L46.8691 26.0085L45.591 27.2647L46.9116 28.5972ZM48.8286 26.713L50.0467 25.5157L48.7262 24.1832L47.5081 25.3805L48.8286 26.713ZM48.0856 23.5368L46.8143 22.254L45.5962 23.4513L46.8675 24.7341L48.0856 23.5368ZM44.7569 15.3052L48.0484 18.6265L47.3495 19.3135L45.8614 17.8119C44.9246 18.4776 43.9785 19.0345 43.0431 19.4828L44.8367 21.2926L40.2937 25.7579L38.5691 24.0177L37.8103 24.7635L37.1402 24.0873L41.0541 20.2403C40.5771 20.3755 40.1101 20.4811 39.6532 20.5769L39.9082 19.5017C41.746 19.1087 43.4972 18.3101 45.1716 17.1159L44.058 15.9922L44.7569 15.3052ZM39.2181 23.3798L40.2923 24.4637L43.5273 21.284L42.4531 20.2001L39.2181 23.3798ZM61.2308 30.9141L61.96 31.65C61.1213 32.4743 60.303 33.2198 59.525 33.8667C57.4913 36.9061 56.3611 39.8229 56.1544 42.5977L55.0429 42.6694C55.3463 40.2707 56.2254 37.8165 57.6505 35.3165C57.3217 35.5416 57.0128 35.747 56.7039 35.9525C54.6121 37.2626 52.3567 37.8109 49.9477 37.5678L50.0539 36.5016C52.1755 36.6933 54.1723 36.2619 56.0345 35.1775C57.5584 34.2292 59.2938 32.818 61.2308 30.9141ZM56.5984 26.3392C56.7593 27.5159 56.8118 28.5832 56.746 29.5509L55.7639 29.5544C55.8392 28.6558 55.7868 27.5688 55.6164 26.3228L56.5984 26.3392ZM52.49 28.0806L54.6186 30.2285L50.2554 34.5171C50.9097 34.5807 51.6335 34.6349 52.427 34.6598L51.8655 35.565C50.6654 35.5275 49.4858 35.3914 48.3367 35.1467L48.6998 34.2402C48.9674 34.2716 49.196 34.2039 49.3558 34.0469L53.2497 30.2195L51.8011 28.7577L52.49 28.0806Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_308_2325" x1="11.6465" y1="-9.9162" x2="78.9727" y2="58.4883" gradientUnits="userSpaceOnUse">
<stop stop-color="#01E3AD"/>
<stop offset="1" stop-color="#01E3C8" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_308_2325" x1="2.64578" y1="-2.37436" x2="68.8242" y2="64.3511" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="0.0001" stop-color="white" stop-opacity="0"/>
<stop offset="0.455425" stop-color="white"/>
<stop offset="1" stop-color="white" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

19
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/falsePositives.svg

@ -0,0 +1,19 @@
<svg width="70" height="67" viewBox="0 0 70 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814577">
<path id="Rectangle 3543" d="M3.95687 -0.412891C3.17883 -1.19693 3.18627 -2.46063 3.9735 -3.23545L17.549 -16.597C18.3362 -17.3718 19.6051 -17.3643 20.3832 -16.5803L85.1728 48.7085C85.9508 49.4926 85.9434 50.7563 85.1562 51.5311L71.5807 64.8926C70.7934 65.6674 69.5245 65.6599 68.7465 64.8759L3.95687 -0.412891Z" fill="url(#paint0_linear_308_2321)"/>
<path id="Rectangle 3545" d="M1.08234 -3.30936C0.809533 -3.58427 0.812143 -4.02737 1.08817 -4.29904C1.3642 -4.57072 1.80912 -4.5681 2.08192 -4.29319L70.6609 64.8141C70.9337 65.089 70.9311 65.5321 70.655 65.8038C70.379 66.0755 69.9341 66.0729 69.6613 65.7979L1.08234 -3.30936Z" fill="url(#paint1_linear_308_2321)"/>
<path id="&#232;&#175;&#175;&#230;&#138;&#165;" d="M42.7797 13.8854L47.3326 18.4795L44.7266 21.0409L40.1738 16.4468L42.7797 13.8854ZM44.6757 19.7365L46.0136 18.4215L42.8207 15.1996L41.4828 16.5146L44.6757 19.7365ZM37.0458 18.4416L39.4208 20.8381C39.8194 20.5641 40.1984 20.2505 40.5876 19.8875L40.6276 19.8483L38.4103 17.6108L39.0792 16.9533L44.2727 22.1938L43.6037 22.8514L41.3273 20.5543L41.2873 20.5935C40.8981 20.9565 40.5091 21.28 40.1303 21.5541L42.8009 24.249L42.132 24.9065L39.7668 22.5199C39.3405 23.999 39.3995 25.59 39.9438 27.2928L38.9117 27.3651C38.4278 25.5243 38.4489 23.8153 38.9849 22.248C38.4774 22.4917 37.9903 22.6564 37.4936 22.752C36.312 22.9319 34.9844 22.6663 33.4813 21.9451L33.706 20.9587C35.1498 21.6597 36.4079 21.915 37.4507 21.7341C37.8283 21.6378 38.2062 21.502 38.5843 21.3266L36.3768 19.0991L37.0458 18.4416ZM40.4874 10.9757C40.6386 12.1227 40.6813 13.18 40.6254 14.138L39.6433 14.1414C39.7087 13.2527 39.666 12.1953 39.4956 10.9494L40.4874 10.9757ZM36.3396 12.6773L38.4682 14.8252L34.105 19.1139C34.6506 19.1273 35.2359 19.1213 35.8907 19.1058L35.3191 20.0406C34.2079 20.0728 33.1369 20.0065 32.1063 19.8417L32.4694 18.9352C32.7372 18.9468 32.9558 18.889 33.1155 18.732L37.0993 14.8163L35.6507 13.3545L36.3396 12.6773ZM49.227 27.5909L48.5181 28.2876C47.9539 28.0962 47.3997 27.895 46.8556 27.6642L43.8803 30.5887C43.2812 31.1775 42.6959 31.1836 42.1243 30.6068L41.2078 29.682L41.7391 28.8458C41.9949 29.1636 42.2509 29.4616 42.5169 29.7301C42.783 29.9986 43.0708 29.9906 43.3503 29.7159L45.8664 27.2428C45.2433 26.9522 44.6106 26.6319 43.9878 26.3018L44.5193 25.426C45.1911 25.8454 45.8731 26.2154 46.5653 26.5558L48.8817 24.279L47.4528 22.8371L48.1417 22.16L49.5706 23.6019L51.3778 21.8256L52.0775 22.5316L50.2703 24.3079L51.374 25.4216L50.6851 26.0988L49.5814 24.985L47.5446 26.9871C48.0986 27.208 48.6528 27.4093 49.227 27.5909ZM49.8101 29.4323L45.2971 33.8681L44.627 33.1919L53.3734 24.595L57.6996 28.9605C56.5913 30.0498 55.7934 30.7163 55.3155 30.9701C54.8378 31.204 54.2737 31.0126 53.643 30.3762L52.9334 29.6602L53.3653 28.8431C53.523 29.0022 53.7003 29.2009 53.9368 29.4396C54.1733 29.6782 54.3805 29.8476 54.5187 29.9473C54.6671 30.0174 54.8257 30.0382 55.0145 29.99C55.2731 29.8732 55.7219 29.5106 56.3607 28.922L53.3845 25.9189L50.4691 28.7845L54.2139 32.5633L53.5948 33.1717C52.3394 34.0131 51.0859 34.5581 49.8246 34.7771C49.8384 35.7058 50.0004 36.7047 50.3009 37.7835L49.2787 37.846C49.0476 36.7775 48.9152 35.7887 48.9212 34.8798C47.899 34.9423 46.8683 34.7972 45.8587 34.4547L46.1428 33.4883C47.093 33.8107 48.0346 33.9453 48.9674 33.8922C49.1061 32.4013 49.5809 31.1102 50.3817 30.009L49.8101 29.4323ZM51.0222 30.6554C50.3814 31.5601 49.9877 32.5948 49.8709 33.7697C50.8741 33.5688 51.8788 33.1506 52.8749 32.5249L51.0222 30.6554Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_308_2321" x1="10.7613" y1="-9.9162" x2="78.0875" y2="58.4883" gradientUnits="userSpaceOnUse">
<stop stop-color="#E24631"/>
<stop offset="1" stop-color="#E24631" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_308_2321" x1="2.76483" y1="-1.36213" x2="67.9659" y2="64.3853" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="0.0001" stop-color="white" stop-opacity="0"/>
<stop offset="0.455425" stop-color="white"/>
<stop offset="1" stop-color="white" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.1 KiB

19
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/processed.svg

@ -0,0 +1,19 @@
<svg width="69" height="67" viewBox="0 0 69 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814576">
<path id="Rectangle 3543" d="M3.014 -0.412891C2.23595 -1.19693 2.2434 -2.46063 3.03063 -3.23545L16.6061 -16.597C17.3934 -17.3718 18.6623 -17.3643 19.4403 -16.5803L84.2299 48.7085C85.008 49.4925 85.0005 50.7563 84.2133 51.5311L70.6378 64.8926C69.8506 65.6674 68.5817 65.6599 67.8036 64.8759L3.014 -0.412891Z" fill="url(#paint0_linear_308_2319)"/>
<path id="Rectangle 3545" d="M1.26496 -2.17509C0.992149 -2.44999 0.99476 -2.89309 1.27079 -3.16476C1.54681 -3.43644 1.99173 -3.43382 2.26454 -3.15891L69.7179 64.8141C69.9907 65.089 69.9881 65.5321 69.712 65.8038C69.436 66.0755 68.9911 66.0728 68.7183 65.7979L1.26496 -2.17509Z" fill="url(#paint1_linear_308_2319)"/>
<path id="&#229;&#183;&#178;&#229;&#164;&#132;&#231;&#144;&#134;" d="M36.0875 16.2976L29.8988 10.0527L26.9533 12.9478C26.514 13.3796 26.511 13.834 26.9644 14.2915L31.9114 19.2834C32.1479 19.5221 32.4049 19.6621 32.6726 19.6934C33.0494 19.7157 33.8165 19.2169 34.9739 18.197L35.4441 19.109C34.1075 20.2265 33.2011 20.7836 32.705 20.8001C32.2785 20.7875 31.8435 20.5673 31.4096 20.1692L26.0683 14.7796C25.2701 13.9741 25.2953 13.1641 26.114 12.3594L31.3558 7.20717L32.0654 7.92315L30.5877 9.37559L36.0571 14.8945L38.663 12.3331L32.0899 5.70045L32.7888 5.01348L40.0813 12.3721L36.0875 16.2976ZM45.2128 16.4761L45.7926 17.2999C45.2047 17.7011 44.6369 18.0629 44.0594 18.395L46.2668 20.6225L45.6278 21.2505C43.6145 22.6995 41.6441 23.6349 39.717 24.0372C39.5841 24.639 39.5509 25.1624 39.6272 25.6371C39.8467 26.9525 40.7891 28.4603 42.4346 30.1605C42.947 30.6776 43.4794 31.1751 44.0415 31.6826L43.1547 32.2794L42.0707 31.1856C40.0407 29.1371 38.9218 27.3119 38.6941 25.7298C38.6278 25.2452 38.651 24.7317 38.7439 24.1889C37.3541 24.3378 36.0055 24.25 34.6785 23.9053L34.9731 22.8502C36.3199 23.2147 37.6784 23.2928 39.0289 23.0843C39.3327 22.1379 39.8157 21.0938 40.4779 19.9522C39.7524 20.1549 39.0473 20.2787 38.3822 20.3435L38.5084 19.2576C40.6426 19.0443 42.8708 18.1106 45.2128 16.4761ZM41.7605 19.516C40.9883 20.7854 40.4156 21.898 40.0619 22.8737C41.6518 22.4692 43.2638 21.7092 44.8782 20.5936L43.1733 18.8733C42.6857 19.117 42.2081 19.3312 41.7605 19.516ZM49.075 20.4927L49.7944 21.2186L47.2584 23.7113C47.4774 25.1058 47.6164 26.5985 47.6852 28.1994L46.6225 28.3998C46.643 26.7896 46.612 25.4656 46.5095 24.4474L42.356 28.5299L41.6366 27.804L49.075 20.4927ZM56.974 29.1594L61.7929 34.022L57.1801 38.556L55.1303 36.4876L53.9522 37.6457L56.1695 39.8831L55.4905 40.5504L53.2732 38.313L51.9752 39.5888L54.5572 42.1941L53.8683 42.8713L47.9357 36.885L48.6246 36.2078L51.2657 38.8728L52.5637 37.597L50.3365 35.3497L51.0155 34.6823L53.2426 36.9297L54.4208 35.7717L52.3612 33.6934L56.974 29.1594ZM57.1391 37.2418L58.487 35.9169L57.1172 34.5347L55.7693 35.8596L57.1391 37.2418ZM55.0598 35.1436L56.4077 33.8187L55.028 32.4265L53.6801 33.7514L55.0598 35.1436ZM55.6571 31.8083L57.0367 33.2004L58.3946 31.8658L57.0149 30.4736L55.6571 31.8083ZM59.1041 32.5817L57.7463 33.9164L59.1161 35.2986L60.474 33.964L59.1041 32.5817ZM50.1904 28.8975L51.2646 29.9814L53.6309 27.6555L52.4188 26.4324L53.0977 25.7651L56.2414 28.9372L55.5624 29.6046L54.3601 28.3914L51.9938 30.7173L53.0778 31.8111L52.3889 32.4883L51.3049 31.3944L49.0384 33.6221C49.5427 33.8724 50.0372 34.093 50.5518 34.294L49.8529 34.981C48.5668 34.439 47.2717 33.7686 45.9675 32.9697L46.479 32.1135C46.9925 32.4726 47.526 32.812 48.0695 33.1218L50.5756 30.6585L49.5015 29.5746L50.1904 28.8975Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_308_2319" x1="9.81838" y1="-9.9162" x2="77.1446" y2="58.4883" gradientUnits="userSpaceOnUse">
<stop stop-color="#8B8B8B"/>
<stop offset="1" stop-color="#8B8B8B" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_308_2319" x1="2.91019" y1="-0.265403" x2="67.0523" y2="64.4221" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="0.0001" stop-color="white" stop-opacity="0"/>
<stop offset="0.455425" stop-color="white"/>
<stop offset="1" stop-color="white" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

19
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/processing.svg

@ -0,0 +1,19 @@
<svg width="68" height="67" viewBox="0 0 68 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814575">
<path id="Rectangle 3543" d="M2.86676 -0.412627C2.08886 -1.19681 2.09631 -2.46075 2.88339 -3.23572L16.4533 -16.5967C17.2403 -17.3716 18.509 -17.3642 19.2869 -16.58L84.0517 48.7082C84.8296 49.4924 84.8221 50.7564 84.0351 51.5313L70.4652 64.8923C69.6781 65.6673 68.4094 65.6598 67.6315 64.8756L2.86676 -0.412627Z" fill="url(#paint0_linear_308_2317)"/>
<path id="Rectangle 3545" d="M0.547239 -2.75077C0.274535 -3.02568 0.277147 -3.46877 0.553071 -3.74045C0.828995 -4.01212 1.27375 -4.0095 1.54645 -3.7346L69.5455 64.814C69.8182 65.0889 69.8156 65.532 69.5397 65.8037C69.2637 66.0754 68.819 66.0728 68.5463 65.7979L0.547239 -2.75077Z" fill="url(#paint1_linear_308_2317)"/>
<path id="&#229;&#164;&#132;&#231;&#144;&#134;&#228;&#184;&#173;" d="M34.6074 5.93629L35.1871 6.76024C34.5993 7.16151 34.0316 7.52339 33.4542 7.85556L35.6612 10.0834L35.0223 10.7116C33.0093 12.1608 31.0394 13.0965 29.1126 13.4989C28.9797 14.1008 28.9465 14.6242 29.0228 15.099C29.2422 16.4147 30.1845 17.9228 31.8297 19.6233C32.342 20.1405 32.8743 20.638 33.4363 21.1457L32.5497 21.7426L31.4659 20.6486C29.4362 18.5997 28.3175 16.7742 28.0899 15.1917C28.0236 14.7071 28.0468 14.1934 28.1396 13.6506C26.7501 13.7996 25.4018 13.7117 24.0751 13.367L24.3696 12.3116C25.7161 12.6762 27.0744 12.7543 28.4246 12.5458C28.7284 11.5992 29.2113 10.5549 29.8734 9.41304C29.148 9.61578 28.443 9.73961 27.7781 9.80441L27.9042 8.71831C30.038 8.50505 32.2658 7.57108 34.6074 5.93629ZM31.1557 8.97681C30.3837 10.2464 29.811 11.3592 29.4575 12.3352C31.047 11.9306 32.6588 11.1704 34.2728 10.0546L32.5683 8.33392C32.0807 8.57775 31.6032 8.792 31.1557 8.97681ZM38.4689 9.95366L39.1882 10.6797L36.6526 13.1729C36.8715 14.5676 37.0105 16.0606 37.0793 17.6618L36.0168 17.8623C36.0373 16.2518 36.0063 14.9275 35.9039 13.9091L31.7511 17.9924L31.0318 17.2663L38.4689 9.95366ZM46.3663 18.6219L51.1844 23.4855L46.5724 28.0203L44.523 25.9516L43.3451 27.1098L45.562 29.3477L44.8831 30.0151L42.6663 27.7773L41.3685 29.0533L43.95 31.6592L43.2612 32.3364L37.3297 26.349L38.0185 25.6717L40.6591 28.3372L41.9568 27.0612L39.7301 24.8134L40.4089 24.146L42.6357 26.3937L43.8136 25.2355L41.7544 23.1568L46.3663 18.6219ZM46.5315 26.7059L47.8791 25.3807L46.5096 23.9983L45.1619 25.3234L46.5315 26.7059ZM44.4525 24.6073L45.8002 23.2822L44.4208 21.8897L43.0731 23.2148L44.4525 24.6073ZM45.0497 21.2713L46.4291 22.6638L47.7867 21.3288L46.4073 19.9364L45.0497 21.2713ZM48.4961 22.0449L47.1385 23.3799L48.508 24.7624L49.8657 23.4274L48.4961 22.0449ZM39.584 18.36L40.658 19.4441L43.0239 17.1178L41.812 15.8945L42.4908 15.227L45.6339 18.3997L44.955 19.0672L43.753 17.8538L41.3871 20.1801L42.4709 21.2742L41.7821 21.9515L40.6983 20.8574L38.4323 23.0856C38.9364 23.3359 39.4309 23.5565 39.9453 23.7575L39.2465 24.4446C37.9607 23.9026 36.6659 23.2321 35.3619 22.433L35.8734 21.5767C36.3867 21.9358 36.9201 22.2753 37.4636 22.5851L39.9692 20.1214L38.8952 19.0373L39.584 18.36ZM57.7127 29.2002L58.4418 29.9362L56.6449 31.703L60.1821 35.2736L55.4903 39.887L54.7809 39.1708L55.4098 38.5525L52.582 35.698L49.1779 39.0451L48.4488 38.3091L51.8529 34.962L49.035 32.1174L48.4061 32.7358L47.6967 32.0197L52.3885 27.4064L55.9158 30.967L57.7127 29.2002ZM49.7338 31.4304L52.5517 34.2749L55.217 31.6541L52.3991 28.8096L49.7338 31.4304ZM53.2808 35.0109L56.1086 37.8654L58.7739 35.2446L55.9461 32.3901L53.2808 35.0109Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_308_2317" x1="9.66833" y1="-9.9162" x2="76.9949" y2="58.4631" gradientUnits="userSpaceOnUse">
<stop stop-color="#00B3CC"/>
<stop offset="1" stop-color="#00B3CC" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_308_2317" x1="2.21076" y1="-0.822032" x2="66.8904" y2="64.3791" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="0.0001" stop-color="white" stop-opacity="0"/>
<stop offset="0.455425" stop-color="white"/>
<stop offset="1" stop-color="white" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.0 KiB

19
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/images/toBeConfirmed.svg

@ -0,0 +1,19 @@
<svg width="71" height="67" viewBox="0 0 71 67" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="Group 1142814578">
<path id="Rectangle 3543" d="M5.8995 -0.412891C5.12145 -1.19693 5.1289 -2.46063 5.91613 -3.23545L19.4916 -16.597C20.2789 -17.3718 21.5478 -17.3643 22.3258 -16.5803L87.1154 48.7085C87.8935 49.4926 87.886 50.7563 87.0988 51.5311L73.5233 64.8926C72.7361 65.6674 71.4672 65.6599 70.6891 64.8759L5.8995 -0.412891Z" fill="url(#paint0_linear_308_2323)"/>
<path id="Rectangle 3545" d="M1.21027 -5.13797C0.937464 -5.41288 0.940073 -5.85598 1.2161 -6.12765C1.49213 -6.39933 1.93705 -6.39671 2.20985 -6.1218L72.6034 64.8141C72.8762 65.089 72.8736 65.5321 72.5976 65.8038C72.3216 66.0755 71.8767 66.0728 71.6038 65.7979L1.21027 -5.13797Z" fill="url(#paint1_linear_308_2323)"/>
<path id="&#229;&#190;&#133;&#231;&#161;&#174;&#232;&#174;&#164;" d="M37.9054 6.09139L38.2367 7.00246C36.626 7.56489 34.8296 7.70128 32.8377 7.38194L33.3197 6.49596C35.0046 6.72437 36.5233 6.58616 37.9054 6.09139ZM35.9736 8.71649L36.2951 9.61762C35.5194 9.90891 34.7145 10.1111 33.8805 10.2242L28.8284 15.1899L28.1484 14.5038L32.4018 10.3231C31.6676 10.3381 30.924 10.2838 30.1707 10.18L30.6527 9.29407C32.5857 9.51423 34.3626 9.31843 35.9736 8.71649ZM41.5511 9.84972L42.2311 10.5359L41.1428 11.6056L43.3601 13.843L42.7111 14.4809L40.4938 12.2435L39.2458 13.4702L41.8671 16.1153L41.2081 16.763L35.3347 10.8364L35.9937 10.1886L38.5658 12.784L39.8138 11.5573L37.6162 9.3398L38.2652 8.7019L40.4628 10.9194L41.5511 9.84972ZM34.1659 12.0834L37.9895 15.9417L38.7284 15.2154L39.4379 15.9314L38.6991 16.6576L39.8521 17.8211L39.1831 18.4786L38.0301 17.3152L35.4641 19.8373C34.8151 20.4752 34.1604 20.4709 33.5297 19.8345L32.1304 18.4224L32.6616 17.5862C33.085 18.073 33.5085 18.5401 33.9224 18.9578C34.2476 19.2859 34.5948 19.2783 34.9343 18.9447L37.3206 16.5992L33.4969 12.7409L34.1659 12.0834ZM34.2704 14.297C34.2532 15.4133 34.1777 16.3316 34.054 17.0421L33.1027 16.8777C33.2467 16.1081 33.3421 15.1702 33.3691 14.0836L34.2704 14.297ZM46.1588 24.2248L45.1404 25.2258C45.0605 25.3043 44.9608 25.3827 44.871 25.471L46.1521 26.7638L47.4301 25.5076L46.1588 24.2248ZM44.1927 26.0396C43.1359 26.8427 42.0812 27.3298 40.9888 27.5004L40.9457 26.5221C42.1573 26.3127 43.3222 25.6584 44.4402 24.5988L47.7151 21.3799C47.4275 21.3681 47.1399 21.3564 46.8821 21.3349L46.9679 20.3673C48.3954 20.515 49.8846 20.3272 51.4256 19.8137L51.9558 20.647C51.6476 20.7537 51.3395 20.8406 51.0412 20.9374L53.4162 23.3339L52.907 23.8344C52.1721 23.9679 51.497 24.0425 50.9018 24.0386L52.5574 25.7092L46.5767 31.5877C46.1274 32.0293 45.6416 31.9965 45.139 31.4893L44.4097 30.7535L44.8912 29.9465C45.1176 30.2147 45.3243 30.4631 45.5411 30.6818C45.7382 30.8807 45.9465 30.8722 46.1462 30.6759L47.4842 29.3609L46.1636 28.0284L43.9571 30.1972L43.3165 29.5509L45.5231 27.382L44.1927 26.0396ZM50.1332 23.263C50.7185 23.2569 51.3339 23.2017 51.9892 23.1072L50.0676 21.1681C49.4518 21.2826 48.8462 21.3478 48.2608 21.3736L50.1332 23.263ZM48.1132 28.7426L49.3912 27.4865L48.0707 26.154L46.7926 27.4101L48.1132 28.7426ZM50.0302 26.8584L51.2483 25.6611L49.9278 24.3286L48.7097 25.5259L50.0302 26.8584ZM49.2872 23.6822L48.0159 22.3994L46.7978 23.5967L48.0691 24.8795L49.2872 23.6822ZM45.9585 15.4506L49.25 18.7719L48.5511 19.4589L47.063 17.9574C46.1262 18.623 45.1801 19.1799 44.2447 19.6282L46.0383 21.438L41.4953 25.9033L39.7708 24.1631L39.0119 24.9089L38.3418 24.2328L42.2557 20.3857C41.7787 20.5209 41.3117 20.6265 40.8548 20.7223L41.1098 19.6471C42.9476 19.2542 44.6988 18.4556 46.3732 17.2613L45.2596 16.1376L45.9585 15.4506ZM40.4197 23.5252L41.4939 24.6091L44.7289 21.4294L43.6547 20.3455L40.4197 23.5252ZM62.4324 31.0595L63.1616 31.7954C62.3229 32.6197 61.5046 33.3652 60.7266 34.0121C58.6929 37.0515 57.5627 39.9684 57.356 42.7431L56.2445 42.8148C56.5479 40.4161 57.4271 37.962 58.8521 35.462C58.5233 35.687 58.2144 35.8925 57.9055 36.0979C55.8137 37.408 53.5583 37.9563 51.1493 37.7133L51.2555 36.647C53.3771 36.8387 55.3739 36.4073 57.2361 35.3229C58.7601 34.3746 60.4954 32.9634 62.4324 31.0595ZM57.8 26.4846C57.9609 27.6613 58.0134 28.7286 57.9476 29.6963L56.9655 29.6998C57.0408 28.8012 56.9884 27.7142 56.818 26.4683L57.8 26.4846ZM53.6916 28.226L55.8202 30.3739L51.457 34.6626C52.1113 34.7261 52.8351 34.7803 53.6286 34.8053L53.0671 35.7105C51.867 35.6729 50.6874 35.5368 49.5383 35.2921L49.9014 34.3856C50.169 34.417 50.3976 34.3493 50.5574 34.1923L54.4513 30.3649L53.0027 28.9032L53.6916 28.226Z" fill="white"/>
</g>
<defs>
<linearGradient id="paint0_linear_308_2323" x1="12.7039" y1="-9.9162" x2="80.0301" y2="58.4883" gradientUnits="userSpaceOnUse">
<stop stop-color="#CB7A00"/>
<stop offset="1" stop-color="#CB7A00" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_308_2323" x1="2.95283" y1="-3.13021" x2="69.8613" y2="64.3256" gradientUnits="userSpaceOnUse">
<stop stop-color="white"/>
<stop offset="0.0001" stop-color="white" stop-opacity="0"/>
<stop offset="0.455425" stop-color="white"/>
<stop offset="1" stop-color="white" stop-opacity="0"/>
</linearGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.9 KiB

240
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/index.vue

@ -0,0 +1,240 @@
<template>
<BorderRadiusImage
class="RoadStateCard"
borderRadius="2px"
borderColor="linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0))"
borderWidth="2px"
>
<div class="left">
<!-- <img :src="(cardData.pictures ? cardData.pictures[0] : null) || require(`./test.png`)"> -->
<!-- <img :src="require(`./test.png`)"> -->
<ElImage
style="width: 212px; height: 159px"
:src="cardData.pictures ? cardData.pictures[0] : null"
:preview-src-list="cardData.pictures || []"
>
<div slot="error">
<i class="el-icon-picture-outline icon"></i>
</div>
</ElImage>
</div>
<div class="right">
<div class="info">
<p class="linText" v-for="(item, index) in keyMap" :key="index">
<span>{{ item.label }}: </span>
<span>{{ cardData[item.key] ? cardData[item.key] : "-" }}</span>
</p>
</div>
<div class="controls">
<!-- <Button
:style="{ background: firstBtnColor, width: '50%' }"
@click.native="$emit('firstBtnClick', cardData.id)"
>{{ getFirstBtnText(cardData.state) }}</Button
>
<Button
v-if="cardData.state == 4"
:style="{ background: lastBtnColor, width: '50%' }"
@click.native="$emit('lastBtnClick', cardData.id)"
>{{ getLastBtnText(cardData.state) }}</Button
> -->
</div>
</div>
<img
v-if="cardData.state"
class="status"
:src="require(`./images/${statusMap[cardData.state]}.svg`)"
/>
</BorderRadiusImage>
</template>
<script>
import Button from "@screen/components/Buttons/Button.vue";
import BorderRadiusImage from "@screen/components/BorderRadiusImage.vue";
import { statusMap } from "./data.js";
export default {
name: "ManualWarningCard",
props: {
cardData: {
type: Object,
default: () => ({
time: "2023.12.22 13:00:00",
source: "视频智能识别",
location: "k100+000",
direction: "济南方向",
}),
},
firstBtnText: {
type: String,
default: "详情",
},
lastBtnText: {
type: String,
default: "调度记录",
},
firstBtnColor: {
type: String,
default: "#00B3CC",
},
lastBtnColor: {
type: String,
default: "#CB7A00",
},
keyMap: {
type: Array,
default: () => [
{
key: "warningType",
label: "类型",
},
// {
// key: "warningSubclass",
// label: "",
// },
{
key: "source",
label: "来源",
},
{
key: "facilityName",
label: "位置",
},
{
key: "stringDirection",
label: "方向",
},
{
key: "warningTime",
label: "时间",
},
],
},
},
data() {
return {
picUrl: "./test.png",
};
},
emit: ["firstBtnClick", "lastBtnClick"],
components: {
Button,
BorderRadiusImage,
},
created() {
this.statusMap = statusMap;
},
methods: {
getFirstBtnText(state) {
let text = "详情";
if (state == 5) text = "去确认";
if (state == 4) text = "详情";
if (state == 3) text = "处置记录";
return text;
},
getLastBtnText(state) {
let text = "去处置";
return text;
},
},
};
</script>
<style lang="scss" scoped>
.RoadStateCard {
color: #fff;
display: flex;
background: #133242;
border-radius: 2px 2px 2px 2px;
opacity: 1;
// border: 1px solid;
// border-image: linear-gradient(360deg, rgba(55, 231, 255, 0.3), rgba(55, 231, 255, 0)) 1 1;
padding: 18px 12px;
gap: 12px;
height: 100%;
overflow: hidden;
position: relative;
.left {
img {
width: 212px;
height: 159px;
}
.icon {
display: inline-block;
width: 212px;
height: 159px;
line-height: 157px;
text-align: center;
border: 1px solid #fff;
}
}
.right {
display: flex;
flex-direction: column;
flex: 1;
gap: 12px;
height: 159px;
width: 201px;
.info {
flex: 1;
display: flex;
flex-direction: column;
> p {
font-size: 14px;
color: #f4f4f4;
line-height: 24px;
margin-bottom: 10px;
&:nth-child(1) span:nth-child(2) {
color: #ff5f5f;
}
// &:nth-child(-n + 2) {
// color: #37e7ff;
// font-size: 16px;
// font-weight: bold;
// }
// &:nth-child(2) {
// margin-bottom: 15px;
// }
}
.linText {
/*不换行*/
white-space: nowrap;
/*超出的显示省略号*/
text-overflow: ellipsis;
/*超出部分隐藏*/
overflow: hidden;
/*长单词不换行-兼容ie*/
// word-wrap: normal;
:nth-child(1) {
color: #3de8ff;
}
:nth-child(2) {
color: #fff;
}
}
}
.controls {
display: flex;
gap: 9px;
> div {
// flex: 1;
}
}
}
.status {
position: absolute;
right: 0;
top: 0;
}
}
</style>

BIN
ruoyi-ui/src/views/JiHeExpressway/components/ManualWarningCard/test.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

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

@ -225,12 +225,18 @@ export default {
this.isShowAddNew = true; this.isShowAddNew = true;
}, },
onExport() { onExport() {
let url = '';
if (this.activeName == '-1') {
url = '/business/warning/export'
} else {
url = '/dc/system/event/export';
}
let loadingInstance = Loading.service({ let loadingInstance = Loading.service({
fullscreen: true, fullscreen: true,
background: "#00000052", background: "#00000052",
text: "文件正在下载...", text: "文件正在下载...",
}); });
request.post('/dc/system/event/export', {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' }) request.post(url, {}, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, responseType: 'blob' })
.then((res) => { .then((res) => {
console.log(res); console.log(res);
const url = window.URL.createObjectURL(new Blob([res])); const url = window.URL.createObjectURL(new Blob([res]));

81
ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/data.js

@ -0,0 +1,81 @@
import * as PresetFormItems from "@screen/pages/control/event/event/FormEvent/PresetFormItems.js";
import { merge, cloneDeep } from "lodash";
export const searchFormList = [
{
label: "事件状态:",
key: "eventState",
type: "RadioGroup",
default: "0",
options: {
options: [
{
key: "0",
label: "未解决",
},
{
key: "1",
label: "已解决",
},
{
key: "2",
label: "已关闭",
},
],
},
},
PresetFormItems.eventSources,
PresetFormItems.eventType,
{
label: "方向:",
key: "direction",
type: "RadioGroup",
default: "1",
options: {
options: [
{
key: "1",
label: "菏泽方向",
},
{
key: "2",
label: "双向",
},
{
key: "3",
label: "济南方向",
},
],
},
},
{
label: "时间范围:",
key: "warningTime",
required: false,
type: "datePicker",
options: {
type: "daterange",
format: "yyyy-MM-dd HH:mm:ss",
valueFormat: "yyyy-MM-dd HH:mm:ss",
},
},
{
...PresetFormItems.station,
label: "开始桩号:",
required: false,
},
merge(cloneDeep(PresetFormItems.station), {
options: {
options: [
{
key: "endStakeMark[0]",
},
{
key: "endStakeMark[1]",
},
],
},
label: "结束桩号:",
required: false,
}),
];

79
ruoyi-ui/src/views/JiHeExpressway/pages/control/manual/events/index.vue

@ -2,12 +2,20 @@
<div class="RoadNetworkMonitoring"> <div class="RoadNetworkMonitoring">
<!-- 搜索栏 --> <!-- 搜索栏 -->
<div class="filter"> <div class="filter">
<ButtonGradient @click="onRefresh" class="refresh-btn"> <div class="filter-btn">
<template #prefix> <ButtonGradient @click.native="handleExport">
<img src="./images/refresh.svg" /> <template #prefix>
</template> <img src="@screen/images/export.svg" />
刷新 </template>
</ButtonGradient> 导出
</ButtonGradient>
<ButtonGradient @click="onRefresh" class="refresh-btn">
<template #prefix>
<img src="./images/refresh.svg" />
</template>
刷新
</ButtonGradient>
</div>
<InputSearch <InputSearch
style="width: 402px" style="width: 402px"
@ -19,12 +27,10 @@
<!-- 内容 --> <!-- 内容 -->
<div class="body"> <div class="body">
<RoadStateCard <ManualWarningCard
v-for="(item, index) in data" v-for="(item, index) in data"
:key="index" :key="index"
:cardData="item" :cardData="item"
@firstBtnClick="firstBtnClick"
@lastBtnClick="lastBtnClick"
/> />
</div> </div>
@ -49,10 +55,10 @@
import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue"; import ButtonGradient from "@screen/components/Buttons/ButtonGradient.vue";
import Pagination from "@screen/components/Pagination.vue"; import Pagination from "@screen/components/Pagination.vue";
import InputSearch from "@screen/components/InputSearch/index.vue"; import InputSearch from "@screen/components/InputSearch/index.vue";
import RoadStateCard from "@screen/components/RoadStateCard/index.vue"; import ManualWarningCard from "@screen/components/ManualWarningCard/index.vue";
// import EventDetailDialog from "./EventDetailDialog/index"; import { perceivedEventsList } from "@/api/manualWarning/index.js";
// import EventDispatchDialog from "./EventDispatchDialog/index"; // import EventDispatchDialog from "./EventDispatchDialog/index";
// import { searchFormList } from "./data"; import { searchFormList } from "./data";
import request from "@/utils/request"; import request from "@/utils/request";
const directionMapping = { const directionMapping = {
@ -65,14 +71,14 @@ export default {
name: "RoadNetworkMonitoring", name: "RoadNetworkMonitoring",
components: { components: {
Pagination, Pagination,
RoadStateCard, ManualWarningCard,
InputSearch, InputSearch,
Pagination, Pagination,
ButtonGradient, ButtonGradient,
}, },
data() { data() {
return { return {
searchFormList: {}, searchFormList,
detailDialogFormData: {}, detailDialogFormData: {},
total: 0, total: 0,
data: [], data: [],
@ -80,7 +86,7 @@ export default {
searchData: { searchData: {
pageSize: 16, pageSize: 16,
pageNum: 1, pageNum: 1,
eventState: "0", warningSource: "6",
}, },
}; };
}, },
@ -88,24 +94,40 @@ export default {
this.initData(); this.initData();
}, },
methods: { methods: {
//
handleExport() {
this.$message.warning("待开发");
},
//
onRefresh() {},
initData() { initData() {
request({ perceivedEventsList(this.searchData).then((res) => {
// url: `/dc/system/event/dispatchEventList`, console.log("res", res);
url: "/dc/system/event/list", if (res.code != 200) return Message.error(res?.msg);
method: "get", this.total = res.total;
params: this.searchData, res.rows.forEach((it) => {
}).then((result) => { it.source = "非机预警";
if (result.code != 200) return Message.error(result?.msg);
this.total = result.total;
result.rows.forEach((it) => {
it.stringDirection = directionMapping[it.direction] || it.direction; it.stringDirection = directionMapping[it.direction] || it.direction;
}); });
this.data = result.rows; this.data = res.rows;
}); });
// request({
// // url: `/dc/system/event/dispatchEventList`,
// url: "/dc/system/event/list",
// method: "get",
// params: this.searchData,
// }).then((result) => {
// if (result.code != 200) return Message.error(result?.msg);
// this.total = result.total;
// result.rows.forEach((it) => {
// it.stringDirection = directionMapping[it.direction] || it.direction;
// });
// this.data = result.rows;
// });
}, },
onSizeChange(pageSize) {}, onSizeChange(pageSize) {},
getStateCardBind(item) {}, getStateCardBind(item) {},
onRefresh() {},
firstBtnClick(id) {}, firstBtnClick(id) {},
handleSearch(data) {}, handleSearch(data) {},
}, },
@ -126,7 +148,10 @@ export default {
display: flex; display: flex;
// justify-content: flex-end; // justify-content: flex-end;
justify-content: space-between; justify-content: space-between;
.refresh-btn { .filter-btn {
width: 150px;
justify-content: space-between;
display: flex;
} }
} }

6
ruoyi-ui/vue.config.js

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

Loading…
Cancel
Save