diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue similarity index 57% rename from src/pages/Shelving/Parking/Card/ParkingBasicData.vue rename to src/pages/Parking/Card/ParkingBasicData.vue index e5b886eff..5f3e824e1 100644 --- a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue +++ b/src/pages/Parking/Card/ParkingBasicData.vue @@ -30,29 +30,23 @@ const filter = { diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue similarity index 95% rename from src/pages/Shelving/Parking/Card/ParkingCard.vue rename to src/pages/Parking/Card/ParkingCard.vue index 1dfc51173..74d021fff 100644 --- a/src/pages/Shelving/Parking/Card/ParkingCard.vue +++ b/src/pages/Parking/Card/ParkingCard.vue @@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore'; import { useArrayData } from 'src/composables/useArrayData'; import LeftMenu from 'components/LeftMenu.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; -import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue'; +import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue'; const stateStore = useStateStore(); const { t } = useI18n(); diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingDescriptor.vue rename to src/pages/Parking/Card/ParkingDescriptor.vue diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Parking/Card/ParkingLog.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingLog.vue rename to src/pages/Parking/Card/ParkingLog.vue diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue similarity index 100% rename from src/pages/Shelving/Parking/Card/ParkingSummary.vue rename to src/pages/Parking/Card/ParkingSummary.vue diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue similarity index 100% rename from src/pages/Shelving/Parking/ParkingFilter.vue rename to src/pages/Parking/ParkingFilter.vue diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue similarity index 100% rename from src/pages/Shelving/Parking/ParkingList.vue rename to src/pages/Parking/ParkingList.vue diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue deleted file mode 100644 index 66ce78f23..000000000 --- a/src/pages/Shelving/Parking/ParkingMain.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js index 565a9eec6..993400f75 100644 --- a/src/router/modules/parking.js +++ b/src/router/modules/parking.js @@ -8,33 +8,16 @@ export default { icon: 'garage_home', }, component: RouterView, - redirect: { name: 'ParkingMain' }, + redirect: { name: 'ParkingCard' }, menus: { - main: ['ParkingList'], + main: [], card: ['ParkingBasicData', 'ParkingLog'], }, children: [ { - path: '', - name: 'ParkingMain', - component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), - redirect: { name: 'ParkingList' }, - children: [ - { - path: 'list', - name: 'ParkingList', - meta: { - title: 'parkingList', - icon: 'view_list', - }, - component: () => import('src/pages/Shelving/Parking/ParkingList.vue'), - }, - ], - }, - { - path: ':id', + path: '/parking/:id', name: 'ParkingCard', - component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'), + component: () => import('src/pages/Parking/Card/ParkingCard.vue'), redirect: { name: 'ParkingSummary' }, children: [ { @@ -44,8 +27,7 @@ export default { title: 'summary', icon: 'view_list', }, - component: () => - import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'), + component: () => import('src/pages/Parking/Card/ParkingSummary.vue'), }, { name: 'ParkingBasicData', @@ -54,8 +36,7 @@ export default { title: 'basicData', icon: 'vn:settings', }, - component: () => - import('pages/Shelving/Parking/Card/ParkingBasicData.vue'), + component: () => import('pages/Parking/Card/ParkingBasicData.vue'), }, { name: 'ParkingLog', @@ -64,8 +45,7 @@ export default { title: 'log', icon: 'history', }, - component: () => - import('src/pages/Shelving/Parking/Card/ParkingLog.vue'), + component: () => import('src/pages/Parking/Card/ParkingLog.vue'), }, ], }, diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js index 92e479f27..af2605c93 100644 --- a/src/router/modules/shelving.js +++ b/src/router/modules/shelving.js @@ -37,6 +37,15 @@ export default { }, component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'), }, + { + path: '/parking', + name: 'ParkingList', + meta: { + title: 'parkingList', + icon: 'view_list', + }, + component: () => import('src/pages/Parking/ParkingList.vue'), + }, ], }, { @@ -74,14 +83,5 @@ export default { }, ], }, - { - path: 'parking', - name: 'ParkingList', - meta: { - title: 'parkingList', - icon: 'view_list', - }, - component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'), - }, ], };