diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElSelect.vue b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElSelect.vue index 9e37c290..b461d42f 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElSelect.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/FormConfig/components/ElSelect.vue @@ -12,6 +12,10 @@ export default { name: 'ElSelect_', props: { + defaultl: { + type: Number, + default: undefined + }, options: { type: Array, default: () => [] diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue index 430ec573..6126f45b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/RoadStateCard/index.vue @@ -116,7 +116,7 @@ export default { .left { img { width: 212px; - height: 159; + height: 159px; } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue index 42b14da7..4501f2db 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -3,8 +3,9 @@ -
- +
+ +
@@ -22,6 +23,19 @@ import 'vue-slick-carousel/dist/vue-slick-carousel-theme.css' export default { name: "Carousel", components: { VueSlickCarousel }, + props: { + pictures: { + type: Array, + default: () => [ + "shareWith/message-active.svg", + "shareWith/message.svg", + "shareWith/website-active.svg", + "shareWith/website.svg", + "shareWith/weChat-active.svg", + "shareWith/weChat-active.svg" + ] + }, + }, data() { return { carouselItems: [ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue index 44694e29..91349236 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/index.vue @@ -6,7 +6,7 @@
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 89b43a73..b753d588 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 @@ -203,6 +203,7 @@ export const eventLevel = { required: true, type: "select", options:{ + defaultl: 5, options:[ { key: 1, 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 0add8ac7..d4e18d36 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 @@ -87,23 +87,23 @@ export const gjSearchFormList = [ }, { ...PresetFormItems.station, - label: "开始桩号:", + label: "桩号:", required: false, }, - merge(cloneDeep(PresetFormItems.station), { - options: { - options: [ - { - key: "endStakeMark[0]", - }, - { - key: "endStakeMark[1]", - }, - ], - }, - label: "结束桩号:", - required: false, - }), + // merge(cloneDeep(PresetFormItems.station), { + // options: { + // options: [ + // { + // key: "endStakeMark[0]", + // }, + // { + // key: "endStakeMark[1]", + // }, + // ], + // }, + // label: "结束桩号:", + // required: false, + // }), ]; export const gzSearchFormList = [ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue index 1e17b4fc..d256a0a6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/index.vue @@ -297,6 +297,10 @@ export default { data.startTime = data.warningTime; data.stringEventState = warningStateMapping[data.warningState]; data.stringEventType = warningTypeMapping[data.warningType]; + if (data.otherConfig) { + let otherConfig = JSON.parse(data.otherConfig); + data.pictures = otherConfig.pictures || []; + } this.detailDialogFormData = data; // console.log('data', this.detailDialogFormData)