diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 7f3c178..5b5cf59 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -6,7 +6,7 @@
-
@@ -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
@@ -134,6 +136,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 +150,6 @@ const getTreeData = () => {
//数据过滤
let upData = transData(evaluationList.value)
-
if(upData.length){
treeData.value = [...upData]
}
@@ -153,10 +158,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 +200,9 @@ const emitChangeBook = () => {
},
node: curNode
}
+
+ localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
+ localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
emit('changeBook', data)
}
@@ -230,6 +250,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 +306,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 +357,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()
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]
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()
}
diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js
index 7bc8424..948b7d8 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',
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) => {
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 @@
+
+
+
学生答复内容
+
{{stuItem.rightanswer}}
+
学生答题附件内容
+
+
+
未提交附件内容
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 69913c6..e99bd75 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -87,7 +87,7 @@ const menuList = [{
// path: '/prepare'
// },
{
- name: '教学实施',
+ name: '教学实践',
icon: 'icon-jiaoxuefenxi',
path: '/prepare'
},
@@ -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('//', '/')
// 通知主进程