From 50dfd64df930a2c9e8776ecfecc018e89845384d Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 03 八月 2020 20:03:55 +0800
Subject: [PATCH] 实时监控双击左侧树app修改
---
src/pages/gb28181/index/App.vue | 2 +-
src/components/treeMenu/index.vue | 13 ++++++++++---
src/components/LeftNav.vue | 36 ++++++++++++++++++------------------
src/pages/cameraVideo/index/Video.vue | 2 ++
src/Pool/TreeData.ts | 1 +
5 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 0e77acd..22ad3a2 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -96,6 +96,7 @@
}
setVideoArr(index: number, value: object, vue: any): void {
+ debugger
vue.$set(this.videoArr, index, value);
this.activeForceChoose = false;
}
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index e3ef85e..6fe6546 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -337,24 +337,24 @@
loadingGBTree: false
};
},
- watch: {
- $route(to, from) {
- switch (to.name) {
- case "Searching":
- this.cameraAuth = "videoSearch:camera"
- this.dataStack = "videoSearch:dataStack"
- break
- case "VideoManage":
- this.cameraAuth = "VIDEOCAMERA:camera"
- this.dataStack = "VIDEOCAMERA:dataStack"
- break
- default:
- this.cameraAuth = "videoMonitor:camera"
- this.dataStack = "videoMonitor:dataStack"
- }
- // console.log("璺敱鍙樺寲锛�", to, from)
- }
- },
+ // watch: {
+ // $route(to, from) {
+ // switch (to.name) {
+ // case "Searching":
+ // this.cameraAuth = "videoSearch:camera"
+ // this.dataStack = "videoSearch:dataStack"
+ // break
+ // case "VideoManage":
+ // this.cameraAuth = "VIDEOCAMERA:camera"
+ // this.dataStack = "VIDEOCAMERA:dataStack"
+ // break
+ // default:
+ // this.cameraAuth = "videoMonitor:camera"
+ // this.dataStack = "videoMonitor:dataStack"
+ // }
+ // // console.log("璺敱鍙樺寲锛�", to, from)
+ // }
+ // },
created() {
if (this.showCam) {
this.TreeDataPool.treeActiveName = "camera"
diff --git a/src/components/treeMenu/index.vue b/src/components/treeMenu/index.vue
index 89d63f6..bd8a7a7 100644
--- a/src/components/treeMenu/index.vue
+++ b/src/components/treeMenu/index.vue
@@ -156,11 +156,16 @@
hoverNodeId: "",
itemClickEvents: {
dblclick: (VNode, item, e) => {
-
- if (item.type !== "4" || this.app !== "Video") {
+ console.log('dblclick',item);
+ console.log('dblclick',this.TreeDataPool.videoArr);
+ console.log(this.app)
+ // if (item.type !== "4" || this.app !== "Video") {
+ // return;
+ // }
+ if (item.type !== "4" || this.app !== "Camera") {
return;
}
-
+ console.log('activeForceChoose',this.TreeDataPool.activeForceChoose)
this.TreeDataPool.activeVideoId = item.id;
let videoArr = this.TreeDataPool.videoArr;
let nullVideoIndex = "";
@@ -170,6 +175,7 @@
this.TreeDataPool.activeVideoIndex !== "" &&
this.TreeDataPool.activeVideoIndex <= videoArr.length - 1
) {
+ console.log('setVideoArr')
this.TreeDataPool.setVideoArr(this.TreeDataPool.activeVideoIndex, undefined, this);
this.$nextTick(() => {
this.TreeDataPool.setVideoArr(
@@ -310,6 +316,7 @@
this.showDialog = true;
},
itemClick(node, item, e) {
+ console.log('jsTree index.vue',item)
this.TreeDataPool.selectedNode = item;
this.TreeDataPool.updateSelectedNodes();
this.TreeDataPool.treeType = this.treeName;
diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 57c0c17..278fa15 100644
--- a/src/pages/cameraVideo/index/Video.vue
+++ b/src/pages/cameraVideo/index/Video.vue
@@ -147,6 +147,7 @@
},
created() {
console.log("befor created")
+ debugger
// this.TreeDataPool.clean();
// this.TreeDataPool.fetchTreeData();
// this.guid = sessionStorage.guid ? Number(sessionStorage.guid) : this.guid;
@@ -186,6 +187,7 @@
},
watch: {
"TreeDataPool.videoArr": function (newArry) {
+ console.log('newArry',newArry)
const cameras = this.filterNodes(newArry);
this.getActiveIndex();
this.$refs.taskview.showTasks(cameras);
diff --git a/src/pages/gb28181/index/App.vue b/src/pages/gb28181/index/App.vue
index 58ebcca..1c8fb77 100644
--- a/src/pages/gb28181/index/App.vue
+++ b/src/pages/gb28181/index/App.vue
@@ -228,8 +228,8 @@
</script>
<style lang="scss">
.s-basic-setting {
- width: 100%;
height: 100%;
+ padding: 0 30px;
.el-form {
width: 1000px;
margin-top: 30px;
--
Gitblit v1.8.0