diff --git a/hw-ui/src/views/login.vue b/hw-ui/src/views/login.vue index a7788c8..0a38ce9 100644 --- a/hw-ui/src/views/login.vue +++ b/hw-ui/src/views/login.vue @@ -224,10 +224,13 @@ export default { } this.$store.dispatch('Login', this.loginForm).then(() => { let data = this.options.find(v => v.processId === this.loginForm.processId) || {} - let routeData = this.floorData.find(v => v.floor === data.processFloor && v.processId === data.processId) || { - floor: 4, - processId: 44, - route: '/board/assemble'//装配 + let routeData = this.floorData.find(v => v.floor === data.processFloor && v.processId === data.processId) || null + if(this.$route?.query?.isStationId === 'true' && !routeData){ + routeData = { + floor: 4, + processId: 44, + route: '/board/assemble'//装配 + } } let query = { processName: this.loginForm.processName } routeData.query = query