src/renderer/src/components/choose-textbook/index.vue

@@ -75,7 +75,8 @@ const curBookImg = ref('')
 const curBookPath = ref('')
 // 上册
 const volumeOne = ref([])
-
+// 下册
+const volumeTwo = ref([])
 // 当前节点
 const currentNode = reactive({
   data:{}
@@ -110,11 +111,9 @@ const getSubjectContent = async () => {
   //获取教材版本
   await getSubject()
   //上册
-  /**
+  volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
-   * 不区分上下册
+  //下册
-   * 2024/08/20调整
+  volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
-   */
-  volumeOne.value = data.filter(item => item.level == 1)
   getTreeData()
 }
 
@@ -133,8 +132,12 @@ const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
 const getTreeData = () => {
   //数据过滤
   let upData = transData(volumeOne.value)
-  if(upData.length){
+  let downData = transData(volumeTwo.value)
-    treeData.value = [...upData]
+  if(upData.length && downData.length){
+    treeData.value = [...upData,...downData]
+  }
+  else if(upData.length || downData.length){
+    treeData.value = upData.length ? upData : downData
   }
   else{
     treeData.value = []

src/renderer/src/components/move-file/index.vue

@@ -88,6 +88,8 @@ const curBookId = ref(-1)
 const curBookName = ref('')
 // 上册
 const volumeOne = ref([])
+// 下册
+const volumeTwo = ref([])
 // 当前节点
 const currentNode = reactive({
   data: {}
@@ -125,12 +127,9 @@ const getSubjectContent = async () => {
   //获取教材版本
   getSubject()
   //上册
-    /**
+  volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
-   * 不区分上下册
+  //下册
-   * 2024/08/20调整
+  volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
-   */
-  volumeOne.value = data.filter(item => item.level == 1)
-
   getTreeData()
 }
 
@@ -161,8 +160,13 @@ const isHaveUnit = (id) => {
 const getTreeData = () => {
   //数据过滤
   let upData = transData(volumeOne.value)
-  if(upData.length){
+  let downData = transData(volumeTwo.value)
-    treeData.value = [...upData]
+
+  if(upData.length && downData.length){
+    treeData.value = [...upData,...downData]
+  }
+  else if(upData.length || downData.length){
+    treeData.value = upData.length ? upData : downData
   }
   else{
     treeData.value = []

src/renderer/src/views/tool/components/lesson.vue

@@ -42,17 +42,18 @@ const getTreeData = () => {
   evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
 
     //上册
-        /**
+  let volumeOne = evaluationList.value.filter(item => item.level == 1 && item.semester == '上册')
-   * 不区分上下册
+  //下册
-   * 2024/08/20调整
+  let volumeTwo = evaluationList.value.filter(item => item.level == 1 && item.semester == '下册')
-   */
-  let volumeOne = evaluationList.value.filter(item => item.level == 1)
-
   //数据过滤
 
   let upData = transData(volumeOne)
-  if(upData.length){
+  let downData = transData(volumeTwo)
-    treeData.value = [...upData]
+  if(upData.length && downData.length){
+    treeData.value = [...upData,...downData]
+  }
+  else if(upData.length || downData.length){
+    treeData.value = upData.length ? upData : downData
   }
   else{
     treeData.value = []