From a05c8267eb3620b1b28f747efc109375a4e329cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Fri, 16 Oct 2020 18:05:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/kpi-layout/AppMain.vue | 2 +- src/components/kpi-layout/NavBar.vue | 65 ++---- src/components/kpi-layout/NavHeader.vue | 74 ++++++ src/components/kpi-layout/index.vue | 7 +- src/router/kpi_route.js | 43 ++-- src/style/common.less | 3 +- src/utils/elementConfig.js | 15 +- src/views/kpi/assessment/index.vue | 13 +- src/views/kpi/okr/index.vue | 29 ++- .../assessmentGroup/edit/components/a.js | 2 + .../assessmentGroup/edit/components/basis.vue | 97 ++++++++ .../edit/components/getDepart.vue | 210 ++++++++++++++++++ .../edit/components/process.vue | 30 +++ .../edit/components/templateSet.vue | 27 +++ .../workbench/assessmentGroup/edit/index.vue | 90 ++++++++ .../workbench/assessmentGroup/groundTable.vue | 149 +++++++++++++ .../kpi/workbench/assessmentGroup/index.vue | 14 +- 17 files changed, 788 insertions(+), 82 deletions(-) create mode 100644 src/components/kpi-layout/NavHeader.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/a.js create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/getDepart.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/process.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/index.vue create mode 100644 src/views/kpi/workbench/assessmentGroup/groundTable.vue diff --git a/src/components/kpi-layout/AppMain.vue b/src/components/kpi-layout/AppMain.vue index 0e831cf..d1a203c 100644 --- a/src/components/kpi-layout/AppMain.vue +++ b/src/components/kpi-layout/AppMain.vue @@ -28,7 +28,7 @@ export default { .appamin{ flex: 1; box-sizing: border-box; - padding: 30px 80px 0; + padding: 30px 80px; } diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue index 2d95b78..4337f09 100644 --- a/src/components/kpi-layout/NavBar.vue +++ b/src/components/kpi-layout/NavBar.vue @@ -11,13 +11,13 @@ > {{i.meta.title}} -
+ +
{{name}}
-
+ -->
@@ -102,11 +103,11 @@ export default { number: '10' }, { date: '2016-05-03', - name: '2020年01月绩效考核', + name: '2020年02月绩效考核', number: '10' }, { date: '2016-05-03', - name: '2020年01月绩效考核', + name: '2020年03月绩效考核', number: '10' }, { date: '2016-05-03', diff --git a/src/views/kpi/okr/index.vue b/src/views/kpi/okr/index.vue index 0bc08f1..9c5e4f0 100644 --- a/src/views/kpi/okr/index.vue +++ b/src/views/kpi/okr/index.vue @@ -2,8 +2,10 @@ @@ -11,13 +13,32 @@ OKR export default { data () { return { - + array: [{ + id: 1, + isTrue: true + }, { + id: 2, + isTrue: true + }, { + id: 3, + isTrue: true + }], + arr1: [1, 2] } }, computed: {}, beforeMount () {}, mounted () {}, - methods: {}, + methods: { + bbb (item) { + console.log(145623) + return this.arr1.some(i => i === item.id) + }, + aaa () { + this.arr1 = [] + console.log('this.array: ', this.array) + } + }, watch: {} } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/a.js b/src/views/kpi/workbench/assessmentGroup/edit/components/a.js new file mode 100644 index 0000000..6669575 --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/a.js @@ -0,0 +1,2 @@ +const a = {'msg': '操作成功', 'code': 200, 'data': [{'id': 100, 'name': '霖梓控股', 'children': [{'id': 114, 'name': '其他', 'children': [{'id': 115, 'name': 'qtzy', 'children': [{'id': 117, 'name': '电销'}]}]}, {'id': 102, 'name': '武汉分公司', 'children': [{'id': 109, 'name': '财务部门'}, {'id': 108, 'name': '市场部门'}]}, {'id': 101, 'name': '杭州总公司', 'children': [{'id': 103, 'name': '研发部门', 'children': [{'id': 118, 'name': '研发小组'}, {'id': 119, 'name': '测试二组'}, {'id': 112, 'name': '研发一组', 'children': [{'id': 113, 'name': '测试小组'}]}]}, {'id': 104, 'name': '市场部门'}, {'id': 105, 'name': '测试部门'}, {'id': 106, 'name': '财务部门'}, {'id': 107, 'name': '运维部门'}]}]}]} +export default a.data diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue new file mode 100644 index 0000000..3e2ca14 --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -0,0 +1,97 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/getDepart.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/getDepart.vue new file mode 100644 index 0000000..6d59406 --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/getDepart.vue @@ -0,0 +1,210 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue new file mode 100644 index 0000000..d16b65e --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/process.vue @@ -0,0 +1,30 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue new file mode 100644 index 0000000..5cff186 --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue @@ -0,0 +1,27 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue new file mode 100644 index 0000000..6b7d8cb --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -0,0 +1,90 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/groundTable.vue b/src/views/kpi/workbench/assessmentGroup/groundTable.vue new file mode 100644 index 0000000..3ecda73 --- /dev/null +++ b/src/views/kpi/workbench/assessmentGroup/groundTable.vue @@ -0,0 +1,149 @@ + + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/index.vue b/src/views/kpi/workbench/assessmentGroup/index.vue index 0b83ad0..3ffad5b 100644 --- a/src/views/kpi/workbench/assessmentGroup/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/index.vue @@ -1,17 +1,21 @@ -