From 6871702cd083d89b1812b637ae6f41b8f03c9b02 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 14:35:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E8=B7=AF=E5=BE=84=E5=9B=BE=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index eec9b410..6d959654 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1320,7 +1320,7 @@ :permissions="permissions" :createId="createId" :type="2" - v-model:visible="faceTeachModelVisibleTitle" + v-model:visible="faceTeachModelVisible" :datasource="faceData" /> From 01ba9921cf207c11664091adf1ce19e1a88baff5 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 17 Mar 2023 14:45:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?--demand=20=E9=9D=A2=E6=8E=88=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index eec9b410..6d959654 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1320,7 +1320,7 @@ :permissions="permissions" :createId="createId" :type="2" - v-model:visible="faceTeachModelVisibleTitle" + v-model:visible="faceTeachModelVisible" :datasource="faceData" /> From f349acaa75809ac510c647e875f004483d03f408 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 17 Mar 2023 14:59:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?--demand=20=E9=9D=A2=E6=8E=88=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index e42a7538..8fe37259 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3368,7 +3368,6 @@ export default defineComponent({ beginTime: beginTime, endTime: endTime, offcourseId: state.offcourseId, - type:3 }; console.log("获取开obj", obj, state.selectTime); let res = await planList(obj); From 118456018835e71f328cfb0e15bc71ff32dae736 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 15:25:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 ++ src/router/index.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/api/config.js b/src/api/config.js index d2d9e197..0130bcf3 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -61,6 +61,8 @@ http.interceptors.response.use( (process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ? router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) : (window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath)) + // TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用 + localStorage.removeItem('refreshPage') return Promise.reject(response); } show && message.error(msg); diff --git a/src/router/index.js b/src/router/index.js index d7a2556a..d5c57254 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -33,9 +33,15 @@ const timers = setInterval(() => { if(pathArr.length!==0){ // 刷新界面是否重新执行 if(pathArr.indexOf(currentPath)==-1){ + if(localStorage.getItem("refreshPage") == "jumpverify"){ + clearInterval(timers) + return + } clearInterval(timers) router.push({path: pathArr[0]}) + localStorage.setItem("refreshPage", "jumpverify") }else{ + localStorage.setItem("refreshPage", "jumpverify") clearInterval(timers) } }