diff --git a/src/assets/img/shuju/bg.jpg b/src/assets/img/shuju/bg.jpg new file mode 100644 index 00000000..feab0f9d Binary files /dev/null and b/src/assets/img/shuju/bg.jpg differ diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index da5ddef9..0732019c 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -2,10 +2,16 @@ @import "./variables.scss"; // $navbar--height: 60px; +body { +} /* Reset element-ui ------------------------------ */ .g-bd { + background-image: url(../img/shuju/bg.jpg); + background-size: cover; + background-position: center 0; + .el-card + .el-card { margin-top: 15px; } @@ -317,6 +323,9 @@ } } .el-menu-item { + i { + color: #fff; + } &:focus, &:hover { background-color: transparent !important; @@ -401,7 +410,7 @@ position: relative; padding: $content--padding; min-height: calc(100vh - #{$navbar--height}); - background-color: #000; + background-color: transparent; &__wrapper { position: relative; diff --git a/src/js/store/index.js b/src/js/store/index.js index 8eaa5b65..335b5689 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -27,11 +27,11 @@ export default new Vuex.Store({ contentTabs: [ { ...window.SITE_CONFIG["contentTabDefault"], - name: "home", - title: "home", + name: "indexWork", + title: "indexWork", }, ], - contentTabsActiveName: "home", + contentTabsActiveName: "indexWork", mainShuju: { menuList: [], diff --git a/src/router/index.js b/src/router/index.js index 77937f91..67824687 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,11 +34,13 @@ export const pageRoutes = [{ } }, { - path: '/loginWork', - component: () => import('@/views/pages/loginWork'), - name: 'loginWork', + path: '/', + name: 'index', + redirect: { + name: 'indexWork' + }, meta: { - title: '工作端登录' + title: '首页' } }, { @@ -53,7 +55,7 @@ export const pageRoutes = [{ // 模块路由(基于主入口布局页面) export const moduleRoutes = { - path: '/', + path: '/main', component: () => import('@/views/main'), name: 'main', redirect: { @@ -76,7 +78,7 @@ export const moduleRoutes = { // 模块路由(基于主入口布局页面) 可视化数据 export const moduleShujuRoutes = { - path: '/', + path: '/main-shuju', component: () => import('@/views/main-shuju/main'), name: 'main-shuju', redirect: { diff --git a/src/store/index.js b/src/store/index.js index f7f2ca77..a92e7e3f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -23,11 +23,11 @@ export default new Vuex.Store({ contentTabs: [ { ...window.SITE_CONFIG['contentTabDefault'], - 'name': 'home', - 'title': 'home' + 'name': 'indexWork', + 'title': 'indexWork' } ], - contentTabsActiveName: 'home', + contentTabsActiveName: 'indexWork', mainShuju: { menuList: [], diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 6d470b37..b2da8855 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -93,3 +93,6 @@ export default { } } + + + diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index df9555f2..4891afad 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -242,5 +242,6 @@ export default { background: #eeeeee; } + diff --git a/src/views/pages/indexWork.vue b/src/views/pages/indexWork.vue index 6048c4c2..d9012cce 100644 --- a/src/views/pages/indexWork.vue +++ b/src/views/pages/indexWork.vue @@ -83,4 +83,4 @@ export default { } - + diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index d93c8a43..5874b2b9 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -289,4 +289,4 @@ export default { } - + diff --git a/src/views/pages/loginWork.vue b/src/views/pages/loginWork.vue deleted file mode 100644 index 2297c818..00000000 --- a/src/views/pages/loginWork.vue +++ /dev/null @@ -1,293 +0,0 @@ - - - -