diff --git a/src/components/areaTree.vue b/src/components/areaTree.vue index dc01c5b1..e7fbe71e 100644 --- a/src/components/areaTree.vue +++ b/src/components/areaTree.vue @@ -159,6 +159,7 @@ export default { if (this.$route.path.indexOf('/firm/towerManage') != -1) { this.$emit('getTreeData', this.treeData) } + console.log('areaTree.vue传递设备列表数据 --- this.activeLive : ',this.activeLive) if (this.activeLive) { this.treeData.forEach(item => { if (this.activeLive.devSn == item.serialNumber) { diff --git a/src/components/videoModule/videoModule.less b/src/components/videoModule/videoModule.less index 3487641a..5a7077eb 100644 --- a/src/components/videoModule/videoModule.less +++ b/src/components/videoModule/videoModule.less @@ -1,5 +1,5 @@ .videoOverview{ - position: relative; + // position: relative; // background-color: #03112b; height: 100%; .videoTop{ diff --git a/src/views/projectAdmin/fourEngin/security/centerTop.vue b/src/views/projectAdmin/fourEngin/security/centerTop.vue index 55438d91..1b8e22f4 100644 --- a/src/views/projectAdmin/fourEngin/security/centerTop.vue +++ b/src/views/projectAdmin/fourEngin/security/centerTop.vue @@ -2,7 +2,7 @@
- +
- +
@@ -57,6 +57,7 @@ export default { }, data() { return { + pointdata:{}, projectSn: this.$store.state.projectSn, tabIndex: 0, tabs: [ @@ -112,6 +113,7 @@ export default { } // 获取设备信息 selectDevCoordinateListApi(data).then(res => { + console.log("获取设备信息 :"+JSON.stringify(res.result)); this.points = res.result }) }, @@ -129,6 +131,7 @@ export default { this.tabIndex = index }, handlePoint(point) { + this.pointdata = point this.videoDialog = true }, getFaceGateInfo() { diff --git a/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue index d883e979..60f8ec73 100644 --- a/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue +++ b/src/views/projectAdmin/jlw/digitalSite/components/VideoDialog.vue @@ -5,7 +5,6 @@ ({}) + }, + close: { + type: Function, default: () => false } }, @@ -37,7 +41,7 @@ export default { return { videoList: [], playList: [], - activeLiveData: { devSn: '' } + activeLiveData: { devSn: this.data.devSn} } }, methods: { diff --git a/src/views/projectAdmin/zjsj/command/index.vue b/src/views/projectAdmin/zjsj/command/index.vue index 3f49b3f8..f41379f4 100644 --- a/src/views/projectAdmin/zjsj/command/index.vue +++ b/src/views/projectAdmin/zjsj/command/index.vue @@ -39,7 +39,7 @@