From cf331b9c630ed5c2c4e6db1eae6194b9f1fc5b26 Mon Sep 17 00:00:00 2001
From: qinqing <775435633@qq.com>
Date: Tue, 24 Sep 2024 17:23:16 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=BE=E6=A0=87=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=99=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/layout/components/Header.vue | 189 +++++++++++-------
 .../views/teach/standardAnalysis/index.vue    |  76 +++++--
 2 files changed, 185 insertions(+), 80 deletions(-)

diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 8d50bbd..b92f4b8 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -7,16 +7,10 @@
       </div>
       <div class="change-tab">
         <ul class="flex">
-          <li
-            v-for="(item, index) in routeHeader.nowRouter"
-            :key="index"
-            class="flex"
-            :style="{'color' : item.color}"
-            :class="currentRoute === item.url ? 'active-li' : ''"
-            @click="handleOutLink(item.url,item.type, item.name)"
-          >
-            <i :class="item.img"></i>
-            <span class="text">{{ item.name }}</span>
+          <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
+            v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
+            <i class="iconfont" :class="menu.icon"></i>
+            <span class="text">{{ menu.name }}</span>
           </li>
         </ul>
       </div>
@@ -25,14 +19,9 @@
     <div class="right-section flex">
       <WindowTools />
       <div class="user flex">
-        
         <div class="avatar-container">
-          <el-dropdown
-            class="right-menu-item hover-effect"
-            trigger="click"
-            @command="handleCommand"
-          >
-            <div class="avatar-wrapper">
+          <div class="avatar-wrapper flex">
+            <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
               <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
               <template #dropdown>
                 <el-dropdown-menu>
@@ -65,17 +54,8 @@
               </div>
               <div class="user-depname">{{ userStore.user.deptName }}</div>
             </div>
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item @click="changePage('/testpdf')">测试页面</el-dropdown-item>
-                <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
-                <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
-                <el-dropdown-item divided command="logout">
-                  <span>退出登录</span>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
+          </div>
+
         </div>
       </div>
     </div>
@@ -83,13 +63,13 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
-import routerStore from '@/store/modules/route'
+import { updateUserInfo } from '@/api/system/user'
 import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
@@ -104,20 +84,22 @@ const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
+const userSubjectList = ref([])
 
 const handleOutLink = (path, type, name) => {
   if (!path) return
   if (type === 'hash') {
     router.push(path)
   } else {
+
     // key 对应的 linkConfig.js 外部链接配置
     let configObj = outLink().getBaseData()
     let fullPath = configObj.fullPath + path
     fullPath = fullPath.replaceAll('//', '/')
     const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
-    let unitId = levelSecondId ? levelSecondId :levelFirstId
-    if(name == '教材分析' || name == '高考研究'){
-       fullPath += `?unitId=${unitId}`
+    let unitId = levelSecondId ? levelSecondId : levelFirstId
+    if (name == '教材分析' || name == '考试分析') {
+      fullPath += `?unitId=${unitId}`
     }
     // 通知主进程
     ipcRenderer.send('openWindow', {
@@ -127,34 +109,47 @@ const handleOutLink = (path, type, name) => {
     })
   }
 }
-/*const menus = ref([
+
+const activeId = ref('/home')
+const headerMenus = [
   {
-    icon: 'icon-zhuye2 icon-homepage',
-    name: '主页',
-    path: '/homepage'
+    name: '工作台',
+    id: 1,
+    icon: 'icon-gongzuotai',
+    path: '/home'
   },
   {
-    icon: 'icon-jiaoxueziyuan icon-resource',
-    name: '资源',
+    name: '研究室',
+    id: 2,
+    icon: 'icon-yanjiushi',
+    disabled: true
+  },
+  {
+    name: '资源库',
+    id: 3,
+    icon: 'icon-saoyisao',
     path: '/resource'
   },
   {
-    icon: 'icon-beike icon-prepare',
-    name: '备课',
-    path: '/prepare'
-  },
-  {
-    icon: 'icon-jiangke1 icon-teach',
-    name: '授课',
-    path: '/teach'
+    name: '朋友圈',
+    id: 4,
+    icon: 'icon-pengyouquan1',
+    disabled: true
   }
-])*/
+]
+
+const clickMenu = ({ id, disabled, path }) => {
+  if (disabled) return
+  activeId.value = id
+  router.push(path)
+}
 
 // 监听当前路由
 watch(
   () => router.currentRoute.value,
   (newValue) => {
-    currentRoute.value = newValue.path
+    currentRoute.value = newValue
+    activeId.value = newValue.path
   },
   { immediate: true }
 )
@@ -195,20 +190,48 @@ function logout() {
           ipcRenderer && ipcRenderer.send('openLoginWindow')
         })
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
 const emits = defineEmits(['setLayout'])
 function setLayout() {
   emits('setLayout')
 }
