diff --git a/src/components/kpi-layout/SmallNav.vue b/src/components/kpi-layout/SmallNav.vue index db6bbd0..23d6b4a 100644 --- a/src/components/kpi-layout/SmallNav.vue +++ b/src/components/kpi-layout/SmallNav.vue @@ -31,7 +31,7 @@ export default { handleBack () { const name = this.$route.query.name if (name) { - return this.$router.replace({name: 'assessment-homeList'}) + return this.$router.replace({name: name.replace('/', '-')}) } this.$router.go(-1) } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 1e461a0..0f6a26c 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -255,6 +255,13 @@ export default { i.staffId = i.id i.staffName = i.name i.isSelect = 1 + this.GroundList = this.GroundList.map(j => { + if (i.staffId === j.staffId) { + i = Object.assign({}, j, i) + j.isSelect = 1 + } + return j + }) return i }) const a = this.$personlGetForm(res.staffs) diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue index 59f7cbe..0811a4d 100644 --- a/src/views/kpi/workbench/initiateAssessment/index.vue +++ b/src/views/kpi/workbench/initiateAssessment/index.vue @@ -209,7 +209,7 @@ export default { this.$message.error(res.msg) return } - this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: '1' } }) + this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: 'assessment/homeList' } }) this.$message({ message: res.msg, type: 'success'