From 4be34ff89a5e1d600f81f2394a776ff1d2405b73 Mon Sep 17 00:00:00 2001
From: JayChou <xxx@gmail.com>
Date: Sat, 30 Nov 2024 18:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AF=94=E8=B5=9B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oldRace.ts                            |  36 +++++
 src/views/competition/index.vue               |  28 +++-
 src/views/login/registered.vue                | 151 +++++++++++-------
 src/views/projectName/index.vue               |   9 +-
 src/views/raceInfo/index.vue                  |  21 ++-
 .../registrationGroup/components/stuList.vue  | 102 +++++++++---
 .../registrationGroup/components/teaList.vue  |  25 ++-
 src/views/registrationGroup/index.vue         | 101 ++++++++----
 src/views/registrationPersonage/index.vue     |   5 +-
 src/views/userInfo/components/reacList.vue    |  39 ++++-
 src/views/userInfo/index.vue                  |   7 +
 11 files changed, 389 insertions(+), 135 deletions(-)
 create mode 100644 src/api/oldRace.ts

diff --git a/src/api/oldRace.ts b/src/api/oldRace.ts
new file mode 100644
index 0000000..a72faf6
--- /dev/null
+++ b/src/api/oldRace.ts
@@ -0,0 +1,36 @@
+import request  from "@/utils/requset";
+
+// 获取年度比赛和项目
+export  const getOldRaceList = (params:any) => {
+    return request({
+        url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryCompInfo4Stu',
+        method: 'get',
+        params
+    })
+}
+// 查询报名信息
+export  const getOldRaceInfo = (params:any) => {
+    return request({
+        url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryTopicById',
+        method: 'get',
+        params
+    })
+}
+
+// 查询团队成员列表
+export  const getTeamList = (params:any) => {
+    return request({
+        url: 'annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryTeamManagementByMainId',
+        method: 'get',
+        params
+    })
+}
+
+// 获取指导老师列表
+export  const getTeacherList = (params:any) => {
+    return request({
+        url: 'annualcompetitionprojectregistration/annualCompetitionProjectRegistration/queryInstructorSheetByMainId',
+        method: 'get',
+        params
+    })
+}
\ No newline at end of file
diff --git a/src/views/competition/index.vue b/src/views/competition/index.vue
index 9893c2a..0e2f048 100644
--- a/src/views/competition/index.vue
+++ b/src/views/competition/index.vue
@@ -7,7 +7,19 @@
   <div class="competition" v-loading="loading">
     <!-- 简介 -->
     <div class="synopsis">
-      <div class="name">{{ yearRaceInfo.name }}</div>
+      <div style="display: flex;justify-content: space-between;">
+        <div class="name">{{ yearRaceInfo.name }}</div>
+        <div class="back">
+          <el-button
+            type="primary"
+            style="margin-top: 10px"
+            @click="$router.back()"
+          >
+            返回
+          </el-button>
+        </div>
+      </div>
+
       <div class="content">
         {{ yearRaceInfo.introduction }}
       </div>
@@ -20,11 +32,15 @@
         <div class="text-box">
           <div class="title">选择项目</div>
           <div class="small">选择下面的项目报名，参与比赛</div>
-          <div class="back"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div>
         </div>
 
         <div class="card-list">
-          <div v-if="dataList.length == 0" style="font-size: 20px; color:#828282 ;">没有项目，请创建年度比赛项目</div>
+          <div
+            v-if="dataList.length == 0"
+            style="font-size: 20px; color: #828282"
+          >
+            没有项目，请创建年度比赛项目
+          </div>
           <template v-for="(o, i) in dataList" :key="o.id">
             <div v-if="(i + 5) % 4 == 1" class="card" type="yellow">
               <div class="top" :title="o.objName">{{ o.objName }}</div>
@@ -82,7 +98,9 @@
               <div class="text">{{ i.name }}</div>
               <img src="../../assets/images/编组.png" alt="" />
             </div>
-            <div class="bottom">报名时间：{{ i.starttime }} - {{ i.endtime }}</div>
+            <div class="bottom">
+              报名时间：{{ i.starttime }} - {{ i.endtime }}
+            </div>
           </div>
         </div>
       </div>
