修改无数据匹配工位

master
夜笙歌 2 weeks ago
parent 3dac744226
commit 4dbcd896a4

@ -42,6 +42,7 @@
"clipboard": "2.0.8", "clipboard": "2.0.8",
"core-js": "3.25.3", "core-js": "3.25.3",
"echarts": "5.5.0", "echarts": "5.5.0",
"echarts-liquidfill": "^3.1.0",
"element-ui": "2.15.14", "element-ui": "2.15.14",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.4.3", "fuse.js": "6.4.3",

@ -224,7 +224,7 @@ export default {
} }
this.$store.dispatch('Login', this.loginForm).then(() => { this.$store.dispatch('Login', this.loginForm).then(() => {
let data = this.options.find(v => v.processId === this.loginForm.processId) || {} 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) || null let routeData = this.floorData.find(v => v.floor === data.processFloor && v.processId === data.processId) || {}
if(this.$route?.query?.isStationId === 'true' && !routeData){ if(this.$route?.query?.isStationId === 'true' && !routeData){
routeData = { routeData = {
floor: 4, floor: 4,
@ -234,9 +234,10 @@ export default {
} }
let query = { processName: this.loginForm.processName } let query = { processName: this.loginForm.processName }
routeData.query = query routeData.query = query
if (routeData.route) { if (routeData?.route) {
sessionStorage.setItem('FLOORDATA', JSON.stringify(routeData)) sessionStorage.setItem('FLOORDATA', JSON.stringify(routeData))
} }
console.log(routeData)
// this.$router.push({path: this.redirect || "/"}).catch(() => { // this.$router.push({path: this.redirect || "/"}).catch(() => {
// }); // });
this.$router.push({ path: routeData.route || this.redirect || '/' }).catch(() => { this.$router.push({ path: routeData.route || this.redirect || '/' }).catch(() => {

Loading…
Cancel
Save