+// 切换学科
+const changeSubject = async (command) =>{
+  clearBookInfo()
+  const { userId, userName, phonenumber, plainpwd  } = userStore.user
+  const data = {
+    userId,
+    userName,
+    edustage: command.edustage,
+    edusubject:  command.edusubject
+  }
+  await updateUserInfo(data)
+  await userStore.login({username: phonenumber, password: plainpwd})
+  await userStore.getInfo()
+  router.go()
+}
+
+// 获取学科
+const getAllSubject = async () => {
+  const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
+  if(!userStore.user.subject) return
+  const subject = userStore.user.subject.split(',')
+  userSubjectList.value = rows.filter(item =>
+    subject.some(el => item.id == el)
+  )
+}
+
+
+onMounted(() => {
+  getAllSubject()
+})
 </script>
 
 <style lang="scss" scoped>
 .title-bar {
   height: 80px;
-  background: #ebf0f9;
-
   justify-content: space-between;
   align-items: center;
   -webkit-app-region: drag;
@@ -216,27 +239,41 @@ function setLayout() {
 
 .left-section {
   display: flex;
-  align-items: center;
+  align-items: flex-start;
+  flex-direction: column;
   width: 50%;
 
+  .title-box {
+    padding-top: 8px;
+    box-sizing: border-box;
+    align-items: center;
+    padding-left: 20px;
+
+    .title {
+      color: #4b73df;
+      font-size: 13px;
+      padding: 0 5px;
+    }
+  }
+
   .change-tab {
     -webkit-app-region: no-drag;
     margin-left: 20px;
 
     ul {
       li {
-        padding: 3px 13px;
         cursor: pointer;
         flex-direction: column;
         border-radius: 8px;
-        margin: 0 5px;
+        margin: 0 10px;
 
         .text {
           font-size: 13px;
+          font-weight: bold;
         }
 
         .iconfont {
-          font-size: 22px;
+          font-size: 26px;
         }
 
         .icon-resource {
@@ -256,12 +293,20 @@ function setLayout() {
         }
 
         &:hover {
-          background: #d3e3fb;
+          color: #409eff;
+        }
+      }
+
+      .disabled {
+        cursor: not-allowed;
+        color: #bfbfbf;
+
+        &:hover {
+          color: #bfbfbf;
         }
       }
 
       .active-li {
-        background: #d3e3fb;
         color: #409eff;
       }
     }
@@ -271,11 +316,7 @@ function setLayout() {
     -webkit-app-region: no-drag;
   }
 
-  .title {
-    color: #4b73df;
-    font-size: 18px;
-    padding: 0 20px;
-  }
+
 }
 
 .right-section {
@@ -287,11 +328,25 @@ function setLayout() {
   flex-direction: column;
 
   .user {
+    padding-right: 10px;
+
     .user-info {
       padding-right: 5px;
-      align-items: center;
+      align-items: flex-start;
       flex-direction: column;
       font-size: 12px;
+      height: 100%;
+      justify-content: space-around;
+
+      .user-depname {
+        margin-right: 0;
+      }
+
+      .user-subject {
+        display: flex;
+        align-items: center;
+        font-size: 12px;
+      }
     }
   }
 }
@@ -301,12 +356,12 @@ function setLayout() {
 
   .avatar-wrapper {
     display: flex;
+    align-items: center;
 
     .user-avatar {
-      width: 30px;
-      height: 30px;
+      width: 45px;
+      height: 45px;
       border-radius: 10px;
-      margin-top: 8px;
       margin-right: 10px;
     }
 
diff --git a/src/renderer/src/views/teach/standardAnalysis/index.vue b/src/renderer/src/views/teach/standardAnalysis/index.vue
index 5eca765..e2e2cbe 100644
--- a/src/renderer/src/views/teach/standardAnalysis/index.vue
+++ b/src/renderer/src/views/teach/standardAnalysis/index.vue
@@ -4,14 +4,14 @@
     <div class="page-con-left">
       <div class="stand-head" ref="headref">
         <div class="stand-head-left">
-          <el-image class="imges" src="https://file.ysaix.com:7868//src/assets/images/高中语文必修上册.jpg" />
+          <el-image class="imges" :src="bookInfo ? bookInfo.avartar : ''" />
         </div>
         <div class="stand-head-right">
           <div class="stand-head-right-tit">{{booktitle}}</div>
           <i class="iconfont icon-yidongdaozu stand-head-right-icon" @click="dialogVisible = true"></i>
           <div class="stand-head-right-row">
             <div class="stand-head-right-row-time">更新2024.9.10</div>
-            <el-switch class="stand-head-right-row-switch" v-model="isOpenClass" inline-prompt active-text="公开" inactive-text="非公" />
+            <!-- <el-switch class="stand-head-right-row-switch" v-model="isOpenClass" inline-prompt active-text="公开" inactive-text="非公" /> -->
           </div>
         </div>
       </div>
@@ -68,8 +68,10 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="dialogVisible" append-to-body :show-close="false" width="550">
-      <ChooseTextbook @change-book="getData" @node-click="getData" />
+    <el-dialog v-model="dialogVisible" title="切换教材" append-to-body  width="550">
+      <div class="booklist">
+        <div :class="{'item': true,'active': booksel === idx}" v-for="item,idx in bookList" :key="idx" @click="bookChange(item)">{{item.edustage + item.edusubject}}</div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -82,7 +84,7 @@ import { listEvaluationclue } from '@/api/teaching/classwork'
 import { uploadServer, getJSONFile } from '@/utils/common'
 import { ElNotification } from 'element-plus'
 import ChooseTextbook from "@/components/choose-textbook/index.vue";
-
+import { listEvaluation } from '@/api/classManage/index'
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 const sourceStore = useResoureStore()
@@ -101,6 +103,10 @@ const searchref = ref(null);
 const listHeight = ref(0);
 const dialogVisible = ref(false);
 const booktitle = ref('');
+const bookInfo = ref(null);
+const booksel = ref(0);
+const bookList = ref([])
+
 
 const searchOptions = [{
     value: '0',
@@ -109,7 +115,7 @@ const searchOptions = [{
     value: '1',
     label: '按内容量',
   }];
-const standList = ref([])
+const standList = ref([]);
 const showData = ref([]);
 
 //查询课标分析列表
@@ -234,16 +240,41 @@ const getData = (data) => {
   // 头部 教材分析打开外部链接需要当前章节ID
   localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
 }
-onMounted(() => {
-
+// 获取学科
+const getAllSubject = async () => {
+  const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
+  const { edustage, edusubject } = userStore.user;
+  rows && rows.map(item => {
+    if(item.edustage === edustage && item.edusubject === edusubject){
+      bookInfo.value = {...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar}
+    }
+    if(item.fileurl !== ''){
+      bookList.value.push({...item,avartar: import.meta.env.VITE_APP_BUILD_BASE_PATH + item.avartar})
+    }
+  })
+  booksel.value = bookList.value.findIndex(item => item.edustage === edustage && item.edusubject === edusubject)
+}
+const bookChange = async (item, idx) => {
+  booksel.value = idx
+  bookInfo.value = {...item}
+  booktitle.value = `${item.edustage + item.edusubject}课程标准`
+  pdfUrl.value = '';
+  const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + item.fileurl.replace('.txt','.pdf')
+  await loadPdfAnimation(filepath)
+  dialogVisible.value = false
+}
+const loadPdfAnimation = (path) => {
+  const timer = setTimeout(() => {
+    pdfUrl.value = path
+    clearTimeout(timer);
+  },2000)
+}
+onMounted(async () => {
+  await getAllSubject();
   const { edustage, edusubject } = userStore.user;
   booktitle.value = `${edustage + edusubject}课程标准`
   const filePath = `${import.meta.env.VITE_APP_RES_FILE_PATH}${edustage}-${edusubject}-课标.pdf`
-  const timer = setTimeout(() => {
-    pdfUrl.value = filePath
-    clearTimeout(timer);
-  },2000)
-  
+  await loadPdfAnimation(filePath)  
   if(cardref.value && headref.value){
     const cardH = cardref.value.offsetHeight;
     const headh = headref.value.offsetHeight;
@@ -492,4 +523,23 @@ onMounted(() => {
     }
   }
 }
+.booklist{
+  width: 100%;
+  height: 500px;
+  padding-top: 1px;
+  overflow: auto;
+  .item{
+    width: 100%;
+    height: auto;
+    padding: 8px 16px;
+    background-color: #ffffff;
+    border-top: 1px solid #f1f1f1;
+    font-size: 14px;
+    color: #3b3b3b;
+  }
+  .active{
+    background-color: #409eff;
+    color: #ffffff;
+  }
+}
 </style>
\ No newline at end of file

From 9329da9ddfb4e73877a8eeb788be5e9134a7414c Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Tue, 24 Sep 2024 17:36:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E5=88=87=E6=8D=A2=20edit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/store.js                             |   6 +
 .../src/components/choose-textbook/index.vue  | 130 +++++-------------
 src/renderer/src/hooks/useGetSubject.js       |  36 +++--
 src/renderer/src/views/desktop/index.vue      |  25 ++--
 src/renderer/src/views/prepare/index.vue      |   2 +-
 src/renderer/src/views/resource/index.vue     |   2 +-
 6 files changed, 71 insertions(+), 130 deletions(-)

diff --git a/src/main/store.js b/src/main/store.js
index c37f8f5..0607e19 100644
--- a/src/main/store.js
+++ b/src/main/store.js
@@ -16,6 +16,12 @@ const defaultData = {
     curSubjectNode: {
       data: {},              // 当前教材节点 （包含当前教材 单元）
       querySearch: {}       // 查询资源所需参数
+    },
+    subject: {
+      bookList: null, // 教材列表
+      curBook: null, // 当前选中的教材
+      curNode: null, // 当前选中的节点
+      defaultExpandedKeys: [], //展开的节点
     }
   },
   local: { // 本地(永久localStorage)
diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index a79d68b..aa50586 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -44,11 +44,12 @@
 <script setup>
 import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
 import { cloneDeep } from 'lodash'
+import { sessionStore } from '@/utils/store'
 import { useGetSubject } from '@/hooks/useGetSubject'
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 // 定义要发送的emit事件
-const emit = defineEmits(['nodeClick', 'changeBook'])
+const emit = defineEmits(['nodeClick'])
 let useSubject = null
 const subjectList = ref([])
 const dialogVisible = ref(false)
@@ -74,8 +75,7 @@ const defaultExpandedKeys = ref([])
 //选择教材
 const changeBook = (data) => {
   curBook.data = data
-
-  localStorage.setItem('curBook', JSON.stringify(data))
+  sessionStore.set('subject.curBook', data)
   treeData.value = useSubject.getTreeData(data.id)
 
   //切换教材后默认展开第一个并选中
@@ -83,9 +83,7 @@ const changeBook = (data) => {
     defaultExpandedKeys.value = [treeData.value[0].id]
     curNode.data = getLastLevelData(treeData.value)[0]
 
-    localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
-    localStorage.setItem('curNode',JSON.stringify(curNode.data))
-    emitChangeBook()
+    handleNodeClick(curNode.data)
   })
   // 延迟关闭 视觉上选中
   setTimeout(() => {
@@ -93,40 +91,6 @@ const changeBook = (data) => {
   }, 100);
 }
 
-
-const emitChangeBook = async () => {
-  let curData = cloneDeep(toRaw(curNode.data))
-  let parentNode = findParentByChildId(treeData.value, curData.id)
-  curData.parentNode = toRaw(parentNode)
-  //怎加一个label 之前取的label
-  curData.label = curData.itemtitle
-  const data = {
-    textBook: {
-      curBookId: curBook.data.id,
-      curBookName: curBook.data.itemtitle,
-      curBookImg: BaseUrl + curBook.data.avartar,
-      curBookPath: curBook.data.fileurl
-    },
-    node: curData
-  }
-  /**
-   * 临时用 后续删除 unitId
-   */
-  let levelFirstId = null
-  let levelSecondId = null
-  let bookeId = curBook.data.id
-   if (curData.parentNode) {
-    levelFirstId = curData.parentNode.id
-    levelSecondId = curData.id
-  } else {
-    levelFirstId = curData.id
-    levelSecondId = ''
-  }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
-  emit('changeBook', data)
-}
-
-
 const getLastLevelData = (tree) => {
   let lastLevelData = [];
   // 递归函数遍历树形结构
@@ -171,25 +135,22 @@ const findParentByChildId = (treeData, targetNodeId) => {
 }
 
 
-const handleNodeClick = (data, node) => {
+const handleNodeClick = (data) => {
   /**
    * data : 当前节点数据
-   * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
   let nodeData = cloneDeep(toRaw(data));
-  //怎加一个label 之前取的label
+ 
+  //增加一个label 之前取的label
   nodeData.label = nodeData.itemtitle
-  const parentNode = node.parent.data;
-  // parentNode 为数组 则点击的是一级节点
-  if (Array.isArray(parentNode)) {
-    // 
-    nodeData.parentNode = null
-  }
-  else {
-    // 否则 点击的为二级节点 parentNode 为它的父级节点
-    nodeData.parentNode = toRaw(parentNode)
-  }
-
+  // 父级节点 如果当前是一级节点 父级则为null
+  let parent = {
+    id: nodeData.parentid,
+    label: nodeData.parenttitle,
+    itemtitle: nodeData.parenttitle
+  } 
+  const parentNode = nodeData.parentid ?  parent : null
+  nodeData.parentNode = parentNode
   let curData = {
     textBook: {
       curBookId: curBook.data.id,
@@ -197,63 +158,40 @@ const handleNodeClick = (data, node) => {
       curBookImg: BaseUrl + curBook.data.avartar,
       curBookPath: curBook.data.fileurl
     },
-    node: toRaw(nodeData)
+    node: nodeData
   }
-  localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
-  localStorage.setItem('curNode', JSON.stringify(nodeData))
-
-  /**
- * 临时用 后续删除 unitId
- */
-  let levelFirstId = null
-  let levelSecondId = null
-  let bookeId = curBook.data.id
-   if (nodeData.parentNode) {
-    levelFirstId = nodeData.parentNode.id
-    levelSecondId = nodeData.id
-  } else {
-    levelFirstId = nodeData.id
-    levelSecondId = ''
-  }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
-
+  // 本地存储:electron-store
+  let defaultExpandedKeys = parentNode ? [parentNode.id] : [nodeData.id]
+  sessionStore.set('subject.defaultExpandedKeys', defaultExpandedKeys)
+  sessionStore.set('subject.curNode', nodeData)
   emit('nodeClick', curData)
 
 }
 onMounted( async () => {
   treeLoading.value = true
-
   try{
     useSubject = await useGetSubject()
-    subjectList.value = useSubject.subjectList
-
-    let book = localStorage.getItem('curBook')
-    if(book){
-      book = JSON.parse(book)
-      curBook.data = book
-      treeData.value = useSubject.getTreeData(book.id)
+    subjectList.value = sessionStore.get('subject.bookList')
+    // 当前教材
+    if(sessionStore.get('subject.curBook')){
+      curBook.data = sessionStore.get('subject.curBook')
     }
     else{
-      curBook.data = useSubject.subjectList[0]
-      localStorage.setItem('curBook', JSON.stringify(curBook.data))
-      treeData.value = useSubject.treeData
+      curBook.data = subjectList.value[0]
     }
-    // 设置展开并选中
+
+    // 章节"树"
+    treeData.value = useSubject.getTreeData(curBook.data.id)
     nextTick(() =>{
-      // 取缓存
-      let node = localStorage.getItem('curNode')
-      if(node){
-        curNode.data = JSON.parse(node)
-        defaultExpandedKeys.value = JSON.parse(localStorage.getItem('defaultExpandedKeys'))
-      }
-      else{
+      // 默认展开 选中
+      if(sessionStore.get('subject.curNode')){
+        defaultExpandedKeys.value = sessionStore.get('subject.defaultExpandedKeys')
+        curNode.data = sessionStore.get('subject.curNode')
+      }else{
         defaultExpandedKeys.value = [treeData.value[0].id]
         curNode.data = getLastLevelData(treeData.value)[0]
-        //缓存记录当前展开以及选中节点
-        localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
-        localStorage.setItem('curNode', JSON.stringify(curNode.data))
       }
-      emitChangeBook()
+      handleNodeClick(curNode.data)
     })
   
   } finally{
diff --git a/src/renderer/src/hooks/useGetSubject.js b/src/renderer/src/hooks/useGetSubject.js
index e164e3e..1c234ae 100644
--- a/src/renderer/src/hooks/useGetSubject.js
+++ b/src/renderer/src/hooks/useGetSubject.js
@@ -1,13 +1,13 @@
 import { ref } from 'vue'
 import useUserStore from '@/store/modules/user'
 import { listEvaluation } from '@/api/subject'
+import { sessionStore } from '@/utils/store'
 
 export const useGetSubject = async () =>{
 
   // user store
   const userStore = useUserStore()
   const { edustage, edusubject, userId } = userStore.user
-  const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
   // 章节List
   const unitList = ref([])
   // 教材List
@@ -16,11 +16,10 @@ export const useGetSubject = async () =>{
   let treeData = null
 
 
-  // 根据 学科 + 学段 获取所有单元章节 
+  // 根据学科 + 学段 获取所有单元章节 
   const getSubjectUnit = async () =>{
-    let strUnit = localStorage.getItem('unitList')
-    if(strUnit){
-      unitList.value = JSON.parse(strUnit)
+    if(sessionStore.get('subject.unitList')){
+      unitList.value = sessionStore.get('subject.unitList')
     }
     else{
       const unitParams = {
@@ -32,18 +31,17 @@ export const useGetSubject = async () =>{
       }
       const { rows } = await listEvaluation(unitParams)
       unitList.value = rows
-      localStorage.setItem('unitList', JSON.stringify(rows))
+      sessionStore.set('subject.unitList', rows)
     }
    
     await getSubject()
   }
 
-  // 获取 学科 + 学段 获取教材
+  // 根据学科 + 学段 获取教材
   const getSubject = async () =>{
 
-    let strSubject = localStorage.getItem('subjectList')
-    if(strSubject){
-      subjectList = JSON.parse(strSubject)
+    if(sessionStore.get('subject.bookList')){
+      subjectList = sessionStore.get('subject.bookList')
     }
     else{
       const subjectParams = { 
@@ -55,13 +53,20 @@ export const useGetSubject = async () =>{
       }
       const { rows } = await listEvaluation(subjectParams)
       subjectList = rows
-      localStorage.setItem('subjectList', JSON.stringify(rows))
+      sessionStore.set('subject.bookList', rows)
+      treeData = getTreeData(subjectList[0].id)
+      // 设置一个默认的curNode
+      let curNode
+      if(treeData[0].children){
+        curNode = treeData[0].children[0]
+      }
+      else{
+        curNode = treeData[0]
+      }
+      sessionStore.set('subject.curNode', curNode)
+      console.log(curNode,treeData)
     }
   
-    // 默认选中第一个教材
-    if(subjectList && subjectList.length){
-      treeData = getTreeData(subjectList[0].id)
-    }
   }
 
   // 单元章节数据转为“树”结构
@@ -71,6 +76,7 @@ export const useGetSubject = async () =>{
     data.forEach( item => {
       item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
     }) 
+    sessionStore.set('subject.subjectTree', data)
     return data
 
   }
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 9d92677..f37f9bf 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -45,7 +45,8 @@ import { useRouter } from 'vue-router'
 import workTrend from './container/work-trend.vue'
 import outLink from '@/utils/linkConfig'
 import * as echarts from 'echarts'
-import { useGetClassWork } from '@/hooks/useGetClassWork'
+import { useGetSubject } from '@/hooks/useGetSubject'
+import { sessionStore } from '@/utils/store'
 
 const router = useRouter()
 const { ipcRenderer } = window.electron || {}
@@ -169,13 +170,12 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
     let fullPath = configObj.fullPath + path
     if(id == '1-2' || id == '2-1' || id == '2-2' ){
       // 头部 教材分析打开外部链接需要当前章节ID
-      const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
-      let unitId = levelSecondId ? levelSecondId : levelFirstId
+      const { id, rootid } = sessionStore.get('subject.curNode')
       if(fullPath.indexOf('?') == -1){
-        fullPath += `?unitId=${unitId}&bookeId=${bookeId}`
+        fullPath += `?unitId=${id}&bookeId=${rootid}`
       }
       else{
-         fullPath += `&unitId=${unitId}&bookeId=${bookeId}`
+         fullPath += `&unitId=${id}&bookeId=${id}`
       }
     }
     fullPath = fullPath.replaceAll('//', '/')
@@ -191,6 +191,8 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
 }
 
 onMounted(async ()=>{
+
+  await useGetSubject()
   // 确保DOM 渲染完成
   await nextTick()
   chartInstance = echarts.init(chartDom.value)
@@ -236,21 +238,10 @@ onMounted(async ()=>{
     ]
   }
   chartInstance.setOption(option);
-  // 初始化 获取教材下面的单元 + 章节
-  getSubjectInit();
+
 
 })
 
-const getSubjectInit = async () => {
-  //查看本地是否有缓存
-  let unitId = localStorage.getItem('unitId')
-  if(unitId){
-    // 有缓存不用管
-  } else{
-    // 没有 就获取 获取教材下面的单元 + 章节
-    useGetClassWork();
-  }
-}
   
 </script>
 
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index d675bcb..5de5618 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-loading="isLoading" class="page-resource flex">
-    <ChooseTextbook @change-book="nodeClick" @node-click="nodeClick" />
+    <ChooseTextbook @node-click="nodeClick" />
     <div class="page-center-wrap">
       <el-tabs v-model="activeAptTab" style="height: 100%;">
         <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue
index d078cad..35a5350 100644
--- a/src/renderer/src/views/resource/index.vue
+++ b/src/renderer/src/views/resource/index.vue
@@ -2,7 +2,7 @@
   <div class="page-resource flex">
     <!--左侧 教材 目录-->
     <Third v-if="isThird"  @node-click="getDataOther"></Third>
-    <ChooseTextbook v-else @change-book="getData" @node-click="getData" />
+    <ChooseTextbook v-else @node-click="getData" />
 
     <div class="page-right">
       <!-- 搜索 -->

From 7845d0e0a13b9970896f500950b984ee6956ad86 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Wed, 25 Sep 2024 09:42:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/hooks/useGetSubject.js       |  5 +---
 src/renderer/src/layout/components/Header.vue | 24 -------------------
 src/renderer/src/views/desktop/index.vue      |  2 +-
 .../views/prepare/container/kj-list-item.vue  |  4 ++--
 4 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/renderer/src/hooks/useGetSubject.js b/src/renderer/src/hooks/useGetSubject.js
index 1c234ae..07bbb5e 100644
--- a/src/renderer/src/hooks/useGetSubject.js
+++ b/src/renderer/src/hooks/useGetSubject.js
@@ -7,7 +7,7 @@ export const useGetSubject = async () =>{
 
   // user store
   const userStore = useUserStore()
-  const { edustage, edusubject, userId } = userStore.user
+  const { edustage, edusubject } = userStore.user
   // 章节List
   const unitList = ref([])
   // 教材List
@@ -15,7 +15,6 @@ export const useGetSubject = async () =>{
   // 单元章节树结构
   let treeData = null
 
-
   // 根据学科 + 学段 获取所有单元章节 
   const getSubjectUnit = async () =>{
     if(sessionStore.get('subject.unitList')){
@@ -33,7 +32,6 @@ export const useGetSubject = async () =>{
       unitList.value = rows
       sessionStore.set('subject.unitList', rows)
     }
-   
     await getSubject()
   }
 
@@ -64,7 +62,6 @@ export const useGetSubject = async () =>{
         curNode = treeData[0]
       }
       sessionStore.set('subject.curNode', curNode)
-      console.log(curNode,treeData)
     }
   
   }
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index b92f4b8..710c338 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -86,30 +86,6 @@ const currentRoute = ref('')
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
 const userSubjectList = ref([])
 
-const handleOutLink = (path, type, name) => {
-  if (!path) return
-  if (type === 'hash') {
-    router.push(path)
-  } else {
-
-    // key 对应的 linkConfig.js 外部链接配置
-    let configObj = outLink().getBaseData()
-    let fullPath = configObj.fullPath + path
-    fullPath = fullPath.replaceAll('//', '/')
-    const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
-    let unitId = levelSecondId ? levelSecondId : levelFirstId
-    if (name == '教材分析' || name == '考试分析') {
-      fullPath += `?unitId=${unitId}`
-    }
-    // 通知主进程
-    ipcRenderer.send('openWindow', {
-      key: path,
-      fullPath: fullPath,
-      cookieData: { ...configObj.data }
-    })
-  }
-}
-
 const activeId = ref('/home')
 const headerMenus = [
   {
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index b990a95..8547950 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -180,7 +180,7 @@ const clickMenu = ({isOuter, path, disabled, id}) =>{
         fullPath += `?unitId=${id}&bookeId=${rootid}`
       }
       else{
-         fullPath += `&unitId=${id}&bookeId=${id}`
+         fullPath += `&unitId=${id}&bookeId=${rootid}`
       }
     }
     fullPath = fullPath.replaceAll('//', '/')
diff --git a/src/renderer/src/views/prepare/container/kj-list-item.vue b/src/renderer/src/views/prepare/container/kj-list-item.vue
index 99f1da3..7334daa 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -207,8 +207,8 @@ export default {
     },
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
-        let curBook = JSON.parse(localStorage.getItem('curBook'))
-        const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id;
+        const { id, rootid } = sessionStore.get('subject.curNode')
+        const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + id + "&bookId=" + rootid;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')