From fb48984e7f73f1ff3ae847e8af424de4b86c45d9 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Wed, 18 Sep 2024 11:29:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?APT=E4=B8=8A=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             | 2 +-
 src/renderer/src/views/prepare/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b7c1f41..578bc20 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 859843b..c410ea0 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -68,7 +68,7 @@
           <el-tab-pane label="素材" name="素材">
             <div class="prepare-body-header">
               <div>
-                <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
+                <label style="font-size: 15px">共{{ currentFileList.filter(ite=>ite.fileFlag!=='apt'&&ite.fileFlag!=='课件').length }}个文件</label>&nbsp;
                 <el-popover placement="top-start" :width="250" trigger="hover">
                   <template #default>
                     <div>

From 2ca637072dffcb377040a1ef0e3dda915615ab55 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 20 Sep 2024 09:18:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                         |  2 +-
 .../src/components/choose-textbook/index.vue         | 12 +++++++++---
 .../src/views/prepare/container/file-oper-batch.vue  |  4 ++--
 src/renderer/src/views/prepare/index.vue             |  4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 578bc20..77b31bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.2.5",
+  "version": "2.0.1",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 7f3c178..3daaf75 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -30,7 +30,7 @@
       <el-scrollbar height="450px">
         <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
           :key="item.id" @click="changeBook(item)">
-          <img v-if="item.avartar" :src="BaseUrl + item.avartar" class="textbook-img" alt="">
+          <img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
           <div v-else class="textbook-img">
             <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
           </div>
@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
+import { onMounted, ref, nextTick, toRaw, reactive, computed } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { listEvaluation } from '@/api/subject'
 
@@ -64,6 +64,12 @@ const defaultProps = {
   class: 'textbook-tree'
 }
 
+/*let coverImgUrl = computed((item)=>{
+  if(!item.avartar){
+    return ""
+  }
+  return item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar
+})*/
 const treeLoading = ref(false)
 //当前教材ID
 const curBookId = ref(-1)
@@ -113,7 +119,7 @@ const getSubjectContent = async () => {
     localStorage.setItem('evaluationList', JSON.stringify(rows))
     evaluationList.value = rows
   }
- 
+
   treeLoading.value = false
 
   //获取教材版本
diff --git a/src/renderer/src/views/prepare/container/file-oper-batch.vue b/src/renderer/src/views/prepare/container/file-oper-batch.vue
index 41f8357..3747f92 100644
--- a/src/renderer/src/views/prepare/container/file-oper-batch.vue
+++ b/src/renderer/src/views/prepare/container/file-oper-batch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="file-oper-batch-wrap">
-    <div style="margin: 0 20px; line-height: 40px">
+    <div style="line-height: 40px">
       <el-checkbox
         v-model="isCheckAll"
         :indeterminate="indeterminate"
@@ -15,7 +15,7 @@
 </template>
 <script>
 import { deleteSmarttalkBatch } from '@/api/file'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { exportFile } from '@/utils/talkFile'
 export default {
   name: 'FileOperBatch',
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index c410ea0..3f393ec 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -140,7 +140,7 @@
       </div>
       <file-oper-batch
         v-show="checkFileList.length > 0"
-        :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
+        :indeterminate="checkFileList.length > 0 && checkFileList.length < currentSCFileList.length"
         :choose="checkFileList"
         :check-all="isCheckAll"
         @click-delete="clickDelete"
@@ -252,7 +252,7 @@ export default {
   computed: {
     isCheckAll() {
       return (
-        this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
+        this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
       )
     },
     currentKJFileList() {