diff --git a/src/router/index.js b/src/router/index.js index 85cf483..ff29539 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -57,19 +57,6 @@ export const constantRoutes = [ component: () => import('@/views/login/index'), hidden: true }, - { - path: '/', - component: Layout, - redirect: '/dashboard', - children: [ - { - path: 'dashboard', - component: () => import('@/views/dashboard/index'), - name: 'Dashboard', - meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', iconPart: 'dashboard', affix: true, required: true, requireToken: true } - } - ] - }, // { // path: '/', // component: () => import('@/views/ChoicePart'), @@ -91,6 +78,20 @@ export const constantRoutes = [ component: () => import('@/views/error-page/401'), hidden: true }, + { + path: '/dashboard', + component: Layout, + redirect: '/dashboard', + name: 'Dash', + children: [ + { + path: 'dashboard', + component: () => import('@/views/dashboard/index'), + name: 'Dashboard', + meta: { title: routerTitle.dashboard?.[language] || routerTitle.dashboard.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true } + } + ] + }, { path: '/', component: Layout, diff --git a/src/views/basicData/Warehouse/components/processStorageLink.vue b/src/views/basicData/Warehouse/components/processStorageLink.vue index 34c4116..3e5cfd6 100644 --- a/src/views/basicData/Warehouse/components/processStorageLink.vue +++ b/src/views/basicData/Warehouse/components/processStorageLink.vue @@ -1,8 +1,8 @@ @@ -104,13 +104,13 @@ cursor: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? '#A2A8B5' : '', border: selectStorageList.some( @@ -135,7 +135,7 @@ v-if=" z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' " class="dashboard-layout-item-cricle" :style="{ @@ -164,7 +164,7 @@ {{ z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' ? z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) ].name @@ -233,13 +233,13 @@ cursor: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? '#A2A8B5' : '', border: selectStorageList.some( @@ -264,7 +264,7 @@ v-if=" z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' " class="dashboard-layout-item-cricle" :style="{ @@ -293,7 +293,7 @@ {{ z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' ? z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) ].name @@ -325,13 +325,13 @@ cursor: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? 'not-allowed' : 'pointer', color: z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute === 3 + ].attribute === '3' ? '#A2A8B5' : '', border: selectStorageList.some( @@ -356,7 +356,7 @@ v-if=" z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' " class="dashboard-layout-item-cricle" :style="{ @@ -385,7 +385,7 @@ {{ z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) - ].attribute !== 3 + ].attribute !== '3' ? z.portVoList[ (current - 1) * 80 + (item - 1) * 20 + (x - 1) ].name @@ -457,7 +457,7 @@ export default { this.selectStorageList.splice(0, this.selectStorageList.length) }, setType(item) { - if (item.attribute !== 3) { + if (item.attribute !== '3') { if ( this.selectStorageList.findIndex( StorageItem => StorageItem.locationId === item.id diff --git a/src/views/dashboard/components/PortDetail.vue b/src/views/dashboard/components/PortDetail.vue index 81d6201..b05cd8e 100644 --- a/src/views/dashboard/components/PortDetail.vue +++ b/src/views/dashboard/components/PortDetail.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2020-12-29 16:37:56 * @LastEditors: gtz - * @LastEditTime: 2022-03-17 10:49:54 + * @LastEditTime: 2022-03-18 16:18:38 * @Description: -->