mo пре 2 година
родитељ
комит
fba8f84b27
1 измењених фајлова са 12 додато и 10 уклоњено
  1. 12 10
      src/views/liveClassManager/liveClassDetail.vue

+ 12 - 10
src/views/liveClassManager/liveClassDetail.vue

@@ -96,11 +96,12 @@
             label="学员姓名"
           ></el-table-column>
           <el-table-column align="center" prop="organName" label="分部"></el-table-column>
-          <el-table-column
-            align="center"
-            prop="musicGroupName"
-            label="乐团"
-          ></el-table-column>
+          <el-table-column align="center" prop="musicGroupName" label="乐团">
+            <template slot-scope="scope">
+              <tooltip :content="scope.row.musicGroupName" />
+            </template>
+          </el-table-column>
+
           <el-table-column align="center" prop="phone" label="手机号"></el-table-column>
           <el-table-column align="center" prop="subName" label="声部"></el-table-column>
           <el-table-column
@@ -164,7 +165,7 @@
       <!-- activeUrl -->
       <div class="activeVideoWrap">
         <vue-core-video-player
-          v-if="activeVideo.os == 'mobile' && activeVideo.videoType == 'mp4'"
+          v-if="activeVideo.os == 'mobile' && activeVideo.videoType != 'm3u8'"
           style="width: 320px"
           :src="activeVideo.url"
           ref="dialogVideo"
@@ -172,16 +173,16 @@
           您的浏览器不支持视频播放
         </vue-core-video-player>
         <vue-core-video-player
-          v-else-if="activeVideo.os == 'mobile' && activeVideo.videoType != 'mp4'"
+          v-if="activeVideo.os == 'mobile' && activeVideo.videoType == 'm3u8'"
           style="width: 320px"
           :src="activeVideo.url"
           ref="dialogVideo"
-          :core="activeVideo.videoType == 'mp4' ? null : HLSCore"
+          :core="HLSCore"
         >
           您的浏览器不支持视频播放
         </vue-core-video-player>
         <vue-core-video-player
-          v-else-if="activeVideo.os == 'pc' && activeVideo.videoType != 'mp4'"
+          v-if="activeVideo.os == 'client'"
           style="width: 640px"
           :src="activeVideo.url"
           ref="dialogVideo"
@@ -190,7 +191,7 @@
           您的浏览器不支持视频播放
         </vue-core-video-player>
         <vue-core-video-player
-          v-else-if="activeVideo.os == 'pc' && activeVideo.videoType == 'mp4'"
+          v-if="activeVideo.os == 'pc'"
           style="width: 640px"
           :src="activeVideo.url"
           ref="dialogVideo"
@@ -288,6 +289,7 @@ export default {
       }
     },
     opneVideo(row) {
+      console.log(row, "opneVideo");
       this.activeVideo = row;
       this.videoVisible = true;
     },