fix

src/views/course/content/index.vue

@@ -38,38 +38,44 @@
           </div>
         </div>
 
-        <ul class="sections">
+        <ul v-if="sections.length" class="sections">
           <draggable v-model="sections" :group="{
             name: 'sec',
             pull: false,
           }" handle=".drag" animation="1000" @end="updateSort">
-            <li v-for="(section, i) in sections" :key="i">
-              <div class="section-left">
-                <img class="drag" src="@/assets/img/drag.svg" alt="">
-                <el-checkbox v-model="section.check"></el-checkbox>
-                <span class="serial">{{ i + 1 }}.</span>
-                <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
-                <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
-                <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
-                  src="@/assets/img/exts/word.png" alt="">
-                <img v-else-if="section.fileType === 'xlsx' || section.fileType === 'xls'"
-                  src="@/assets/img/exts/excel.png" alt="">
-                <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
-                <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
-                <img v-else src="@/assets/img/exts/pic.png" alt="">
-                <span class="name">{{ section.name }}</span>
-              </div>
-              <div class="section-actions">
-                <el-button type="text" @click="download(section)" v-auth="'/curriculum:内容设置:下载'">下载</el-button>
-                <el-button type="text" @click="preview(section)" v-auth="'/curriculum:内容设置:查看'">预览</el-button>
-                <el-button type="text" @click="editSectionName(section)"
-                  v-auth="'/curriculum:内容设置:修改小节名称'">修改资源名称</el-button>
-                <el-button type="text" @click="switchFile(section)" v-auth="'/curriculum:内容设置:更换文件'">更换</el-button>
-                <el-button type="text" @click="delSection(section)" v-auth="'/curriculum:内容设置:删除小节'">移除</el-button>
-              </div>
-            </li>
+            <template v-for="(section, i) in sections">
+              <li v-if="section.name.includes(keyword)" :key="i">
+                <div class="section-left">
+                  <img class="drag" src="@/assets/img/drag.svg" alt="">
+                  <el-checkbox v-model="section.check"></el-checkbox>
+                  <span class="serial">{{ i + 1 }}.</span>
+                  <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
+                  <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
+                  <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
+                    src="@/assets/img/exts/word.png" alt="">
+                  <img v-else-if="section.fileType === 'xlsx' || section.fileType === 'xls'"
+                    src="@/assets/img/exts/excel.png" alt="">
+                  <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
+                  <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
+                  <img v-else src="@/assets/img/exts/pic.png" alt="">
+                  <span class="name">{{ section.name }}</span>
+                </div>
+                <div class="section-actions">
+                  <el-button type="text" @click="download(section)" v-auth="'/curriculum:内容设置:下载'">下载</el-button>
+                  <el-button type="text" @click="preview(section)" v-auth="'/curriculum:内容设置:查看'">预览</el-button>
+                  <el-button type="text" @click="editSectionName(section)"
+                    v-auth="'/curriculum:内容设置:修改小节名称'">修改资源名称</el-button>
+                  <el-button type="text" @click="switchFile(section)" v-auth="'/curriculum:内容设置:更换文件'">更换</el-button>
+                  <el-button type="text" @click="delSection(section)" v-auth="'/curriculum:内容设置:删除小节'">移除</el-button>
+                </div>
+              </li>
+            </template>
           </draggable>
         </ul>
+        <div v-else class="empty">
+          <img class="icon" src="@/assets/img/empty.svg" alt="">
+          <p>暂无数据</p>
+        </div>
       </div>
     </div>
 
@@ -398,21 +404,14 @@ export default {
       Oss.del(this.fileUrl)
       this.fileUrl = ''
     },
