update

src/components/pages/aiAddCourse/addCourse.vue

@@ -972,32 +972,52 @@
                   </div>
                 </div>
                 <div class="know_serach" v-show="interFindPan">
+                  <div class="know_serach_box" v-if="getTypeC(2).length || getTypeC(1).length">
+                    <span>检索项：</span>
+                    <el-select v-if="getTypeC(2).length" v-model="typeC1" placeholder="请选择年级" @change="forceUpdate()" style="width: 150px;margin-right: 10px;" clearable multiple :collapse-tags="true" :collapse-tags-tooltip="true">
+                      <el-option v-for="(e, eIndex) in getTypeC(2)" :key="eIndex" :label="e" :value="e">
+                      </el-option>
+                    </el-select>
+                    <el-select v-if="getTypeC(1).length" v-model="typeC2" placeholder="请选择学科" @change="forceUpdate()" style="width: 150px;margin-right: 10px;" clearable multiple :collapse-tags="true" :collapse-tags-tooltip="true">
+                      <el-option v-for="(e, eIndex) in getTypeC(1)" :key="eIndex" :label="e" :value="e">
+                      </el-option>
+                    </el-select>
+                  </div>
                   <div class="know_serach_box">
                     <span>检索关键词：</span>
                     <input type="text" placeholder="请输入检索关键词" class="binfo_input" v-model="searchFileName"
                         style="width: 100%;margin: 0 5px 0 0;min-height: 36px;box-sizing: border-box;height: 36px;" />
                       <button class="c_pub_button_add" @click="startFindMatchingContents">点击检索资料</button>
                   </div>
-                  <div class="know_serach_box" v-if="getTypeC(2)">
+                  <!-- <div class="know_serach_box" v-if="getTypeC(2)">
                     <span>筛选年级：</span>
                     <div>{{getTypeC(2)}}</div>
                   </div>
                   <div class="know_serach_box" v-if="getTypeC(1)">
                     <span>筛选学科：</span>
                     <div>{{getTypeC(1)}}</div>
-                  </div>
+                  </div> -->
                   <div class="know_serach_box" v-if="findMatchingContentsPage != 1">
                     <span>筛选项：</span>
+                    <el-select v-model="knowFileType1" placeholder="请选择册数" @change="forceUpdate()" style="width: 125px;margin-right: 10px;" clearable>
+                      <el-option v-for="(e, eIndex) in knowFileTypeArray1" :key="eIndex" :label="e" :value="e">
+                      </el-option>
+                    </el-select>
+                    <el-select v-model="knowFileType2" placeholder="请选择单元" @change="forceUpdate()" style="width: 125px;margin-right: 10px;" clearable>
+                      <el-option v-for="(e, eIndex) in 10" :key="eIndex" :label="`第${e}单元`" :value="e">
+                      </el-option>
+                    </el-select>
                     <el-select v-model="knowFileType" placeholder="请选择类型" @change="forceUpdate()" style="width: 125px;margin-right: 10px;" clearable>
                       <el-option v-for="(e, eIndex) in knowFileTypeArray" :key="eIndex" :label="e" :value="e">
                       </el-option>
                     </el-select>
+                    <button class="c_pub_button_confirm" style="margin: 0 10px 0 0px;" @click="knowFileType1 = '',knowFileType2 = '',knowFileType = ''">重置</button>
                     <button v-loading="isfindMatchingContents" class="c_pub_button_confirm" style="margin: 0 0 0 0px;" @click="panFind" v-if="findMatchingContentsPage != 1">下一页</button>
                   </div>
                 </div>
                 <div style="display: flex; align-items: center;" v-show="interFindPan">
-                    <div v-loading="knowInfoDataLoading" element-loading-text="小可正在努力生成中，请稍等..."
-                      style="height: 400px; width:100%;">
+                  <div v-loading="knowInfoDataLoading" element-loading-text="小可正在努力生成中，请稍等..."
+                      style="height: 400px; width:calc(50% - 50px);">
                       <div class="c_pub_button_confirm stopBtn" v-if="knowInfoDataLoading && isfindMatchingContents"
                         @click="cancelAjax('findMatchingContents')">停止</div>
                     <div class="add_chapters_check_box" v-if="allknowInfoData3() && allknowInfoData3().length">
@@ -1015,12 +1035,12 @@
                     </div>
                     <div v-else class="add_chapters_box" style="display: flex; flex-direction: column;height:calc(100% - 50px);overflow: auto;padding: 0;">
                       <div class="chapter_upload">
-                        <div class="chapter_upload_o" style="position: relative; display: flex; align-items: center; padding: 0 10px;">
+                        <div class="chapter_upload_o" style="position: relative; display: flex; align-items: center; padding: 0 10px;box-sizing: border-box;">
                           <div class="chapter_upload_check" style="min-width: 50px; background: unset;text-align: center; font-size: 14px;">选中</div>
                           <div class="chapter_upload_l" style="padding: 1px 0 0 10px">
                             <div class="chapter_upload_l_i2" style="background: unset"></div>
                           </div>
-                          <div class="chapter_upload_n" style="width: 100%; margin-top:0">
+                          <div class="chapter_upload_n" style="width: calc(100% - 80px - 80px - 116px - 20px); margin-top:0">
                             <div class="chapter_upload_box" style="color: #000">文件名</div>
                           </div>
                           <div class="chapter_upload_type">文件类型</div>
@@ -1041,6 +1061,7 @@
                                       display: flex;
                                       align-items: center;
                                       padding: 0 10px;
+                                      box-sizing: border-box;
                                       ">
                             <div class="chapter_upload_check file-loading-class"
                               :class="{ checked: knowFileids3.indexOf(item1.url) != -1 }"
