From d7cdde904b58a0814f2d899a5ed00b36eda33718 Mon Sep 17 00:00:00 2001 From: JayChou Date: Wed, 12 Mar 2025 09:56:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/registered.vue | 27 +++++++++++++++++---------- src/views/raceInfo/index.vue | 5 +++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/views/login/registered.vue b/src/views/login/registered.vue index fcfb79b..588ecde 100644 --- a/src/views/login/registered.vue +++ b/src/views/login/registered.vue @@ -143,22 +143,22 @@ const KeyValue: any = { } const rules = { username: [ - { required: true, message: '请输入姓名', trigger: 'blur' }, + { required: true, message: '请输入用户名', trigger: 'blur' }, { min: 6, max: 20, message: '账号长度在6到50个字符', trigger: 'blur' }, { pattern: /^[a-zA-Z0-9]+$/, - message: '姓名只能包含中文、英文', + message: '姓名只能包含数字、英文', trigger: 'blur', }, ], realname: [ { required: true, message: '请输入姓名', trigger: 'blur' }, { min: 2, max: 20, message: '姓名长度在2到10个字符', trigger: 'blur' }, - { - pattern: /^[a-zA-Z0-9]+$/, - message: '姓名只能包含中文、英文', - trigger: 'blur', - }, + // { + // pattern: /^[a-zA-Z0-9]+$/, + // message: '姓名只能包含中文、英文', + // trigger: 'blur', + // }, ], workno: [ { required: true, message: '请输入工号/学号', trigger: 'blur' }, @@ -194,13 +194,13 @@ const props = { lazy: true, checkStrictly: true, emitPath: false, - isLeaf: 'isLeaf', + isLeaf: 'isLeaf', async lazyLoad(node: any, resolve: any) { // console.log(node, '1212') // console.log(node.data.isLeaf) - // if (node.data.isLeaf) { + // if (node.data.isLeaf) { // console.log(1111) // return resolve([]) @@ -275,9 +275,16 @@ const ragistered = async () => { console.log(res) } catch (error: any) { console.log(error, 'error') - for (const key in error) { + // 判断对象是否有这个属性 + if(error.hasOwnProperty('data')){ + ElMessage.warning(error.data.message) + + }else{ + for (const key in error) { ElMessage.warning(`${KeyValue[key]}${error[key][0].message}`) } + } + } } const codeUrl = ref('') diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue index ef5206f..a16b987 100644 --- a/src/views/raceInfo/index.vue +++ b/src/views/raceInfo/index.vue @@ -142,7 +142,7 @@ class="item" v-for="item in reacProjectList" :key="item.id" - @click="goToCompetition(item.id, item.endtime)" + @click="goToCompetition(item.id, item.endtime,item.isopen)" :style="{ 'background-color': isTimePassed(item.endtime) ? 'rgb(232 232 232)' : '#fff', }" @@ -246,7 +246,8 @@ const getraceInfoEvent = async () => { getraceInfoEvent() // 前往年度比赛页面 -const goToCompetition = async (id: any, endTime: string) => { +const goToCompetition = async (id: any, endTime: string,isOpen:string) => { + if(isOpen == '0') return ElMessage.error('比赛未开启') if (isTimePassed(endTime)) { return ElMessage.error('比赛已结束') } From 0f59d5e00a3e3a736e5ce300fc19d40c2717b717 Mon Sep 17 00:00:00 2001 From: JayChou Date: Wed, 12 Mar 2025 10:01:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=8F=90=E7=A4=BA=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/registrationPersonage/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index be9afcc..713e62c 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -188,7 +188,8 @@ From 5957a74fd5c0a5c46e02d0a5de5dc02aaa464f4c Mon Sep 17 00:00:00 2001 From: JayChou Date: Wed, 12 Mar 2025 17:48:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E9=98=9F=E9=95=BF=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/registrationPersonage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index 713e62c..61131eb 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -235,7 +235,7 @@ const upData = ref[0]>({ entryFormat: '个人', id: route.query.edit ? route.query.annualCompid : route.query.id, instructorSheetList: [], - teamManagementList: [{ realname: '', captain: '', teamSeq: '', userId: '' }], + teamManagementList: [{ realname: '', captain: '1', teamSeq: '', userId: '' }], // WorkName:WorkName.value, // file:fileUrl.value })