diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue index 56a9d4d..fff3e0b 100644 --- a/src/views/registrationGroup/index.vue +++ b/src/views/registrationGroup/index.vue @@ -44,31 +44,6 @@ - - - 比赛项目信息 - - - {{ ndbsXm.objName }} - - - - 项目名称 - {{ ndbsXm.objName }} - 要求人数 - {{ ndbsXm.workCount }} - - 开始报名时间: - {{ ndbsXm.starttime?.split(' ')[0] }} - - - 开始截至时间: - {{ ndbsXm.endtime?.split(' ')[0] }} - - - - - @@ -122,6 +97,16 @@ + @@ -157,7 +142,7 @@ import { ElMessage } from 'element-plus' import { getSignUpApi } from '@/api/person' import stuList from './components/stuList.vue' import teaList from './components/teaList.vue' -import { getNdbswxqList, getComppxqList } from '@/api/person' +import { getNdbswxqList } from '@/api/person' import { getOldRaceList,getOldRaceInfo } from '@/api/oldRace' import { getTopicList } from '@/api/race' const user = userStore() @@ -177,9 +162,8 @@ function pasSex(num: number) { else return '保密' } -// 比赛信息、项目信息 +// 比赛信息 const ndbs = ref({}) -const ndbsXm = ref({}) console.log(route.query.edit, 'route.query.edit') const options = ref([]) @@ -187,11 +171,12 @@ 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}) + // ruleForm.annualCompid = route.query.annualCompid ruleForm.teamName = res.result.teamName + ruleForm.topicid = res.result.topicObj ? res.result.topicObj.id : '' ruleForm.objName = res.result.annualCompPointName options.value = res.result.topicList.map((item) => { return { @@ -209,26 +194,23 @@ if (route.query.edit) { 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 }) - - 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()*/ +// 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:老师 @@ -264,6 +246,8 @@ const submit = () => { ruleForm.enrollCode = route.query.enrollCode ruleForm.id = route.query.annualCompid } + + ruleForm.substa = "1" getSignUpApi(ruleForm) .then((res: any) => { ElMessage({ @@ -377,7 +361,7 @@ const submit = () => { height: 300px; .com { - width: 685px; + width: 100%; height: 300px; border-radius: 6px 6px 6px 6px; padding-top: 22px; @@ -395,7 +379,6 @@ const submit = () => { margin-bottom: 18px; } - margin-right: 22px; .content { display: flex; @@ -445,7 +428,7 @@ const submit = () => { .right { .info-box { - width: 210px; + width: 100%; .name { height: 20px; font-family:
{{ ndbsXm.objName }}