Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop

src/views/task-manage/all-task/components/LiveDrawer.vue

@@ -32,8 +32,8 @@
             class="video_content"
             :class="videoShow == 'back' ? 'video_show' : 'video_hidden'"
           >
-            <VideoPlayer :options="getVideoOptions" />
-            <VideoPlayer :options="getVideoLiveOptions" />
+            <VideoPlayer :options="getVideoOptions.origin" />
+            <VideoPlayer :options="getVideoOptions.analyse" />
           </div>
         </div>
       </div>
@@ -126,21 +126,20 @@ export default defineComponent({
     /* 获取原视频地址 */
     const getVideoOptions = computed(() => {
       return {
-        id: 'video-live',
-        width: '800px',
-        height: '212px',
-        source: props.data.pullUrl,
-        isLive: true
-      }
-    })
-    /* 获取AI视频地址 */
-    const getVideoLiveOptions = computed(() => {
-      return {
-        id: 'video-live',
-        width: '800px',
-        height: '212px',
-        source: props.data.pullUrl,
-        isLive: true
+        origin: {
+          id: 'video-live',
+          width: '800px',
+          height: '212px',
+          source: props.data.playUrl,
+          isLive: true
+        },
+        analyse: {
+          id: 'video-live-analyse',
+          width: '800px',
+          height: '212px',
+          source: props.data.aiplayUrl,
+          isLive: true
+        }
       }
     })
 
@@ -384,7 +383,6 @@ export default defineComponent({
       getDrawerOptions,
       handleDrawerColse,
       getVideoOptions,
-      getVideoLiveOptions,
       showVideo
     }
   }
@@ -453,6 +451,7 @@ export default defineComponent({
   width: 800px;
   height: 220px;
   position: relative;
+  display: flex;
 }
 
 .video_show {