大屏视频问题调整

src/components/screenDisplay.vue

@@ -427,7 +427,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
             <div class="titleStyleTwoVideo"><p>换热站监控</p></div>
             <div class="moreInfo" @click="PreviousVideo()">上一个</div>
             <div class="moreInfo" @click="nextVideo()">下一个</div>
-<!--            <div class="moreInfo" @click="moreVideo()">更多》</div>-->
+            <div class="moreInfo" @click="moreVideo()">更多》</div>
           </div>
           <video-components :divWidth="divWidth" :divHeight="divHeight" :queryParams="queryParams" :stopParams="stopParams"/>
 
@@ -2983,20 +2983,24 @@ export default defineComponent({
       const container = this.$refs.myContainer;
       this.divWidth = container.offsetWidth *0.9; // 获取元素的宽度，包括元素的padding，不包括border、margin和滚动条
       this.divHeight = container.offsetHeight *0.8; // 获取元素的宽度，包括元素的padding，不包括border、margin和滚动条
-      console.log('width',this.divWidth);
-      console.log('divHeight',this.divHeight);
     },
     // 更多视频
     moreVideo() {
       this.videoOpen = true
+      this.queryParams = ''
       this.stopParams += 1
       console.log('this.VideoInfo.playVideoList',this.VideoInfo.playVideoList)
       this.queryParamsAll = JSON.stringify(this.VideoInfo.playVideoList)
     },
     // 关闭更多视频弹窗
     handleVideoClose() {
+      this.queryParamsAll =  ''
       this.stopParamsAll += 1
       this.videoOpen = false
+      const videoList = []
+      videoList.push(this.VideoInfo.playVideoList[this.videoNum])
+      this.getDivWidth()
+      this.queryParams = JSON.stringify(videoList)
     },
     // 下一个视频
     nextVideo() {
@@ -3901,16 +3905,16 @@ export default defineComponent({
   top: 17%;
 }
 .videoInfo{
-  width: 1300px;
-  height: 750px;
+  width: 100%;
+  height: 100%;
   border: rgba(129, 210, 230, 0.5) solid 1px;
   //padding: 0 0 0 10px;
   background: linear-gradient(318deg, rgba(29, 70, 128, 0.8) 0%, rgba(13, 23, 76, 0.8) 100%);
   color: white;
   position: absolute;
   z-index: 9;
-  left: 13%;
-  top: 10%;
+  //left: 13%;
+  //top: 10%;
 }
 .alarmTable{
   margin-bottom: 20px;

src/components/videoComponents.vue

@@ -642,15 +642,17 @@ function playVideotest(cameraIndexCode) {
 watch(
     () => pProps.queryParams,
     async (newData) => {
+      const params = JSON.parse(pProps.queryParams)
+      // const params = ['31c0d567dd1944d5b4ea3eddf94f740b']
+      if(params && params.length > 0) {
         await initIp();//ip
         initPlugin();
         showPlay()
-      const params = JSON.parse(pProps.queryParams)
-      // const params = ['31c0d567dd1944d5b4ea3eddf94f740b']
         console.log('params',params)
         console.log('divWidth',pProps.divWidth)
         getVideoFromVideoList(params)
       }
+    }
 )
 
 watch(

src/components/videoComponentsTwo.vue

@@ -107,8 +107,8 @@ const pProps = defineProps({
 var initCount = 0;
 var pubKey = '';
 // var playWnd_width = window.innerWidth - 800;
-var playWnd_width = 500;
-var playWnd_height = 500;
+var playWnd_width = window.innerWidth - 200;
+var playWnd_height = window.innerHeight - 220;
 var oWebControl;
 var videoIp="218.69.97.198";;
 var videoPort=1443;
@@ -131,7 +131,7 @@ function down(){
 function resetVideoWidth(){
   var menuWidth=localStorage.getItem("tabWidth");
   if(!menuWidth || menuWidth ==='' || !Number(menuWidth)){
-    playWnd_width = 500;
+    playWnd_width = window.innerWidth - 200;
   }else{
     playWnd_width = window.innerWidth - Number(menuWidth);
   }
@@ -635,15 +635,17 @@ function playVideotest(cameraIndexCode) {
 watch(
     () => pProps.queryParams,
     async (newData) => {
+      const params = JSON.parse(pProps.queryParams)
+      // const params = ['31c0d567dd1944d5b4ea3eddf94f740b']
+      if(params && params.length > 0) {
         await initIp();//ip
         initPlugin();
         showPlay()
-      const params = JSON.parse(pProps.queryParams)
-      // const params = ['31c0d567dd1944d5b4ea3eddf94f740b']
         console.log('params',params)
         console.log(' window.innerWidth', window.innerWidth)
         getVideoFromVideoList(params)
       }
+    }
 )
 
 watch(