diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue index 1fa1a68..06fb91e 100644 --- a/src/pages/achievement/info/course.vue +++ b/src/pages/achievement/info/course.vue @@ -572,7 +572,7 @@ export default { type: "category", boundaryGap: false, interval: 10, - data: ["0-10", "11-20", "21-30", "31-40", "41-50", "51-60", "61-70", "71-80", "81-90", "91-100"] + data: ["0-10", "10-20", "20-30", "30-40", "40-50", "50-60", "60-70", "70-80", "80-90", "90-100"] }, yAxis: { name: "人数", diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue index f83b4af..de7400b 100644 --- a/src/pages/achievement/info/project.vue +++ b/src/pages/achievement/info/project.vue @@ -546,7 +546,7 @@ export default { // axisLabel: { // interval: 9, // }, - data: ["0-10", "11-20", "21-30", "31-40", "41-50", "51-60", "61-70", "71-80", "81-90", "91-100"] + data: ["0-10", "10-20", "20-30", "30-40", "40-50", "50-60", "60-70", "70-80", "80-90", "90-100"] }, yAxis: { name: this.permissions ? "人数" : '成绩报告数量', diff --git a/src/pages/match/add/step2.vue b/src/pages/match/add/step2.vue index 218783d..62d0725 100644 --- a/src/pages/match/add/step2.vue +++ b/src/pages/match/add/step2.vue @@ -85,6 +85,7 @@ :label="1">自定义 (可限制本阶段单个团队的出战人数) @@ -110,6 +111,7 @@ 本阶段成绩排名前 队,可晋级下一阶段比赛 @@ -117,6 +119,7 @@ 本阶段成绩排名前 %,可晋级下一阶段比赛 @@ -131,6 +134,7 @@ 分,可晋级下一阶段比赛 @@ -142,6 +146,7 @@ 占总成绩权重: % @@ -150,6 +155,7 @@ (阶段)比赛结束后 小时,公布(阶段)比赛成绩。 @@ -195,6 +201,7 @@ (阶段)比赛结束后 小时,公布(阶段)比赛成绩。 @@ -404,7 +411,7 @@ export default { // 积分赛 if (!rule) { // 个人 - if (form.resultCalculationMethod == 0 && e.pointWeight === '') { + if (form.resultCalculationMethod == 0 && (e.pointWeight === '' || e.pointWeight === undefined)) { invalid = 1 util.errorMsg('请输入权重') break @@ -420,7 +427,7 @@ export default { if (e.score !== '') e.scoreLimit = e.operator + e.score } if (rule !== 2 && competitionType && e.teamNumLimit) { - if (e.customNumber === '') { + if (e.customNumber === '' || e.customNumber === undefined) { invalid = 1 util.errorMsg('请输入团队参数人数限制') break @@ -434,7 +441,7 @@ export default { break } } - if (e.resultsDetails === 0 && e.resultAnnouncementTime !== '') { + if (e.resultsDetails === 0 && (e.resultAnnouncementTime !== '' && e.resultAnnouncementTime !== undefined)) { if (e.resultAnnouncementTime < 0) { invalid = 1 util.errorMsg('成绩公布时间不得小于0') diff --git a/src/pages/match/manage/matchArchList copy.vue b/src/pages/match/manage/matchArchList copy.vue deleted file mode 100644 index 2ed5446..0000000 --- a/src/pages/match/manage/matchArchList copy.vue +++ /dev/null @@ -1,656 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index 72be9e9..add6017 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -769,7 +769,8 @@ export default { color2: 'rgba(150, 20, 144, 0.4)' }, ] - // 登录前登录后调的课程接口不一样 + 1 + const cousrseRes = await this.$post(this.api.websiteProductList, { pageNum: 1, pageSize: 1000, @@ -911,9 +912,9 @@ export default { } chart[1] = echarts.init(document.querySelector(`#chart5`)) chart[1].setOption(option) - // setInterval(function () { - // animateChart(chart[1], option, times) - // }, 5000) + setInterval(function () { + animateChart(chart[1], option, times) + }, 5000) }).catch(res => { }) }