mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-12 12:26:47 +08:00
feat:合并
This commit is contained in:
@@ -61,6 +61,8 @@ http.interceptors.response.use(
|
|||||||
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
|
(process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'alpine') ?
|
||||||
router.push({path: 'login', query: { returnUrl: router.currentRoute.value.fullPath }}) :
|
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))
|
(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);
|
return Promise.reject(response);
|
||||||
}
|
}
|
||||||
show && message.error(msg);
|
show && message.error(msg);
|
||||||
|
|||||||
@@ -33,9 +33,15 @@ const timers = setInterval(() => {
|
|||||||
if(pathArr.length!==0){
|
if(pathArr.length!==0){
|
||||||
// 刷新界面是否重新执行
|
// 刷新界面是否重新执行
|
||||||
if(pathArr.indexOf(currentPath)==-1){
|
if(pathArr.indexOf(currentPath)==-1){
|
||||||
|
if(localStorage.getItem("refreshPage") == "jumpverify"){
|
||||||
|
clearInterval(timers)
|
||||||
|
return
|
||||||
|
}
|
||||||
clearInterval(timers)
|
clearInterval(timers)
|
||||||
router.push({path: pathArr[0]})
|
router.push({path: pathArr[0]})
|
||||||
|
localStorage.setItem("refreshPage", "jumpverify")
|
||||||
}else{
|
}else{
|
||||||
|
localStorage.setItem("refreshPage", "jumpverify")
|
||||||
clearInterval(timers)
|
clearInterval(timers)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3368,7 +3368,6 @@ export default defineComponent({
|
|||||||
beginTime: beginTime,
|
beginTime: beginTime,
|
||||||
endTime: endTime,
|
endTime: endTime,
|
||||||
offcourseId: state.offcourseId,
|
offcourseId: state.offcourseId,
|
||||||
type:3
|
|
||||||
};
|
};
|
||||||
console.log("获取开obj", obj, state.selectTime);
|
console.log("获取开obj", obj, state.selectTime);
|
||||||
let res = await planList(obj);
|
let res = await planList(obj);
|
||||||
|
|||||||
@@ -1320,7 +1320,7 @@
|
|||||||
:permissions="permissions"
|
:permissions="permissions"
|
||||||
:createId="createId"
|
:createId="createId"
|
||||||
:type="2"
|
:type="2"
|
||||||
v-model:visible="faceTeachModelVisibleTitle"
|
v-model:visible="faceTeachModelVisible"
|
||||||
:datasource="faceData"
|
:datasource="faceData"
|
||||||
/>
|
/>
|
||||||
<!-- 面授管理抽屉 结束-->
|
<!-- 面授管理抽屉 结束-->
|
||||||
|
|||||||
Reference in New Issue
Block a user