From 9197292305bdad78b3068a9cf4eea883261c8040 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 25 Mar 2024 13:53:59 +0800 Subject: [PATCH] fix --- src/layouts/header/index.vue | 2 +- src/pages/index/list/index.vue | 2 +- src/pages/match/details/index.vue | 10 +++++----- src/pages/match/list/index.vue | 4 ++-- src/pages/station/preview/index.vue | 3 ++- src/setting.js | 2 +- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index b68018c..060f8ea 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -124,11 +124,11 @@ export default { this.getSystemDetail(); this.getUserInfo(); this.getNotice() + this.heartbeatDetection() } this.$once('hook:beforeDestroy', function () { clearInterval(this.noticeTimer) }) - this.heartbeatDetection() }, methods: { ...mapMutations("user", [ diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 11d51c5..4099403 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -409,7 +409,7 @@ export default { }, // 问卷调查 toQues () { - window.open('https://f.wps.cn/g/0sJLI4NA/') + window.open('https://www.wjx.cn/vm/wB0RcMm.aspx') }, } }; diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue index 1c2fc49..59ff947 100644 --- a/src/pages/match/details/index.vue +++ b/src/pages/match/details/index.vue @@ -373,11 +373,11 @@ {{ item.resultAnnouncementTime ? info.totalScore || 0 : '' }} + :rowspan="info.stages.length">{{ item.showDetail && item.resultAnnouncementTime >= 0 ? info.totalScore || 0 : '' }} - 分数{{item.score}} - 查看成绩详情 @@ -1690,7 +1690,7 @@ export default { Util.cookies.set('teamId', this.form.competitionRegistration.teamId) Util.cookies.set('stopTime', form.endTime) Util.cookies.set('resultsDetails', form.resultsDetails) - Util.cookies.set('resultAnnouncementTime', form.resultAnnouncementTime) + Util.cookies.set('resultAnnouncementTime', isNaN(form.resultAnnouncementTime) ? '' : form.resultAnnouncementTime) Util.cookies.set('mallId', form.mallId) Util.cookies.set('fromManager', '', -1) Util.cookies.set('language', '', -1) @@ -1716,7 +1716,7 @@ export default { window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}${Setting.isTest ? '&beta=1' : ''}`); } else if (systemId == 19) { // 沙盘 - location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${resultAnnouncementTime || ''}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}` + location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${isNaN(resultAnnouncementTime) ? '' : resultAnnouncementTime}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}` } else { // python系统 this.toPython(this.curProject) diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue index e3ae50e..2f6048c 100644 --- a/src/pages/match/list/index.vue +++ b/src/pages/match/list/index.vue @@ -1021,7 +1021,7 @@ export default { Util.cookies.set('teamId', this.curItem.teamId) Util.cookies.set('stopTime', form.endTime) Util.cookies.set('resultsDetails', form.resultsDetails) - Util.cookies.set('resultAnnouncementTime', form.resultAnnouncementTime) + Util.cookies.set('resultAnnouncementTime', isNaN(form.resultAnnouncementTime) ? '' : form.resultAnnouncementTime) Util.cookies.set('mallId', form.mallId) Util.cookies.set('fromManager', '', -1) Util.cookies.set('isSubmit', '', -1) @@ -1049,7 +1049,7 @@ export default { window.open(`http://${Setting.zcPath}?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}${Setting.isTest ? '&beta=1' : ''}`); } else if (systemId == 19) { // 沙盘 - location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${resultAnnouncementTime || ''}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}` + location.href = `${Setting.sandPath}/#/?curriculumName=${systemName}&token=${token}&cid=${cid}&mallId=${mallId}&systemId=${systemId}&projectId=${projectId}&assessmentId=&classId=&startTime=&stopTime=${endTime}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&resultAnnouncementTime=${isNaN(resultAnnouncementTime) ? '' : resultAnnouncementTime}&userId=${this.userId}&account=${this.account}&referrer=${encodeURIComponent(location.href)}` } else { // python系统 this.toPython() diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 9220a86..7cb7a5a 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -67,6 +67,7 @@