前端问题修改
This commit is contained in:
parent
51e0dd0681
commit
7f33b1a081
|
|
@ -103,7 +103,7 @@ export default {
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$store.dispatch('LogOut').then(() => {
|
this.$store.dispatch('LogOut').then(() => {
|
||||||
location.href = '/index';
|
location.href = '/login';
|
||||||
})
|
})
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ router.beforeEach((to, from, next) => {
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
store.dispatch('LogOut').then(() => {
|
store.dispatch('LogOut').then(() => {
|
||||||
Message.error(err)
|
Message.error(err)
|
||||||
next({ path: '/' })
|
next({ path: '/login' })
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ service.interceptors.response.use(res => {
|
||||||
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
|
MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
|
||||||
isRelogin.show = false;
|
isRelogin.show = false;
|
||||||
store.dispatch('LogOut').then(() => {
|
store.dispatch('LogOut').then(() => {
|
||||||
location.href = '/index';
|
location.href = '/login';
|
||||||
})
|
})
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
isRelogin.show = false;
|
isRelogin.show = false;
|
||||||
|
|
|
||||||
|
|
@ -304,7 +304,6 @@ export default {
|
||||||
query:{
|
query:{
|
||||||
taskId:row.taskId,
|
taskId:row.taskId,
|
||||||
isEdit:true,
|
isEdit:true,
|
||||||
isBack:false,
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -344,7 +344,7 @@ export default {
|
||||||
|
|
||||||
this.GetDeviceTypeTree()
|
this.GetDeviceTypeTree()
|
||||||
// this.getList();
|
// this.getList();
|
||||||
if(this.$route.query.taskId&&!this.$route.query.isBack){
|
if(this.$route.query.taskId){
|
||||||
this.GetTaskDetail(this.$route.query.taskId)
|
this.GetTaskDetail(this.$route.query.taskId)
|
||||||
}
|
}
|
||||||
if(this.$route.query.taskId&&this.$route.query.isBack){
|
if(this.$route.query.taskId&&this.$route.query.isBack){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue