diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 9bad764..e344365 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -89,7 +89,7 @@ export default { title: '系统配置' }, { - icon: 'el-icon-s-check', + icon: 'el-icon-box', index: '/parner', title: '合伙管理' }, @@ -99,15 +99,20 @@ export default { title: '合伙运营' }, { - icon: 'el-icon-s-shop', + icon: 'el-icon-shopping-cart-2', index: '/shop', title: '商城管理' }, { - icon: 'el-icon-s-shop', + icon: 'el-icon-data-board', index: '/theoryExam', title: '考试平台' }, + { + icon: 'el-icon-document-copy', + index: '/review', + title: '评阅平台' + }, ], menus: [], onRoutes: this.$route.path diff --git a/src/router/index.js b/src/router/index.js index a766c71..a1d72d1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -219,6 +219,10 @@ let router = new Router({ path: '/theoryExam', component: () => import('../views/theoryExam'), }, + { + path: '/review', + component: () => import('../views/review'), + }, { path: '/404', component: () => import('../views/404.vue'), diff --git a/src/setting.js b/src/setting.js index ab9dacd..77f0b79 100644 --- a/src/setting.js +++ b/src/setting.js @@ -51,7 +51,7 @@ const Setting = { isDev, isPro, // 是否使用动态路由 - dynamicRoute: true, + dynamicRoute: false, /** * @description 默认密码 */ diff --git a/src/views/review/index.vue b/src/views/review/index.vue new file mode 100644 index 0000000..194230b --- /dev/null +++ b/src/views/review/index.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue index 53b95a1..f22c984 100644 --- a/src/views/system/staff.vue +++ b/src/views/system/staff.vue @@ -4,8 +4,7 @@
后台员工账号
- +
所有员工
@@ -17,40 +16,25 @@
-
组织架构
- 添加 +
组织架构
+ 添加
- - + + {{ node.label }} - + - + - + @@ -58,36 +42,22 @@
- - - - + + + + {{ orgForm.parentName }} - + - + 取 消 - 确 定 + 确 定
@@ -97,195 +67,96 @@
- 新增员工 - 批量导入 + 新增员工 + 批量导入
- - - - - - - - - - + + + + + + + + + + - - - - + + + + - - + + - - + + - - + + - + - - + + - - + + - + 取消 - 确定 + 确定 - +
- 模板下载 + 模板下载
- - 上传文件 + + 上传文件 - 部分数据导入失败,查看失败原因 + 部分数据导入失败,查看失败原因
- - 取 消 - 确 定 + + 取 消 + 确 定
@@ -868,27 +739,32 @@ export default { \ No newline at end of file diff --git a/src/views/theoryExam/index.vue b/src/views/theoryExam/index.vue index 3b12947..b21d3b0 100644 --- a/src/views/theoryExam/index.vue +++ b/src/views/theoryExam/index.vue @@ -16,12 +16,7 @@ export default { mounted () { const cache = localStorage.getItem('examPath') // 理论考试平台每次跳转都会往localStorage存路径 let url = `${location.origin}/examination/` - if (Setting.isDev) { - url = `http://192.168.31.125:8098/` - } else if (Setting.isPro) { - const { host } = location - url = `https://${host === 'dev.huorantech.cn' ? host : 'www.huorantech.cn'}/examination/` - } + if (Setting.isDev) url = `http://192.168.31.125:8098/` if (cache) { url += `#${cache}${cache.includes('?') ? `&` : '?'}token=${sessionStorage.getItem('token')}` } else {