diff --git a/.gitignore b/.gitignore index 20d50575..1d85f8ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ back/dist-西海岸-后台管理.zip +front/public/index.html +front/public/index.html +back/public/index.html +back/dist-西海岸-后台管理-带配置文件.zip +back/dist-市局-后台管理-带配置文件.zip +front/public/index.html diff --git a/back/public/index.html b/back/public/index.html index e33d81d8..59ed843e 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-13 11:21:09 + * @LastEditTime: 2022-06-20 16:20:34 * @Description: 告诉大家这是什么 --> @@ -29,7 +29,8 @@ }; // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/#/vueTemplateDemo'; // window.SITE_CONFIG['frontUrl'] = 'http://124.222.94.39:9796/#/vueTemplateDemo'; - window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + // window.SITE_CONFIG['frontUrl'] = 'http://15.72.183.90:7008/#/vueTemplateDemo'; + window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9797/#/vueTemplateDemo'; window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表（后台返回，未做处理） window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限（后台返回，未做处理） window.SITE_CONFIG['dynamicRoutes'] = []; // 动态路由列表 @@ -70,7 +71,8 @@ // window.SITE_CONFIG['apiURL'] = 'http://124.222.94.39:8888/renren-admin'; // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; - window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; + // window.SITE_CONFIG['apiURL'] = 'http://15.72.183.90:8000/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // WebSocket地址 window.SITE_CONFIG['socketURL'] ='ws://localhost:8080/renren-admin/websocket'; 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 @@