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

zxl

5 天以前 c1e567ddda7f65651179a8a73ca849b07b066b14

 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)