-    uploadSure () {
-      this.importVisible = false;
-      this.pageNo = 1;
-      this.staffGradeId = "";
-      this.keyword = "";
-      this.getTeacher();
-    },
     transferType (ext) {
       if ("jpg,jpeg,png,gif,svg,psd".includes(ext)) return "图片";
       if ("mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv".includes(ext)) return "视频";
       return ext;
     },
     addChapter () {
-      this.chapterName = "";
-      this.chapterId = "";
+      this.chapterName = ''
+      this.chapterId = ''
       this.chapterVisible = true;
     },
     sort () {
@@ -797,11 +796,11 @@ export default {
       }).catch(err => { })
     },
     closePlayer () {
-      this.playAuth = "";
+      this.playAuth = ''
       this.player.pause();
     },
     closeIframe () {
-      this.iframeSrc = "";
+      this.iframeSrc = ''
       this.videoSrc = ''
       this.showMask = false;
       this.showMask1 = false;
@@ -955,7 +954,7 @@ export default {
 
   .left {
     width: 400px;
-    height: calc(100vh - 247px);
+    height: calc(100vh - 290px);
     padding: 0 15px 15px 0;
     margin-right: 20px;
     border-right: 1px solid #eee;
@@ -1000,7 +999,9 @@ export default {
     flex: 1;
 
     .sections {
+      max-height: calc(100vh - 344px);
       margin-top: 20px;
+      overflow: auto;
 
       li {
         display: flex;
@@ -1037,6 +1038,17 @@ export default {
   }
 }
 
+.empty {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  font-size: 14px;
+  text-align: center;
+  color: #a3a3a3;
+}
+
 /deep/.source-list {
   display: flex;
   gap: 10px;

src/views/course/content/source.vue

@@ -64,8 +64,7 @@
             </div>
             <ul class="lines">
               <li v-for="(item, i) in sourceType" :key="i" class="line">
-                <el-checkbox v-model="item.check" :label="item.name"
-                  @change="val => typeChange(val, item)"></el-checkbox>
+                <el-checkbox v-model="item.check" :label="item.name" @change="getCourse"></el-checkbox>
               </li>
             </ul>
           </div>
@@ -75,12 +74,12 @@
               <p class="addhr_tag"></p>
               <span>资源列表</span>
             </div>
-            <el-input placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="checkedKeyword" clearable></el-input>
+            <el-input class="m-b-10" placeholder="请输入资源名称" prefix-icon="el-icon-search" v-model="keyword"
+              clearable></el-input>
             <ul class="lines">
               <el-checkbox v-if="sources.length" v-model="checkAll" label="全选" @change="checkAllChange"></el-checkbox>
               <li v-for="(item, i) in sources" :key="i" class="line">
-                <el-checkbox v-model="item.check" :label="item.name"
-                  @change="val => sourceChange(val, item)"></el-checkbox>
+                <el-checkbox v-model="item.check" :label="item.resourceName" @change="sourceChange(item)"></el-checkbox>
               </li>
             </ul>
           </div>
@@ -101,7 +100,7 @@
 
           <div class="lines">
             <template v-for="(item, i) in checked">
-              <div v-if="item.name.includes(checkedKeyword)" :key="i" class="line">
+              <div v-if="!item.name || item.name.includes(checkedKeyword)" :key="i" class="line">
                 <div class="check-left">
                   <el-checkbox v-model="item.check"></el-checkbox>
                   <span class="serial">{{ i + 1 }}</span>
@@ -177,31 +176,52 @@ export default {
     init () {
       this.getCourse()
       this.checked = []
+      this.sourceType.forEach(e => {
+        e.check = false
+      })
     },
     // 课程列表
     async getCourse () {
       try {
         this.loading = true
-        const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`)
-        if (list.length) {
-          const all = []
+        this.checkAll = false
+        if (this.active === 'tab3') {
+          const { page } = await this.$post(this.api.resourceLibrary, {
+            pageNum: 1,
+            pageSize: 10000,
+            platformId: Setting.platformId,
+            type: 2,
+            keyword: this.keyword,
+            displayFileType: this.sourceType.filter(e => e.check).map(e => e.name),
+          })
+          const list = page.records
           list.forEach(e => {
-            e.shrink = false
+            e.name = e.resourceName
             e.check = false
-            e.chapters.forEach(n => {
-              n.shrink = false
-              n.check = false
-              all.push(...n.subsections)
-              n.subsections.forEach(m => {
-                m.check = false
+          })
+          this.sources = list
+        } else {
+          const { list } = await this.$post(`${this.api[this.active === 'tab1' ? 'curriculumTree' : 'boutiqueCurriculumTree']}?name=${this.keyword}`)
+          if (list.length) {
+            const all = []
+            list.forEach(e => {
+              e.shrink = false
+              e.check = false
+              e.chapters.forEach(n => {
+                n.shrink = false
+                n.check = false
+                all.push(...n.subsections)
+                n.subsections.forEach(m => {
+                  m.check = false
+                })
               })
             })
-          })
-          list[0].shrink = true
-          list[0].chapters[0].shrink = true
-          this.allSections = all
+            list[0].shrink = true
+            list[0].chapters[0].shrink = true
+            this.allSections = all
+          }
+          this.course = list
         }
-        this.course = list
       } finally {
         this.loading = false
       }
@@ -269,21 +289,28 @@ export default {
         cur !== -1 && this.checked.splice(cur, 1)
       }
       chapter.check = chapter.subsections.every(e => e.check)
-    },
-    // 资源类型选择回调
-    typeChange (val, item) {
-
     },
     // 资源全选回调
-    checkAllChange (val, systemId) {
-      // this.systemChange(val, { systemId })
-      // this.systems.map(e => {
-      //   if (e.systemId == systemId) e.check = val
-      // })
+    checkAllChange (val) {
+      this.sources.map(e => {
+        e.check = val
+        this.sourceChange(e)
+      })
     },
     // 资源列表选择回调
-    sourceChange (val, item) {
-
+    sourceChange (row) {
+      const { check } = row
+      const { checked } = this
+      const cur = checked.findIndex(m => m.id === row.id)
+      if (check) {
+        if (cur === -1) {
+          const section = _.cloneDeep(row)
+          section.check = false
+          this.checked.push(section)
+        }
+      } else {
+        cur !== -1 && this.checked.splice(cur, 1)
+      }
     },
 
     // 批量移除
@@ -324,7 +351,7 @@ export default {
               chapterId,
               cid: id,
               resourceId: e.id,
-              type: e.cid ? 0 : 1,
+              type: e.cid ? 0 : e.resourceName ? 2 : 1,
             }
           })
 
@@ -522,18 +549,24 @@ export default {
 
   .types {
     width: 250px;
-    padding: 10px;
+    height: calc(100vh - 223px);
+    padding: 15px;
     background-color: #f9f9f9;
     box-sizing: border-box;
+    overflow: auto;
 
     .line {
-      margin-bottom: 5px;
+      margin-bottom: 10px;
     }
   }
 
   .sources {
     flex: 1;
     padding: 10px;
+
+    .line {
+      margin-top: 8px;
+    }
   }
 }
 </style>

src/views/resourse/index.vue

@@ -43,7 +43,7 @@
         </li>
         <li>
           <label>资源类型：</label>
-          <el-select v-model="form.displayFileType" clearable @change="initData">
+          <el-select v-model="form.displayFileType" multiple clearable @change="initData">
             <el-option v-for="(item, i) in types" :key="i" :label="item.name" :value="item.name"></el-option>
           </el-select>
         </li>
@@ -198,7 +198,7 @@ export default {
         keyword: '',
         startTime: '',
         endTime: '',
-        displayFileType: '',
+        displayFileType: [],
         editor: '',
       },
       multipleSelection: [],

src/views/resourse/upload.vue

@@ -101,7 +101,6 @@ export default {
     // 自定义上传
     async handleRequest ({ file }) {
       Oss.upload(file).then(res => {
-        console.log("🚀 ~ Oss.upload ~ res:", res, file)
         this.uploading = false
         this.form.fileType = res.format
         this.form.fileUrl = res.url
@@ -138,6 +137,7 @@ export default {
         platformId: Setting.platformId,
         ...form
       })
+      this.submiting = false
       this.uploadVisible = false
     },
     // 弹框关闭回调