diff --git a/src/api/person.ts b/src/api/person.ts index 97db75a..951443e 100644 --- a/src/api/person.ts +++ b/src/api/person.ts @@ -49,6 +49,8 @@ enum api { membersList = '/online/cgreport/api/getData/1696139786651197442', // 团队成员列表 adviserList = '/online/cgreport/api/getData/1828357196360998913', // 指导老师列表 listStudent = '/AnnualCompPoint/annualCompPoint/listStudent', // 比赛项目报名表 + findndbswxq = '/annualcomp/annualComp/findndbswxq', // 年度比赛详情 + findcomppxq = '/AnnualCompPoint/annualCompPoint/findcomppxq', // 年度比赛项目详情 } @@ -88,3 +90,5 @@ export const getSignUpApi = (data: SignUpData) => request.post(api.signUp, data) export const getMembersList = (params: MembersOrAdviser) => request.get(api.membersList, { params }); export const getAdviserList = (params: MembersOrAdviser) => request.get(api.adviserList, { params }); +export const getNdbswxqList = (id:string) => request.get(api.findndbswxq, { params:{id} }); +export const getComppxqList = (id:string) => request.get(api.findcomppxq, { params:{id} }); \ No newline at end of file diff --git a/src/views/competition/index.vue b/src/views/competition/index.vue index 2ef84f1..c0b7aa7 100644 --- a/src/views/competition/index.vue +++ b/src/views/competition/index.vue @@ -126,7 +126,7 @@ getList(); // 跳转项目名称 function goProjectName(id: any) { - router.push(`/projectName?id=${id}`) + router.push(`/projectName?id=${id}&bcId=${route.query.id}`) } diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue index f3bcbe8..312437e 100644 --- a/src/views/projectName/index.vue +++ b/src/views/projectName/index.vue @@ -84,7 +84,7 @@ function handleSub() { let path; if (data.value.entryForm === 'Y') path = '/registrationGroup'; else path = '/registrationPersonage'; - router.push({ path, query: { id: route.query.id,objName:data.value.objName } }) + router.push({ path, query: { id: route.query.id,objName:data.value.objName,bcId:route.query.bcId } }) } getData(); diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue index a1916f9..9bc7ecd 100644 --- a/src/views/registrationGroup/index.vue +++ b/src/views/registrationGroup/index.vue @@ -23,26 +23,26 @@
比赛信息
-
-
2023年度
+
+
{{ ndbs.annualid }}年度
-
河南省大学生创新创业大赛
+
{{ ndbs.name }}
比赛年度
-
2024年度
+
{{ ndbs.annualid }}年度
比赛名称
-
河南省大学生创新创业大赛
+
{{ ndbs.name }}
开始报名时间:
-
2323.6.1 18:00
+
{{ ndbs.starttime }}
开始截至时间:
-
2323.6.1 18:00
+
{{ ndbs.endtime }}
@@ -52,22 +52,22 @@
项目信息
-
-

红色之旅赛道

+
+

{{ ndbsXm.objName }}

项目名称
-
红色之旅赛道
+
{{ ndbsXm.objName }}
要求人数
-
1人
+
{{ ndbsXm.workCount }}
开始报名时间:
-
2323.6.1 18:00
+
{{ ndbsXm.starttime?.split(' ')[0] }}
开始截至时间:
-
2323.6.1 18:00
+
{{ ndbsXm.endtime?.split(' ')[0] }}
@@ -128,8 +128,8 @@
- - + +
@@ -150,6 +150,8 @@ 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'; + const user = userStore(); const route = useRoute(); @@ -163,6 +165,17 @@ function pasSex(num: number) { else return '保密' } +// 比赛信息、项目信息 +const ndbs = ref({}) +const ndbsXm = ref({}) +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 +}) + // members:学生 adviser:老师 const activeName = ref('members'); @@ -319,7 +332,10 @@ const submit = () => { gap: 22px; .card-annual { - padding: 28px 0 0 28px; + &.padding { + padding: 20px; + } + width: 340px; height: 182px; background: linear-gradient(90deg, #21ACA5 0%, #42D9AC99 100%); @@ -380,6 +396,9 @@ const submit = () => { align-items: center; .label { + text-overflow: ellipsis; + overflow: hidden; + text-wrap: nowrap; height: 20px; font-family: Microsoft YaHei UI, Microsoft YaHei UI; font-weight: 400; @@ -389,6 +408,9 @@ const submit = () => { } .date { + text-overflow: ellipsis; + overflow: hidden; + text-wrap: nowrap; font-family: Microsoft YaHei UI, Microsoft YaHei UI; font-weight: bold; font-size: 18px; diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index b6948e1..159fc55 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -23,26 +23,26 @@
比赛信息
-
-
2023年度
+
+
{{ ndbs.annualid }}年度
-
河南省大学生创新创业大赛
+
{{ ndbs.name }}
比赛年度
-
2024年度
+
{{ ndbs.annualid }}年度
比赛名称
-
河南省大学生创新创业大赛
+
{{ ndbs.name }}
开始报名时间:
-
2323.6.1 18:00
+
{{ ndbs.starttime }}
开始截至时间:
-
2323.6.1 18:00
+
{{ ndbs.endtime }}
@@ -52,22 +52,22 @@
项目信息
-
-

红色之旅赛道

+
+

{{ ndbsXm.objName }}

项目名称
-
红色之旅赛道
+
{{ ndbsXm.objName }}
要求人数
-
1人
+
{{ ndbsXm.workCount }}
开始报名时间:
-
2323.6.1 18:00
+
{{ ndbsXm.starttime?.split(' ')[0] }}
开始截至时间:
-
2323.6.1 18:00
+
{{ ndbsXm.endtime?.split(' ')[0] }}
@@ -152,6 +152,8 @@ import { getSignUpApi } from '@/api/person'; import { ElMessage } from 'element-plus'; import { useRoute, useRouter } from 'vue-router'; import userStore from '@/store/module/user'; +import { getNdbswxqList, getComppxqList } from '@/api/person'; + const user = userStore(); const route = useRoute(); const router = useRouter(); @@ -175,6 +177,17 @@ const upData = ref[0]>({ teamName: "" }); +// 比赛信息、项目信息 +const ndbs = ref({}) +const ndbsXm = ref({}) +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 subLoading = ref(false); async function submit() { @@ -301,7 +314,10 @@ async function submit() { gap: 22px; .card-annual { - padding: 28px 0 0 28px; + &.padding { + padding: 20px; + } + width: 340px; height: 182px; background: linear-gradient(90deg, #21ACA5 0%, #42D9AC99 100%); @@ -362,6 +378,9 @@ async function submit() { align-items: center; .label { + text-overflow: ellipsis; + overflow: hidden; + text-wrap: nowrap; height: 20px; font-family: Microsoft YaHei UI, Microsoft YaHei UI; font-weight: 400; @@ -371,6 +390,9 @@ async function submit() { } .date { + text-overflow: ellipsis; + overflow: hidden; + text-wrap: nowrap; font-family: Microsoft YaHei UI, Microsoft YaHei UI; font-weight: bold; font-size: 18px;