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 ad7a0b8..675b604 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 fe6f383..9c918b1 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/src/views/screens/warehouse-overview/index.vue b/src/views/screens/warehouse-overview/index.vue index 48d4b41..fbf941b 100644 --- a/src/views/screens/warehouse-overview/index.vue +++ b/src/views/screens/warehouse-overview/index.vue @@ -209,7 +209,7 @@ - +