From 929cf4c7be11bfd1e134d0cb0d7cbbe94772ebdf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 07 九月 2020 15:35:14 +0800
Subject: [PATCH] 摄像机树增加导入功能
---
src/pages/cameraAccess/index/VideoManage.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index c9ce732..8e26bfc 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -1,6 +1,6 @@
<template>
<div class="s-video-manage">
- <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+ <el-tabs class="video-tab" ref="topTab" v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane
:label="firstLabeName"
name="camera-info"
@@ -50,8 +50,8 @@
// import fTemplate from "@/components/common/fTemplate";
// import localSeparate from "@/components/camera/localSeparate";
-//import bus from "@/main";
-import TreeDataPool from "@/Pool/TreeData";
+import bus from "@/plugin/bus";
+//import TreeDataPool from "@/Pool/TreeData";
export default {
components: {
@@ -123,7 +123,8 @@
})
},
deep: true
- }
+ },
+
},
created() {
if (this.TreeDataPool.treeActiveName == 'camera') {
@@ -160,13 +161,13 @@
},
mounted() {
this.$nextTick(() => {
- // bus.$on("addCameraOnTree", node => {
- // this.handAddDevice(node);
- // });
- // bus.$on("addDirOnTree", node => {
- // this.handAddDIr(node);
- // });
- // this.TreeDataPool.clean();
+ bus.$on("addCameraOnTree", node => {
+ this.handAddDevice(node);
+ });
+ bus.$on("addDirOnTree", node => {
+ this.handAddDIr(node);
+ });
+ this.TreeDataPool.clean();
});
let _this = this
@@ -231,8 +232,6 @@
height: 100%;
float: right;
box-sizing: border-box;
- padding: 16px;
- background-color: #e9ebf2;
.el-tabs--border-card {
box-shadow: none;
-webkit-box-shadow: none;
@@ -249,6 +248,16 @@
.el-tabs--border-card {
height: 100%;
width: 100%;
+ &.video-tab{
+ &>.el-tabs__header{
+ //position: fixed;
+ //position: absolute;
+ //top:0;
+ //left: 0;
+ height: 54px;
+ overflow-y: hidden;
+ }
+ }
.el-tabs__header {
.is-active {
color: #3d68e1 !important;
@@ -276,15 +285,17 @@
}
}
}
- .el-tabs__content {
+ .video-tab > .el-tabs__content {
width: 100%;
- height: calc(100% - 52px);
+ //margin-top: 52px;
+ height: calc(100% - 36px);
box-sizing: border-box;
- padding: 13px 38px;
+ overflow-y: auto;
+ padding: 0;
}
.el-tab-pane {
width: 100%;
- height: 100%;
+ //height: 100%;
}
}
</style>
--
Gitblit v1.8.0