From c1e567ddda7f65651179a8a73ca849b07b066b14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 19:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager/src/views/health/HealthVideoList.vue |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/manager/src/views/health/HealthVideoList.vue b/manager/src/views/health/HealthVideoList.vue
index 97aa47d..43ef70c 100644
--- a/manager/src/views/health/HealthVideoList.vue
+++ b/manager/src/views/health/HealthVideoList.vue
@@ -19,7 +19,8 @@
             style="width: 160px"
           />
         </Form-item>
-        <Form-item label="鏍囩" prop="tagList">
+<!--      todo  鏆傛椂闅愯棌澶у仴搴蜂竴鏈熸病瀹氫箟鏍囩-->
+        <Form-item v-if="false" label="鏍囩" prop="tagList">
           <Select
             v-model="searchForm.tagList"
             clearable
@@ -111,6 +112,7 @@
               <FormItem label="瑙嗛">
                 <video style="width: 150px;height: 150px"
                        controls
+                       @loadedmetadata="getVideoDuration"
                        :poster="uploadVideoForm.showCoverUrl"
                        :autoplay="false"
                        id="remoteVideo" :src="uploadVideoForm.showVideoUrl"
@@ -424,18 +426,18 @@
           minWidth: 240,
           tooltip: true,
         },
-        {
-          title: "浣滆��",
-          key: "authorName",
-          width: 130,
-          tooltip: true,
-        },
-        {
-          title: "瑙嗛鏍囩",
-          key: "tagList",
-          width: 180,
-          slot: "tagList",
-        },
+        // {
+        //   title: "浣滆��",
+        //   key: "authorName",
+        //   width: 130,
+        //   tooltip: true,
+        // },
+        // {
+        //   title: "瑙嗛鏍囩",
+        //   key: "tagList",
+        //   width: 180,
+        //   slot: "tagList",
+        // },
         {
           title: "瑙嗛鍐呭",
           key: "videoFileKey",
@@ -670,6 +672,10 @@
         this.auditingLoading = false
       })
     },
+    getVideoDuration(e){
+      const duration = this.$refs.healthVideoInfo.duration;
+      this.uploadVideoForm.videoDuration = Math.floor(duration);
+    },
     // 鎵撳紑缂栬緫寮圭獥
     deleteHealthVideo(row) {
       console.log('鍒犻櫎娴嬭瘯', row)

--
Gitblit v1.8.0