From be222a2ba60742533646a6eea12e1099c6fa69d6 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Fri, 23 Aug 2024 11:28:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8F=E8=87=AA=E5=B7=B1=E6=89=80=E9=80=89=E7=9A=84=E5=AD=A6?=
 =?UTF-8?q?=E7=A7=91=E5=AD=A6=E6=AE=B5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/third.vue  | 15 +++++------
 .../choose-textbook/third/index.vue           | 27 ++++++++++---------
 .../choose-textbook/third/selectSubject.vue   | 19 ++++++++-----
 src/renderer/src/utils/resourceDict.js        |  4 +++
 .../resource/container/resoure-search.vue     |  5 +++-
 src/renderer/src/views/resource/store.js      |  2 +-
 6 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/renderer/src/components/choose-textbook/third.vue b/src/renderer/src/components/choose-textbook/third.vue
index bc110c2..14d3d45 100644
--- a/src/renderer/src/components/choose-textbook/third.vue
+++ b/src/renderer/src/components/choose-textbook/third.vue
@@ -5,8 +5,9 @@
         <el-dropdown style="width: 100%;height: 100%">
         <div class="el-dropdown-link flex" style="width: 100%;height: 100%;justify-content: space-between;align-items: center">
           <span>{{titleName}}</span>
-          <i class="iconfont icon-xiangyou"></i>
+<!--          <i class="iconfont icon-xiangyou"></i>-->
         </div>
+<!--          学科学段选择-->
           <template #dropdown>
             <div style="width: 300px;padding: 20px">
               <ThirdIndex @getVertion="getVertion"></ThirdIndex>
@@ -29,10 +30,12 @@ import ThirdIndex from './third/index.vue'
 import {nextTick, reactive, ref,onMounted,watch} from 'vue'
 import {getBook, getTextbook} from '@/api/file/third'
 import useThirdStore from '@/store/modules/thirdTextbook'
+import useUserStore from '@/store/modules/user'
 
 const useThird = useThirdStore()
+const useStore = useUserStore()
 const emit = defineEmits(['nodeClick'])
-const titleName = ref('小学-语文')
+const titleName = ref('')
 //树结构的数据
 const treeData = ref([])
 // 默认展开的节点
