From b23a2a35a14b010a3b97a1b61a02ec179dfab924 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 04 九月 2020 17:25:14 +0800
Subject: [PATCH] feat: sort camera tree
---
src/pages/cameraVideo/index/App.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/pages/cameraVideo/index/App.vue b/src/pages/cameraVideo/index/App.vue
index 609db2c..c038b7d 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 {
@@ -42,7 +44,7 @@
<style lang="scss" scoped>
.column {
- overflow: hidden;
+ height:100%;
}
.column-left {
height: inherit;
@@ -52,10 +54,10 @@
}
.column-right {
height: 100%;
- padding: 16px;
- background-color: #eee;
+ background-color: #fff;
box-sizing: border-box;
- overflow: hidden;
+ overflow-x: auto;
+ overflow-y: hidden;
}
.resize-save {
position: absolute;
@@ -63,7 +65,7 @@
right: 5px;
bottom: 0;
left: 0;
- padding: 16px;
+ padding: 14px;
overflow-x: hidden;
}
.resize-bar {
@@ -83,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