Showing
4 changed files
with
16 additions
and
16 deletions
| ... | @@ -40,7 +40,6 @@ import { mapGetters } from "vuex" | ... | @@ -40,7 +40,6 @@ import { mapGetters } from "vuex" |
| 40 | import Breadcrumb from "@/components/Breadcrumb" | 40 | import Breadcrumb from "@/components/Breadcrumb" |
| 41 | import TopNav from "@/components/TopNav" | 41 | import TopNav from "@/components/TopNav" |
| 42 | import Hamburger from "@/components/Hamburger" | 42 | import Hamburger from "@/components/Hamburger" |
| 43 | -import { removeToken } from '@/utils/auth' | ||
| 44 | import settings from "@/settings" | 43 | import settings from "@/settings" |
| 45 | 44 | ||
| 46 | export default { | 45 | export default { |
| ... | @@ -126,7 +125,6 @@ export default { | ... | @@ -126,7 +125,6 @@ export default { |
| 126 | type: "warning", | 125 | type: "warning", |
| 127 | }).then(() => { | 126 | }).then(() => { |
| 128 | this.$store.dispatch("LogOut").then(() => { | 127 | this.$store.dispatch("LogOut").then(() => { |
| 129 | - removeToken() | ||
| 130 | window.location.href = settings.logoutURL;//wsso系统跳转 | 128 | window.location.href = settings.logoutURL;//wsso系统跳转 |
| 131 | }); | 129 | }); |
| 132 | }); | 130 | }); | ... | ... |
| ... | @@ -85,7 +85,7 @@ export const constantRoutes = [ | ... | @@ -85,7 +85,7 @@ export const constantRoutes = [ |
| 85 | meta: { title: '流水表', icon: 'user' } | 85 | meta: { title: '流水表', icon: 'user' } |
| 86 | }, | 86 | }, |
| 87 | { | 87 | { |
| 88 | - path: '/upDateResult->:from', | 88 | + path: '/upDateResult', |
| 89 | component: (resolve) => require(['@/views/preMdeConfig/upDateResult'], resolve), | 89 | component: (resolve) => require(['@/views/preMdeConfig/upDateResult'], resolve), |
| 90 | name: 'UpDateResult', | 90 | name: 'UpDateResult', |
| 91 | meta: { title: '错误信息提示', icon: 'user' } | 91 | meta: { title: '错误信息提示', icon: 'user' } | ... | ... |
| ... | @@ -52,7 +52,7 @@ service.interceptors.request.use(config => { | ... | @@ -52,7 +52,7 @@ service.interceptors.request.use(config => { |
| 52 | // 响应拦截器 | 52 | // 响应拦截器 |
| 53 | service.interceptors.response.use(res => { | 53 | service.interceptors.response.use(res => { |
| 54 | if (res.headers['token']) { | 54 | if (res.headers['token']) { |
| 55 | - setToken(decodeURIComponent(res.headers['token'])) | 55 | + setToken(res.headers['token']) |
| 56 | } | 56 | } |
| 57 | // 未设置状态码则默认成功状态 | 57 | // 未设置状态码则默认成功状态 |
| 58 | const code = res.data.code || 200; | 58 | const code = res.data.code || 200; | ... | ... |
| ... | @@ -374,7 +374,6 @@ export default { | ... | @@ -374,7 +374,6 @@ export default { |
| 374 | this.selectTable = [] | 374 | this.selectTable = [] |
| 375 | this.cargoTotal() | 375 | this.cargoTotal() |
| 376 | if (this.$route.params.fltNo) { | 376 | if (this.$route.params.fltNo) { |
| 377 | - console.log(1) | ||
| 378 | //判断进入页面是否带参,确定是否是index跳转 | 377 | //判断进入页面是否带参,确定是否是index跳转 |
| 379 | this.formData = { | 378 | this.formData = { |
| 380 | fltDateStart: "", | 379 | fltDateStart: "", |
| ... | @@ -407,7 +406,6 @@ export default { | ... | @@ -407,7 +406,6 @@ export default { |
| 407 | limitStart: 1, | 406 | limitStart: 1, |
| 408 | limitSize: 100, | 407 | limitSize: 100, |
| 409 | } | 408 | } |
| 410 | - console.log(this.$route) | ||
| 411 | this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate] | 409 | this.cargoPlaneTime = [this.$route.params.fltDate, this.$route.params.fltDate] |
| 412 | this.formData.cargoPlaneStart = this.$route.params.fltDate | 410 | this.formData.cargoPlaneStart = this.$route.params.fltDate |
| 413 | this.formData.cargoPlaneEnd = this.$route.params.fltDate | 411 | this.formData.cargoPlaneEnd = this.$route.params.fltDate |
| ... | @@ -694,17 +692,21 @@ export default { | ... | @@ -694,17 +692,21 @@ export default { |
| 694 | }, | 692 | }, |
| 695 | //配载航班号获取航线 | 693 | //配载航班号获取航线 |
| 696 | planeNoChange(val) { | 694 | planeNoChange(val) { |
| 697 | - if (val != '' && val != null) { | 695 | + let arr = [] |
| 698 | - getFlightsRoutes(val.split(';')).then(res => { | 696 | + if (typeof val != 'object') { |
| 699 | - if (res.code === 200) { | 697 | + arr = val.split(';') |
| 700 | - this.routeList = res.data | 698 | + } else { |
| 701 | - } else { | 699 | + arr = val |
| 702 | - this.msgWarning(res.msg) | ||
| 703 | - } | ||
| 704 | - }).catch(err => { | ||
| 705 | - console.log(err) | ||
| 706 | - }) | ||
| 707 | } | 700 | } |
| 701 | + getFlightsRoutes(arr).then(res => { | ||
| 702 | + if (res.code === 200) { | ||
| 703 | + this.routeList = res.data | ||
| 704 | + } else { | ||
| 705 | + this.msgWarning(res.msg) | ||
| 706 | + } | ||
| 707 | + }).catch(err => { | ||
| 708 | + console.log(err) | ||
| 709 | + }) | ||
| 708 | }, | 710 | }, |
| 709 | routeSelectChange(val) { | 711 | routeSelectChange(val) { |
| 710 | this.$forceUpdate() | 712 | this.$forceUpdate() | ... | ... |
-
Please register or login to post a comment