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/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/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/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue index 53bc7f5..24d0d93 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" > - + - + @@ -60,7 +62,7 @@
{{ item.name }}: - +
@@ -72,6 +74,7 @@
+ 上一步 立即注册
@@ -104,7 +107,7 @@ --> - +