diff --git a/src/views/kpi/report/detail/index.vue b/src/views/kpi/report/detail/index.vue index 21cf0a7..57679c9 100644 --- a/src/views/kpi/report/detail/index.vue +++ b/src/views/kpi/report/detail/index.vue @@ -124,8 +124,8 @@ export default { watch: { showDialogDepart (newV, oldV) { if (!newV && oldV) { - this.selectDepName = this.showData.list[0].departmentName - this.selectDepId = this.showData.list[0].departmentId + this.selectDepName = this.showData.list.length > 0 ? this.showData.list[0].departmentName : '全部' + this.selectDepId = this.showData.list.length > 0 ? this.showData.list[0].departmentId : '' this.handleDetailReq(this.selectDepId) } } diff --git a/src/views/kpi/report/home/index.vue b/src/views/kpi/report/home/index.vue index 6022a47..04f51ad 100644 --- a/src/views/kpi/report/home/index.vue +++ b/src/views/kpi/report/home/index.vue @@ -49,26 +49,33 @@
- - - - - - - + + + + + + + - +
@@ -134,7 +141,6 @@ export default { type: 'shadow' }, formatter (params) { - console.log('params: ', params) for (let x in params) { return '考核部门:' + params[x].axisValueLabel + '
考核人数:' + params[x].value } @@ -180,6 +186,17 @@ export default { type: 'shadow' } }, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'shadow' + }, + formatter (params) { + for (let x in params) { + return '绩效等级:' + params[x].axisValueLabel + '
实际分布:' + params[x].value + } + } + }, grid: { left: '3%', right: '4%', @@ -405,7 +422,7 @@ export default { padding-left: 20px; } .num_report { - width: 420px; + width: 500px; display: flex; flex-direction: column; }