From be94749e6e128cd6b4615bb4208eb0403cde93cc Mon Sep 17 00:00:00 2001 From: zhoule Date: Wed, 21 Feb 2024 14:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Dialog/index.vue | 3 +- .../EventDetailDialog/Carousel/index.vue | 40 ++++++------------- .../control/event/event/FormEvent/data.js | 21 +++++++--- .../components/eventQuery/index.vue | 4 +- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue index 4a008298..d96d1c7e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/Dialog/index.vue @@ -165,7 +165,8 @@ export default { .dialog-content { padding: 9px 21px 27px 21px; - max-height: 96vh; + max-height: 90vh; + overflow-y: auto; } .bottom-right { 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 4501f2db..2d9c992a 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 @@ -5,7 +5,9 @@
- + + +
@@ -27,37 +29,20 @@ export default { 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" + "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg", + "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", + // "require('@screen/images/shareWith/message-active.svg')", + // "require('@screen/images/shareWith/message.svg')", + // "require('@screen/images/shareWith/website-active.svg')", + // "require('@screen/images/shareWith/website.svg')", + // "require('@screen/images/shareWith/weChat-active.svg')", + // "require('@screen/images/shareWith/weChat-active.svg')" ] }, }, data() { return { - carouselItems: [ - { - "imageURL": "shareWith/message-active.svg" - }, - { - "imageURL": "shareWith/message.svg" - }, - { - "imageURL": "shareWith/website-active.svg" - }, - { - "imageURL": "shareWith/website.svg" - }, - { - "imageURL": "shareWith/weChat-active.svg" - }, - { - "imageURL": "shareWith/weChat-active.svg" - } - ], + carouselItems: [], settings: { infinite: true, arrows: false, @@ -74,6 +59,7 @@ export default { this.$refs.CarouselRef.prev() }, nextSlide() { + // console.log('pics',this.pictures) this.$refs.CarouselRef.next() }, }, diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js index 1342fd92..9cfe7f00 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/FormEvent/data.js @@ -35,7 +35,7 @@ export const tabConfigList = [ }, { label: "地点:", - key: "dcEventAccident.dd", + key: "dcEventAccident.location", isAlone: false, required: true, options: { @@ -71,11 +71,11 @@ export const tabConfigList = [ }, { label: "匝道:", - key: "dcEventAccident.dd", + key: "dcEventAccident.rampId", + type: "select", isAlone: false, required: true, options: { - placeholder: "服务区地点", }, visible:(data) => { if(data?.dcEventAccident?.locationType == 3){ @@ -107,11 +107,22 @@ export const tabConfigList = [ }, { label: "地点:", - key: "dcEventAccident.dd", + key: "dcEventAccident.location", + type: "select", isAlone: false, required: true, options: { - placeholder: "服务区地点", + placeholder: "收费站地点", + options: [ + { + value: "1", + label: "入口车道", + }, + { + value: "2", + label: "出口车道", + }, + ], }, visible:(data) => { if(data?.dcEventAccident?.locationType == 4){ diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue index 415d5b0b..b48b5391 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue @@ -199,8 +199,8 @@ export default { if (this.type == "month") { xData.push(it.day.split("-")[2] + "日"); } - if (this.type == "day") { - xData.push(it.time.split(" ")[1] + "小时"); + if (this.type == "date") { + xData.push(it.time.split(" ")[1] + "时"); } if (this.type == "quarter") { xData.push(it.month + '月');