diff --git a/src/views/modules/kpi/kpiformula-add-or-update.vue b/src/views/modules/kpi/formula-add-or-update.vue
similarity index 90%
rename from src/views/modules/kpi/kpiformula-add-or-update.vue
rename to src/views/modules/kpi/formula-add-or-update.vue
index 73e411cd..138433d5 100644
--- a/src/views/modules/kpi/kpiformula-add-or-update.vue
+++ b/src/views/modules/kpi/formula-add-or-update.vue
@@ -10,9 +10,9 @@
-
-
-
+
+
+
@@ -87,7 +87,7 @@ export default {
},
// 获取信息
getInfo () {
- this.$http.get(`/kpi/kpiformula/${this.dataForm.id}`).then(({ data: res }) => {
+ this.$http.get(`/kpi/formula/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -103,7 +103,7 @@ export default {
if (!valid) {
return false
}
- this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpiformula/', this.dataForm).then(({ data: res }) => {
+ this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/formula/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
diff --git a/src/views/modules/kpi/kpiformula.vue b/src/views/modules/kpi/formula.vue
similarity index 78%
rename from src/views/modules/kpi/kpiformula.vue
rename to src/views/modules/kpi/formula.vue
index e1250557..542f73ff 100644
--- a/src/views/modules/kpi/kpiformula.vue
+++ b/src/views/modules/kpi/formula.vue
@@ -18,14 +18,11 @@
-
-
+
-
-
-
-
+
+
@@ -51,15 +48,15 @@
diff --git a/src/views/modules/kpi/kpimanualscore-add-or-update.vue b/src/views/modules/kpi/manualScore-add-or-update.vue
similarity index 75%
rename from src/views/modules/kpi/kpimanualscore-add-or-update.vue
rename to src/views/modules/kpi/manualScore-add-or-update.vue
index df8cc90a..20e0252f 100644
--- a/src/views/modules/kpi/kpimanualscore-add-or-update.vue
+++ b/src/views/modules/kpi/manualScore-add-or-update.vue
@@ -40,16 +40,7 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -72,10 +63,6 @@ export default {
score: '',
scoreStartDate: '',
scoreEndDate: '',
- parentDeptIds: '',
- parentDeptNames: '',
- allDeptIds: '',
- allDeptNames: '',
scoreStartMonth: ''
},
kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
@@ -85,14 +72,12 @@ export default {
}
},
created () {
- this.$http
- .get(`/sys/user/deptOptions/getByLoginUser`)
- .then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- }
- this.deptIdOptions = res.data.options
- })
+ this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.deptIdOptions = res.data.options
+ })
.catch(() => {})
},
watch: {
@@ -124,18 +109,6 @@ export default {
],
scoreEndDate: [
{ required: false, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- parentDeptIds: [
- { required: false, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- parentDeptNames: [
- { required: false, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- allDeptIds: [
- { required: false, message: this.$t('validate.required'), trigger: 'blur' }
- ],
- allDeptNames: [
- { required: false, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
@@ -159,7 +132,7 @@ export default {
},
// 获取信息
getInfo () {
- this.$http.get(`/kpi/kpimanualscore/${this.dataForm.id}`).then(({ data: res }) => {
+ this.$http.get(`/kpi/manualScore/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -175,7 +148,7 @@ export default {
if (!valid) {
return false
}
- this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpimanualscore/', this.dataForm).then(({ data: res }) => {
+ this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/manualScore/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -192,7 +165,7 @@ export default {
})
}, 1000, { 'leading': true, 'trailing': false }),
getKpiManualRule () {
- this.$http.get(`/kpi/kpirule/getKpiManualRule/`).then(({ data: res }) => {
+ this.$http.get(`/kpi/rule/getKpiManualRule/`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
diff --git a/src/views/modules/kpi/kpimanualscore.vue b/src/views/modules/kpi/manualScore.vue
similarity index 62%
rename from src/views/modules/kpi/kpimanualscore.vue
rename to src/views/modules/kpi/manualScore.vue
index 54f13077..2522ed36 100644
--- a/src/views/modules/kpi/kpimanualscore.vue
+++ b/src/views/modules/kpi/manualScore.vue
@@ -2,6 +2,14 @@
+
+
+
- 上传
+ 导入打分结果
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
{{ $t('update') }}
@@ -78,23 +79,13 @@
-
-
-
-
+
+
+
+
- 确定
+ 确定
@@ -103,7 +94,7 @@
diff --git a/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue b/src/views/modules/kpi/manualScoreRule-add-or-update.vue
similarity index 95%
rename from src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
rename to src/views/modules/kpi/manualScoreRule-add-or-update.vue
index f9d042fb..486704f9 100644
--- a/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
+++ b/src/views/modules/kpi/manualScoreRule-add-or-update.vue
@@ -86,7 +86,7 @@ export default {
},
// 获取信息
getInfo () {
- this.$http.get(`/kpi/kpimanualscorerule/${this.dataForm.id}`).then(({ data: res }) => {
+ this.$http.get(`/kpi/manualScoreRule/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -102,7 +102,7 @@ export default {
if (!valid) {
return false
}
- this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpimanualscorerule/', this.dataForm).then(({ data: res }) => {
+ this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/manualScoreRule/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
diff --git a/src/views/modules/kpi/kpimanualscorerule.vue b/src/views/modules/kpi/manualScoreRule.vue
similarity index 97%
rename from src/views/modules/kpi/kpimanualscorerule.vue
rename to src/views/modules/kpi/manualScoreRule.vue
index 3bee55e5..1ca55d94 100644
--- a/src/views/modules/kpi/kpimanualscorerule.vue
+++ b/src/views/modules/kpi/manualScoreRule.vue
@@ -53,15 +53,15 @@
diff --git a/src/views/modules/kpi/resultGrid.vue b/src/views/modules/kpi/resultGrid.vue
new file mode 100644
index 00000000..2dbacd6e
--- /dev/null
+++ b/src/views/modules/kpi/resultGrid.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ {{ $t('export') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ {{ $t('export') }}
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('query') }}
+
+
+ 新增公式规则
+
+
+ 新增手动打分规则
+
+
+ {{ $t('deleteBatch') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('update') }}
+ {{ $t('delete') }}
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- 考核公式
- 响应率得分A=（议题响应数/议题总数）×50；
- 办结满意率得分B=[(满意数×100%+基本满意数×65%+不满意数×0)/项目总数]
- 履行抓基层党建工作职责得分D=主观打分×50%
- 群众满意度得分E=（A+B）×50%
- 考核总分=D+E
-
-
- {{ $t('add') }}
-
-
- {{ $t('deleteBatch') }}
-
-
-
-
-
-
-
-
- {{ $t('update') }}
- {{ $t('delete') }}
-
-
-
-
-
-
-
-
-
-
- {{ $t('add') }}
-
-
- {{ $t('deleteBatch') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('update') }}
- {{ $t('delete') }}
-
-
-
-
-
-
-
-