From e2e82c21928283962aaa4be96c9b32e5045a3145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Tue, 10 Jan 2023 23:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=EF=BC=88?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B7=A5=E5=9C=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/areaTree.vue                            |  1 +
 src/components/videoModule/videoModule.less            |  2 +-
 .../projectAdmin/fourEngin/security/centerTop.vue      |  7 +++++--
 .../jlw/digitalSite/components/VideoDialog.vue         | 10 +++++++---
 src/views/projectAdmin/zjsj/command/index.vue          |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

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 @@
   <Card title="数字工地" showRefresh @query="handleQuery" class="mapContent">
     <vue-scroll>
     <div class="pane mapUrl">
-      <img :src="imageUrlMap" alt="" class="bgPackImg" ref="bgPackImg" @load="countBoxSize" style="width: 100%; height: auto; position: relative">
+      <img :src="imageUrlMap" alt="" class="bgPackImg" ref="bgPackImg" @load="countBoxSize" style="width: 100%; height: 571; position: relative;top:7px">
       <div
         class="point"
         :class="[`i-video`, { show: tabIndex === 0 || point === tabs[tabIndex].value }]"
@@ -18,7 +18,7 @@
       </div>
       <FaceGageDialog v-if="gateDialog" :close="() => (gateDialog = false)" :data="faceGateData" />
       <EnvironmentDialog v-if="environmentDialog" :data="environmentInfo" :close="() => (environmentDialog = false)" />
-      <VideoDialog v-if="videoDialog" :close="() => (videoDialog = false)" />
+      <VideoDialog v-if="videoDialog" :close="() => (videoDialog = false)" :data="pointdata" />
       <ElevatorDialog v-if="elevatorDialog" :close="() => (elevatorDialog = false)" />
       <TowerDialog v-if="towerDialog" :close="() => (towerDialog = false)" />
     </div>
@@ -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 @@
         <AreaTree @playParams="getPlayParams" :activeLive="activeLiveData" :videoType="1"></AreaTree>
         <VideoModule
           class="playVideoBox playVideoBox2"
-          :class="{ isIframe: isIframe }"
           :value="playList"
           :type="'1x1'"
           :displayBottomMod="true"
@@ -28,8 +27,13 @@ import VideoModule from '@/components/videoModule/videoModule'
 export default {
   components: { AreaTree, VideoModule },
   props: {
-    close: {
+    data: {
       type: Object,
+      required: true,
+      default: () => ({})
+    },
+    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 @@
 <script>
 import LeftOne from './leftOne'
 import LeftTwo from './leftTwo'
-import LeftThree from './leftThree'
+import LeftThree from './LeftThree'
 import LeftFour from './leftFour'
 import Center from './center'
 import CenterBOne from './centerBOne'