From bcf54fefe40a7b2a019c6e7cf672e2490b24b613 Mon Sep 17 00:00:00 2001
From: wangsixiang <2970484253@qq.com>
Date: Fri, 20 Dec 2024 10:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JiHeExpressway/components/Video/index.vue     |  1 +
 .../components/VideoMulti/index.vue               | 15 +++++++++++----
 .../event/event/EventDetailDialog/index.vue       | 14 ++++++--------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
index e6741b0b..2875365d 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/Video/index.vue
@@ -159,6 +159,7 @@ export default {
     height: 100%;
     max-height: 100%;
     max-width: 100%;
+    object-fit: fill;
   }
 
   .video-stream {
diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
index 4e9cb77a..56d3d68a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/components/VideoMulti/index.vue
@@ -10,7 +10,7 @@
         dialogData.parseOtherConfig.ptzCtrl
       )
         " src="@screen/images/camera-control-icon.svg" width="18px" height="18px"
-        style="cursor: pointer;background-color: #0d5f79;" />
+        style="cursor: pointer;background-color: #0d5f79;margin-top: 3px" />
     </div>
 
     <Transition name="fade" mode="out-in">
@@ -136,16 +136,20 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-
+.video-pic .video-container:nth-child(2){
+  margin-right: 0px;
+}
 
 .video-container {
   position: relative;
   background-color: #000;
+  width: 100%;
   height: 100%;
+  margin-right: 15px;
   overflow: hidden;
   display: flex;
-  flex-direction: column;
   justify-content: center;
+  flex-direction:column;
   .fade-enter-active,
   .fade-leave-active {
     transition: opacity 0.24s ease;
@@ -161,6 +165,7 @@ export default {
     z-index: 999;
     display: flex;
     justify-content: space-between;
+    background-color: #145775;
     .radio {
       background: #265A70;
       border-radius: 41px 41px 41px 41px;
@@ -213,8 +218,10 @@ export default {
   .video-stream,
   img {
     height: 100%;
-    max-height: 100%;
+    max-height: 93%;
     max-width: 100%;
+    object-fit: fill;
+    box-sizing: border-box;
   }
 
   .video-stream {
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 19ebd7a0..e946c7bc 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
@@ -15,7 +15,7 @@
       <Form ref="FormConfigRef" :formList="formList" v-model="data" label-width="110px" />
       <!-- 视频组件 -->
       <div class="video-pic" v-if="['-1','-2'].indexOf(activeName) !== -1 && [1,2,5].indexOf(data.warningSource) !== -1">
-        <div style="display:flex;justify-content: space-between;align-items: center;position:relative;">
+        <div style="display:flex;justify-content: space-between;align-items: center;position:relative;width:100%;">
           <!-- 选择按钮-->
 <!--          <div class="radio">-->
 <!--            <span @click="videoClick('upCamera')" :class="{ active: realVideo === 'upCamera' }">菏泽</span>-->
@@ -43,7 +43,6 @@
             :pileNum="data.stakeMark"
             rangeIndex="upCamera"
             :showHeader="false"
-            style="width: 49%;margin-right: 2%"
           />
           <span>济南方向</span></div>
         <div class="item">
@@ -52,7 +51,6 @@
             :pileNum="data.stakeMark"
             rangeIndex="downCamera"
             :showHeader="false"
-            style="width: 49%;"
           />
           <span>菏泽方向</span></div>
       </div>
@@ -663,7 +661,7 @@ export default {
   align-items: center;
   .video-pic {
     display: flex;
-    height: 270px;
+    height: 260px;
     gap: 15px;
     flex-direction: row;
     width: 98%;
@@ -697,10 +695,10 @@ export default {
     }
   }
 }
-::v-deep .item-video {
-  width: 49%;
-  height: 100%;
-}
+//::v-deep .item-video {
+//  width: 49%;
+//  height: 100%;
+//}
 .radio {
       position: absolute;
       right: 10px;