From 20fa52d1b749c3af395f19dda6cf6eff6a108062 Mon Sep 17 00:00:00 2001 From: Joe <1712833832@qq.com> Date: Mon, 15 Jan 2024 14:59:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- .../Carousel/images/arrow.svg | 36 ++++++ .../EventDetailDialog/Carousel/index.vue | 112 ++++++++++++++++++ .../event/event/EventDetailDialog/index.vue | 23 ++-- 4 files changed, 164 insertions(+), 10 deletions(-) create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/images/arrow.svg create mode 100644 ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue diff --git a/package.json b/package.json index 04a37ae9..9f970962 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "dependencies": { - "flv.js": "^1.6.2" + "flv.js": "^1.6.2", + "vue-slick-carousel": "^1.0.6" } } diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/images/arrow.svg b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/images/arrow.svg new file mode 100644 index 00000000..0e183e4b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/images/arrow.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 00000000..a502ef1b --- /dev/null +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/event/EventDetailDialog/Carousel/index.vue @@ -0,0 +1,112 @@ + + + + + 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 7ecafca0..d7e03549 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 @@ -3,6 +3,12 @@
+
+
+
@@ -16,6 +22,8 @@ import TimeLine2 from "@screen/components/TimeLine/TimeLine2/index"; import Form from '@screen/components/FormConfig'; import { formList, timeLine1List } from "./data" import { timeLine2List } from "@screen/pages/control/event/commandDispatch/Cards/DisposalProcess/data.js" +import Video from "@screen/components/Video"; +import Carousel from "./Carousel/index.vue" export default { name: 'EventDetail', @@ -23,7 +31,9 @@ export default { Dialog, Form, TimeLine1, - TimeLine2 + TimeLine2, + Video, + Carousel }, model: { prop: 'visible', @@ -60,15 +70,10 @@ export default { height: 768px; flex-direction: column; - .left { - flex: 1; - } - - .right { + .video-pic { display: flex; - flex-direction: column; - gap: 9px; - cursor: pointer; + height: 150px; + gap: 15px } }