-
-
-
-
- {{ scope.row.name }}
-
-
-
-
-
- {{ scope.row.score?scope.row.score:0 }}
-
-
-
- 进入
-
-
-
-
-
+
+
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1d6254ccc..47582d8b1 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -223,7 +223,7 @@ export default {
this.cookiesToken = 'UserDesignToken';
this.modelType = 'design';
this.loginClient = 'Design';
- this.path = '/refereeJsxt/preview';
+ this.path = '/refereeJsxt/home';
}
const nowLang = LangStorage.getLang('zh');
@@ -336,17 +336,23 @@ export default {
this.tipsMsg = '';
removeSessionStorage('againEnter');
if (this.$route.query.raceId) {
- getIsSignUp(this.$route.query.raceId).then(res => {
- if (res.data) {
- this.$router.push({ path: this.path });
- }
- }).catch(() => {
- this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
- });
- } else if (!this.$route.path.includes('jsxt/login')) {
+ if (this.$route.path.includes('jsxt/login')) {
+ getIsSignUp(this.$route.query.raceId).then(res => {
+ if (res.data) {
+ this.$router.push({ path: this.path, query:{raceId:this.$route.query.raceId} });
+ } else {
+ this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
+ }
+ }).catch(() => {
+ this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
+ });
+ } else {
+ this.$router.push({ path: this.path, query:{raceId:this.$route.query.raceId} });
+ }
+ } else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
this.$router.push({ path: this.path });
} else {
- this.$messageBox('请调整路径参数');
+ this.$messageBox('请输入正确的链接地址');
}
},
handleLanguage() {
From ba42e40200d4fcee0de273d191f437cccf6b46f2 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 22 May 2020 16:30:18 +0800
Subject: [PATCH 02/97] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E7=B3=BB=E7=BB=9F?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/newMap/jointTrainingNew/menuDemon.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 7a32b40b4..1eb00f503 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -11,7 +11,7 @@
- 结束
+ 提交
返回
{{ $t('global.back') }}
From 86edffb98442bc833b915b6fec1efa36cbc440af Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 22 May 2020 16:34:05 +0800
Subject: [PATCH 03/97] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=80=83=E8=AF=95?=
=?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/jsxt/competition/result.vue | 127 +++++++++++-------
.../jsxt/competition/theory/quiz/index.vue | 3 +-
.../newMap/jointTrainingNew/menuDemon.vue | 2 +-
3 files changed, 82 insertions(+), 50 deletions(-)
diff --git a/src/views/jsxt/competition/result.vue b/src/views/jsxt/competition/result.vue
index 52f0c8133..d51780711 100644
--- a/src/views/jsxt/competition/result.vue
+++ b/src/views/jsxt/competition/result.vue
@@ -5,29 +5,35 @@