From 1b2a1347dd6c1fb844d90d1202530e1ef86faf85 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Thu, 31 Oct 2024 10:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=9D=A1=E7=9B=91=E6=B5=8B=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RoadStateCard/index.vue | 6 ++++-- .../JiHeExpressway/images/device/边坡.png | Bin 0 -> 1083 bytes .../event/event/FormEvent/PresetFormItems.js | 4 ++++ .../pages/control/event/event/data.js | 8 ++++++++ .../perception/eventDetection/statistics/data.js | 4 ++++ ruoyi-ui/src/views/JiHeExpressway/utils/enum.js | 6 +++++- .../utils/enum_event/PresetFormItems.js | 8 ++++++-- 7 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/device/边坡.png diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index 80249a7f..9258bfdd 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -2,14 +2,14 @@
-
-
@@ -124,6 +124,8 @@ export default { return require(`@screen/images/device/扫码报警B.png`) } else if(warningSource ===7){ return require(`@screen/images/device/气象监测器B.png`) + } else if(warningSource ===8){ + return require(`@screen/images/device/边坡.png`) } else { return require(`@screen/images/device/view.png`) } diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/device/边坡.png b/ruoyi-ui/src/views/JiHeExpressway/images/device/边坡.png new file mode 100644 index 0000000000000000000000000000000000000000..a9b1be9e9b7bf48a2f93890beae56cf9721a79b6 GIT binary patch literal 1083 zcmV-B1jPG^P)Px&^+`lQR9HvNm|s%cFc8MSHSo|$OUw=6v5lD_Hy}4iP5_($I04BC3MU|(pm2ib z24o=6M{(&gXiM&>z*PPI@qK$c%opf{swX zx7(`&egLrPTZae-6TsYV80fwyXne;z%((W!$#-EX0Gf$IB6L)Zx*!q1R7 z1oT{hdOj1{k2UIq{48|LA{HdzYA&Eob4EjLQ!f-CWL$N?zX8O)vDO&0Od3)J^;DO9 zKMnaF5BP|I@1C*4Q9@f@3mPkS)Hb;^D}<>qCcfo16HdH37^F#nq7~H3mLRkC9)Mi~ zs)%uc&uC|rBoI)i{9{4~@h{%QU!!5G7z(rmKE@`dA}Cd({vu|r4p_2!mk9OQxj`;Y z7fXL&HYM)S^^<@zJ>~^cTg4(n26|D1EA@>oeXtpzB_S6AeBEVllu$z!G?qMK(#2k$ z36!{qv2Q@-y<*@}-n-PGOu&Nd2q?d3;mt~y=w}36G3!iC<4bSCRsc!`%v&*aU3|?k zuj2gG-OZdk1*U~DnwD(U-_m$18xRzsWs9wNz+Hxp!R(Q-V8piWg@Mz@gpNxGl(@3V zj<)2QZUpk3iXuV-W9;YRHMaxwMIxkWwNu5`duUefkl%Z~$4l8c_v;x$OKYHbv3vAv9o^F|s{gkwpZ zc);fj?Aye7ln_-1EHS#{5br|Rlm)2Q;|QlT#*wRX2w;4}-JFOQhR(XV)I-xe>q+L1 z658+r63$eOvQ3r-=xaKpJ5~ubQ_Y)GpLHLYelG>klskznXO}G9G5+9^*C5^W+($y8 zG(cM|wydtL;CfR32vr2aJtz1Tw*PMOq?5{(j}*NHgB-Hlrd}E6_UhQOze=o002ovPDHLkV1jKi B?neLs literal 0 HcmV?d00001 diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js index 413bb897..5e4a2488 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/PresetFormItems.js @@ -319,6 +319,10 @@ export const eventSources = { key: "13", label: "气象检测器", }, + { + key: "14", + label: "边坡监测", + }, ], }, }; diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js index 8b3d5e7f..29f9e186 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/data.js @@ -93,6 +93,10 @@ export const gjSearchFormList = [ key: "7", label: "气象检测器", }, + { + key: "8", + label: "边坡监测", + }, ], }, }, @@ -268,6 +272,10 @@ export const gzSearchFormList = [ key: "13", label: "气象检测器", }, + { + key: "14", + label: "边坡监测", + }, ], }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js index 45e1fb14..25681b45 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/statistics/data.js @@ -139,6 +139,10 @@ export const searchFormList = [ key: "7", label: "气象检测器", }, + { + key: "8", + label: "边坡监测", + }, ], }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js index d23b9a96..30a9d699 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum.js @@ -905,6 +905,9 @@ export const InfoWarningSource = { 7: { text: "气象检测器", }, + 8: { + text: "边坡监测", + }, }; export const warningSourceMapping = { @@ -914,7 +917,8 @@ export const warningSourceMapping = { 4: "护栏碰撞", 5: "扫码报警", 6: "非机预警", - 7: '气象检测器' + 7: '气象检测器', + 8: '边坡监测', }; export const warningStateMapping = { diff --git a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js index 070300ec..195bd925 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js +++ b/ruoyi-ui/src/views/JiHeExpressway/utils/enum_event/PresetFormItems.js @@ -13,7 +13,7 @@ const stake_start = { message: "请输入正确桩号", callback(value, data) { if (!value || - value==='' || + value==='' || (parseInt(value) >= 54 && parseInt(value) <= 208) ){ return true; @@ -84,6 +84,10 @@ export const source = { key: 13, label: "气象检测器", }, + { + key: 14, + label: "边坡监测", + }, ], }, }; @@ -1416,4 +1420,4 @@ export const locationSelect = [ value: 11, label: "出口内广场", }, -]; \ No newline at end of file +];