浏览代码

电视墙

wangzhe 2 年之前
父节点
当前提交
6a98fc589e
共有 2 个文件被更改,包括 10 次插入10 次删除
  1. 3 3
      src/assets/styles/base.scss
  2. 7 7
      src/components/TVWall.vue

+ 3 - 3
src/assets/styles/base.scss

@@ -83,12 +83,12 @@ $date-state3: #d6333b;
 //视频摄像头预览弹层样式
 .videoCustomWidth {
   width: 1070px !important;
-  height: 700px !important;
+  height: 750px !important;
 }
 //电视墙视频摄像头预览弹层样式
 .TVWallCustomWidth {
-  width: 1150px !important;
-  height: 700px !important;
+  width: 1200px !important;
+  height: 800px !important;
 }
 
 

+ 7 - 7
src/components/TVWall.vue

@@ -283,12 +283,7 @@ export default {
       }
     },
     //火点联动电视墙调用
-    showTVWall1(longitude, latitude, tvListJson, bfArray) {
-      if(tvListJson){
-        this.preview(tvListJson, bfArray);
-        this.TVWallVisible = true;
-        return;
-      }
+    showTVWall1(longitude, latitude, tvListJson) {
       // let that=this;
       /** ----------------------------------大华摄像头预览开始------------------------------------- */
       this.ws.addEventListener('connectStateChange', data => {
@@ -416,7 +411,12 @@ export default {
       rotation(lng,lat,list).then(res => {
       })
     },
-    showTVWall() {
+    showTVWall(tvListJson, bfArray) {
+      if(tvListJson){
+        this.preview(tvListJson, bfArray);
+        this.TVWallVisible = true;
+        return;
+      }
       // let that=this;
       /** ----------------------------------大华摄像头预览开始------------------------------------- */
       this.ws.addEventListener('connectStateChange', data => {