Showing
4 changed files
with
4 additions
and
4 deletions
| ... | @@ -75,7 +75,7 @@ let tableHeaders = { | ... | @@ -75,7 +75,7 @@ let tableHeaders = { |
| 75 | }, | 75 | }, |
| 76 | { | 76 | { |
| 77 | name: "推送状态", | 77 | name: "推送状态", |
| 78 | - value: "cargoPushStatus", | 78 | + value: "cargoAllocationDataStatus", |
| 79 | width: "100", | 79 | width: "100", |
| 80 | align: "center", | 80 | align: "center", |
| 81 | sorTable: true, | 81 | sorTable: true, | ... | ... |
| ... | @@ -9,7 +9,7 @@ | ... | @@ -9,7 +9,7 @@ |
| 9 | <!-- 多选框 --> | 9 | <!-- 多选框 --> |
| 10 | <el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column> | 10 | <el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column> |
| 11 | <!-- 序号 --> | 11 | <!-- 序号 --> |
| 12 | - <el-table-column v-if="order" type="index" width="50" align="center" :index="indexAdd"></el-table-column> | 12 | + <el-table-column v-if="order" type="index" width="70" align="center" :index="indexAdd" show-overflow-tooltip></el-table-column> |
| 13 | <template v-for="(item, index) in headerData" v-if="item.status == 1"> | 13 | <template v-for="(item, index) in headerData" v-if="item.status == 1"> |
| 14 | <!-- 自定义插槽 --> | 14 | <!-- 自定义插槽 --> |
| 15 | <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align" | 15 | <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align" | ... | ... |
| ... | @@ -135,7 +135,7 @@ export default { | ... | @@ -135,7 +135,7 @@ export default { |
| 135 | type: "warning", | 135 | type: "warning", |
| 136 | }).then(() => { | 136 | }).then(() => { |
| 137 | this.$store.dispatch("LogOut").then(() => { | 137 | this.$store.dispatch("LogOut").then(() => { |
| 138 | - location.href = "/index"; | 138 | + this.$router.push('/login') |
| 139 | // window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转 | 139 | // window.location.href = "https://test.secure.fedex.com/logout";//wsso系统跳转 |
| 140 | }); | 140 | }); |
| 141 | }); | 141 | }); | ... | ... |
| ... | @@ -90,7 +90,7 @@ export const constantRoutes = [ | ... | @@ -90,7 +90,7 @@ export const constantRoutes = [ |
| 90 | ] | 90 | ] |
| 91 | 91 | ||
| 92 | export default new Router({ | 92 | export default new Router({ |
| 93 | - mode: 'hash', // 去掉url中的# | 93 | + mode: 'history', // 去掉url中的# |
| 94 | scrollBehavior: () => ({ y: 0 }), | 94 | scrollBehavior: () => ({ y: 0 }), |
| 95 | routes: constantRoutes, | 95 | routes: constantRoutes, |
| 96 | base: settings.routerBase, | 96 | base: settings.routerBase, | ... | ... |
-
Please register or login to post a comment