From cc7f28137c5fbd698b02817259f2af1311bbb1b2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 07 八月 2020 11:41:38 +0800
Subject: [PATCH] fix: 修复bus
---
src/pages/cameraAccess/index/VideoManage.vue | 31 +++++++++++++++----------------
src/components/LeftNav.vue | 14 ++++++++------
src/plugin/bus.js | 2 ++
3 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 711a98d..0c72515 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -53,7 +53,7 @@
@click="closeTree"
></i>
</el-tooltip>
- </div> -->
+ </div>-->
</li>
<!-- 娣诲姞鍖哄煙鍥炬爣 -->
@@ -186,7 +186,7 @@
style="color: #3D68E1;line-height: 22px;font-size: 27px;"
@click="closeTree"
></i>
- </div> -->
+ </div>-->
</div>
<!-- 鏈湴瑙嗛婧愬垪琛� -->
@@ -225,6 +225,7 @@
updateStatus
} from "@/api/localVedio";
+import bus from "@/plugin/bus"
import TreeMenu from "@/components/treeMenu/index";
import LocalVedioList from '@/components/subComponents/LocalVedioList';
import FileUpload from '@/components/subComponents/FileUpload/index';
@@ -385,16 +386,16 @@
},
closeTree() {
this.TreeDataPool.showTreeBox = false;
- // bus.$emit('refreshCompareImg')
+ bus.$emit('refreshCompareImg')
},
addNode(event) {
this.$refs.tree.addNode(event, { id: 0 });
},
addCamera(node) {
- // bus.$emit("addCameraOnTree", node);
+ bus.$emit("addCameraOnTree", node);
},
addDir(node) {
- // bus.$emit("addDirOnTree", node);
+ bus.$emit("addDirOnTree", node);
},
menuOpen(index) {
this.TreeDataPool.openeds[index] = true;
@@ -514,7 +515,8 @@
.left-tree-box {
float: left;
width: 100%;
- .el-tabs__nav-prev,.el-tabs__nav-next{
+ .el-tabs__nav-prev,
+ .el-tabs__nav-next {
display: none;
}
.el-tabs--border-card {
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index c7369b9..d06377a 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -50,7 +50,7 @@
// import fTemplate from "@/components/common/fTemplate";
// import localSeparate from "@/components/camera/localSeparate";
-//import bus from "@/main";
+import bus from "@/plugin/bus";
//import TreeDataPool from "@/Pool/TreeData";
export default {
@@ -160,13 +160,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
@@ -247,19 +247,18 @@
.el-tabs--border-card {
height: 100%;
width: 100%;
- &.video-tab{
- &>.el-tabs__header{
+ &.video-tab {
+ & > .el-tabs__header {
position: fixed;
- top:0;
-
- width:100%;
- z-index:999;
+ top: 0;
+
+ width: 100%;
+ z-index: 999;
height: 54px;
overflow-y: hidden;
}
}
.el-tabs__header {
-
.is-active {
color: #3d68e1 !important;
}
@@ -286,7 +285,7 @@
}
}
}
- .video-tab>.el-tabs__content {
+ .video-tab > .el-tabs__content {
width: 100%;
margin-top: 52px;
//height: calc(100% - 52px);
diff --git a/src/plugin/bus.js b/src/plugin/bus.js
new file mode 100644
index 0000000..25bc244
--- /dev/null
+++ b/src/plugin/bus.js
@@ -0,0 +1,2 @@
+import Vue from "vue"
+export default new Vue();
\ No newline at end of file
--
Gitblit v1.8.0