@@ -95,7 +113,7 @@ import { getCompetitionApi } from '@/api/person'
 import { ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElLoading } from 'element-plus'
-import { getYearRaceInfo,getHistoryRaceList } from '@/api/race'
+import { getYearRaceInfo, getHistoryRaceList } from '@/api/race'
 const route = useRoute()
 const router = useRouter()
 
diff --git a/src/views/login/registered.vue b/src/views/login/registered.vue
index 8799f9e..42bdeaf 100644
--- a/src/views/login/registered.vue
+++ b/src/views/login/registered.vue
@@ -2,7 +2,7 @@
   <div class="login-form">
     <div class="login-title">注册</div>
     <div class="form">
-      <el-form :model="form" label-width="0">
+      <el-form :model="form" ref="ruleFormRef" label-width="0" :rules="rules">
         <!-- <el-form-item>
           <el-col :span="11">
             <el-input
@@ -24,21 +24,21 @@
             />
           </el-col>
         </el-form-item> -->
-        <el-form-item>
+        <el-form-item prop="username">
           <el-input
             v-model="form.username"
             :prefix-icon="User"
             placeholder="账号"
           />
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="realname">
           <el-input
             v-model="form.realname"
             :prefix-icon="User"
             placeholder="姓名"
           />
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="workno">
           <el-input
             v-model="form.workno"
             placeholder="工号/学号"
@@ -61,14 +61,14 @@
             ref="cascader"
           />
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="mobile">
           <el-input
             placeholder="手机号码"
             v-model="form.mobile"
             :prefix-icon="Iphone"
           ></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="password">
           <el-input
             placeholder="密码"
             v-model="form.password"
@@ -119,6 +119,7 @@ import { User, Iphone, Lock } from '@element-plus/icons-vue'
 import { getFaculties } from '@/api/race'
 import { ElMessage } from 'element-plus'
 import { getCode, sturegister } from '@/api/user'
+import { ca } from 'element-plus/es/locales.mjs'
 const $emits = defineEmits(['backLogin'])
 const form = reactive<any>({
   username: '',
@@ -140,7 +141,43 @@ const KeyValue: any = {
   confirmPassword: '确认密码' /*, policy: false*/,
   smscode: '验证码',
 }
-
+const rules = {
+  username: [
+    { required: true, message: '请输入姓名', trigger: 'blur' },
+    { min: 6, max: 20, message: '账号长度在6到50个字符', trigger: 'blur' },
+    {
+      pattern: /^[a-zA-Z0-9]+$/,
+      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',
+    },
+  ],
+  workno: [
+    { required: true, message: '请输入工号/学号', trigger: 'blur' },
+    {  pattern: /^\d{1,20}$/, message: '工号/学号必须是8位数字', trigger: 'blur' },
+  ],
+  mobile: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' },
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' },
+    { min: 8, max: 16, message: '密码长度在8到16个字符', trigger: 'blur' },
+    { 
+    pattern: /^(?=(.*[a-zA-Z]){2,}|(?=.*[a-zA-Z])(?=.*\d)|(?=.*[a-zA-Z])(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?])|(?=.*\d)(?=.*[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]))[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};':"\\|,.<>/?]{8,16}$/, 
+    message: '密码必须包含至少两种字符类型：英文字符、数字、特殊字符', 
+    trigger: 'blur' 
+  }
+  ],
+}
 const FacultiesList = ref([])
 const getFacultiesList = async (data: any) => {
   const res: any = await getFaculties(data)
@@ -160,67 +197,73 @@ const props = {
       primaryKey: 'key',
       pid: node.value,
     })
-    if(node.level == 0 || node.level == 1){
+    if (node.level == 0 || node.level == 1) {
       const nodes = FacultiesList.value.map((item: any) => ({
-      value: item.id,
-      label: item.title,
-      disabled : true
-    }))
-    resolve(nodes)
-    }else{
+        value: item.id,
+        label: item.title,
+        disabled: true,
+      }))
+      resolve(nodes)
+    } else {
       const nodes = FacultiesList.value.map((item: any) => ({
-      value: item.id,
-      label: item.title,
-    }))
-    resolve(nodes)
+        value: item.id,
+        label: item.title,
+      }))
+      resolve(nodes)
     }
