From b132bb5813001bc6d928867d74b5988c72ac053d 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, 17 Oct 2024 17:25:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B8=83=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/classTask/classTaskAssign.vue | 15 ++++++++++----- .../container/newTask/taskTypeView.vue | 19 +++++++++++++------ .../src/views/classTask/newClassTask.vue | 5 ++++- src/renderer/src/views/prepare/index.vue | 7 ++++++- 4 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue index 3e91c71..4baf8a3 100644 --- a/src/renderer/src/views/classTask/classTaskAssign.vue +++ b/src/renderer/src/views/classTask/classTaskAssign.vue @@ -121,12 +121,12 @@ @@ -203,8 +203,7 @@
- 确 定 + 确 定
@@ -779,7 +778,12 @@ const handleTaskAssignToAllClass = () => { */ const handleNewClassWorkDialog = () => { // 打开作业设计页面 - router.push({ path: '/newClassTask' }); + router.push({ + path: '/newClassTask', + query: { + isBack: true, + } + }); } /** @@ -930,3 +934,4 @@ watch(() => courseObj.node, (newVal,oldVal) => { } } + \ No newline at end of file diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 022bc4d..8a3efe0 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -266,6 +266,10 @@ const props = defineProps({ isedit: { type: Boolean, default: false + }, + isback:{ + type: Boolean, + default: false } }) @@ -737,14 +741,16 @@ const handleClassWorkSave = async () => { //这里分离了，所以不需要更新表单数据了 // this.getClassWorkAllList(); - // TODO 后续看是否跳转到 作业布置页面 - - //TODO 下面3个后续看是啥 - // this.newWorkSpace = false; - // this.newWorkSpaceEdit = false; - // this.workEdit = false; }) } + + if(props.isback){ + // 其他页面进入的 返回上一页 + router.back(); + }else{ + // 首页进入的，跳转到作业布置页面 + router.push({ path: '/classTaskAssign' }); + } } }); }; @@ -976,3 +982,4 @@ watch(() => props.bookobj.levelSecondId, (newVal) => { } + diff --git a/src/renderer/src/views/classTask/newClassTask.vue b/src/renderer/src/views/classTask/newClassTask.vue index 16e2df2..b1d8236 100644 --- a/src/renderer/src/views/classTask/newClassTask.vue +++ b/src/renderer/src/views/classTask/newClassTask.vue @@ -16,6 +16,7 @@
+ 返回上页 课程目录 @@ -35,7 +36,7 @@ - +
@@ -53,6 +54,7 @@ const route = useRoute(); const router = useRouter() const { proxy } = getCurrentInstance() +const isback = ref(route.query.isBack?true:false); const classtaskObj = route.query.classtaskObj;//作业布置的内容对象 const bookTitle = ref(classtaskObj? JSON.parse(classtaskObj).bookName: '');// 课程名称 const isOpenLeftBook = ref(classtaskObj? JSON.parse(classtaskObj).id ? true : false: false ); // 是否打开左侧目录 @@ -183,3 +185,4 @@ onMounted(() => { } } + diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 38cc251..8e74903 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -689,7 +689,12 @@ export default { // 前往作业设计页面 goNewClassTask(){ // router.push({ path: '/newClassTask' }); - this.$router.push({ path: '/newClassTask' }); + this.$router.push({ + path: '/newClassTask', + query: { + isBack: true, + } + }); }, getWeekday1(date) { const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] From cc2606d50717509aa03d8d96e815d1714cf422f6 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: Fri, 18 Oct 2024 10:11:10 +0800 Subject: [PATCH 2/2] 1 --- src/renderer/src/views/classTask/classTask.vue | 10 ++++------ .../src/views/desktop/container/work-trend.vue | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue index 2742b43..46e22c0 100644 --- a/src/renderer/src/views/classTask/classTask.vue +++ b/src/renderer/src/views/classTask/classTask.vue @@ -58,17 +58,17 @@