Merge branch 'GST002' of http://182.92.169.222:3000/dlsx/ContestPortal into GST002

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('')

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('比赛已结束')
   }

src/views/registrationPersonage/index.vue

@@ -188,7 +188,8 @@
           </template>
 
           <template #tip>
-            <div class="el-upload__tip text-red">作品只允许上传一个</div>
+            <div class="el-upload__tip text-red">作品只允许上传一个,格式为{{ndbsXm.uploadWorksType}}</div>
+            
           </template>
         </el-upload>
       </el-form-item>
@@ -234,7 +235,7 @@ const upData = ref<Parameters<typeof getSignUpApi>[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
 })