@@ -1061,7 +1082,7 @@
                               <div v-if="item1.type == 13" class="chapter_upload_l_i13" style="margin-left: 1px">
                               </div>
                             </div>
-                            <div class="chapter_upload_n" style="width: 100%">
+                            <div class="chapter_upload_n" style="width: calc(100% - 80px - 80px - 116px - 20px)">
                               <el-tooltip :content="item1.name" placement="top" effect="dark">
                                 <!-- content to trigger tooltip here -->
                                 <div v-if="
@@ -1117,7 +1138,7 @@
                       </svg>
                     </button>
                   </div>
-                  <div style="height: 400px; width:100%;position: relative;">
+                  <div style="height: 400px; width:calc(50% - 50px);position: relative;">
                     <div class="add_chapters_check_box" v-if="knowInfoData2 && knowInfoData2.length">
                       <div class="add_chapters_check" @click="checkAllKnowInfoData2()" v-if="knowInfoData2 && knowInfoData2.length">
                         <div class="chapter_upload_check" :class="{ checked: knowFileids2.length == knowInfoData2.length }"></div>
@@ -1140,12 +1161,12 @@
                     </div>
                     <div v-else class="add_chapters_box" style="display: flex; flex-direction: column;height:calc(100% - 50px);overflow: auto;padding: 0;" ref="rightKnow">
                       <div class="chapter_upload">
-                        <div class="chapter_upload_o" style="position: relative; display: flex; align-items: center; padding: 0 10px;">
+                        <div class="chapter_upload_o" style="position: relative; display: flex; align-items: center; padding: 0 10px;box-sizing: border-box;">
                           <div class="chapter_upload_check" style="min-width: 50px; background: unset;text-align: center; font-size: 14px;">选中</div>
                           <div class="chapter_upload_l" style="padding: 1px 0 0 10px">
                             <div class="chapter_upload_l_i2" style="background: unset"></div>
                           </div>
-                          <div class="chapter_upload_n" style="width: 100%; margin-top:0">
+                          <div class="chapter_upload_n" style="width: calc(100% - 80px - 80px - 116px - 20px); margin-top:0">
                             <div class="chapter_upload_box" style="color: #000">文件名</div>
                           </div>
                           <div class="chapter_upload_type">文件类型</div>
@@ -1165,6 +1186,7 @@
                                         display: flex;
                                         align-items: center;
                                         padding: 0 10px;
+                                        box-sizing: border-box;
                                       ">
                             <div class="chapter_upload_check file-loading-class"
                               :class="{ checked: knowFileids2.indexOf(item1.fileid) != -1 }"
@@ -1185,7 +1207,7 @@
                               <div v-if="item1.type == 13" class="chapter_upload_l_i13" style="margin-left: 1px">
                               </div>
                             </div>
-                            <div class="chapter_upload_n" style="width: 100%">
+                            <div class="chapter_upload_n" style="width: calc(100% - 80px - 80px - 116px - 20px)">
                               <el-tooltip :content="item1.name" placement="top" effect="dark">
                                 <!-- content to trigger tooltip here -->
                                 <div v-if="
@@ -8105,7 +8127,12 @@ export default {
       ],
       appendixLoading: false,
       interFindPan: true,
+      typeC1: [],
+      typeC2: [],
+      knowFileType1: "",
+      knowFileType2: "",
       knowFileType: "",
+      knowFileTypeArray1: ['上册', '下册'],
       knowFileTypeArray: ['作业', '教案', '其他'],
     };
   },
@@ -8448,9 +8475,9 @@ export default {
           }
         }
         if(index == 1){
-          return sub.join('，')
+          return sub
         }else if(index == 2){
-          return grade.join('，')
+          return grade
         }
       }
     },
@@ -8480,6 +8507,12 @@ export default {
             knowInfoData = knowInfoData.filter(item => converter(item.name).includes(this.knowFileType))
           }
         }
+        if(this.knowFileType1){
+          knowInfoData = knowInfoData.filter(item => converter(item.name).includes(this.knowFileType1))
+        }
+        if(this.knowFileType2){
+          knowInfoData = knowInfoData.filter(item => converter(item.name).includes(converter(`第${this.knowFileType2}单元`)) || converter(item.name).includes(converter(`第${this.numberToChinese(this.knowFileType2)}单元`)))
+        }
         return knowInfoData;
       };
     },
@@ -25735,6 +25768,9 @@ ${msg}
       this.findMatchingContentsFinish = false
       this.findMatchingContentsPage = 1
       this.knowInfoData3 = []
+      this.knowFileType1 = ''
+      this.knowFileType2 = ''
+      this.knowFileType = ''
       this.findMatchingContents(); // 调用下拉刷新方法
     },
     findMatchingContents(){
@@ -25767,9 +25803,9 @@ ${msg}
         this.knowInfoDataLoading = true
       }
       let params = {
-        type: sub.join(","),
+        type: this.typeC2.join(","),
         string: this.searchFileName,
-        grade: grade.join(","),
+        grade: this.typeC1.join(","),
         page: this.findMatchingContentsPage
       };
       let md = new MarkdownIt();

src/components/tools/hevue-img-preview/package-lock.json

@@ -1,8 +1,22 @@
 {
   "name": "hevue-img-preview",
   "version": "5.0.3",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "hevue-img-preview",
+      "version": "5.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "hevue-img-preview": "file:"
+      }
+    },
+    "node_modules/hevue-img-preview": {
+      "resolved": "",
+      "link": true
+    }
+  },
   "dependencies": {
     "hevue-img-preview": {
       "version": "file:",