diff --git a/back/src/assets/font/convergence-typeface.ttf b/back/src/assets/font/convergence-typeface.ttf new file mode 100644 index 00000000..e651bf53 Binary files /dev/null and b/back/src/assets/font/convergence-typeface.ttf differ diff --git a/back/src/assets/font/header-typeface.ttf b/back/src/assets/font/header-typeface.ttf new file mode 100644 index 00000000..61ed7a82 Binary files /dev/null and b/back/src/assets/font/header-typeface.ttf differ diff --git a/back/src/assets/font/num-typeface.otf b/back/src/assets/font/num-typeface.otf new file mode 100644 index 00000000..b4608d06 Binary files /dev/null and b/back/src/assets/font/num-typeface.otf differ diff --git a/back/src/assets/font/text-typeface.otf b/back/src/assets/font/text-typeface.otf new file mode 100644 index 00000000..091f56d1 Binary files /dev/null and b/back/src/assets/font/text-typeface.otf differ diff --git a/back/src/assets/img/activitiMyWorkDynamics/header-bak.png b/back/src/assets/img/activitiMyWorkDynamics/header-bak.png new file mode 100644 index 00000000..fe65d63f Binary files /dev/null and b/back/src/assets/img/activitiMyWorkDynamics/header-bak.png differ diff --git a/back/src/assets/img/activitiMyWorkDynamics/no-img.png b/back/src/assets/img/activitiMyWorkDynamics/no-img.png new file mode 100644 index 00000000..bd051790 Binary files /dev/null and b/back/src/assets/img/activitiMyWorkDynamics/no-img.png differ diff --git a/back/src/router/index.js b/back/src/router/index.js index 6c6a8b21..de422fdd 100644 --- a/back/src/router/index.js +++ b/back/src/router/index.js @@ -5,6 +5,13 @@ import { isURL } from '@/utils/validate' import store from '@/store' import Cookies from 'js-cookie' + +// 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题 +const originalPush = Router.prototype.push +Router.prototype.push = function push(location) { + return originalPush.call(this, location).catch(err => err) +} + Vue.use(Router) // 页面路由(独立页面) diff --git a/back/src/store/index.js b/back/src/store/index.js index c63854c2..f7821bab 100644 --- a/back/src/store/index.js +++ b/back/src/store/index.js @@ -12,7 +12,7 @@ export default new Vuex.Store({ // 导航条, 布局风格, default(白色) / colorful(鲜艳) navbarLayoutType: 'colorful', // 侧边栏, 布局皮肤, default(白色) / dark(黑色) - sidebarLayoutSkin: 'dark', + sidebarLayoutSkin: 'default', // 侧边栏, 折叠状态 sidebarFold: false, // 侧边栏, 菜单 diff --git a/back/src/views/main-navbar.vue b/back/src/views/main-navbar.vue index 0667ace4..adb8b4fe 100644 --- a/back/src/views/main-navbar.vue +++ b/back/src/views/main-navbar.vue @@ -1,81 +1,124 @@ + diff --git a/back/src/views/main-sidebar-sub-menu.vue b/back/src/views/main-sidebar-sub-menu.vue index e4b604ec..6630a7e1 100644 --- a/back/src/views/main-sidebar-sub-menu.vue +++ b/back/src/views/main-sidebar-sub-menu.vue @@ -1,89 +1,135 @@ diff --git a/back/src/views/main-theme-tools.vue b/back/src/views/main-theme-tools.vue index 867e9871..e83d008c 100644 --- a/back/src/views/main-theme-tools.vue +++ b/back/src/views/main-theme-tools.vue @@ -1,21 +1,34 @@