@@ -158,16 +161,12 @@ const handleNodeClick = (data,node) => {
 }
 //缓存
 onMounted(() => {
-  const info = localStorage.getItem('selectBookInfo')
-  if(info){
-    const {gradeName,subjectName} = JSON.parse(info)
-    titleName.value = `${gradeName}-${subjectName}`
-  }
+  titleName.value = `${useStore.user.edustage}-${useStore.user.edusubject}`
   treeLoading.value = true
 })
 //监听数据变化
 watch(() => useThird,() => {
-  titleName.value = `${useThird.gradeName}-${useThird.subjectName}`
+  titleName.value = `${useStore.user.edustage}-${useStore.user.edusubject}`
 },{deep:true})
 
 const defaultProps = {
diff --git a/src/renderer/src/components/choose-textbook/third/index.vue b/src/renderer/src/components/choose-textbook/third/index.vue
index 5ab637f..68903df 100644
--- a/src/renderer/src/components/choose-textbook/third/index.vue
+++ b/src/renderer/src/components/choose-textbook/third/index.vue
@@ -14,10 +14,12 @@ import { gradeList } from '@/utils/resourceDict'
 import SelectSubject from './selectSubject.vue'
 import {getSubjects,getTextbookVersion} from '@/api/file/third'
 import useThirdStore from '@/store/modules/thirdTextbook'
+import useUserStore from '@/store/modules/user'
 const useThird = useThirdStore()
+const useStore = useUserStore()
 
 const emit = defineEmits(['getVertion'])
-const active = ref(useThird.activeGrade || gradeList[0].value)
+const active = ref(1)
 //用来获取所有学科
 const subjectList = ref([])
 //用来获取学科的id
@@ -27,9 +29,17 @@ const handleClick = (tab) => {
 }
 //获取当前学段所有学科
 const getSubject = (value) => {
+  const currentIndex = gradeList.findIndex(item => item.value === value)
   getSubjects({stage:value}).then(res => {
     if(res.code === 200){
-      subjectList.value = [...res.data]
+      subjectList.value = res.data.map(item => {
+        return {
+          ...item,
+          gradeName:gradeList[currentIndex].label
+        }
+      })
+      const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject)
+      getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
       if(textbookVersionId.value === 0){
         getTagId(subjectList.value[0])
       }
@@ -44,21 +54,14 @@ const getTagId = (item) => {
     if(res.code === 200){
       emit('getVertion',res.data)
       useThird.getSelectBookInfo({...item,activeGrade:active.value,gradeName:gradeList[currentIndex].label})
-      localStorage.setItem('selectBookInfo',JSON.stringify({...item,activeGrade:active.value,gradeName:gradeList[currentIndex].label}))
     }
   })
 }
 onMounted(() => {
+  const currentIndex = gradeList.findIndex(item => item.label === useStore.user.edustage)
   //首次渲染获取
-  handleClick(active.value)
-  //查看是否缓存数据
-  const info = localStorage.getItem('selectBookInfo')
-  if(info){
-    const {activeGrade,subjectId,subjectName} = JSON.parse(info)
-    active.value = activeGrade
-    //获取一次列表接口
-    getTagId({subjectId:subjectId,subjectName:subjectName})
-  }
+  getSubject(gradeList[currentIndex].value)
+  active.value = gradeList[currentIndex].value
 })
 </script>
 
diff --git a/src/renderer/src/components/choose-textbook/third/selectSubject.vue b/src/renderer/src/components/choose-textbook/third/selectSubject.vue
index 9512f56..af4b57b 100644
--- a/src/renderer/src/components/choose-textbook/third/selectSubject.vue
+++ b/src/renderer/src/components/choose-textbook/third/selectSubject.vue
@@ -1,11 +1,11 @@
 <template>
   <template v-for="item in subjectList" :key="item.subjectId">
     <el-tag
-      type="primary"
+      :type="useStore.user.edusubject === item.subjectName && useStore.user.edustage === item.gradeName ?  'primary' : 'info'"
       effect="dark"
       round
-      style="cursor: pointer;margin-right: 5px;margin-top: 5px;"
-      @click="clickTag(item)"
+      class="tagItem"
+      :style="useStore.user.edusubject === item.subjectName && useStore.user.edustage === item.gradeName ? {'cursor': 'pointer'} : {'cursor': 'no-Drop'}"
     >
       {{ item.subjectName }}
     </el-tag>
@@ -13,6 +13,8 @@
 </template>
 
 <script setup name="selectSubject">
+import useUserStore from "@/store/modules/user";
+const useStore = useUserStore()
 const props = defineProps({
   subjectList: {
     type: Array,
@@ -20,11 +22,14 @@ const props = defineProps({
   }
 })
 const emit = defineEmits(['clickTag'])
-const clickTag = (item) => {
-  emit('clickTag',item)
-}
+// const clickTag = (item) => {
+//   emit('clickTag',item)
+// }
 </script>
 
 <style scoped>
-
+  .tagItem{
+    margin-right: 5px;
+    margin-top: 5px;
+  }
 </style>
diff --git a/src/renderer/src/utils/resourceDict.js b/src/renderer/src/utils/resourceDict.js
index a334ccb..9a26a2b 100644
--- a/src/renderer/src/utils/resourceDict.js
+++ b/src/renderer/src/utils/resourceDict.js
@@ -88,6 +88,10 @@ export const gradeList = [
 ]
 //课件类别
 export const coursewareTypeList = [
+  {
+    label:'全部',
+    value:''
+  },
   {
     label:'课件',
     value:3
diff --git a/src/renderer/src/views/resource/container/resoure-search.vue b/src/renderer/src/views/resource/container/resoure-search.vue
index c267157..6f94391 100644
--- a/src/renderer/src/views/resource/container/resoure-search.vue
+++ b/src/renderer/src/views/resource/container/resoure-search.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script setup>
-import {watch,ref} from 'vue'
+import {watch,ref,onMounted} from 'vue'
 import useResoureStore from '../store'
 import {coursewareTypeList} from '@/utils/resourceDict'
 const isThird = ref(false)
@@ -71,6 +71,9 @@ const debouncedChangeName = debounce(sourceStore.changeName, 300);
 const onchangeInput = () => {
   debouncedChangeName()
 }
+onMounted(() => {
+  sourceStore.query.fileSource = '平台'
+})
 
 watch(() => sourceStore.query.fileSource,() => {
   sourceStore.query.fileSource === '第三方'?isThird.value = true:isThird.value = false
diff --git a/src/renderer/src/views/resource/store.js b/src/renderer/src/views/resource/store.js
index e0e0c6b..e48ce6f 100644
--- a/src/renderer/src/views/resource/store.js
+++ b/src/renderer/src/views/resource/store.js
@@ -69,7 +69,7 @@ export default defineStore('resource', {
       bookId:0,
       stage:0,
       subjectId:0,
-      type:3,
+      type:'',
       title:''
     },
     result: {

From 59be0c07d10667bafac32742472d203c6e1d1b78 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Mon, 26 Aug 2024 09:30:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=B9=B4=E7=BA=A7=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=87=E6=8D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/choose-textbook/third/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/choose-textbook/third/index.vue b/src/renderer/src/components/choose-textbook/third/index.vue
index 68903df..354f79d 100644
--- a/src/renderer/src/components/choose-textbook/third/index.vue
+++ b/src/renderer/src/components/choose-textbook/third/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-tabs v-model="active" class="demo-tabs" @tab-change="handleClick">
     <template v-for="(item,index) in gradeList" :key="index">
-      <el-tab-pane :label="item.label" :name="item.value">
+      <el-tab-pane :label="item.label" :name="item.value" disabled>
         <SelectSubject ref="selectSubject" :subjectList="subjectList" @clickTag="getTagId"></SelectSubject>
       </el-tab-pane>
     </template>
@@ -24,7 +24,9 @@ const active = ref(1)
 const subjectList = ref([])
 //用来获取学科的id
 const textbookVersionId = ref(0)
+//不需要切换年级教材了
 const handleClick = (tab) => {
+  console.log(tab,'tab')
   getSubject(tab)
 }
 //获取当前学段所有学科