Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop

src/views/question-manage/question-list/components/MapDrawer.vue

@@ -1,6 +1,6 @@
 <template>
   <n-drawer v-bind="getDrawerOptions" @update:show="handleDrawerColse">
-    <n-drawer-content closable title="轨迹回放">
+    <n-drawer-content closable title="图片位置">
       <PositionMsg :data="getPostionOptions" />
     </n-drawer-content>
   </n-drawer>
@@ -30,7 +30,6 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const data = reactive({
-
     })
 
     /* 获取抽屉的信息 */

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

@@ -27,14 +27,14 @@
             >
           </div>
           <!-- 直播视频 -->
-          <!-- <div
+          <div
             class="video_content"
             :class="videoShow == 'back' ? 'video_show' : 'video_hidden'"
           >
             <VideoPlayer :ref="videoRef" :options="getVideoOptions" @time-update="handleOriginTime" @video-status="handleOriginStatus" />
             <VideoPlayer :ref="aiVideoRef" :options="getVideoAiOptions" @time-update="handleAiTime" @video-status="(data)=>videoStatus.aiStatus = data.status" />
 
-          </div> -->
+          </div>
         </div>
       </div>
     </n-drawer-content>
@@ -96,8 +96,8 @@ export default defineComponent({
       disdance: null,
       animating: null,
       detailData: {
-        videoUrl: '',
-        aiVideoUrl: ''
+        videoUrl: 'http://vod.play.t-aaron.com/228e844c4d18476b82627a54ccf7f4ec/1796b49c9df546ceabe30cda01ebb792-59f1f8c925e0817f19545b7d28f4eea9-fd.mp4',
+        aiVideoUrl: 'http://vod.play.t-aaron.com/228e844c4d18476b82627a54ccf7f4ec/1796b49c9df546ceabe30cda01ebb792-59f1f8c925e0817f19545b7d28f4eea9-fd.mp4'
       },
       videoShow: 'back', // 视频展示开关
       videoInfo: {
@@ -133,7 +133,7 @@ export default defineComponent({
       }
     })
     /* 获取AI视频地址 */
-    const getVideoLiveOptions = computed(() => {
+    const getVideoAiOptions = computed(() => {
       return {
         id: 'palyer-ai-on',
         width: '400px',
@@ -288,7 +288,7 @@ export default defineComponent({
       handleOriginTime,
       handleAiTime,
       getVideoOptions,
-      getVideoLiveOptions,
+      getVideoAiOptions,
       handleDrawerColse
     }
   }

src/views/task-manage/all-task/tools/table.js

@@ -193,8 +193,8 @@ const data = reactive({
                 text: true,
                 onClick: handleTaskLive.bind(null, row)
               },
-              auth: 'basic_list',
-              show: row.status === 2
+              auth: 'basic_list'
+              // show: row.status === 2
             },
             {
               label: '轨迹',

src/views/task-manage/question/components/PositionDrawer.vue

@@ -30,6 +30,7 @@ export default defineComponent({
   },
   setup(props, { emit }) {
     const data = reactive({
+      flag: props.visible,
       problemList: [],
       positionType: 'handle'
     })