From ccee429d379e0108b7445f72ade8d97c110a6fb3 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 09 十一月 2021 18:01:59 +0800
Subject: [PATCH] 问题修复
---
src/pages/cameraVideo/index/App.vue | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/pages/cameraVideo/index/App.vue b/src/pages/cameraVideo/index/App.vue
index 82f3f05..c2479d2 100644
--- a/src/pages/cameraVideo/index/App.vue
+++ b/src/pages/cameraVideo/index/App.vue
@@ -1,28 +1,30 @@
<template>
<div class="column">
- <div class="column-left" :style="`height:${screenHeight}px;`">
+ <div class="column-left" >
<div class="resize-bar"></div>
<div class="resize-line"></div>
<div class="resize-save">
- <left-nav :appName="'Video'" :height="screenHeight - 40"></left-nav>
+ <left-nav :appName="'Camera'" :height="screenHeight - 40"></left-nav>
</div>
</div>
- <div class="column-right" :style="`height:${screenHeight}px;`">
+ <div class="column-right" >
<right-side />
</div>
+ <card-window></card-window>
</div>
</template>
<script>
import LeftNav from "@/components/LeftNav";
-// import CameraVideo from "./components/Video.vue";
-import RightSide from "./Video"
+import RightSide from "./Video";
+import CardWindow from "@/components/cardWindow";
export default {
name: "CameraVideo",
components: {
LeftNav,
- RightSide
+ RightSide,
+ CardWindow
},
data() {
return {
@@ -41,21 +43,26 @@
</script>
<style lang="scss" scoped>
+
.column {
overflow: hidden;
+ min-width: 1399px;
+ height: 100%;
}
.column-left {
- height: inherit;
background-color: #fff;
position: relative;
float: left;
+ height: 100vh;
+ //height: inherit;
}
.column-right {
- height: 100%;
- padding: 16px;
+ height: 100vh;
background-color: #eee;
box-sizing: border-box;
- overflow: hidden;
+ //overflow: hidden;
+ overflow-x: auto;
+ overflow-y: auto;
}
.resize-save {
position: absolute;
@@ -63,7 +70,7 @@
right: 5px;
bottom: 0;
left: 0;
- padding: 16px;
+ padding: 14px;
overflow-x: hidden;
}
.resize-bar {
@@ -74,7 +81,7 @@
opacity: 0;
overflow: scroll;
max-width: 500px; //璁惧畾鏈�澶ф媺浼搁暱搴�
- min-width: 310px; //璁惧畾鏈�灏忓搴�
+ min-width: 33px; //璁惧畾鏈�灏忓搴�
}
/* 鎷栨嫿绾� */
.resize-line {
@@ -82,8 +89,8 @@
right: 0;
top: 0;
bottom: 0;
- border-right: 2px solid #eee;
- border-left: 1px solid #bbb;
+ border-right: 2px solid #efefef;
+ border-left: 1px solid #e0e0e0;
pointer-events: none;
}
.resize-bar:hover ~ .resize-line,
--
Gitblit v1.8.0