diff --git a/package-lock.json b/package-lock.json index 8b1862d..6724f8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -705,9 +705,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -729,9 +726,6 @@ "arm" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -753,9 +747,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -777,9 +768,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -801,9 +789,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -825,9 +810,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1007,9 +989,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1024,9 +1003,6 @@ "arm" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1041,9 +1017,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1058,9 +1031,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1075,9 +1045,6 @@ "loong64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1092,9 +1059,6 @@ "loong64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1109,9 +1073,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1126,9 +1087,6 @@ "ppc64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1143,9 +1101,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1160,9 +1115,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -1177,9 +1129,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1194,9 +1143,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -1211,9 +1157,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ diff --git a/src/components/DataVLayout.vue b/src/components/DataVLayout.vue new file mode 100644 index 0000000..cc92b40 --- /dev/null +++ b/src/components/DataVLayout.vue @@ -0,0 +1,117 @@ + + + + + diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 22af418..57eaa0c 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -14,9 +14,9 @@ \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index b3255c8..ff0e3bb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,7 +4,7 @@ export const constantRoutes = [ { path: '/', component: () => import('@/layout/index.vue'), - redirect: '/dashboard/demo', + redirect: '/dashboard/acid-rolling', children: [] }, { @@ -12,12 +12,6 @@ export const constantRoutes = [ component: () => import('@/layout/index.vue'), meta: { title: '数据大屏', icon: 'monitor' }, children: [ - { - path: 'demo', - name: 'Demo', - component: () => import('@/modules/dashboardBig/views/index.vue'), - meta: { title: '示例大屏', icon: 'example' } - }, { path: 'order', name: 'Order', diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index bb720ac..1111cf7 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -36,7 +36,7 @@ const actions = { function filterAsyncRoutes(routes) { return routes.filter(route => { if (!route.component || route.component === '') { - route.component = () => import('@/modules/dashboardBig/views/index.vue') + route.component = () => import('@/views/screens/acid-rolling/index.vue') } else if (route.component !== 'Layout') { route.component = loadComponent(route.component) } @@ -51,7 +51,6 @@ function loadComponent(componentPath) { const path = componentPath.replace(/^\//, '').replace(/\.vue$/, '') const componentMap = { 'Layout': () => import('@/layout/index.vue'), - 'modules/dashboardBig/views/index': () => import('@/modules/dashboardBig/views/index.vue'), 'modules/dashboardBig/views/order': () => import('@/modules/dashboardBig/views/order.vue'), 'modules/dashboardBig/views/cost': () => import('@/modules/dashboardBig/views/cost.vue'), 'modules/dashboardBig/views/energy': () => import('@/modules/dashboardBig/views/energy.vue'), @@ -60,7 +59,7 @@ function loadComponent(componentPath) { 'modules/dashboardBig/views/stopAnalysis': () => import('@/modules/dashboardBig/views/stopAnalysis.vue'), 'screens/acid-rolling/index': () => import('@/views/screens/acid-rolling/index.vue') } - return componentMap[path] || (() => import('@/modules/dashboardBig/views/index.vue')) + return componentMap[path] || (() => import('@/views/screens/acid-rolling/index.vue')) } export default { diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..2c8ee2b --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@/*": ["src/*"] + } + } +}