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 00000000..a9b1be9e Binary files /dev/null and b/ruoyi-ui/src/views/JiHeExpressway/images/device/边坡.png differ 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 +];