-   
   },
 }
 const cascader = ref()
-const handleChange = (e:any) => {
+const handleChange = (e: any) => {
   // console.log(e,cascader.value);
   cascader.value.togglePopperVisible()
-  
 }
-
+const ruleFormRef = ref<any>()
 const ragistered = async () => {
-  for (const key in form) {
-    if (form[key] === '') {
-      ElMessage.warning(`${KeyValue[key]}不能为空`)
-      return console.log(KeyValue[key], '不能为空')
-    } else {
-      if (key === 'mobile') {
-        const phoneRegex = /^1[3-9]\d{9}$/
-        if (!phoneRegex.test(form[key])) {
-          return ElMessage.warning(`手机号格式不正确`)
+  try {
+    await ruleFormRef.value.validate()
+    for (const key in form) {
+      if (form[key] === '') {
+        ElMessage.warning(`${KeyValue[key]}不能为空`)
+        return console.log(KeyValue[key], '不能为空')
+      } else {
+        if (key === 'mobile') {
+          const phoneRegex = /^1[3-9]\d{9}$/
+          if (!phoneRegex.test(form[key])) {
+            return ElMessage.warning(`手机号格式不正确`)
+          }
         }
       }
     }
+    if (!(form.password === form.confirmPassword)) {
+      return ElMessage.warning(`两次密码不同`)
+    }
+    console.log(form)
+    let data = {
+      checkKey: 1629428467008,
+      departmentid: form.department,
+      password: form.password,
+      phone: form.mobile,
+      realname: form.realname,
+      smscode: form.smscode,
+      username: form.username,
+      workno: form.workno,
+    }
+    const res: any = await sturegister(data)
+    if (res.code === 200) {
+      ElMessage.success(`注册成功`)
+      $emits('backLogin')
+    } else {
+      ElMessage.warning(res.message)
+      getcodeinfo()
+    }
+    console.log(res)
+  } catch (error: any) {
+    console.log(error, 'error')
+    for (const key in error) {
+      ElMessage.warning(`${KeyValue[key]}${error[key][0].message}`)
+    }
   }
-  if (!(form.password === form.confirmPassword)) {
-    return ElMessage.warning(`两次密码不同`)
-  }
-  console.log(form)
-  let data = {
-    checkKey: 1629428467008,
-    departmentid: form.department,
-    password: form.password,
-    phone: form.mobile,
-    realname: form.realname,
-    smscode: form.smscode,
-    username: form.username,
-    workno: form.workno,
-  }
-  const res: any = await sturegister(data)
-  if (res.code === 200) {
-    ElMessage.success(`注册成功`)
-    $emits('backLogin')
-  } else {
-    ElMessage.warning(res.message)
-    getcodeinfo()
-  }
-  console.log(res)
 }
 const codeUrl = ref('')
 
diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue
index b17918c..9984c0b 100644
--- a/src/views/projectName/index.vue
+++ b/src/views/projectName/index.vue
@@ -21,7 +21,7 @@
           </el-breadcrumb-item>
         </template>
       </el-breadcrumb>
-      <div class="black"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div>
+      <!-- <div class="black"><el-button type="primary" style="margin-top: 10px;" @click="$router.back()">返回</el-button></div> -->
     </div>
 
     <div class="content">
@@ -37,7 +37,10 @@
     </div>
 
     <div class="btn-box">
-      <el-button class="btn" @click="handleSub">立刻报名</el-button>
+      <el-button class="btn" @click="$router.back()">返回</el-button>
+
+      <el-button class="btn" style="margin-left: 60px;"  @click="handleSub">立刻报名</el-button>
+
       
     </div>
   </div>
@@ -157,7 +160,7 @@ getData()
       --color2: #42d9ac;
       cursor: pointer;
       text-align: center;
-      width: 470px;
+      width: 270px;
       height: 50px;
       border-radius: 45px;
       border: none;
diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue
index 1f9eccb..51a2a30 100644
--- a/src/views/raceInfo/index.vue
+++ b/src/views/raceInfo/index.vue
@@ -139,11 +139,18 @@
           />
         </div>
         <div class="reac-info">
+          <div class="niandu">{{item.annualname}}年度</div>
           <div class="reac-title">{{ item.name }}</div>
-          <div class="reac-project">{{ item.introduction }}</div>
-          <div class="time">
-            报名时间:{{ item.starttime }}-{{ item.endtime }}
+          <div class="reac-title">负责部门：{{ item.compOrgan }}</div>
+          <!-- <div class="reac-project">{{ item.introduction }}</div> -->
+          <div class="time" style="display: flex;justify-content: space-between;">
+            <div>  开始时间:{{ item.starttime }} </div>
+           结束时间:{{ item.endtime }}
+           <div></div>
           </div>
+          <!-- <div class="time">
+           
+          </div> -->
         </div>
       </div>
     </div>
@@ -275,7 +282,13 @@ const createfileLink = (url: any) => {
         .time {
           font-size: 14px;
           color: #8c8b8b;
-          margin-top: 40px;
+          margin-top: 30px;
+        }
+        .niandu{
+          color: #1e2033;
+          font-size: 18px;
+          margin-top: 20px;
+          font-weight: 600;
         }
       }
     }
diff --git a/src/views/registrationGroup/components/stuList.vue b/src/views/registrationGroup/components/stuList.vue
index ca042d0..9e70f57 100644
--- a/src/views/registrationGroup/components/stuList.vue
+++ b/src/views/registrationGroup/components/stuList.vue
@@ -3,13 +3,7 @@
     <el-button type="primary" icon="Plus" @click="add" class="btn">
       新增
     </el-button>
-    <el-button
-      type="danger"
-      icon="Delete"
-      @click="del"
-      class="btn"
-
-    >
+    <el-button type="danger" icon="Delete" @click="del" class="btn">
       删除
     </el-button>
     <div class="table-box">
@@ -58,6 +52,39 @@
             />
           </template>
         </el-table-column>
+        <el-table-column>
+          <template #header>
+            <el-icon>
+              <Edit />
+            </el-icon>
+            <span style="margin-left: 10px">学号</span>
+          </template>
+          <template #default="{ row }">
+            <el-input v-model="row.work_no" />
+          </template>
+        </el-table-column>
+        <el-table-column>
+          <template #header>
+            <el-icon>
+              <Edit />
+            </el-icon>
+            <span style="margin-left: 10px">手机号</span>
+          </template>
+          <template #default="{ row }">
+            <el-input v-model="row.phone" />
+          </template>
+        </el-table-column>
+        <el-table-column>
+          <template #header>
+            <el-icon>
+              <Edit />
+            </el-icon>
+            <span style="margin-left: 10px">邮箱</span>
+          </template>
+          <template #default="{ row }">
+            <el-input v-model="row.email" />
+          </template>
+        </el-table-column>
         <el-table-column>
           <template #header>
             <el-icon>
@@ -76,11 +103,14 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, onMounted ,watch} from 'vue'
+import { reactive, ref, onMounted, watch } from 'vue'
 import stuDialog from './stuDialog.vue'
 import { ClusterOutlined } from '@ant-design/icons-vue'
 import { ElMessage } from 'element-plus'
 import userStore from '@/store/module/user'
+import { getTeamList } from '@/api/oldRace'
+import { useRoute } from 'vue-router'
+const route = useRoute()
 const userModel = userStore()
 
 const options = [
@@ -97,31 +127,48 @@ const options = [
 // 数据
 const tableData = reactive<any[]>([])
 onMounted(() => {
-  if(tableData.length === 1) return
+  if (route.query.edit) {
+    const getTeamListEvent = async () => {
+      const res: any = await getTeamList({ id: route.query.id })
+      console.log(res, 'res~~~')
+      res.result.forEach((item: any) => {
+        tableData.push(item)
+      })
+    }
+    getTeamListEvent()
+    return
+  }
+  if (tableData.length === 1) return
   setTimeout(() => {
     tableData.push({
       userId: userModel.userInfo.id,
       realname: userModel.userInfo.realname,
+      work_no: userModel.userInfo.workNo,
+      phone: userModel.userInfo.phone,
+      email: userModel.userInfo.email,
       captain: '1',
       teamSeq: 1,
     })
-  }, 50)
-})
-watch(()=>userModel.userInfo,()=>{
-  if(tableData.length === 1) return
-  tableData.push({
-      userId: userModel.userInfo.id,
-      realname: userModel.userInfo.realname,
-      captain: '1',
-      teamSeq: 1,
-    })
+  }, 500)
 })
+// watch(()=>userModel.userInfo,()=>{
+//   if(tableData.length === 1) return
+//   tableData.push({
+//       userId: userModel.userInfo.id,
+//       realname: userModel.userInfo.realname,
+//       captain: '1',
+//       teamSeq: 1,
+//     })
+// })
 const add = () => {
   const length = tableData.push({
     realname: '', // 用户
     captain: '0', // 是否队长
     teamSeq: tableData.length + 1, // 队员序号
     userId: '', // id
+    work_no: '',
+    phone: '',
+    email: '',
   })
   openDialog(tableData[length - 1])
 }
@@ -129,6 +176,8 @@ const add = () => {
 // 当下打开dialog的数据源，在打开dialog时赋值
 const target = ref<any>()
 const openDialog = (row: any) => {
+  // console.log(row,'row');
+
   visible.value = true
   target.value = row
 }
@@ -144,7 +193,10 @@ const handleSelected = (row: any = {}) => {
     })
     return
   }
-
+  console.log(row, 'aqq')
+  target.value.work_no = row.work_no
+  target.value.phone = row.phone
+  target.value.email = row.email
   target.value.realname = row.realname
   target.value.userId = row.id
 }
@@ -157,12 +209,12 @@ const multipleTableRef = ref<any>(null)
 const isSele = ref(false)
 const del = () => {
   const rows = multipleTableRef.value.getSelectionRows()
-  console.log(rows,'111');
+  console.log(rows, '111')
   if (rows.length === 0) {
-      return ElMessage({
-        message: '请选择要删除的成员',
-        type: 'error',
-      })
+    return ElMessage({
+      message: '请选择要删除的成员',
+      type: 'error',
+    })
   }
   rows.forEach((row: any) => {
     const index = tableData.indexOf(row)
diff --git a/src/views/registrationGroup/components/teaList.vue b/src/views/registrationGroup/components/teaList.vue
index a20840c..a2abb96 100644
--- a/src/views/registrationGroup/components/teaList.vue
+++ b/src/views/registrationGroup/components/teaList.vue
@@ -119,10 +119,13 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref ,onMounted} from 'vue'
 import teaDialog from './teaDialog.vue'
 import { ClusterOutlined } from '@ant-design/icons-vue'
 import { ElMessage } from 'element-plus'
+import {getTeacherList} from '@/api/oldRace'
+import { useRoute } from 'vue-router'
+const route = useRoute()
 const options = [
   {
     value: '1',
@@ -136,12 +139,28 @@ const options = [
 
 // 数据
 const tableData = reactive<any[]>([])
-
+onMounted(async() => {
+  if (route.query.edit) {
+    const res:any = await getTeacherList({ id: route.query.id})
+    res.result.forEach((item: any) => {
+      tableData.push({
+        teacherName: item.teacherName,
+        teacherPhone: item.teacherPhone,
+        teacherType: item.teacherType.toString(),
+        teacherXl: item.teacherXl,
+        teacherYjfx: item.teacherYjfx,
+        teacherZc: item.teacherZc,
+        teacherZy: item.teacherZy,
+        teacherid: item.teacherid,
+      })
+    })
+  }
+})
 const add = () => {
   const length = tableData.push({
     teacherName: '',
     teacherPhone: '',
-    teacherType: '',
+    teacherType: '1',
     teacherXl: '',
     teacherYjfx: '',
     teacherZc: '',
diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index 397d1f8..21cc552 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -5,11 +5,7 @@
     <div class="box">
       <div class="title-box">
         <div class="title">报名信息确认</div>
-        <!-- <div class="text">
-          请仔细核对报名信息，报名成功后无法修改。请仔细核对报名信息，报名成功后无法修改。
-          请仔细核对报名信息，报名成功后无法修改。请仔细核对报名信息，报名成功后无法修改。
-          请仔细核对报名信息，报名成功后无法修改。请仔细核对报名信息，报名成功后无法修改。
-        </div> -->
+        <div class="text">请仔细核对报名信息，报名成功后无法修改。</div>
       </div>
 
       <div class="img-box">
@@ -154,7 +150,7 @@
       </div>
     </el-card>
     <div class="bottom">
-      <el-button class="btn" @click="$router.push('/')">取消报名</el-button>
+      <el-button class="btn" @click="$router.back()">取消报名</el-button>
       <el-button class="btn cyan" @click="submit" :loading="loading">
         确认报名
       </el-button>
@@ -163,7 +159,7 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref, toRefs,nextTick } from 'vue'
+import { reactive, ref, toRefs, nextTick } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import userStore from '@/store/module/user'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -172,6 +168,7 @@ import { getSignUpApi } from '@/api/person'
 import stuList from './components/stuList.vue'
 import teaList from './components/teaList.vue'
 import { getNdbswxqList, getComppxqList } from '@/api/person'
+import { getOldRaceList,getOldRaceInfo } from '@/api/oldRace'
 import { getTopicList } from '@/api/race'
 const user = userStore()
 const route = useRoute()
@@ -189,13 +186,59 @@ function pasSex(num: number) {
 // 比赛信息、项目信息
 const ndbs = ref<any>({})
 const ndbsXm = ref<any>({})
-getNdbswxqList(route.query.bcId as string).then((res: any) => {
-  if (res.result) ndbs.value = res.result
-})
-getComppxqList(route.query.id as string).then((res: any) => {
-  //console.log(res.result, 'xm')
-  if (res.result) ndbsXm.value = res.result
-})
+console.log(route.query.edit, 'route.query.edit')
+const options = ref([])
+
+if (route.query.edit) {
+  const getOldRaceListEvent = async () => {
+    const res: any = await getOldRaceList({ id: route.query.id})
+    ndbs.value = res.result.annualComp
+    ndbsXm.value = res.result.annualCompPoint
+  }
+  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.id
+    options.value = res.result.topicList.map((item) => {
+    return {
+      value: item.id,
+      label: item.name,
+    }
+  })
+  }
+
+  getOldRaceListEvent()
+  getOldRaceInfoEvent()
+
+  
+} else {
+  getNdbswxqList(route.query.bcId as string).then((res: any) => {
+    if (res.result) ndbs.value = res.result
+  })
+  getComppxqList(route.query.id as string).then((res: any) => {
+    //console.log(res.result, 'xm')
+    if (res.result) ndbsXm.value = res.result
+  })
+const getTopicListApi = async () => {
+  const res: any = await getTopicList({ annualCompid: route.query.id })
+  console.log(res)
+
+  nextTick(() => {
+    if (res.result.length != 0) {
+      ruleForm.topicId = res.result[0].id
+    }
+  })
+  options.value = res.result.map((item) => {
+    return {
+      value: item.id,
+      label: item.name,
+    }
+  })
+}
+getTopicListApi()
+}
 
 // members:学生 adviser:老师
 const activeName = ref('members')
@@ -219,18 +262,23 @@ const teaRef = ref<any>(null)
 const loading = ref(false)
 
 const submit = () => {
-  if(!ruleForm.teamName) return ElMessage.warning('请输入队伍名称')
-  if(!ruleForm.topicId) return ElMessage.warning('请选择题目')
+  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
+  ruleForm.id = route.query.id
+  if(route.query.edit){
+  ruleForm.enrollCode = route.query.enrollCode
+
+  }
   getSignUpApi(ruleForm)
     .then((res: any) => {
       ElMessage({
         message: res?.message || '报名成功',
         type: 'success',
       })
-      router.push('/')
+      router.push('/user-info')
     })
     .catch((err) => {
       ElMessage({
@@ -240,24 +288,7 @@ const submit = () => {
     })
     .finally(() => (loading.value = false))
 }
-const options = ref([])
-const getTopicListApi = async () => {
-  const res: any = await getTopicList({ annualCompid: route.query.id })
-  console.log(res)
-  
-  nextTick((  ) => {
-    if(res.result.length != 0){
-    ruleForm.topicId = res.result[0].id
-  }
-  })
-  options.value = res.result.map((item) => {
-    return {
-      value: item.id,
-      label: item.name,
-    }
-  })
-}
-getTopicListApi()
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 1475bff..15480b2 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -138,9 +138,7 @@
     </el-card>
 
     <div class="bottom">
-      <el-button class="btn" @click="() => router.push('/')">
-        取消报名
-      </el-button>
+      <el-button class="btn" @click="() => router.back()">取消报名</el-button>
       <el-button class="btn cyan" :loading="subLoading" @click="submit">
         确认报名
       </el-button>
@@ -209,6 +207,7 @@ async function submit() {
       message: res?.message || res?.result || '报名成功',
       type: 'success',
     })
+    router.push('/user-info')
   } catch (error) {
     ElMessage({
       // @ts-ignore
diff --git a/src/views/userInfo/components/reacList.vue b/src/views/userInfo/components/reacList.vue
index 41e42ee..719828a 100644
--- a/src/views/userInfo/components/reacList.vue
+++ b/src/views/userInfo/components/reacList.vue
@@ -33,7 +33,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作">
+        <el-table-column label="上传作品">
           <template #default="{ row }">
             <el-button
               link
@@ -47,7 +47,7 @@
             <el-tag v-else>已上传作品</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="提交" prop="fileName">
+        <el-table-column label="操作" prop="fileName">
           <template #default="{ row }">
             <el-button
               link
@@ -58,6 +58,23 @@
             >
               提交
             </el-button>
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="editEvent(row.id,row.annualCompid,row.enrollCode)"
+              v-if="row.enrollStatic == '1' || row.enrollStatic == '3'"
+            >
+              编辑
+            </el-button>
+            <!-- <el-button
+              link
+              type="primary"
+              size="small"
+             
+            >
+              详情
+            </el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -115,8 +132,10 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
-import { getStuRaceList, uploadFileZp, sava, getfile } from '@/api/race'
+import { getStuRaceList, uploadFileZp, sava } from '@/api/race'
 import { ElMessage } from 'element-plus'
+import { useRouter } from 'vue-router'
+const router = useRouter()
 const list = ref<any>([])
 const page = ref<any>({
   pageNo: 1,
@@ -214,6 +233,20 @@ const formatstatus = (status: any) => {
       break
   }
 }
+
+const editEvent =  (id: any,annualCompid: any,enrollCode:any) => {
+    console.log(id);
+    router.push({
+      path: '/registrationGroup',
+      query:{
+        id,
+        annualCompid,
+        enrollCode,
+        edit: true
+      }
+    })
+    
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index 491cb8e..a6507ab 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -36,6 +36,7 @@
               <div class="label">姓名</div>
               <div class="text">{{ useUserStore.userInfo.realname }}</div>
             </div>
+            
 
             <div class="info-box">
               <div class="label">姓别</div>
@@ -115,6 +116,9 @@
       <el-form-item label="姓名">
         <el-input v-model="form.name" />
       </el-form-item>
+      <el-form-item label="学号">
+        <el-input v-model="form.workNo" />
+      </el-form-item>
       <!-- <el-form-item label="部门">
         <el-cascader
           :props="props"
@@ -171,6 +175,7 @@ const editUserInfo = () => {
   form.birthday = useUserStore.userInfo.birthday
   form.sex = useUserStore.userInfo.sex
   form.email = useUserStore.userInfo.email
+  form.workNo = useUserStore.userInfo.workNo
   // form.facultiesId = useUserStore.userInfo.facultiesId
   form.phone = useUserStore.userInfo.phone
   dialogVisible.value = true
@@ -192,6 +197,7 @@ const form = reactive({
   email: '',
   facultiesId: '',
   phone: '',
+  workNo:'',
 })
 
 // 上传文件
@@ -218,6 +224,7 @@ const submit = async () => {
     facultiesId: form.facultiesId,
     phone: form.phone,
     avatar: avatar.value,
+    workNo: form.workNo
   }
   for (const key in data) {
     if (data[key] === '') {