From 853eed57dee648446f9fc269aef26268429a418a Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 27 Sep 2024 13:33:51 +0800 Subject: [PATCH] fix --- src/pages/achievement/info/course.vue | 4 +++ src/pages/achievement/info/project.vue | 4 +++ src/pages/match/add/index.vue | 1 + src/pages/match/add/step2.vue | 3 +- src/pages/match/manage/index.vue | 8 ++++-- src/pages/match/manage/matchArchList.vue | 4 +++ src/pages/match/manage/matchSignup.vue | 8 ++++-- src/pages/match/manage/theoryReport.vue | 36 +----------------------- 8 files changed, 27 insertions(+), 41 deletions(-) diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue index 7b24e2d..a48d4cd 100644 --- a/src/pages/achievement/info/course.vue +++ b/src/pages/achievement/info/course.vue @@ -495,6 +495,10 @@ export default { data, type: "line", areaStyle: {}, + label: { + show: true, + position: 'top' + }, color: ["#8191fd"] }] }) diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue index 04d3f33..1973378 100644 --- a/src/pages/achievement/info/project.vue +++ b/src/pages/achievement/info/project.vue @@ -472,6 +472,10 @@ export default { data, type: "line", areaStyle: {}, + label: { + show: true, + position: 'top' + }, color: ["#8191fd"] }] }) diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue index f75dd7b..73a48c8 100644 --- a/src/pages/match/add/index.vue +++ b/src/pages/match/add/index.vue @@ -184,6 +184,7 @@ export default { // 处于第三步 && 编辑 this.editing = 0 this.step = 1 + this.$parent.initTabs && this.$parent.initTabs() } else { // 新增 this.$router.push(`/match`) diff --git a/src/pages/match/add/step2.vue b/src/pages/match/add/step2.vue index 0cb84e9..eeb8a7a 100644 --- a/src/pages/match/add/step2.vue +++ b/src/pages/match/add/step2.vue @@ -322,7 +322,8 @@ export default { let changeLimit = 0 for (const i in form.competitionStageList) { const e = form.competitionStageList[i] - if (e.teamNumLimit !== originForm.competitionStageList[i].teamNumLimit || e.customNumber !== originForm.competitionStageList[i].customNumber) { + const originStage = originForm.competitionStageList[i] + if (!originStage || e.teamNumLimit !== originStage.teamNumLimit || e.customNumber !== originStage.customNumber) { changeLimit = 1 break } diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue index 13ea87a..7749fef 100644 --- a/src/pages/match/manage/index.vue +++ b/src/pages/match/manage/index.vue @@ -53,7 +53,6 @@ export default { tab3: "竞赛进展", tab4: "公告通知", tab5: "报名人员", - tab6: '查看异常团队' }, pass: 0 }; @@ -112,7 +111,12 @@ export default { tab3 || this.$delete(this.tabs, 'tab3') tab4 || this.$delete(this.tabs, 'tab4') tab5 || this.$delete(this.tabs, 'tab5') - res.competition.completeCompetitionSetup.competitionType || this.$delete(this.tabs, 'tab6') + + if (res.competition.completeCompetitionSetup.competitionType) { + this.tabs.tab6 || this.$set(this.tabs, 'tab6', '查看异常团队') + } else { + this.tabs.tab6 && this.$delete(this.tabs, 'tab6') + } const type = this.$route.query.tab const keys = Object.keys(this.tabs) diff --git a/src/pages/match/manage/matchArchList.vue b/src/pages/match/manage/matchArchList.vue index 5f12c49..f1c83cd 100644 --- a/src/pages/match/manage/matchArchList.vue +++ b/src/pages/match/manage/matchArchList.vue @@ -340,6 +340,10 @@ export default { data: data.map(e => e.count), type: "line", areaStyle: {}, + label: { + show: true, + position: 'top' + }, color: ["#8191fd"] }] }); diff --git a/src/pages/match/manage/matchSignup.vue b/src/pages/match/manage/matchSignup.vue index d0e8aa8..06548b6 100644 --- a/src/pages/match/manage/matchSignup.vue +++ b/src/pages/match/manage/matchSignup.vue @@ -23,9 +23,11 @@ '取消' : '' }}自动分配阶段成员
-

报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）

-

报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次

-

注：自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配

+

报名结束前，设置的自动分配将在报名结束时触发一次系统自动分配（取消则不触发）

+

报名结束后，也可以手动点击自动分配按钮来立即触发系统自动分配，并且点击一次就触发一次

+

注：

+

  1. 自动分配仅对触发时已报名的人员进行。对于分配后才报名的人员，如需自动分配，则需手动再次触发自动分配

+

  2. 若已有学生提交了成绩报告，则无法启用自动分配功能

diff --git a/src/pages/match/manage/theoryReport.vue b/src/pages/match/manage/theoryReport.vue index 09564ac..727a6d5 100644 --- a/src/pages/match/manage/theoryReport.vue +++ b/src/pages/match/manage/theoryReport.vue @@ -464,44 +464,10 @@ export default {