+
diff --git a/src/main.js b/src/main.js
index d2c5e15..457b2ff 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,11 +3,10 @@
import Vue from 'vue'
import App from './App'
import router from './router'
-
import './utils/elementConfig'
+import './utils/permission'
import './style/index.less'
import '@/icons'
-
Vue.config.productionTip = false
/* eslint-disable no-new */
new Vue({
diff --git a/src/router/kpi_route.js b/src/router/kpi_route.js
index 101f773..dcbfae8 100644
--- a/src/router/kpi_route.js
+++ b/src/router/kpi_route.js
@@ -15,7 +15,34 @@ export default [
meta: {
title: '工作台',
isNav: true
+ },
+ redirect: 'workbench/home',
+ children: [{
+ path: 'home',
+ name: 'workbench-home',
+ component: (resolve) => require(['@/views/kpi/workbench/home/index.vue'], resolve),
+ meta: {
+ title: '首页',
+ isNav: true
+ }
+ }, {
+ path: 'todo',
+ name: 'workbench-todo',
+ component: (resolve) => require(['@/views/kpi/workbench/todo/index.vue'], resolve),
+ meta: {
+ title: '待办事项',
+ isNav: true
+ }
+ }, {
+ path: 'group',
+ name: 'workbench-group',
+ component: (resolve) => require(['@/views/kpi/workbench/assessmentGroup/index.vue'], resolve),
+ meta: {
+ title: '考评组设置',
+ isNav: false
+ }
}
+ ]
}, {
path: 'assessment',
name: 'assessment',
@@ -48,21 +75,23 @@ export default [
title: '设置',
isNav: true
}
- }, {
- path: 'home',
- name: 'home',
- component: (resolve) => require(['@/views/kpi/home/index.vue'], resolve),
- meta: {
- title: '智能测试'
- }
- }, {
- path: 'home1',
- name: 'home1',
- component: (resolve) => require(['@/views/kpi/home1/index.vue'], resolve),
- meta: {
- title: '智能测试带弹窗',
- pop: true
- }
- } ]
+ }
+ // , {
+ // path: 'home',
+ // name: 'home',
+ // component: (resolve) => require(['@/views/kpi/home/index.vue'], resolve),
+ // meta: {
+ // title: '智能测试'
+ // }
+ // }, {
+ // path: 'home1',
+ // name: 'home1',
+ // component: (resolve) => require(['@/views/kpi/home1/index.vue'], resolve),
+ // meta: {
+ // title: '智能测试带弹窗',
+ // pop: true
+ // }
+ // }
+ ]
}
]
diff --git a/src/style/common.less b/src/style/common.less
index 745818f..3baf1a2 100644
--- a/src/style/common.less
+++ b/src/style/common.less
@@ -1 +1,19 @@
@borderColor: #ebebeb;
+@fontBlue: #3ba1ff;
+.boderAndRadius{
+ border: 1px solid @borderColor;
+ border-radius:6px ;
+ background: #fff;
+}
+.commonFont {
+ font-size: 16px;
+ color: #52575b;
+}
+.noSelect {
+ -webkit-touch-callout: none;
+ -webkit-user-select: none;
+ -khtml-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
\ No newline at end of file
diff --git a/src/utils/permission.js b/src/utils/permission.js
new file mode 100644
index 0000000..19639ea
--- /dev/null
+++ b/src/utils/permission.js
@@ -0,0 +1,7 @@
+import router from '@/router'
+router.beforeEach((to, from, next) => {
+ next()
+})
+
+router.afterEach(() => {
+})
diff --git a/src/views/kpi/assessment/index.vue b/src/views/kpi/assessment/index.vue
index 3b4bd41..1884a80 100644
--- a/src/views/kpi/assessment/index.vue
+++ b/src/views/kpi/assessment/index.vue
@@ -15,7 +15,7 @@
-
+
diff --git a/src/views/kpi/workbench/assessmentGroup/index.vue b/src/views/kpi/workbench/assessmentGroup/index.vue
new file mode 100644
index 0000000..0b83ad0
--- /dev/null
+++ b/src/views/kpi/workbench/assessmentGroup/index.vue
@@ -0,0 +1,27 @@
+
+
+
+ 考评组
+
+
+
+
+
+
diff --git a/src/views/kpi/workbench/home/index.vue b/src/views/kpi/workbench/home/index.vue
new file mode 100644
index 0000000..d7d0f60
--- /dev/null
+++ b/src/views/kpi/workbench/home/index.vue
@@ -0,0 +1,110 @@
+
+
+
+
+
+
+
快捷入口
+
+
考核管理
+
考评组
+
发起考核
+
指标库
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/kpi/workbench/home/report.vue b/src/views/kpi/workbench/home/report.vue
new file mode 100644
index 0000000..3f3e7f4
--- /dev/null
+++ b/src/views/kpi/workbench/home/report.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
diff --git a/src/views/kpi/workbench/index.vue b/src/views/kpi/workbench/index.vue
index 75ab06b..bf07fcd 100644
--- a/src/views/kpi/workbench/index.vue
+++ b/src/views/kpi/workbench/index.vue
@@ -1,7 +1,6 @@
-
- 考核管理
+
@@ -23,11 +22,6 @@ export default {
-
diff --git a/src/views/kpi/workbench/todo/index.vue b/src/views/kpi/workbench/todo/index.vue
new file mode 100644
index 0000000..65b8dcb
--- /dev/null
+++ b/src/views/kpi/workbench/todo/index.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+