diff --git a/src/components/PopupRight/index.vue b/src/components/PopupRight/index.vue index c4c8c07..c3dd159 100644 --- a/src/components/PopupRight/index.vue +++ b/src/components/PopupRight/index.vue @@ -76,8 +76,7 @@ export default { this.$emit('update:show', false) }, getRight () { - this.isShow = false - this.$emit('update:show', false) + this.$emit('cancel') } } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 25da832..739599a 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -35,7 +35,7 @@ placeholder="请选择考评组管理员" readonly :value="Ground.title?(Ground.title+ ' 等'+ Ground.list.length + '人'):''"> - +
设置哪些管理员可以管理该考评组
@@ -51,7 +51,7 @@ size="small" :value ="showData.title + '等' + showData.list.length + '个部门' || '请选择部门'" readonly> - + @@ -62,7 +62,7 @@ size="small" :value ="personnelList.title + '等' + personnelList.list.length + '个人'" readonly> - + @@ -81,7 +81,7 @@ size="small" :value ="outIdsLsit.title + '等' + outIdsLsit.list.length + '个人'" readonly> - + diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue index 9585288..36d7a8c 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue @@ -314,12 +314,13 @@ export default { }, // 更具维度id获取维度名称 handleWeiDu (item) { - return this.dimensionsList.filter(i => i.id === item.type)[0].length > 0 ? this.dimensionsList.filter(i => i.id === item.type)[0].length.name : '' + return this.dimensionsList.filter(i => i.id === item.type).length > 0 ? this.dimensionsList.filter(i => i.id === item.type)[0].name : '' }, // 获取维度类型 async handleGetDimensions () { try { let res = await getDimensions() + console.log('res: ', res) if (res.code !== 200) { this.dimensionsList = [] return diff --git a/src/views/kpi/workbench/home/index.vue b/src/views/kpi/workbench/home/index.vue index e0e8b53..56dc261 100644 --- a/src/views/kpi/workbench/home/index.vue +++ b/src/views/kpi/workbench/home/index.vue @@ -169,7 +169,7 @@ export default { } &-right{ box-sizing: border-box; - width: 330px; + width: 600px; min-height: 100px; padding: 25px 20px; &-content{ diff --git a/src/views/kpi/workbench/home/report.vue b/src/views/kpi/workbench/home/report.vue index 3f3e7f4..99f5034 100644 --- a/src/views/kpi/workbench/home/report.vue +++ b/src/views/kpi/workbench/home/report.vue @@ -18,6 +18,9 @@ export default { data () { return { option: { + title: { + text: '个人成长曲线' + }, color: ['#3398DB'], tooltip: { trigger: 'axis',