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 1/8] =?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 2/8] =?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 3/8] =?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 4/8] =?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 5/8] =?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 6/8] =?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 7/8] =?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 8/8] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=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]