bzkf30 1 рік тому
батько
коміт
081048aede

+ 1 - 6
src/pages/courseResourcesChapter.vue

@@ -136,15 +136,10 @@ import { user } from "@/store/user.js";
     },
     /**预览页面*/
     reviewFile(item) {
-      // let marklable = item.kf_path.substr(item.kf_path.lastIndexOf(".") + 1);
+      let marklable = item.kf_path.substr(item.kf_path.lastIndexOf(".") + 1);
       let kfId = item.kf_id;
       sessionStorage.removeItem("index");
       this.$router.push({ path:'/resourceMovReview', query:{kfId:kfId,kkID:this.kkID} });
-      // if (marklable == "mp4" || marklable == "mp3") {
-      //   this.$router.push({ path:'/resourceMovReview', query:{icon:marklable,kfId:kfId,kkID:this.kkID} });
-      // } else {
-      //   this.$router.push({ path:'/resourceFileReview', query:{icon:marklable,kfId:kfId} });
-      // }
     },
     /***/
     searchBtn() {

+ 1 - 5
src/pages/courseResourcesChapterList.vue

@@ -170,11 +170,7 @@ import { user } from "@/store/user.js";
     toDetail(allItem) {
       let marklable = allItem.kf_path.substr(allItem.kf_path.lastIndexOf(".") + 1);
       let kfId = allItem.kf_id;
-      if (marklable == "mp4" || marklable == "mp3") {
-        this.$router.push({ path:'/resourceMovReview', query:{icon:marklable,kfId:kfId,kkID:this.kkID} });
-      } else {
-        this.$router.push({ path:'/resourceFileReview', query:{icon:marklable,kfId:kfId} });
-      }
+      this.$router.push({ path:'/resourceMovReview', query:{kfId:kfId,kkID:this.kkID} });
     },
 
   },

+ 1 - 1
src/pages/personal/components/MyCourse/components/MultiFileUpload.vue

@@ -45,7 +45,7 @@ function init() {
         part_url,
         url: window.GLOBAL_CONFIG.oss + part_url,
         // _status: 1,
-        name,
+        name: name || `文件${idx+1}`,
         // uid: Date.now() - idx
       })
     })

+ 1 - 6
src/pages/personal/components/MyCourse/kczy-zy.vue

@@ -128,14 +128,9 @@ export default {
       });
     },
     lookDetail(item) {
-      // let marklable = item.kf_path.substr(item.kf_path.lastIndexOf(".") + 1);
+      let marklable = item.kf_path.substr(item.kf_path.lastIndexOf(".") + 1);
       let kfId = item.kf_id;
       this.$router.push({ path: '/resourceMovReview', query: { kfId: kfId, kkID: this.parentId } });
-      // if (marklable == "mp4" || marklable == "mp3") {
-      //   this.$router.push({ path: '/resourceMovReview', query: { icon: marklable, kfId: kfId, kkID: this.parentId } });
-      // } else {
-      //   this.$router.push({ path: '/resourceFileReview', query: { icon: marklable, kfId: kfId } });
-      // }
     },
     handleCreate() {
       this.$router.push({ name: "course-kczy-zycreate", query: { parentId: this.parentId } });

+ 18 - 26
src/pages/resourceMovReview.vue

@@ -12,7 +12,7 @@
     </div>
     <div class="common1280 vedioMain">
       <div class="vedio_titel">
-        <div class="vedio_titel_left">{{ zyName }} - {{ currentFilename }}</div>
+        <div class="vedio_titel_left">{{ zyName }} <span v-if="currentFilename"> - {{ currentFilename }}</span></div>
         <div class="vedio_titel_right" @mouseenter="showTrue" @mouseleave="showFalse">
           <img src="../assets/kczy/shareIcon.png" alt="" /> 分享
           <div class="qrcodeAll" v-if="shareSwitch">
@@ -166,7 +166,7 @@
                     {{ item.user_name == false ? "未知" : item.user_name }}
                     <span class="itemSon1">{{ item.create_time }}</span>
                   </p>
-                  <div class="px-5px pt-10px">
+                  <div class="px-5px pt-10px" v-if="item.fileData.length>1">
                     <div class="text-15px">{{ item.kf_name }}</div>
                     <div class="pt-8px">
                       <div class="flex items-center text-13px mb-3px" v-for="(value, i) in item.fileData" :key="`${index}-${i}`">
@@ -178,15 +178,17 @@
                       </div>
                     </div>
                   </div>
-
-                  <!-- <div class="fileAll">
-                    <div class="fileAll_left">
-                      <img :src="item.kf_img" />
+                  <div class="px-5px pt-10px" v-else>
+                    <div class="flex items-center text-13px mb-3px">
+                      <div class="flex-1 truncate">
+                        <el-tooltip  effect="dark" :content="item.kf_name"  placement="left">{{ item.kf_name }}</el-tooltip>
+                      </div>
+                      <template v-if="item.fileData.length==1">
+                        <el-button class="!h-24px !bg-transparent !text-hex-409eff" plain round type="primary" size="mini" @click="handleDownload(item.fileData[0])">下载</el-button>
+                        <el-button class="!h-24px !bg-transparent !text-hex-409eff" plain round type="primary" size="mini" @click="handlePreview(item, item.fileData[0], 0)">预览</el-button>
+                      </template>
                     </div>
-                    <div class="fileAll_middle">{{ item.kf_name }}</div>
-                    <div class="fileAll_right" @click="downloadFile(item)">下载</div>
-                    <div class="fileAll_right" @click="preview(item)">预览</div>
-                  </div> -->
+                  </div>
                 </div>
               </div>
             </div>
@@ -345,10 +347,10 @@ export default {
   },
   methods: {
     //预览
-    handlePreview(d) {
-      this.dialogDataFile = d
-      this.dialogPreviewVisible = true
-    },
+    // handlePreview(d) {
+    //   this.dialogDataFile = d
+    //   this.dialogPreviewVisible = true
+    // },
     getFullUrl(url) {
       if (!url) return '';
       return url.startsWith('http') ? url : window.GLOBAL_CONFIG.oss + '/' + url
@@ -401,7 +403,7 @@ export default {
         let file = item.split("|");
         let url = this.getFullUrl(file[0])
         let suffix = file[0]?.substr(file[0].lastIndexOf(".") + 1);
-        let name = file[1] || `文件${index+1}`;
+        let name = arr.length == 1 ? "" : (file[1] || `文件${index+1}`);
         return {
           url, suffix, name
         }
@@ -446,8 +448,8 @@ export default {
       }, 30000);
     },
     handlePreview(item, value, index) {
+      sessionStorage.setItem("index", index);
       if (item.kf_id == this.transKfId) {
-        sessionStorage.setItem("index", index);
         this.zyName = item.kf_name;
         this.initCurrentFile(value);
       } else {
@@ -566,16 +568,6 @@ export default {
       let downFileUrl = value.url;
       window.open(downFileUrl);
     },
-    /**预览*/
-    preview(item) {
-      let marklable = item.kf_path.substr(item.kf_path.lastIndexOf(".") + 1);
-      let kfId = item.kf_id;
-      if (marklable == "mp4" || marklable == "mp3") {
-        this.$router.push({ path:'/resourceMovReview', query:{icon:marklable,kfId:kfId,kkID:this.kkID} });
-      } else {
-        this.$router.push({ path:'/resourceFileReview', query:{icon:marklable,kfId:kfId} });
-      }
-    },
     /**评价*/
     evalua() {
       let prefiexOBJ = {