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 01/36] =?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 db2be260a7fd0829c6790ff609ee13ac4904ab58 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 19 Sep 2024 11:25:01 +0800
Subject: [PATCH 02/36] =?UTF-8?q?=E6=95=99=E6=9D=90edit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/index.vue  | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 7f3c178..4e4d3df 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -6,7 +6,7 @@
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
+        <el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
           :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
           @node-click="handleNodeClick">
           <template #default="{ node }">
@@ -134,6 +134,10 @@ const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
   curBookName.value = itemtitle
   curBookImg.value = BaseUrl + avartar
   curBookPath.value = fileurl
+
+  localStorage.removeItem('defaultExpandedKeys')
+  localStorage.removeItem('currentNodeId')
+  localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
   getTreeData()
   setTimeout(() => {
     dialogVisible.value = false
@@ -144,7 +148,6 @@ const getTreeData = () => {
   //数据过滤
   let upData = transData(evaluationList.value)
 
-
   if(upData.length){
     treeData.value = [...upData]
   }
@@ -153,10 +156,22 @@ const getTreeData = () => {
     return
   }
   nextTick(() => {
-    defaultExpandedKeys.value = [treeData.value[0].id]
-    currentNode.data = getLastLevelData(treeData.value)[0]
-    currentNodeId.value = getLastLevelData(treeData.value)[0].id
-    currentNodeName.value = getLastLevelData(treeData.value)[0].label
+
+    let defaultCurNodeId = localStorage.getItem('currentNodeId')
+    if(defaultCurNodeId){
+      defaultCurNodeId = JSON.parse(defaultCurNodeId)
+      const data = findNode(defaultCurNodeId)
+      currentNode.data = findNode(defaultCurNodeId)
+      currentNodeId.value = data.id
+      currentNodeName.value = data.label
+    }
+    else{
+      defaultExpandedKeys.value = [treeData.value[0].id]
+      currentNode.data = getLastLevelData(treeData.value)[0]
+      currentNodeId.value = getLastLevelData(treeData.value)[0].id
+      currentNodeName.value = getLastLevelData(treeData.value)[0].label
+    }
+    
     emitChangeBook()
   })
 
@@ -183,6 +198,9 @@ const emitChangeBook = () => {
     },
     node: curNode
   }
+
+  localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
+  localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
   emit('changeBook', data)
 }
 
@@ -230,6 +248,11 @@ const findParentByChildId = (treeData, targetNodeId) => {
   return null;
 }
 
+const findNode = (id) =>{
+  if(!id) return
+  return evaluationList.value.find( item => item.id == id)
+}
+
 const transData = (data) => {
   let ary = []
   data.forEach(item => {
@@ -281,10 +304,21 @@ const getSubject = async () => {
 
   // 默认第一个
   if(!subjectList.value.length) return
-  curBookName.value = subjectList.value[0].itemtitle
-  curBookId.value = subjectList.value[0].id
-  curBookImg.value = BaseUrl + subjectList.value[0].avartar
-  curBookPath.value = subjectList.value[0].fileurl
+  let curBook = localStorage.getItem('curBook')
+  if(curBook){
+    curBook = JSON.parse(curBook)
+    curBookName.value = curBook.itemtitle
+    curBookId.value = curBook.id
+    curBookImg.value = BaseUrl + curBook.avartar
+    curBookPath.value = curBook.fileurl
+  }
+  else{
+    curBookName.value = subjectList.value[0].itemtitle
+    curBookId.value = subjectList.value[0].id
+    curBookImg.value = BaseUrl + subjectList.value[0].avartar
+    curBookPath.value = subjectList.value[0].fileurl
+    localStorage.setItem('curBookId', curBookId.value)
+  }
 }
 
 
@@ -321,7 +355,12 @@ const handleNodeClick = (data, node) => {
     node: toRaw(nodeData)
   }
   currentNode.data = curData
+
+  localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
+  localStorage.setItem('currentNodeId', JSON.stringify(data.id))
+
   emit('nodeClick', curData)
+
 }
 onMounted(() => {
   getSubjectContent()

From 3ec25f07b4b7d88621ffee103040386e79382948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Thu, 19 Sep 2024 14:25:33 +0800
Subject: [PATCH 03/36] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82=E6=9C=AA=E4=BC=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=80=BCbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/classTask/classTask.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index 9769b8d..2c23d0a 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -141,6 +141,7 @@ const getClassWorkList = () => {
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
       deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+      status: '1', // 作业状态：1-已发布
       orderby: 'concat(deaddate,uniquekey) DESC',
       pageSize: 100
     }).then((response) => {

From 5f06657b09cc71000556551840fc62aa842a66cc Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 19 Sep 2024 14:58:54 +0800
Subject: [PATCH 04/36] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/desktop/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 95679c4..ae33213 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -85,7 +85,7 @@ const menuList = [{
       //   path: '/prepare'
       // },
       {
-        name: '教学实施',
+        name: '教学实践',
         icon: 'icon-jiaoxuefenxi',
         path: '/prepare'
       },

From 34c1c66b311ead8629a0221ffd2272816025e107 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 19 Sep 2024 15:15:16 +0800
Subject: [PATCH 05/36] =?UTF-8?q?edit=20=E6=95=99=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/choose-textbook/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 4e4d3df..5b5cf59 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -109,6 +109,8 @@ const getSubjectContent = async () => {
     evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
   }
   else{
+    localStorage.removeItem('defaultExpandedKeys')
+    localStorage.removeItem('currentNodeId')
     const { rows } = await listEvaluation(params)
     localStorage.setItem('evaluationList', JSON.stringify(rows))
     evaluationList.value = rows

From 0cbb513a6063ec677dc155c00f9f969aa6091c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Thu, 19 Sep 2024 15:29:52 +0800
Subject: [PATCH 06/36] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E5=B8=B8=E8=A7=84=E4=BD=9C=E4=B8=9Aui=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classTask/container/item-dialog-score.vue   | 8 ++++++++
 src/renderer/src/views/desktop/index.vue                  | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue
index e180ecd..6ac467d 100644
--- a/src/renderer/src/views/classTask/container/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue
@@ -211,6 +211,11 @@
 
                 <!-- 学生答题展示 -->
                 <div v-if="feedContentList.length > 0">
+                  <div v-if="dialogProps.studentObj.worktype == '常规作业' && stuItem.rightanswer != ''&& stuItem.rightanswer != null">
+                    <!-- 常规作业：学生有的会答复 -->
+                     <p style="padding: 10px 0;">学生答复内容</p>
+                     <div style="padding: 0 20px">{{stuItem.rightanswer}}</div>
+                  </div>
                   <p>学生答题附件内容</p>
                   <div class="image_list">
                     <div v-if="imageList.length > 0">
@@ -247,6 +252,9 @@
                         </span>
                       </div>
                     </div>
+
+                    <!-- 无附件内容 -->
+                    <div v-if="imageList.length == 0 && fileList.length == 0" style="padding: 0 20px">未提交附件内容</div>
                   </div>
                 </div>
                 <div v-else>
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 69913c6..68bb2fe 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -166,12 +166,14 @@ const clickMenu = ({isOuter, path, disabled}) =>{
   if(isOuter){
     let configObj = outLink().getBaseData()
     let fullPath = configObj.fullPath + path
-    if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask'){
+    if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask' || path == '/teaching/classtaskassign?titleName=作业布置'){
       // 头部 教材分析打开外部链接需要当前章节ID
       const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
 
       let unitId = levelSecondId ? levelSecondId : levelFirstId
       fullPath = fullPath + `&unitId=${unitId}`
+
+      console.log(fullPath)
     }
     fullPath = fullPath.replaceAll('//', '/')
      // 通知主进程

From ce8b2e6ab0683875795f7a9dde4668588c0d0df3 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 19 Sep 2024 15:55:19 +0800
Subject: [PATCH 07/36] =?UTF-8?q?=E8=B7=AF=E7=94=B1title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/router/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index 6bdcac9..16c3677 100644
--- a/src/renderer/src/router/index.js
+++ b/src/renderer/src/router/index.js
@@ -36,13 +36,13 @@ export const constantRoutes = [
         path: '/resource',
         component: () => import('@/views/resource/index.vue'),
         name: 'resource',
-        meta: {title: '资源'}
+        meta: {title: '资源库'}
       },
       {
         path: '/prepare',
         component: () => import('@/views/prepare/index.vue'),
         name: 'prepare',
-        meta: {title: '备课'}
+        meta: {title: '教学实践'}
       },
       {
         path: '/teach',

From 893be27671e75550f2e29da7931dcd306029a0eb Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Thu, 19 Sep 2024 16:02:42 +0800
Subject: [PATCH 08/36] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=AD=A6=E7=A7=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/layout/components/Header.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 253fab4..e9b53c6 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -200,6 +200,8 @@ const changeSubject = async (command) =>{
   await updateUserInfo(data)
   await userStore.login({username: phonenumber, password: plainpwd})
   await userStore.getInfo()
+  localStorage.removeItem('subjectList')
+  localStorage.removeItem('evaluationList')
   router.go()
 }
 

From 746cb150c45c3bea5970b10be71b2537bf4d876a Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Thu, 19 Sep 2024 16:02:56 +0800
Subject: [PATCH 09/36] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=A9=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E5=88=A4=E6=96=AD;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/choose-textbook/third.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/components/choose-textbook/third.vue b/src/renderer/src/components/choose-textbook/third.vue
index 554a6f5..ca8f65d 100644
--- a/src/renderer/src/components/choose-textbook/third.vue
+++ b/src/renderer/src/components/choose-textbook/third.vue
@@ -64,6 +64,8 @@ const getVertion = (data) => {
       childs: []
     }
   })
+  //判断是否存在该教材，有则展示第一项
+  if(treeData.value.length === 0) return
   nextTick(() => {
     defaultExpandedKeys.value = [treeData.value[0].id]
     node.currentNode.data = treeData.value[0]

From 02a25db5e2ecb858f242bb2f8577e9e27878dda6 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Thu, 19 Sep 2024 16:35:36 +0800
Subject: [PATCH 10/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/prepare/index.vue      |  2 +-
 src/renderer/src/views/tool/directive/drag.js |  3 +++
 src/renderer/src/views/tool/sphere.vue        | 13 +++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index ca2b197..9b7592e 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -308,7 +308,7 @@ export default {
       if(item.fileFlag === '课件') {
         // 关闭状态，打开上课相关功能(已打开，忽略)
         const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
-        if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
+        // if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {
diff --git a/src/renderer/src/views/tool/directive/drag.js b/src/renderer/src/views/tool/directive/drag.js
index 5565441..9751fde 100644
--- a/src/renderer/src/views/tool/directive/drag.js
+++ b/src/renderer/src/views/tool/directive/drag.js
@@ -57,6 +57,8 @@ class Drag {
     document.removeEventListener('mouseup', this.up);
     document.addEventListener('touchmove', this.move);
     document.addEventListener('touchend', this.up);
+    // 手动-触发事件 v-drag-start
+    this.el.dispatchEvent(new CustomEvent('v-drag-end', {detail:{drag: this}}))
   }
   // 业务逻辑
   updatePosition(e) {
@@ -108,6 +110,7 @@ export default {
     // const { style } = binding.value
     const drag = new Drag(el, binding)
     const dragStart = (e) => {
+      // console.log('start', e)
       drag.down(e)
       document.addEventListener('mousemove', drag.move);
       document.addEventListener('mouseup', drag.up);
diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index 09be0e0..a2f69a9 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -13,9 +13,11 @@
     <im-chat ref="imChatRef" @change="chatChange" group />
 
     <!-- 底部工具栏 -->
-    <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
+    <div class="tool-bottom-all"
+      @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
-        @v-drag-start="dragtime = Date.now()">
+        @v-drag-start="dragtime = Date.now()"
+        @v-drag-end="mouseChange(1)">
         <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
           <el-image :src="logo" draggable="false" />
         </div>
@@ -106,7 +108,7 @@ const getClassInfo = async () => {
 const tabChange = (val) => {
   const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
   if(bool) toolStore.showBoardAll = true
-  console.log('tabChange:', val, bool)
+  // console.log('tabChange:', val, bool)
   toolStore.model = val // 存储当前tab
 }
 // logo 点击-事件 折叠|展开
@@ -143,9 +145,12 @@ const mouseChange = (bool) => {
     const isPdf = !resBool && toolStore.isPdfWin
     if (isPdf) resBool = true
   }
-  // console.log('mouseChange:', bool, resBool)
+  console.log('mouseChange:', bool, resBool)
   setIgnore(resBool)
 }
+const touchChange = (e) => {
+  console.log(e)
+}
 // im-chat: 聊天事件 {type, data}
 const chatChange = (type, data, ...args) => {
   if (type == 'createGroup') {  // 创建群-监听

From c5075af2fc26961c0e8a69ec88956369206a6486 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Thu, 19 Sep 2024 16:37:07 +0800
Subject: [PATCH 11/36] =?UTF-8?q?=E5=B7=B2=E4=B8=8A=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/prepare/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 9b7592e..ca2b197 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -308,7 +308,7 @@ export default {
       if(item.fileFlag === '课件') {
         // 关闭状态，打开上课相关功能(已打开，忽略)
         const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
-        // if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
+        if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {

From 9ea05568e118bb4f6f372316ac99752ffac2d1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Thu, 19 Sep 2024 16:56:15 +0800
Subject: [PATCH 12/36] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=E5=90=8C=E6=AD=A5web=E7=AB=AF164=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../classTask/container/item-dialog-score.vue | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/item-dialog-score.vue b/src/renderer/src/views/classTask/container/item-dialog-score.vue
index 6ac467d..df31dd6 100644
--- a/src/renderer/src/views/classTask/container/item-dialog-score.vue
+++ b/src/renderer/src/views/classTask/container/item-dialog-score.vue
@@ -8,15 +8,15 @@
       <div class="teacher_content_con">
         <!-- 题目内容：习题训练 -->
         <div v-if="dialogProps.studentObj.worktype == '习题训练'">
-          <div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
-            <div v-for="quItem in dialogProps.quizlist" :key="quItem.id">
+          <div v-for="(quItem, qIndex) in dialogProps.quizlist" :key="quItem.id">
+            <div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
               <div v-if="stuItem.entpcourseworkid == quItem.id">
                 <el-card style="max-width: 100%; margin-bottom: 10px">
                   <!-- 题型 分值 -->
                   <template #header>
                     <div class="card-header">
                       <span
-                        >{{ sIndex + 1 }}、{{ quItem.worktype }}
+                        >{{ qIndex + 1 }}、{{ quItem.worktype }}
                         {{ stuItem.score ? stuItem.score : 0 }}分</span
                       >
                     </div>
@@ -94,21 +94,19 @@
                         </span>
                       </el-col>
                       <el-col :span="6" style="padding: 10px">
-                        <div
-                          v-for="(imageItem, index) in stuItem.imagefile"
-                          v-if="stuItem.imagefile && stuItem.imagefile.length > 0"
-                          :key="index"
-                        >
-                          <el-image
-                            style="width: 30px; height: 30px"
-                            :src="imageItem"
-                            :zoom-rate="1.2"
-                            :max-scale="7"
-                            :min-scale="0.2"
-                            :preview-src-list="stuItem.imagefile"
-                            :initial-index="4"
-                            fit="contain"
-                          />
+                        <div v-if="stuItem.imagefile && stuItem.imagefile.length > 0"> 
+                          <div v-for="(imageItem, index) in stuItem.imagefile" :key="index">
+                            <el-image
+                              style="width: 30px; height: 30px"
+                              :src="imageItem"
+                              :zoom-rate="1.2"
+                              :max-scale="7"
+                              :min-scale="0.2"
+                              :preview-src-list="stuItem.imagefile"
+                              :initial-index="4"
+                              fit="contain"
+                            />
+                          </div>
                         </div>
                       </el-col>
                       <el-col :span="6" style="padding: 10px">

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 13/36] =?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() {

From 2531c25d7c66eda4e9b9a67f8c8a51245f2f8104 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 20 Sep 2024 09:21:31 +0800
Subject: [PATCH 14/36] =?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

---
 .../container/newTask/taskTypeView.vue        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index e0f3ac9..f1ea7e5 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -34,7 +34,7 @@
                   </el-col>
                   <el-col :span="11">
                     <el-form-item label="知识点" label-width="70">
-                      <el-cascader 
+                      <el-cascader
                         v-model="entpCourseWorkQueryParams.point"
                         clearable
                         style="width: 100%"
@@ -59,15 +59,15 @@
                   <el-col :span="15">
                     <el-form-item label="关键词" label-width="70">
                       <el-input
-                        v-model="entpCourseWorkQueryParams.keyWord" 
-                        style="width: 70%" type="text" 
+                        v-model="entpCourseWorkQueryParams.keyWord"
+                        style="width: 70%" type="text"
                         placeholder="请输入关键词"
                       />
                       <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button>
                     </el-form-item>
                   </el-col>
                 </el-row>
-                
+
                 <el-table :data="workResource.entpCourseWorkList" style="width: 100%;">
                   <el-table-column type="index" width="60" />
                   <el-table-column align="left" >
@@ -96,10 +96,10 @@
                 <div style="height: 55px;">
                   <!-- 分页 -->
                   <pagination
-                    v-show="entpCourseWorkTotal > 0" 
-                    v-model:page="paginationParams.pageNum" 
+                    v-show="entpCourseWorkTotal > 0"
+                    v-model:page="paginationParams.pageNum"
                     v-model:limit="paginationParams.pageSize"
-                    :total="entpCourseWorkTotal" 
+                    :total="entpCourseWorkTotal"
                     :style="{ position: 'relative', 'margin-top': '5px' }"
                     @pagination="getPaginationList" />
                 </div>
@@ -266,7 +266,7 @@ const entpCourseWorkTypeList = ref([
   {value: 5, label: "主观题"},
   {value: 6, label: "复合题"},
 ]); // 习题查询条件 - 题型
-    
+
 const entpCourseWorkGroupList = ref([{
   Key: -1,
   Value: '不限',
@@ -323,7 +323,7 @@ const workResource = reactive({
 const classWorkForm =  reactive({
   worktype: '习题训练', //作业类型
   // uniquekey: userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1),
-  
+
 })
 const entpCourseWorkList = ref([]); // 习题列表
 const entpCourseWorkTotal = ref(0); // 习题总数
@@ -344,7 +344,7 @@ const queryForm = reactive({
   sectionName: props.bookobj.coursetitle,
   edusubject: userStore.edusubject,
   edustage: userStore.edustage,
-  // 
+  //
   // 题类
   worktype: entpCourseWorkQueryParams.worktype.label,
   workTypeId: entpCourseWorkQueryParams.worktype.value,
@@ -381,8 +381,8 @@ const queryForm = reactive({
   //   // [初中+政治]需改为[初中+道德与法治]
   //   queryForm.edusubject = '道德与法治';
   // }
-  
- 
+
+
   console.log(queryForm)
   listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
     // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
@@ -411,8 +411,6 @@ const queryForm = reactive({
       entpCourseWorkTotal.value = entpcourseworkres.data.length;
     }
 
-    if()
-    
     //格式化试题信息
     processList(workResource.entpCourseWorkList);
   })
@@ -447,8 +445,8 @@ onMounted(() => {
       border-radius:5px;
     }
 
-  
+
   }
-  
+
 }
 </style>

From 75c6777933587afc9d776950bb7b68f953884057 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 13:41:18 +0800
Subject: [PATCH 15/36] edit

---
 src/renderer/src/views/desktop/container/work-trend.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index c162f82..2a0e70a 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -2,9 +2,9 @@
   <div class="desktop-work-item">
     <div class="item-title flex">
       <span class="title">工作动态</span>
-      <el-radio-group v-model="type">
+      <!-- <el-radio-group v-model="type">
         <el-radio-button label="全部" :value="-1" />
-      </el-radio-group>
+      </el-radio-group> -->
     </div>
     <div class="item-content" v-loading="loading">
       <el-scrollbar height="500px">

From 4ab4d5dff2819fbe7f03e59e11e45ac0d9fed676 Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Fri, 20 Sep 2024 13:53:42 +0800
Subject: [PATCH 16/36] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/prepare/container/class-start.vue     |  3 +++
 .../src/views/prepare/container/kj-list-item.vue    |  6 +++---
 src/renderer/src/views/prepare/index.vue            | 13 ++++++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/renderer/src/views/prepare/container/class-start.vue b/src/renderer/src/views/prepare/container/class-start.vue
index cfb9ec9..9653bc1 100644
--- a/src/renderer/src/views/prepare/container/class-start.vue
+++ b/src/renderer/src/views/prepare/container/class-start.vue
@@ -89,6 +89,8 @@ const userStore = useUserStore()
 const visible = ref(false)      // 是否打开窗口
 const myClassActive = ref({})   // 我的课件：准备上课的APT课件
 const imChatRef = ref(null)     // im-chat ref
+const emit = defineEmits(['close'])
+
 const classForm = reactive({    // 班级(左侧)：表单数据 表单配置
   form: {}, itemOption: [], option: {}
 })
@@ -137,6 +139,7 @@ const handleClose = async () => {
   reset() // 重置数据
   await chat?.logout()
   chat = null
+  emit('close')
 }
 // 初始化-数据
 const initData = () => {
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 2e28989..7841e07 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -52,8 +52,8 @@
       </div>
     </div>
     <div class="prepare-body-main-item-btn">
-      <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button>
-      <el-button v-else type="primary" @click="clickStartClass(item)">上课</el-button>
+      <!-- <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button> -->
+      <el-button type="primary" @click="clickStartClass(item)">上课</el-button>
     </div>
     <div class="prepare-body-main-item-tool">
       <el-popover
@@ -74,7 +74,7 @@
                   </el-button>
                 </div>
                 <div class="item-popover-item">
-                  <el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
+                  <el-button text @click="deleteTalk(item)">
                     <i class="iconfont icon-shanchu"></i>
                     <span>删除</span>
                   </el-button>
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index ca2b197..9601a8c 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -20,7 +20,6 @@
               :key="index"
               :item="item"
               :index="index"
-              :activeClassId="activeClass?.id"
               @on-delete="deleteTalk"
               @on-start-class="startClass"
             >
@@ -161,7 +160,7 @@
     @add-success="initReserv"
   ></reserv>
   <!-- 上课配置 -->
-  <class-start ref="calssRef"/>
+  <class-start ref="calssRef" @close="closeChange"/>
 </template>
 <script setup>
 import { Check,Plus } from '@element-plus/icons-vue'
@@ -305,10 +304,10 @@ export default {
   methods: {
     startClass(item) {
       // console.log(item, sessionStore)
+      // 关闭状态，打开上课相关功能(已打开，忽略)
+      const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
+      if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
       if(item.fileFlag === '课件') {
-        // 关闭状态，打开上课相关功能(已打开，忽略)
-        const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
-        if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {
@@ -319,6 +318,10 @@ export default {
       sessionStore.set('activeClass', item)
       this.activeClass = item
     },
+    closeChange() { // 上课弹窗被关闭-触发
+      this.activeClass = null
+      sessionStore.delete('activeClass')
+    },
     initReserv(id) {
       getClassInfo(id).then((res) => {
         this.curClassReserv = res.data

From 27ec047981bdf0df8fc652287cc6f4b675216291 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 14:30:36 +0800
Subject: [PATCH 17/36] =?UTF-8?q?edit=20=E6=95=99=E6=9D=90=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/index.vue  | 315 +++++-------------
 .../src/components/move-file/index.vue        |   2 +-
 src/renderer/src/hooks/useGetSubject.js       |  82 +++++
 src/renderer/src/layout/components/Header.vue |  13 +-
 src/renderer/src/utils/ruoyi.js               |  14 +
 src/renderer/src/views/profile/userInfo.vue   |   4 +-
 .../src/views/tool/components/lesson.vue      |   2 +-
 7 files changed, 194 insertions(+), 238 deletions(-)
 create mode 100644 src/renderer/src/hooks/useGetSubject.js

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 5b5cf59..64b8c56 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -2,12 +2,12 @@
   <div class="book-wrap">
     <el-scrollbar height="100%">
       <div class="book-name flex" @click="dialogVisible = true">
-        <span>{{ curBookName }}</span>
+        <span>{{ curBook.data.itemtitle }}</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
-          :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
+        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
+          :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
           @node-click="handleNodeClick">
           <template #default="{ node }">
             <span :title="node.label" class="tree-label">{{ node.label }}</span>
@@ -28,7 +28,7 @@
 
     <div class="textbook-container">
       <el-scrollbar height="450px">
-        <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
+        <div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
           :key="item.id" @click="changeBook(item)">
           <img v-if="item.avartar" :src="BaseUrl + item.avartar" class="textbook-img" alt="">
           <div v-else class="textbook-img">
@@ -43,166 +43,70 @@
 
 <script setup>
 import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
-import useUserStore from '@/store/modules/user'
-import { listEvaluation } from '@/api/subject'
+import { cloneDeep } from 'lodash'
+import { useGetSubject } from '@/hooks/useGetSubject'
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 // 定义要发送的emit事件
 const emit = defineEmits(['nodeClick', 'changeBook'])
-// store
-const userStore = useUserStore()
-const { edustage, edusubject, userId } = userStore.user
-//
+let useSubject = null
 const subjectList = ref([])
-const evaluationList = ref([])
 const dialogVisible = ref(false)
 // 当前教材下面单元内容数据
 const treeData = ref([])
 const defaultProps = {
   children: 'children',
-  label: 'label',
+  label: 'itemtitle',
   class: 'textbook-tree'
 }
-
-const treeLoading = ref(false)
-//当前教材ID
-const curBookId = ref(-1)
-//当前教材名称
-const curBookName = ref('')
-//当前教材封面图
-const curBookImg = ref('')
-//当前教材文件路径
-const curBookPath = ref('')
-// 上册
-const volumeOne = ref([])
-//
-const volumeTwo = ref([])
-
+// 当前选中的教材
+const curBook = reactive({
+  data: {}
+})
 // 当前节点
-const currentNode = reactive({
+const curNode = reactive({
   data:{}
 })
-// 当前选中的节点ID
-const currentNodeId = ref(0)
-// 当前选中的节点名称
-const currentNodeName = ref('')
+const treeLoading = ref(false)
 // 默认展开的节点
 const defaultExpandedKeys = ref([])
-// tree
-const refTree = ref(null)
-
-
-//获取教材下面的单元 + 章节
-const getSubjectContent = async () => {
-  treeLoading.value = true
-  const params = {
-    edusubject,
-    edustage,
-    // entpcourseedituserid: userId,
-    itemgroup: 'textbook',
-    orderby: 'orderidx asc',
-    pageSize: 10000
-  }
-
-
-  if(localStorage.getItem('evaluationList')){
-    evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
-  }
-  else{
-    localStorage.removeItem('defaultExpandedKeys')
-    localStorage.removeItem('currentNodeId')
-    const { rows } = await listEvaluation(params)
-    localStorage.setItem('evaluationList', JSON.stringify(rows))
-    evaluationList.value = rows
-  }
- 
-  treeLoading.value = false
-
-  //获取教材版本
-  await getSubject()
-  //上册
-  /**
-   * 不区分上下册
-   * 2024/08/20调整
-   */
-  // volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
-  // volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
-  getTreeData()
-}
 
 //选择教材
-const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
-  curBookId.value = id
-  curBookName.value = itemtitle
-  curBookImg.value = BaseUrl + avartar
-  curBookPath.value = fileurl
+const changeBook = (data) => {
+  curBook.data = data
 
-  localStorage.removeItem('defaultExpandedKeys')
-  localStorage.removeItem('currentNodeId')
-  localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
-  getTreeData()
+  localStorage.setItem('curBook', JSON.stringify(data))
+  treeData.value = useSubject.getTreeData(data.id)
+
+  //切换教材后默认展开第一个并选中
+  nextTick(() =>{
+    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()
+  })
+  // 延迟关闭 视觉上选中
   setTimeout(() => {
     dialogVisible.value = false
   }, 100);
 }
 
-const getTreeData = () => {
-  //数据过滤
-  let upData = transData(evaluationList.value)
-
-  if(upData.length){
-    treeData.value = [...upData]
-  }
-  else{
-    treeData.value = []
-    return
-  }
-  nextTick(() => {
-
-    let defaultCurNodeId = localStorage.getItem('currentNodeId')
-    if(defaultCurNodeId){
-      defaultCurNodeId = JSON.parse(defaultCurNodeId)
-      const data = findNode(defaultCurNodeId)
-      currentNode.data = findNode(defaultCurNodeId)
-      currentNodeId.value = data.id
-      currentNodeName.value = data.label
-    }
-    else{
-      defaultExpandedKeys.value = [treeData.value[0].id]
-      currentNode.data = getLastLevelData(treeData.value)[0]
-      currentNodeId.value = getLastLevelData(treeData.value)[0].id
-      currentNodeName.value = getLastLevelData(treeData.value)[0].label
-    }
-    
-    emitChangeBook()
-  })
-
-}
-
-const emitChangeBook = () => {
-  let curNode = {
-    id: currentNodeId.value,
-    label: currentNodeName.value,
-    itemtitle: currentNode.data.itemtitle,
-    edudegree: currentNode.data.edudegree,
-    edustage: currentNode.data.edustage,
-    edusubject: currentNode.data.edusubject,
-  }
-  let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
-  curNode.parentNode = toRaw(parentNode)
 
+const emitChangeBook = async () => {
+  let curData = cloneDeep(toRaw(curNode.data))
+  let parentNode = findParentByChildId(treeData.value, curNode.id)
+  curData.parentNode = toRaw(parentNode)
   const data = {
     textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value,
-      curBookImg: curBookImg.value,
-      curBookPath: curBookPath.value
+      curBookId: curBook.data.id,
+      curBookName: curBook.data.itemtitle,
+      curBookImg: BaseUrl + curBook.data.avartar,
+      curBookPath: curBook.data.fileurl
     },
-    node: curNode
+    node: curData
   }
-
-  localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
-  localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
   emit('changeBook', data)
 }
 
@@ -250,122 +154,77 @@ const findParentByChildId = (treeData, targetNodeId) => {
   return null;
 }
 
-const findNode = (id) =>{
-  if(!id) return
-  return evaluationList.value.find( item => item.id == id)
-}
-
-const transData = (data) => {
-  let ary = []
-  data.forEach(item => {
-    let obj = {}
-    // 根据当前教材ID 过滤出对应的单元、章节
-    if (item.rootid == curBookId.value) {
-      if(item.level == 1){
-        obj.label = item.itemtitle
-        obj.id = item.id
-        obj.itemtitle = item.itemtitle
-        obj.edudegree = item.edudegree
-        obj.edustage = item.edustage
-        obj.edusubject = item.edusubject
-        let ary2 = []
-        evaluationList.value.forEach(el => {
-          let obj2 = {}
-          if (item.id == el.parentid) {
-            obj2 = {
-              label: el.itemtitle,
-              id: el.id,
-              itemtitle : el.itemtitle,
-              edudegree : el.edudegree,
-              edustage : el.edustage,
-              edusubject : el.edusubject,
-            }
-            ary2.push(obj2)
-          }
-          obj.children = ary2
-        })
-        ary.push(obj)
-      }
-    }
-  })
-  return ary
-}
-
-//获取教材
-const getSubject = async () => {
-  if(localStorage.getItem('subjectList')){
-    subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
-  }
-  else{
-    const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
-
-    // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
-    subjectList.value = rows
-    localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
-  }
-
-  // 默认第一个
-  if(!subjectList.value.length) return
-  let curBook = localStorage.getItem('curBook')
-  if(curBook){
-    curBook = JSON.parse(curBook)
-    curBookName.value = curBook.itemtitle
-    curBookId.value = curBook.id
-    curBookImg.value = BaseUrl + curBook.avartar
-    curBookPath.value = curBook.fileurl
-  }
-  else{
-    curBookName.value = subjectList.value[0].itemtitle
-    curBookId.value = subjectList.value[0].id
-    curBookImg.value = BaseUrl + subjectList.value[0].avartar
-    curBookPath.value = subjectList.value[0].fileurl
-    localStorage.setItem('curBookId', curBookId.value)
-  }
-}
-
-
-const isHaveUnit = (id) => {
-  return evaluationList.value.some(item => {
-    return item.rootid == id
-  })
-}
-
 
 const handleNodeClick = (data, node) => {
   /**
    * data : 当前节点数据
    * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
-
-  const nodeData = data;
+  const nodeData = cloneDeep(toRaw(data));
   const parentNode = node.parent.data;
-
+  // parentNode 为数组 则点击的是一级节点
   if (Array.isArray(parentNode)) {
+    // 
     nodeData.parentNode = null
   }
   else {
+    // 否则 点击的为二级节点 parentNode 为它的父级节点
     nodeData.parentNode = parentNode
   }
 
   let curData = {
     textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value,
-      curBookImg: curBookImg.value,
-      curBookPath: curBookPath.value
+      curBookId: curBook.data.id,
+      curBookName: curBook.data.itemtitle,
+      curBookImg: BaseUrl + curBook.data.avartar,
+      curBookPath: curBook.data.fileurl
     },
     node: toRaw(nodeData)
   }
-  currentNode.data = curData
-
-  localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
-  localStorage.setItem('currentNodeId', JSON.stringify(data.id))
-
+  localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
+  localStorage.setItem('curNode', JSON.stringify(nodeData))
   emit('nodeClick', curData)
 
 }
-onMounted(() => {
-  getSubjectContent()
+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)
+    }
+    else{
+      curBook.data = useSubject.subjectList[0]
+      treeData.value = useSubject.treeData
+    }
+    // 设置展开并选中
+    nextTick(() =>{
+      // 取缓存
+      let node = localStorage.getItem('curNode')
+      if(node){
+        curNode.data = JSON.parse(node)
+        defaultExpandedKeys.value = JSON.parse(localStorage.getItem('defaultExpandedKeys'))
+      }
+      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()
+    })
+  
+  } finally{
+    treeLoading.value = false
+  }
+
 })
 
 </script>
diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue
index f2fec19..6689e4a 100644
--- a/src/renderer/src/components/move-file/index.vue
+++ b/src/renderer/src/components/move-file/index.vue
@@ -137,7 +137,7 @@ const getSubjectContent = async () => {
 }
 
 const getSubject = async () => {
-  subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
+
 
   if (localStorage.getItem('subjectList')) {
     subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
diff --git a/src/renderer/src/hooks/useGetSubject.js b/src/renderer/src/hooks/useGetSubject.js
new file mode 100644
index 0000000..e164e3e
--- /dev/null
+++ b/src/renderer/src/hooks/useGetSubject.js
@@ -0,0 +1,82 @@
+import { ref } from 'vue'
+import useUserStore from '@/store/modules/user'
+import { listEvaluation } from '@/api/subject'
+
+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
+  let subjectList = null
+  // 单元章节树结构
+  let treeData = null
+
+
+  // 根据 学科 + 学段 获取所有单元章节 
+  const getSubjectUnit = async () =>{
+    let strUnit = localStorage.getItem('unitList')
+    if(strUnit){
+      unitList.value = JSON.parse(strUnit)
+    }
+    else{
+      const unitParams = {
+        edusubject,
+        edustage,
+        itemgroup: 'textbook',
+        orderby: 'orderidx asc',
+        pageSize: 10000
+      }
+      const { rows } = await listEvaluation(unitParams)
+      unitList.value = rows
+      localStorage.setItem('unitList', JSON.stringify(rows))
+    }
+   
+    await getSubject()
+  }
+
+  // 获取 学科 + 学段 获取教材
+  const getSubject = async () =>{
+
+    let strSubject = localStorage.getItem('subjectList')
+    if(strSubject){
+      subjectList = JSON.parse(strSubject)
+    }
+    else{
+      const subjectParams = { 
+        itemkey: "version",
+        edusubject,
+        edustage,
+        pageSize: 10000,
+        orderby: 'orderidx asc'
+      }
+      const { rows } = await listEvaluation(subjectParams)
+      subjectList = rows
+      localStorage.setItem('subjectList', JSON.stringify(rows))
+    }
+  
+    // 默认选中第一个教材
+    if(subjectList && subjectList.length){
+      treeData = getTreeData(subjectList[0].id)
+    }
+  }
+
+  // 单元章节数据转为“树”结构
+  const getTreeData = (bookId) =>{
+    // 根据当前教材的id 查找出对应的章节 
+    let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)       
+    data.forEach( item => {
+      item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
+    }) 
+    return data
+
+  }
+
+  await getSubjectUnit()
+
+  return { subjectList, treeData, getTreeData }
+
+}
\ No newline at end of file
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index e9b53c6..5e3ad3a 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -37,7 +37,7 @@
             <div class="user-info flex">
               <span class="user-name">{{ userStore.user.nickName }}</span>
               <div class="flex">
-                <div class="user-depname">{{ userStore.user.deptName }}</div>
+                
                 <el-dropdown @command="changeSubject">
                   <div class="user-subject">{{ userStore.user.edusubject }}
                     <el-icon class="el-icon--right"><arrow-down />
@@ -52,6 +52,7 @@
                   </template>
                 </el-dropdown>
               </div>
+              <div class="user-depname">{{ userStore.user.deptName }}</div>
             </div>
           </div>
 
@@ -72,6 +73,7 @@ import { updateUserInfo } from '@/api/system/user'
 import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
+import { clearBookInfo } from '@/utils/ruoyi'
 
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -190,6 +192,7 @@ function setLayout() {
 }
 // 切换学科
 const changeSubject = async (command) =>{
+  clearBookInfo()
   const { userId, userName, phonenumber, plainpwd  } = userStore.user
   const data = {
     userId,
@@ -200,8 +203,6 @@ const changeSubject = async (command) =>{
   await updateUserInfo(data)
   await userStore.login({username: phonenumber, password: plainpwd})
   await userStore.getInfo()
-  localStorage.removeItem('subjectList')
-  localStorage.removeItem('evaluationList')
   router.go()
 }
 
@@ -331,7 +332,7 @@ onMounted(() => {
       justify-content: space-around;
 
       .user-depname {
-        margin-right: 5px;
+        margin-right: 0;
       }
 
       .user-subject {
@@ -351,8 +352,8 @@ onMounted(() => {
     align-items: center;
 
     .user-avatar {
-      width: 35px;
-      height: 35px;
+      width: 45px;
+      height: 45px;
       border-radius: 10px;
       margin-right: 10px;
     }
diff --git a/src/renderer/src/utils/ruoyi.js b/src/renderer/src/utils/ruoyi.js
index e51b433..8d7971e 100644
--- a/src/renderer/src/utils/ruoyi.js
+++ b/src/renderer/src/utils/ruoyi.js
@@ -257,3 +257,17 @@ export const getFileName = (filename) => {
   if(!filename) return
   return filename.replace(/\.[^/.]+$/, "");
 }
+
+// 清除当前选中的教材 章节 相关信息
+export const clearBookInfo = () =>{
+  //当前选中的教材
+  localStorage.removeItem('curBook')
+  // 当前选中的节点
+  localStorage.removeItem('curNode')
+  // 所有章节单元数据
+  localStorage.removeItem('unitList')
+  // 所有教材数据
+  localStorage.removeItem('subjectList')
+  // 展开的节点
+  localStorage.removeItem('defaultExpandedKeys')
+}
\ No newline at end of file
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 158392d..18e7dc5 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -45,6 +45,7 @@ import {updateUserInfo } from '@/api/system/user'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
+import { clearBookInfo } from '@/utils/ruoyi'
 
 const props = defineProps({
   user: {
@@ -137,8 +138,7 @@ function submit() {
           userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
             userStore.getInfo().then(res => {
               if(res.code === 200){
-                localStorage.removeItem('subjectList')
-                localStorage.removeItem('evaluationList')
+                clearBookInfo()
                 ElMessage.success('修改成功')
               }else{
                 ElMessage.error(response.msg)
diff --git a/src/renderer/src/views/tool/components/lesson.vue b/src/renderer/src/views/tool/components/lesson.vue
index 75241ae..a111467 100644
--- a/src/renderer/src/views/tool/components/lesson.vue
+++ b/src/renderer/src/views/tool/components/lesson.vue
@@ -38,7 +38,7 @@ const curBookId = ref('')
 const evaluationList = ref([])
 
 const getTreeData = () => {
-  evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+  evaluationList.value = JSON.parse(localStorage.getItem('unitList'))
 
     //上册
         /**

From b5fd1f2a9d56fd47ef8ed4992dc0df9f557ebf39 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 14:42:58 +0800
Subject: [PATCH 18/36] edit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 77b31bb..bc6282a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",

From 1a9b426ec3e4c54c3bbf219aa7b3b9f07723754e Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Fri, 20 Sep 2024 14:56:48 +0800
Subject: [PATCH 19/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D-=E4=B8=8A=E8=AF=BE=20?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/prepare/container/reserv.vue | 4 +++-
 src/renderer/src/views/prepare/index.vue            | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue
index 49660dc..e21c949 100644
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@@ -86,7 +86,7 @@ import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 import { getCurrentTime, getAfterMinutes } from '@/utils/date'
 
-const emit = defineEmits(['addSuccess'])
+const emit = defineEmits(['addSuccess','close'])
 const props = defineProps({
   bookId: {
     type: Number,
@@ -217,6 +217,8 @@ const closeDialog = () => {
   ruleFormDialog.value.resetFields()
   centerDialogVisible.value = false
   form.name = props.currentNode.label
+  emit('close')
+
 }
 const classList = ref([])
 onMounted(() => {
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 85fc0ad..81766ec 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -158,6 +158,7 @@
     :current-node="currentNode"
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
+    @close="closeChange"
   ></reserv>
   <!-- 上课配置 -->
   <class-start ref="calssRef" @close="closeChange"/>
@@ -319,6 +320,7 @@ export default {
       this.activeClass = item
     },
     closeChange() { // 上课弹窗被关闭-触发
+      console.log('关闭上课弹窗')
       this.activeClass = null
       sessionStore.delete('activeClass')
     },

From ca57e72e9c3b149b7f649b11844cf6446409960f Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Fri, 20 Sep 2024 15:04:14 +0800
Subject: [PATCH 20/36] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E5=80=BC=E4=B8=BAnu?=
 =?UTF-8?q?ll=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/plugins/shareStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js
index caa5e52..d846f1f 100644
--- a/src/renderer/src/plugins/shareStore.js
+++ b/src/renderer/src/plugins/shareStore.js
@@ -61,7 +61,7 @@ function stateSyncWatch(storeName, newState) {
   // console.log('state-change-diffData', diffData)
   try {
     for(const key in diffData) {
-      const value = diffData[key]
+      const value = diffData[key] || null
       const newValue = {} // 重新组装pinia需要的数据 {a:{b:1}} 这种
       const keyArr = key.split('.') || []
       keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)

From c93eeeb308b2e1a959f301ab06c231725ddafd3b Mon Sep 17 00:00:00 2001
From: zdg <zdg@163.com>
Date: Fri, 20 Sep 2024 15:16:34 +0800
Subject: [PATCH 21/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/plugins/shareStore.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/plugins/shareStore.js b/src/renderer/src/plugins/shareStore.js
index d846f1f..0db8119 100644
--- a/src/renderer/src/plugins/shareStore.js
+++ b/src/renderer/src/plugins/shareStore.js
@@ -172,6 +172,8 @@ const getObjValue = (obj, key) => {
 const findDifferences = (obj1, obj2) => {
   const differences = {};
   function compareObjects(o1, o2, path = '') {
+    if (o1 == null) return
+    if (o2 == null) return
     for (const key in o1) {
       if (o1.hasOwnProperty(key)) {
         const newPath = path ? `${path}.${key}` : key;

From f9a87143aaff3afdcc2d3b8f14af79a251fe81e8 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 15:19:33 +0800
Subject: [PATCH 22/36] edit

---
 src/renderer/src/components/choose-textbook/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 3c9a66a..5a78a22 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -169,7 +169,7 @@ const handleNodeClick = (data, node) => {
   }
   else {
     // 否则 点击的为二级节点 parentNode 为它的父级节点
-    nodeData.parentNode = parentNode
+    nodeData.parentNode = toRaw(parentNode)
   }
 
   let curData = {

From 00871797bff0acca80b7d25607f2688057f2365e Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 15:24:23 +0800
Subject: [PATCH 23/36] edit

---
 src/renderer/src/components/choose-textbook/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 5a78a22..fbb4b1b 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -96,7 +96,7 @@ const changeBook = (data) => {
 
 const emitChangeBook = async () => {
   let curData = cloneDeep(toRaw(curNode.data))
-  let parentNode = findParentByChildId(treeData.value, curNode.id)
+  let parentNode = findParentByChildId(treeData.value, curData.id)
   curData.parentNode = toRaw(parentNode)
   const data = {
     textBook: {

From ac599a2c3956438f1d134247bf53dabe8521b838 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 20 Sep 2024 15:29:21 +0800
Subject: [PATCH 24/36] =?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

---
 src/renderer/src/views/prepare/container/reserv.vue | 4 ++--
 src/renderer/src/views/prepare/index.vue            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue
index e21c949..eaaf74e 100644
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@@ -115,7 +115,7 @@ const updateForm = ref({})
 watch(
   () => props.currentNode,
   (newValue, oldValue) => {
-    form.name = newValue.label
+    form.name = newValue.itemtitle
   }
 )
 const ruleForm = reactive({
@@ -216,7 +216,7 @@ const openDialog = (data) => {
 const closeDialog = () => {
   ruleFormDialog.value.resetFields()
   centerDialogVisible.value = false
-  form.name = props.currentNode.label
+  form.name = props.currentNode.itemtitle
   emit('close')
 
 }
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 81766ec..09e9abd 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -368,7 +368,7 @@ export default {
       this.downloadNum = num
     },
     createFile() {
-      creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
+      creatPPT(this.currentNode.itemtitle + '.pptx', this.uploadData).then((res) => {
         this.currentFileList.unshift(res.resData)
       })
     },
@@ -448,7 +448,7 @@ export default {
             creatAPT({
               ...this.uploadData,
               fileId: slideid,
-              fileShowName: this.currentNode.label + '.apt'
+              fileShowName: this.currentNode.itemtitle + '.apt'
             }).then((res) => {
               this.currentFileList.unshift(res.resData)
             })
@@ -665,7 +665,7 @@ export default {
           '/tool/sphere?entpcourseid=' +
           this.entpcourseid +
           '&label=' +
-          this.currentNode.label +
+          this.currentNode.itemtitle +
           '&reservId=' +
           id
       })

From ef771f4e0b85d80b869a1fb591c69acccb31f585 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 20 Sep 2024 15:38:37 +0800
Subject: [PATCH 25/36] edit

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

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index fbb4b1b..2436521 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -98,6 +98,8 @@ 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,
@@ -160,7 +162,9 @@ const handleNodeClick = (data, node) => {
    * data : 当前节点数据
    * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
-  const nodeData = cloneDeep(toRaw(data));
+  let nodeData = cloneDeep(toRaw(data));
+  //怎加一个label 之前取的label
+  nodeData.label = nodeData.itemtitle
   const parentNode = node.parent.data;
   // parentNode 为数组 则点击的是一级节点
   if (Array.isArray(parentNode)) {

From 8975784ce045f0a7d7a15601bb531a552412a2fb Mon Sep 17 00:00:00 2001
From: zhangxuelin <959231531@qq.com>
Date: Fri, 20 Sep 2024 16:27:12 +0800
Subject: [PATCH 26/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/tool/sphere.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/renderer/src/views/tool/sphere.vue b/src/renderer/src/views/tool/sphere.vue
index a2f69a9..f46966e 100644
--- a/src/renderer/src/views/tool/sphere.vue
+++ b/src/renderer/src/views/tool/sphere.vue
@@ -16,8 +16,7 @@
     <div class="tool-bottom-all"
       @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
-        @v-drag-start="dragtime = Date.now()"
-        @v-drag-end="mouseChange(1)">
+        @v-drag-start="dragtime = Date.now()">
         <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
           <el-image :src="logo" draggable="false" />
         </div>

From ef9fe838a388c6bb9c0b5f3262cf8473b5fc6441 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 20 Sep 2024 16:56:26 +0800
Subject: [PATCH 27/36] =?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

---
 electron.vite.config.mjs |  9 ++++++++-
 package.json             |  4 +++-
 src/main/index.js        | 25 +++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs
index d5d6421..cc1eedc 100644
--- a/electron.vite.config.mjs
+++ b/electron.vite.config.mjs
@@ -3,7 +3,14 @@ import path from 'path'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import vue from '@vitejs/plugin-vue'
 import WindiCSS from "vite-plugin-windicss"
-
+/*import electron from 'vite-plugin-electron'
+plugins: [electron({
+  main: {
+    builderOptions: {
+      asar: false
+    }
+  }
+})],*/
 export default defineConfig({
   main: {
     plugins: [externalizeDepsPlugin()]
diff --git a/package.json b/package.json
index bc6282a..8bc6d8d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",
@@ -45,10 +45,12 @@
     "jsencrypt": "^3.3.2",
     "jsondiffpatch": "0.6.0",
     "lodash": "^4.17.21",
+    "node-addon-api": "^8.1.0",
     "pdfjs-dist": "4.4.168",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "spark-md5": "^3.0.2",
+    "vite-plugin-electron": "^0.28.8",
     "vue-qr": "^4.0.9",
     "vue-router": "^4.4.0",
     "xgplayer": "^3.0.19",
diff --git a/src/main/index.js b/src/main/index.js
index ac96916..49433ec 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -21,6 +21,27 @@ File({ app, shell, BrowserWindow, ipcMain })
 process.env['ELECTRON_DISABLE_SECURITY_WARNINGS'] = 'true'
 let mainWindow, loginWindow
 
+const additionalData = {myKey:'ys_axi_smarttalk'}
+const gotTheLock = app.requestSingleInstanceLock(additionalData)
+
+if(!gotTheLock){
+  app.quit()
+}else{
+  app.on('second-instance',(event,commandLine,workingDirectory,additionalData)=>{
+    //输入从第二个实例中接收到的数据
+    console.log(additionalData)
+    //有人试图运行第二个实例，我们应该关注我们的窗口
+    if(mainWindow){
+      if(mainWindow.isMinimized()) mainWindow.restore()
+      mainWindow.focus()
+    }
+    if(loginWindow){
+      if(loginWindow.isMinimized()) loginWindow.restore()
+      loginWindow.focus()
+    }
+  })
+}
+
 //登录窗口
 function createLoginWindow() {
   if (loginWindow) return
@@ -53,7 +74,7 @@ function createLoginWindow() {
     updateInit(loginWindow)
   }
 
-  loginWindow.webContents.openDevTools()
+  // loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })
@@ -101,7 +122,7 @@ function createMainWindow() {
     shell.openExternal(details.url)
     return { action: 'deny' }
   })
-  mainWindow.webContents.openDevTools()
+  // mainWindow.webContents.openDevTools()
 
   if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
     mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])

From 71f7e4e5a159889bcf5b1a407c26b163d3eb8672 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 22 Sep 2024 10:38:31 +0800
Subject: [PATCH 28/36] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=B4=A6=E5=8F=B7-?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/login/components/Register.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue
index f61a870..53bc7f5 100644
--- a/src/renderer/src/views/login/components/Register.vue
+++ b/src/renderer/src/views/login/components/Register.vue
@@ -211,12 +211,6 @@ const rules = reactive({
       message: '请选择地址',
       trigger: 'change',
   },],
-  class:[ {
-      type:'array',
-      required: true,
-      message: '请选择班级',
-      trigger: 'change',
-  },],
   discipline:[ {
       type: 'array',
       required: true,

From 78b795bf4f8b55f596793b64bdeae05df3340dcf Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Sun, 22 Sep 2024 10:53:23 +0800
Subject: [PATCH 29/36] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20#801,V2.0.3=20?=
 =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5-=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=EF=BC=8C=E7=BA=A2=E6=A1=86=E9=83=A8=E5=88=86=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/prepare/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 09e9abd..4ea167c 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -115,13 +115,13 @@
             </el-checkbox-group>
           </el-tab-pane>
           <el-tab-pane label="作业" name="作业">
-            <div class="prepare-body-header">
+<!--            <div class="prepare-body-header">
               <div>
                 <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
                 <el-button size="small" @click="handleOutLink('feedback')">作业反馈</el-button>
                 <el-button size="small" @click="handleOutLink('homeWork')">布置作业</el-button>
               </div>
-            </div>
+            </div>-->
             <div class="prepare-work-wrap">
               <file-list-item
                 v-for="(item, index) in currentWorkList"

From 622cdfe0feb620b18cf36fbf95ebaea11e20217b Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Sun, 22 Sep 2024 11:14:19 +0800
Subject: [PATCH 30/36] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=20#811,V2.0.3=20APT?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1-=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8E=E5=BD=93=E5=89=8D=E9=80=89=E6=8B=A9=E7=9A=84?=
 =?UTF-8?q?=E7=AB=A0=E8=8A=82=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/prepare/container/kj-list-item.vue       | 10 ++++++++--
 src/renderer/src/views/prepare/index.vue               |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

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 7841e07..4cd468b 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -108,6 +108,12 @@ export default {
   name: 'FileListItem',
   components: { FileImage },
   props: {
+    curNode: {
+      type: Object,
+      default: function () {
+        return {}
+      }
+    },
     item: {
       type: Object,
       default: function () {
@@ -201,8 +207,8 @@ export default {
     },
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
-        console.log(items);
-        const path="/teaching/aptindex?id="+items.fileId
+        console.log(this.curNode);
+        const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 4ea167c..d675bcb 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -20,6 +20,7 @@
               :key="index"
               :item="item"
               :index="index"
+              :curNode="currentNode"
               @on-delete="deleteTalk"
               @on-start-class="startClass"
             >

From 19a3b948c5f3e85c1b81b3c92fbf469bf52beade Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 22 Sep 2024 12:34:15 +0800
Subject: [PATCH 31/36] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AB=A0=E8=8A=82=20?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=AB=A0=E8=8A=82id=20=EF=BC=88=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/index.vue  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 2436521..b71d22d 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -109,6 +109,19 @@ const emitChangeBook = async () => {
     },
     node: curData
   }
+  /**
+   * 临时用 后续删除 unitId
+   */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (curData.parentNode) {
+    levelFirstId = curData.parentNode.id
+    levelSecondId = curData.id
+  } else {
+    levelFirstId = curData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
   emit('changeBook', data)
 }
 
@@ -187,6 +200,21 @@ const handleNodeClick = (data, node) => {
   }
   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
+   if (nodeData.parentNode) {
+    levelFirstId = nodeData.parentNode.id
+    levelSecondId = nodeData.id
+  } else {
+    levelFirstId = nodeData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+
   emit('nodeClick', curData)
 
 }

From a64ba247428834ae76750ca6b913c3dfcc90fd13 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Sun, 22 Sep 2024 12:51:58 +0800
Subject: [PATCH 32/36] =?UTF-8?q?fix:2.0.4bug=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classManage/basicGroup.vue      | 10 +++----
 src/renderer/src/views/classManage/index.vue  | 11 +++----
 src/renderer/src/views/profile/index.vue      |  6 ++--
 src/renderer/src/views/profile/userInfo.vue   | 29 +++++++++++++------
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/renderer/src/views/classManage/basicGroup.vue b/src/renderer/src/views/classManage/basicGroup.vue
index 148553a..879385a 100644
--- a/src/renderer/src/views/classManage/basicGroup.vue
+++ b/src/renderer/src/views/classManage/basicGroup.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card style="width: 100%;height: 100%;overflow: auto">
-<!--    <template #header>-->
-<!--      <div class="card-header" style="text-align: left">-->
-<!--        <el-button type="primary" @click="addGroup">新建分组</el-button>-->
-<!--      </div>-->
-<!--    </template>-->
+    <template #header>
+      <div class="card-header" style="text-align: left">
+        <el-button type="primary" @click="addGroup">新建分组</el-button>
+      </div>
+    </template>
     <template v-if="groupList.length > 0">
       <div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
       <div class="groupList">
diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue
index 8ef42c2..058a0f9 100644
--- a/src/renderer/src/views/classManage/index.vue
+++ b/src/renderer/src/views/classManage/index.vue
@@ -186,7 +186,8 @@
   ])
   //选择的班级
   const classids = ref('')
-
+  // 未加入的班级
+  const classesNotAMemberOf = ref([])
   // 获取班级信息
   const getClassInfo = () => {
     classList.value = []
@@ -199,13 +200,13 @@
     });
     listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
       //清除已有的班级
-      let arr = [...response.rows]
+      classesNotAMemberOf.value = [...response.rows]
       classList.value.forEach(item => {
-        const currentIndex = arr.findIndex(items => items.id === item.id)
-        if(currentIndex) arr.splice(currentIndex, 1)
+        const currentIndex = classesNotAMemberOf.value.findIndex(items => items.id === item.id)
+        if(currentIndex) classesNotAMemberOf.value.splice(currentIndex, 1)
       })
       //这里获取组装所有班级
-      gradeTree.value = groupByCondition(arr, item => item.agekey);
+      gradeTree.value = groupByCondition(classesNotAMemberOf.value, item => item.agekey);
     })
   }
   //将所有班级筛选成二级的数组
diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index 45eaa40..32ec999 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -30,9 +30,9 @@
               <li class="list-group-item">
                 <div class="left-align">
                   <Message class="Message"/>
-                  <span>用户邮箱</span>
+                  <span>身份证号</span>
                 </div>
-                <div class="right-align">{{ state.user.email }}</div>
+                <div class="right-align">{{ state.user.identity }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
@@ -48,7 +48,7 @@
                   <Avatar class="Avatar"/>
                   <span>所属角色</span>
                 </div>
-                <div class="right-align">{{ state.roleGroup }}</div>
+                <div class="right-align">{{ state.roleGroup || '教师' }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 18e7dc5..708da12 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -6,10 +6,10 @@
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="user.email" maxlength="50" />
+    <el-form-item label="身份证号" prop="identity">
+      <el-input v-model="user.identity" maxlength="50" />
     </el-form-item>
-    <el-form-item label="性别">
+    <el-form-item label="性别" style="display: none">
       <el-radio-group v-model="user.sex">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
@@ -18,8 +18,8 @@
     <el-form-item label="学段">
       <el-radio-group v-model="user.edustage" @change="semeterChange">
         <template v-for="(item,index) in semesterList" :key="index">
-          <el-radio :value="item.title">
-            {{item.title }}
+          <el-radio :value="item.label">
+            {{item.label }}
           </el-radio>
         </template>
       </el-radio-group>
@@ -42,6 +42,7 @@
  <script setup>
 import { ref, getCurrentInstance,onMounted } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
+import {getDept } from '@/api/login'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
@@ -60,21 +61,30 @@ const userStore = useUserStore()
 const semesterList = ref([
   {
     id:1,
-    title:'幼儿园'
+    label:'幼儿园'
   },
   {
     id:2,
-    title:'小学'
+    label:'小学'
   },
   {
     id:3,
-    title:'初中'
+    label:'初中'
   },
   {
     id:4,
-    title:'高中'
+    label:'高中'
   },
 ])
+// 获取学校所存在的学段
+
+const getTheSection = () => {
+  getDept({deptId:userStore.user.deptId}).then(res => {
+    //获取该学校可以选择的学科
+    const arr = res.data.studying.split(',')
+    semesterList.value = semesterList.value.filter(items => {return arr.includes(items.label)}).map(item => item)
+  })
+}
 
 const rules = ref({
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -159,5 +169,6 @@ const semeterChange = (item) => {
 }
 onMounted(() => {
   getSubject()
+  getTheSection()
 })
 </script>

From 79b9a0726ac98d2148847ded28448350d74c51fc Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Sun, 22 Sep 2024 14:27:48 +0800
Subject: [PATCH 33/36] =?UTF-8?q?=E6=89=93=E5=8C=85=E8=81=94=E9=80=9A?=
 =?UTF-8?q?=E6=96=87=E6=9E=A2=E8=AF=BE=E5=A0=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.lt                                       | 19 +++++++
 .env.production                               |  2 +-
 electron-builder-lt.yml                       | 54 +++++++++++++++++++
 package.json                                  |  5 +-
 src/renderer/src/layout/components/Header.vue |  6 +--
 src/renderer/src/views/login/index.vue        |  5 +-
 6 files changed, 83 insertions(+), 8 deletions(-)
 create mode 100644 .env.lt
 create mode 100644 electron-builder-lt.yml

diff --git a/.env.lt b/.env.lt
new file mode 100644
index 0000000..79007b1
--- /dev/null
+++ b/.env.lt
@@ -0,0 +1,19 @@
+# 页面标题
+VITE_APP_TITLE = 文枢课堂
+
+# 生产环境配置
+VITE_APP_ENV = 'production'
+
+# AIx融合数字管理系统/生产环境
+VITE_APP_BASE_API = 'https://prev.ysaix.com:7868/prod-api'
+
+VITE_APP_DOMAIN = 'prev.ysaix.com'
+
+VITE_APP_UPLOAD_API = 'https://prev.ysaix.com:7868/prod-api'
+
+# 是否在打包时开启压缩，支持 gzip 和 brotli
+VITE_BUILD_COMPRESS = gzip
+
+VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktxt/'
+
+VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
diff --git a/.env.production b/.env.production
index 3998cfc..8640aa3 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = AIx数字平台
+VITE_APP_TITLE = AIX智慧课堂
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/electron-builder-lt.yml b/electron-builder-lt.yml
new file mode 100644
index 0000000..f8e0b9a
--- /dev/null
+++ b/electron-builder-lt.yml
@@ -0,0 +1,54 @@
+appId: com.electron.app
+productName: 文枢课堂
+directories:
+  output: dist
+  buildResources: build
+win:
+  executableName: 文枢课堂
+  icon: resources/logo2.ico
+files:
+  - '!**/.vscode/*'
+  - '!src/*'
+  - '!electron.vite.config.{js,ts,mjs,cjs}'
+  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+asarUnpack:
+  - resources/**
+nsis:
+  oneClick: false
+  allowToChangeInstallationDirectory: true
+  artifactName: ${name}-${version}-setup.${ext}
+  shortcutName: ${productName}
+  uninstallDisplayName: ${productName}
+  createDesktopShortcut: always
+mac:
+  entitlementsInherit: build/entitlements.mac.plist
+  extendInfo:
+    - NSCameraUsageDescription: Application requests access to the device's camera.
+    - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
+    - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
+    - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+  notarize: false
+dmg:
+  artifactName: ${name}-${version}.${ext}
+linux:
+  target:
+    - AppImage
+    - snap
+    - deb
+  maintainer: electronjs.org
+  category: Utility
+appImage:
+  artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+  provider: generic
+  url: https://prev.ysaix.com:7868/src/assets/smarttalk/
+electronDownload:
+  mirror: https://npmmirror.com/mirrors/electron/
+# 额外依赖打包到输出目录
+extraFiles:
+  - from: ./node_modules/im_electron_sdk/lib/
+    to: ./resources
+    filter:
+      - '**/*'
diff --git a/package.json b/package.json
index 8bc6d8d..825ea85 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "aix-win",
-  "version": "2.0.4",
-  "description": "An Electron application with Vue",
+  "version": "2.0.6",
+  "description": "",
   "main": "./out/main/index.js",
   "author": "example.com",
   "homepage": "https://electron-vite.org",
@@ -16,6 +16,7 @@
     "build:dev": "npm run build && electron-builder --win --config ./electron-builder-test.yml",
     "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
     "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
+    "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
     "build:mac": "npm run build && electron-builder --mac",
     "build:linux": "npm run build && electron-builder --linux"
   },
diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue
index 5e3ad3a..cba3b47 100644
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@@ -3,7 +3,7 @@
     <div class="left-section">
       <div class="flex title-box">
         <el-image style="width: 23px; height: 23px" :src="logoIco" />
-        <span class="title" @click="changeTab">AIX智慧课堂</span>
+        <span class="title" @click="changeTab">{{homeTitle}}</span>
       </div>
       <div class="change-tab">
         <ul class="flex">
@@ -37,7 +37,7 @@
             <div class="user-info flex">
               <span class="user-name">{{ userStore.user.nickName }}</span>
               <div class="flex">
-                
+
                 <el-dropdown @command="changeSubject">
                   <div class="user-subject">{{ userStore.user.edusubject }}
                     <el-icon class="el-icon--right"><arrow-down />
@@ -74,7 +74,7 @@ import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { clearBookInfo } from '@/utils/ruoyi'
-
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
 const router = useRouter()
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 3175fc5..5b62af3 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -2,7 +2,7 @@
   <div class="login-container">
     <div class="box-item desc">
       <div class="welcome">
-        <p>欢迎登录 AIX智慧课堂</p>
+        <p>欢迎登录 {{homeTitle}}</p>
       </div>
       <img class="welcome-img" :src="leftBg2" />
     </div>
@@ -25,7 +25,7 @@
           <el-checkbox v-model="loginForm.rememberMe" >记住密码</el-checkbox>
            <!-- <el-checkbox >阅读并同意《xxx》</el-checkbox> -->
         </div>
-        
+
         <el-form-item>
           <el-button :loading="btnLoading" class="btn" type="primary" @click="submitForm(formRef)"
             >登录</el-button
@@ -93,6 +93,7 @@ const rules = reactive({
 })
 
 let curWinUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 ipcRenderer.on('update-app-progress', (e, prop) => {
   downloadProp.value = prop
   showDownLoading.value = prop !== 100

From d5afede36c0ca8f47e91d24a65d248cf3c3cb80d Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Sun, 22 Sep 2024 16:28:10 +0800
Subject: [PATCH 34/36] =?UTF-8?q?fix:2.0.4bug=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/classManage/index.vue  |  2 +-
 .../src/views/login/components/Register.vue   | 97 ++++++++++++-------
 2 files changed, 64 insertions(+), 35 deletions(-)

diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue
index 058a0f9..c3c25c7 100644
--- a/src/renderer/src/views/classManage/index.vue
+++ b/src/renderer/src/views/classManage/index.vue
@@ -302,7 +302,7 @@
     addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
       if (res.code === 200) {
         dialogVisible.value = false
-        ElMessage({
+        ElMessage({x
           message: res.msg,
           type: 'success',
         })
diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue
index 53bc7f5..66d69a3 100644
--- a/src/renderer/src/views/login/components/Register.vue
+++ b/src/renderer/src/views/login/components/Register.vue
@@ -7,7 +7,7 @@
     :before-close="handleClose"
   >
   <el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
-    <el-step title="1.基本信息" @click="activeIndex=1" />
+    <el-step title="1.基本信息" @click="activeIndex=1" style="cursor:pointer"/>
     <el-step title="2.在校信息" />
   </el-steps>
     <el-form
@@ -37,12 +37,14 @@
       <el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1">
         <el-input v-model="ruleForm.confirmPassword" type="password"  placeholder="请确认密码" />
       </el-form-item>
-      <el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
+      <el-form-item  label="所属地区" prop="address" v-if="activeIndex==2">
         <el-cascader
             style="width:100%"
+            popper-class="aix-regist-address"
             v-model="ruleForm.address"
             :options="regionData"
              @change="handleChange"
+            :props="{checkStrictly: true}"
           />
       </el-form-item>
       <el-form-item label="学校" prop="school" v-if="activeIndex==2">
@@ -60,7 +62,7 @@
       <el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
         <div v-for="item in schoolSubject" style="display: flex;">
                 <span style="width:50px">{{ item.name }}：</span>
-                <el-checkbox-group style="width:100%" v-model="ruleForm.discipline"> 
+                <el-checkbox-group style="width:100%" v-model="ruleForm.discipline">
                   <el-checkbox style="margin-right:10px" v-for="el in item.children" :key="el.id" :label="el.itemtitle" :value="el" />
                 </el-checkbox-group>
           </div>
@@ -72,6 +74,7 @@
       </el-form-item>
       <el-form-item v-if="activeIndex==2">
         <div  class="centerDiv">
+          <el-button  type="default" @click="activeIndex=1">上一步</el-button>
           <el-button  type="primary" @click="submitForm(ruleFormRef)">立即注册</el-button>
         </div>
       </el-form-item>
@@ -104,7 +107,7 @@
         </template> -->
       </el-dialog>
   </el-dialog>
-  
+
 </template>
 
 <script  setup>
@@ -216,7 +219,7 @@ const rules = reactive({
       required: true,
       message: '请选择学科',
       trigger: 'change',
-    },] 
+    },]
 })
 const dialogVisible = ref(false)
 
@@ -308,7 +311,7 @@ const getSubject = async ()=>{
   const  rows= await listEvaluation({ itemkey: "subject", pageSize: 500 })
   console.log(rows,'所有学科')
   allSubjectList.value = rows.data
-  
+
 }
 
 const submitForm = async (formEl) => {
@@ -409,46 +412,53 @@ const sbmitImg=()=>{
         ruleForm.Code=res.data
         isImg.value=false
       }
-       
+
     })
    }else{
     ElMessage.error('请根据图片输入验证码')
    }
-  // 
+  //
 }
 const handleChange = (value) => {
       console.log('选中的地址值：', value);
     };
-const handleSchoolChange= async ()=>{
+const handleSchoolChange= ()=>{
   ruleForm.discipline=[];
   ruleForm.class=[];
+  //获取学科班级
+  accessToDisciplines()
+  getClassmain()
+}
+// 获取学科
+const accessToDisciplines = () => {
   getDept({deptId:ruleForm.school[2]}).then(res =>{
-      if(res.data.studying && res.data.studying.length){
-        let studying = res.data.studying.split(',')
-        let ary = []
-        studying.forEach(item =>{
-          let obj = {
-            name: item,
-            children: []
+    if(res.data.studying && res.data.studying.length){
+      let studying = res.data.studying.split(',')
+      let ary = []
+      studying.forEach(item =>{
+        let obj = {
+          name: item,
+          children: []
+        }
+        allSubjectList.value.forEach(el =>{
+          if(item == el.edustage){
+            obj.children.push(el)
           }
-          allSubjectList.value.forEach(el =>{
-            if(item == el.edustage){
-              obj.children.push(el)
-            }
-          })
-          ary.push(obj)
         })
-        schoolSubject.value = ary
-      }
-      else{
-        schoolSubject.value = []
-      }
-    })
-  listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'}).then(res=>{
-    gradeTree.value = groupByCondition(res.rows, item => item.agekey);
-    console.log(gradeTree.value,'班级')
+        ary.push(obj)
+      })
+      schoolSubject.value = ary
+    }
+    else{
+      schoolSubject.value = []
+    }
   })
- 
+}
+// 获取班级
+const getClassmain = async ()=>{
+  const res = await listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'})
+  console.log(res,'res')
+  gradeTree.value = groupByCondition(res.rows, item => item.agekey);
 }
 //将所有班级筛选成二级的数组
 const groupByCondition = (arr, condition)=>{
@@ -484,8 +494,14 @@ const gradeName = (key) =>{
   }
 }
  onMounted(()=>{
-  
- }) 
+   //默认给到地区重庆
+   ruleForm.address = ['50']
+   //默认给到学校的值
+   ruleForm.school = [100,255,279]
+   //默认获取重庆第一个学校的学科
+   accessToDisciplines()
+   getClassmain()
+ })
 defineExpose({
   OpenModel,
 })
@@ -498,4 +514,17 @@ defineExpose({
   display: flex;
   justify-content: center;
 }
+
+</style>
+<style lang="scss">
+.aix-regist-address{
+.el-cascader-node{
+  position: relative!important;
+.el-radio{
+  position: absolute!important;
+  width: 90%!important;
+  left:5px!important;
+}
+}
+}
 </style>

From cafea2d7190980837c7973cbb54910bac2f74b7c Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 22 Sep 2024 16:41:49 +0800
Subject: [PATCH 35/36] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=A2=9E=E5=8A=A0booki?=
 =?UTF-8?q?d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/components/choose-textbook/index.vue     | 6 ++++--
 src/renderer/src/hooks/useGetClassWork.js                 | 3 ++-
 src/renderer/src/views/desktop/index.vue                  | 5 +++--
 src/renderer/src/views/prepare/container/kj-list-item.vue | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index b71d22d..f701bda 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -114,6 +114,7 @@ const emitChangeBook = async () => {
    */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (curData.parentNode) {
     levelFirstId = curData.parentNode.id
     levelSecondId = curData.id
@@ -121,7 +122,7 @@ const emitChangeBook = async () => {
     levelFirstId = curData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
   emit('changeBook', data)
 }
 
@@ -206,6 +207,7 @@ const handleNodeClick = (data, node) => {
  */
   let levelFirstId = null
   let levelSecondId = null
+  let bookeId = curBook.data.id
    if (nodeData.parentNode) {
     levelFirstId = nodeData.parentNode.id
     levelSecondId = nodeData.id
@@ -213,7 +215,7 @@ const handleNodeClick = (data, node) => {
     levelFirstId = nodeData.id
     levelSecondId = ''
   }
-  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
   emit('nodeClick', curData)
 
diff --git a/src/renderer/src/hooks/useGetClassWork.js b/src/renderer/src/hooks/useGetClassWork.js
index 7aa313a..2d7c654 100644
--- a/src/renderer/src/hooks/useGetClassWork.js
+++ b/src/renderer/src/hooks/useGetClassWork.js
@@ -102,8 +102,9 @@ const getTreeData = () => {
       levelFirstId = curNode.id
       levelSecondId = ''
     }
+    let bookeId = curBookId
     // 头部 教材分析、作业设计：打开外部链接需要当前章节ID
-    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+    localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId, bookeId}))
 
     // const data = {
     //   textBook: {
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index e99bd75..679fc19 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -168,10 +168,11 @@ const clickMenu = ({isOuter, path, disabled}) =>{
     let fullPath = configObj.fullPath + path
     if(path == '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask' || path == '/teaching/classtaskassign?titleName=作业布置'){
       // 头部 教材分析打开外部链接需要当前章节ID
-      const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
+      const { levelFirstId, levelSecondId, bookeId } = JSON.parse(localStorage.getItem('unitId'))
 
       let unitId = levelSecondId ? levelSecondId : levelFirstId
-      fullPath = fullPath + `&unitId=${unitId}`
+  
+      fullPath = fullPath + `&unitId=${unitId}&bookeId=${bookeId}`
 
       console.log(fullPath)
     }
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 4cd468b..090b9b4 100644
--- a/src/renderer/src/views/prepare/container/kj-list-item.vue
+++ b/src/renderer/src/views/prepare/container/kj-list-item.vue
@@ -208,7 +208,8 @@ export default {
     openFileWin(items) {
       if (items.fileFlag === 'apt') {
         console.log(this.curNode);
-        const path="/teaching/aptindex?id="+items.fileId + "&cataId=" + this.curNode.id;
+        let curBook = JSON.parse(localStorage.getItem('curBook'))
+        const path="/teaching/aptindex?id="+items.fileId + "&unitId=" + this.curNode.id + "&bookId=" + curBook.id;
         let configObj = outLink().getBaseData()
         let fullPath = configObj.fullPath + path
         fullPath = fullPath.replaceAll('//', '/')

From 4c66cc90c054afa1e6ceb3c3160fc87f1f8b4b33 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Sun, 22 Sep 2024 16:46:37 +0800
Subject: [PATCH 36/36] =?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

---
 src/renderer/src/views/login/components/Register.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue
index 66d69a3..24d0d93 100644
--- a/src/renderer/src/views/login/components/Register.vue
+++ b/src/renderer/src/views/login/components/Register.vue
@@ -297,7 +297,6 @@ const nextStep = (formEl) => {
             }
           })
           getSubject()
-          console.log(res)
         })
         console.log('submit!')
       }
@@ -311,7 +310,8 @@ const getSubject = async ()=>{
   const  rows= await listEvaluation({ itemkey: "subject", pageSize: 500 })
   console.log(rows,'所有学科')
   allSubjectList.value = rows.data
-
+  accessToDisciplines()
+  getClassmain()
 }
 
 const submitForm = async (formEl) => {
@@ -456,8 +456,8 @@ const accessToDisciplines = () => {
 }
 // 获取班级
 const getClassmain = async ()=>{
+  console.log(ruleForm.school)
   const res = await listClassmain( {entpid: ruleForm.school[2], pageSize: 500, status: 'open'})
-  console.log(res,'res')
   gradeTree.value = groupByCondition(res.rows, item => item.agekey);
 }
 //将所有班级筛选成二级的数组
@@ -498,9 +498,6 @@ const gradeName = (key) =>{
    ruleForm.address = ['50']
    //默认给到学校的值
    ruleForm.school = [100,255,279]
-   //默认获取重庆第一个学校的学科
-   accessToDisciplines()
-   getClassmain()
  })
 defineExpose({
   OpenModel,