From 7d29a0d42e2148227f53b280029876c750e7fab5 Mon Sep 17 00:00:00 2001
From: Ly <503441659@qq.com>
Date: Tue, 1 Apr 2025 14:11:45 +0800
Subject: [PATCH] Merge branch 'GST002_admin' of
 http://182.92.169.222:3000/dlsx/ContestPortal into GST002_admin

---
 src/views/registrationGroup/index.vue     | 14 +++++++-------
 src/views/registrationPersonage/index.vue |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index eee5b1b..54ddfa8 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -30,7 +30,7 @@
             <div class="info-box">
               <div class="name">比赛年度</div>
               <div class="title">{{ ndbs.annualid }}年度</div>
-              <div class="name">比赛名称</div>
+              <div class="name">年度比赛名称</div>
               <div class="title">{{ ndbs.name }}</div>
               <div class="date-box">
                 <div class="label">开始报名时间：</div>
@@ -88,7 +88,7 @@
             label-width="auto"
             class="demo-ruleForm"
           >
-            <el-form-item label="年度比赛项目">
+            <el-form-item label="年度比赛">
               <el-input v-model="ruleForm.objName" type="text" disabled />
             </el-form-item>
             <el-form-item label="参赛形式">
@@ -97,7 +97,7 @@
             <el-form-item label="队伍名称" prop="teamName">
               <el-input v-model="ruleForm.teamName"  maxlength="30"  type="text" :disabled="isDisable"/>
             </el-form-item>
-            <el-form-item label="选择题目" prop="topicid" v-show="false">
+           <!-- <el-form-item label="选择题目" prop="topicid" v-show="false">
               <el-select v-model="ruleForm.topicid" placeholder="请选择题目"  :disabled="isDisable">
                 <el-option
                   v-for="item in options"
@@ -106,7 +106,7 @@
                   :value="item.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item>-->
           </el-form>
         </div>
 
@@ -174,7 +174,6 @@ if (route.query.edit) {
   }
   const getOldRaceInfoEvent = async () => {
     const res: any = await  getOldRaceInfo({ id: route.query.id})
-    console.log(res,'res~~~');
     // ruleForm.annualCompid = route.query.annualCompid
     ruleForm.teamName = res.result.teamName
     ruleForm.topicid = res.result.topicObj ? res.result.topicObj.id : ''
@@ -211,7 +210,7 @@ const getTopicListApi = async () => {
     }
   })
 }
-getTopicListApi()
+// getTopicListApi()
 }
 
 // members:学生 adviser:老师
@@ -238,7 +237,6 @@ const loading = ref(false)
 
 const submit = () => {
   if (!ruleForm.teamName) return ElMessage.warning('请输入队伍名称')
-  if (!ruleForm.topicid) return ElMessage.warning('请选择题目')
   ruleForm.instructorSheetList = [...teaRef.value.submit()]
   ruleForm.teamManagementList = [...stuRef.value.submit()]
   loading.value = true
@@ -248,6 +246,8 @@ const submit = () => {
   ruleForm.enrollCode = route.query.enrollCode
   ruleForm.id = route.query.annualCompid
   }
+
+  ruleForm.substa = "1"
   getSignUpApi(ruleForm)
     .then((res: any) => {
       ElMessage({
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 91a89e9..af1d19e 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -32,7 +32,7 @@
             <div class="info-box">
               <div class="name">比赛年度</div>
               <div class="title">{{ ndbs.annualid }}年度</div>
-              <div class="name">比赛名称</div>
+              <div class="name">年度比赛名称</div>
               <div class="title">{{ ndbs.name }}</div>
               <div class="date-box">
                 <div class="label">开始报名时间：</div>
@@ -76,7 +76,7 @@
       <div>
         <el-form ref="ruleFormRef" style="max-width: 600px" :model="ruleForm" status-icon label-width="auto"
           class="demo-ruleForm">
-          <el-form-item label="年度比赛项目">
+          <el-form-item label="年度比赛">
             <el-input v-model="ruleForm.objName" type="text" disabled />
           </el-form-item>
           <el-form-item label="参赛形式">