Merge remote-tracking branch 'origin/pet' into pet

2.去除5分钟时效,演示使用

src/views/keyprojects/videomanager/components/video-list.vue

@@ -141,9 +141,11 @@
 
     <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" title="视频" width="1200px">
       <!--      <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
-      <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
-        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
-          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
+      <div style="display: flex;flex-wrap: wrap; gap:20px">
+        <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 30%">
+          <iframe v-if="video.GBSVIDEOURL" :src="video.GBSVIDEOURL"
+                  width="100%" height="250" allowfullscreen allow="autoplay; fullscreen;microphone"
+                  style="position: relative;border:none"/>
           <div v-if="video.HLSVIDEOURL" :id="'aLiVideoPlayer'+index" class="prism-player"/>
         </div>
       </div>
@@ -376,7 +378,7 @@ export default {
     // 五分钟关闭视频播放页面定时任务
     start() {
       console.log('定时器开启')
-      this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟;
+      // this.timer = setInterval(this.closeVideoStart, (5 * 60 * 1000)) // 5分钟;
     },
     over() {
       // 定时器手动关闭
@@ -411,7 +413,7 @@ export default {
               'id': 'aLiVideoPlayer',
               'source': res.data.url,
               'width': '100%',
-              'height': '500px',
+              'height': '380px',
               'autoplay': true,
               'isLive': true,
               'rePlay': false,
@@ -499,7 +501,7 @@ export default {
               'id': 'aLiVideoPlayer' + i,
               'source': this.videoList[i].HLSVIDEOURL.data.url,
               'width': '100%',
-              'height': '500px',
+              'height': '380px',
               'autoplay': true,
               'isLive': true,
               'rePlay': false,