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 0000000..5834495 Binary files /dev/null and b/src/views/kpi/assessment/stepList/img/right.jpg differ 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 0000000..38ba635 Binary files /dev/null and b/src/views/kpi/assessment/stepList/img/shu.jpg differ 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">