Merge pull request '教材选择不区分上下册' (#148) from lyc-dev into main

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

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