diff --git a/hw-ui/src/components/board/Chart.vue b/hw-ui/src/components/board/Chart.vue new file mode 100644 index 0000000..c27ccfd --- /dev/null +++ b/hw-ui/src/components/board/Chart.vue @@ -0,0 +1,35 @@ + + + diff --git a/hw-ui/src/layout/index2.vue b/hw-ui/src/layout/index2.vue new file mode 100644 index 0000000..c5e8d19 --- /dev/null +++ b/hw-ui/src/layout/index2.vue @@ -0,0 +1,18 @@ + + + + diff --git a/hw-ui/src/store/modules/permission.js b/hw-ui/src/store/modules/permission.js index b3c216a..d32a794 100644 --- a/hw-ui/src/store/modules/permission.js +++ b/hw-ui/src/store/modules/permission.js @@ -2,6 +2,7 @@ import auth from '@/plugins/auth' import router, { constantRoutes, dynamicRoutes } from '@/router' import { getRouters } from '@/api/menu' import Layout from '@/layout/index' +import Layout2 from '@/layout/index2' import ParentView from '@/components/ParentView' import InnerLink from '@/layout/components/InnerLink' @@ -58,7 +59,7 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { if (type && route.children) { route.children = filterChildren(route.children) } - if (route.component) { + if (route.component && !(route.name === 'Board')) { // Layout ParentView 组件特殊处理 if (route.component === 'Layout') { route.component = Layout @@ -70,6 +71,10 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { route.component = loadView(route.component) } } + if(route.name === 'Board'){ + console.log(route) + route.component = Layout2 + } if (route.children != null && route.children && route.children.length) { route.children = filterAsyncRouter(route.children, route, type) } else { diff --git a/hw-ui/src/store/modules/user.js b/hw-ui/src/store/modules/user.js index 766d9c9..909c135 100644 --- a/hw-ui/src/store/modules/user.js +++ b/hw-ui/src/store/modules/user.js @@ -90,7 +90,7 @@ const user = { }) }) }, - + // 退出系统 LogOut({ commit, state }) { return new Promise((resolve, reject) => { diff --git a/hw-ui/src/views/board/firstFloor/index.vue b/hw-ui/src/views/board/firstFloor/index.vue new file mode 100644 index 0000000..db26456 --- /dev/null +++ b/hw-ui/src/views/board/firstFloor/index.vue @@ -0,0 +1,132 @@ + + + + diff --git a/hw-ui/vue.config.js b/hw-ui/vue.config.js index 56cfadb..8b9fb03 100644 --- a/hw-ui/vue.config.js +++ b/hw-ui/vue.config.js @@ -35,7 +35,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://localhost:7080`, + target: `http://175.27.215.92:7080`, + // target: `http://localhost:7080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''