From 29555b7c085c9d26c42cba2eee068397b49403ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Mon, 26 Oct 2020 18:16:40 +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/api/assessment.js | 19 ++ src/components/kpi-layout/AppMain.vue | 5 +- src/components/kpi-layout/NavBar.vue | 2 +- src/components/kpi-layout/SmallNav.vue | 23 +- src/router/kpi_route.js | 28 +++ src/utils/elementConfig.js | 5 +- src/views/kpi/assessment/homeList/index.vue | 236 ++++++++++++++++++ src/views/kpi/assessment/index.vue | 165 +----------- .../kpi/assessment/performance/index.vue | 148 +++++++++++ .../kpi/assessment/stepList/img/right.jpg | Bin 0 -> 818 bytes src/views/kpi/assessment/stepList/img/shu.jpg | Bin 0 -> 722 bytes src/views/kpi/assessment/stepList/index.vue | 190 ++++++++++++++ .../workbench/assessmentGroup/edit/index.vue | 1 + .../workbench/assessmentGroup/groundTable.vue | 2 +- 14 files changed, 654 insertions(+), 170 deletions(-) create mode 100644 src/api/assessment.js create mode 100644 src/views/kpi/assessment/homeList/index.vue create mode 100644 src/views/kpi/assessment/performance/index.vue create mode 100644 src/views/kpi/assessment/stepList/img/right.jpg create mode 100644 src/views/kpi/assessment/stepList/img/shu.jpg create mode 100644 src/views/kpi/assessment/stepList/index.vue diff --git a/src/api/assessment.js b/src/api/assessment.js new file mode 100644 index 0000000..8bd40f9 --- /dev/null +++ b/src/api/assessment.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 考核任务列表 +export function apiGetAssessList (query) { + return request({ + url: '/lz_management/performance/assess/manager/list', + method: 'post', + data: query + }) +} + +// 删除考核任务 +export function apiDeleteAssessList (query) { + return request({ + url: '/lz_management/performance/assess/manager/delete', + method: 'get', + params: query + }) +} diff --git a/src/components/kpi-layout/AppMain.vue b/src/components/kpi-layout/AppMain.vue index d1a203c..c85d174 100644 --- a/src/components/kpi-layout/AppMain.vue +++ b/src/components/kpi-layout/AppMain.vue @@ -26,9 +26,10 @@ export default { diff --git a/src/components/kpi-layout/NavBar.vue b/src/components/kpi-layout/NavBar.vue index 4337f09..d7fa7f2 100644 --- a/src/components/kpi-layout/NavBar.vue +++ b/src/components/kpi-layout/NavBar.vue @@ -77,7 +77,7 @@ export default { left: 0; } .navBar{ - position: relative; + position: fixed; z-index: 4; width: 100%; height: @headerHeight; diff --git a/src/components/kpi-layout/SmallNav.vue b/src/components/kpi-layout/SmallNav.vue index 32000ab..9b44896 100644 --- a/src/components/kpi-layout/SmallNav.vue +++ b/src/components/kpi-layout/SmallNav.vue @@ -1,13 +1,20 @@ + + + diff --git a/src/views/kpi/assessment/index.vue b/src/views/kpi/assessment/index.vue index bf31610..bf07fcd 100644 --- a/src/views/kpi/assessment/index.vue +++ b/src/views/kpi/assessment/index.vue @@ -1,180 +1,27 @@ - - diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue new file mode 100644 index 0000000..cc102fd --- /dev/null +++ b/src/views/kpi/assessment/performance/index.vue @@ -0,0 +1,148 @@ + + + + + + diff --git a/src/views/kpi/assessment/stepList/img/right.jpg b/src/views/kpi/assessment/stepList/img/right.jpg new file mode 100644 index 0000000000000000000000000000000000000000..58344950f5e8140ed690315611b2a10b8fa347ba GIT binary patch literal 818 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTivwh= zDOELf4NWZ*Q!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ z&aO$5r%atTea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds z_3+W-Cr_U}fAR9w$4{TXeEs(Q$Io9Ne=#yJL%ap|8JfQYf&OA*VPR%r2lxYE z#}NLy#lXYN2#h>tK?ZwjZQaLHb9ak>dVXooWw%K7eufYGrotFF&pZFIWC6d=Z;i>%bc;CuGt6^;`bT5AUTDGOP5KGvn_U@->+~*f zotr0JZOwUXe!kxOt#{ns%badnYO{=?aS}()H=D3|or`Y#sJmpLlW?nhPE8koP&MPL Tj71G5QUb?K0$myE|K9`v=Jh1! literal 0 HcmV?d00001 diff --git a/src/views/kpi/assessment/stepList/img/shu.jpg b/src/views/kpi/assessment/stepList/img/shu.jpg new file mode 100644 index 0000000000000000000000000000000000000000..38ba635d42bf233291caa1aab142425947a6ed06 GIT binary patch literal 722 zcmex=``2_j6xdp@o1cgOJMMZh|#U;coyG6VInuyV4pa*FVB^NNrR z{vTivwh= zDOELf4NWZ*Q!{f5ODks=S2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ z&aO$5r%atTea6gLixw|gx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds z_3+W-Cr_U}fAR9w$4{TXeEs(Q$Io9Ne=#yJL%ap|8JfQYf&OA*VPR%r2lxYE z#}NLy#lXYN2#h>tK?Zwn>OR z`~EVn@^Su8jenf~8MeRwE41~6iR39?YvuEM3XdP@X95a-d%N#PYjIrjmh1C>JpbqZ VpMksn_Vs^VQD3-Nb>VT`wjpA literal 0 HcmV?d00001 diff --git a/src/views/kpi/assessment/stepList/index.vue b/src/views/kpi/assessment/stepList/index.vue new file mode 100644 index 0000000..987409f --- /dev/null +++ b/src/views/kpi/assessment/stepList/index.vue @@ -0,0 +1,190 @@ + + + + + + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index 0ac623e..41affd4 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -92,6 +92,7 @@ export default { this.$message({ message: '保存成功', type: 'success', + duration: 1000, onClose: () => { this.$router.replace({name: 'workbench-group'}) } diff --git a/src/views/kpi/workbench/assessmentGroup/groundTable.vue b/src/views/kpi/workbench/assessmentGroup/groundTable.vue index ad79ccf..e7ce85c 100644 --- a/src/views/kpi/workbench/assessmentGroup/groundTable.vue +++ b/src/views/kpi/workbench/assessmentGroup/groundTable.vue @@ -59,7 +59,7 @@ small @current-change="handleChangePage" layout="prev, pager, next" - page-size.sync='params.pageSize' + :page-size.sync='params.pageSize' :total="params.totalCount">