@@ -56,19 +57,23 @@
{{child.scoreComment || '--'}}
+
-
+
-
+
+ {{handleGetScorc()}}
+
+
@@ -135,10 +140,23 @@ export default {
}
},
mounted () {
- console.log('list', this.obj)
this.handleGrt375()
},
methods: {
+ handleGetScorc (obj = this.obj) {
+ const result = obj.recortModelDtos.reduce((result, i) => {
+ i.detailDtos.map(j => {
+ const str = j.calculate.replace(/{\w+}/g, (i) => {
+ i = i.replace(/{|}/g, '')
+ return j[i]
+ })
+ let a = eval(str)
+ result += a
+ })
+ return result
+ }, 0)
+ return result.toFixed(3)
+ },
handleScore (item) {
console.log('this.scoreList: ', this.scoreList)
return this.scoreList.filter(i => i.score === item).length > 0 ? this.scoreList.filter(i => i.score === item)[0].name : 0
@@ -172,7 +190,6 @@ export default {
let res = await apiGet375()
if (res.code !== 200) return
this.scoreList = res.data
- console.log('resssss: ', res)
},
async handleSaveDetail (params = this.obj) {
this.loadingZan = true
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index ba21bab..7883e37 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -90,10 +90,7 @@
-
![]()
+
{{i.staffName}}#{{i.optDesc}}#
@@ -187,6 +184,7 @@ export default {
let res = await apiResultGetDetail({ id })
this.$loadingEnd()
if (res.code !== 200) return this.$message.error(res.msg)
+ res.data.recortModelDtos = res.data.recortModelDtos.concat([{name: '总分', detailDtos: []}])
this.obj = res.data
},
handleRight (item) {
@@ -340,14 +338,14 @@ export default {
margin: 0 4px;
}
&-img {
- width: 30px;
- height: 30px;
+ // width: 30px;
+ // height: 30px;
border-radius: 50%;
overflow: hidden;
margin-right: 10px;
img {
- width: 100%;
- height: 100%;
+ // width: 100%;
+ // height: 100%;
}
}
}
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index d7b6b12..656b05b 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -9,7 +9,7 @@
active-text-color="#3ba1ff"
>
考评组设置
-
默认值设置
+
权限设置
diff --git a/src/views/kpi/workbench/todo/tableItem.vue b/src/views/kpi/workbench/todo/tableItem.vue
index 351f81f..2ceb49f 100644
--- a/src/views/kpi/workbench/todo/tableItem.vue
+++ b/src/views/kpi/workbench/todo/tableItem.vue
@@ -8,7 +8,7 @@
style="border-top: 1px solid #ebebeb;"
max-height="500"
>
-
+
@@ -19,7 +19,7 @@
align="right"
>
- {{scope.row.time}}
+ {{scope.row.time}}