From d656ff9cf8c97a01c0cc990d935e4b42b314be22 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 06 八月 2020 18:21:50 +0800
Subject: [PATCH] 摄像机信息区域/时间规则,系统维护,实时监控,算力管理样式调整
---
src/pages/cameraVideo/index/App.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/pages/cameraVideo/index/App.vue b/src/pages/cameraVideo/index/App.vue
index 998da23..b2fc260 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="'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 {
@@ -42,7 +44,7 @@
<style lang="scss" scoped>
.column {
- overflow: hidden;
+ height:100%;
}
.column-left {
height: inherit;
@@ -55,6 +57,7 @@
background-color: #fff;
box-sizing: border-box;
overflow: hidden;
+
}
.resize-save {
position: absolute;
@@ -62,7 +65,7 @@
right: 5px;
bottom: 0;
left: 0;
- padding: 16px;
+ padding: 14px;
overflow-x: hidden;
}
.resize-bar {
@@ -82,8 +85,8 @@
top: 0;
bottom: 0;
z-index: 100;
- 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