From f502a34dffd62f35efda20d18f7ba2e638342275 Mon Sep 17 00:00:00 2001
From: fwb <fwb>
Date: Thu, 26 Sep 2024 08:58:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?'=E6=96=B0=E9=97=BB=E6=9B=B4=E6=96=B0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/news.ts                          |  15 ++
 src/views/news/components/newsDetail.vue |  40 ++--
 src/views/news/components/newsList.vue   | 250 +++++++++--------------
 3 files changed, 136 insertions(+), 169 deletions(-)
 create mode 100644 src/api/news.ts

diff --git a/src/api/news.ts b/src/api/news.ts
new file mode 100644
index 0000000..fd5c10f
--- /dev/null
+++ b/src/api/news.ts
@@ -0,0 +1,15 @@
+import request from '@/utils/requset'
+//获取新闻栏目
+export const getColumnListApi = () => {
+    return request({
+        url:'/cms/front/getColumnList'
+    })
+}
+//根据栏目id获取新闻列表
+export function queryEssayListApi(columnId) {
+    return request.get(`/cms/front/getArticleListByColumn?columnId=${columnId}`);
+}
+//根据点击的新闻id获取新闻详细信息
+export function queryEssayApi(id) {
+    return request.get(`/cms/front/getByArticleTitle?id=${id}`);
+}
\ No newline at end of file
diff --git a/src/views/news/components/newsDetail.vue b/src/views/news/components/newsDetail.vue
index 215d30e..beb973a 100644
--- a/src/views/news/components/newsDetail.vue
+++ b/src/views/news/components/newsDetail.vue
@@ -3,22 +3,37 @@
     <el-button style="margin-left: 93%" @click="backHandle" type="success">返回</el-button>
     <el-divider/>
     <p class="list-title">{{ data.title }}</p>
-    <p class="list-summary">{{ data.summary }}</p>
+    <p class="list-summary" v-html="data.content"></p>
     <div class="center-image">
-      <img class="list-image" :src="data.imageUrl" alt="News Image">
+      <img class="list-image" :src="completeImageUrl" alt="News Image"  v-default-image>
     </div>
-    <p class="list-time">{{ data.date }}</p>
+    <p class="list-time">{{ data.publishTime }}</p>
   </div>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref,computed } from 'vue'
 import {useRoute, useRouter} from "vue-router";
+import {queryEssayApi} from "@/api/news";
+
 const router = useRouter();
 const route = useRoute();
 const backHandle = ()=>{
   router.go(-1);
 }
-const data = ref(route.query);
+const data = ref({});
+//通过id获取文章详细信息
+queryEssayApi(route.params.id).then(res=>{
+  data.value = res.result[0]
+  console.log(data.value,'data')
+})
+
+// 定义一个计算属性来处理图片路径
+const completeImageUrl = computed(() => {
+  if (data.value.comimg) {
+    return new URL(data.value.comimg, 'https://localhost:18085/jeecg-boot/').href;
+  }
+  return '';
+});
 </script>
 
 <style scoped>
@@ -41,14 +56,9 @@ const data = ref(route.query);
 .list-summary{
   font-size: 20px;
   color: #8c8b8b;
-  margin-top: 10px;
+  margin-top: 30px;
   line-height: 1.9;
 }
-.list-time{
-  font-size: 16px;
-  color: #999999;
-  margin-top: 10px;
-}
 .center-image{
   display: flex;
   justify-content: center;
@@ -56,7 +66,13 @@ const data = ref(route.query);
 }
 .list-image{
   width: 500px;
-  height: 500px;
+  height: 200px;
   margin-top: 20px;
 }
+.list-time{
+  font-size: 16px;
+  color: #999999;
+  margin-top: 60px;
+  margin-left: 84%;
+ }
 </style>
\ No newline at end of file
diff --git a/src/views/news/components/newsList.vue b/src/views/news/components/newsList.vue
index 6a75778..3932ccb 100644
--- a/src/views/news/components/newsList.vue
+++ b/src/views/news/components/newsList.vue
@@ -1,172 +1,108 @@
 <template>
-  <div class="container">
-    <el-tabs v-model="activeName" style="max-width: 60%;margin: auto" @tab-click="handleTabClick">
-      <el-tab-pane
-          v-for="(newsCategory, categoryName) in newsData"
-          :key="categoryName"
-          :label="categoryName"
-          :name="categoryName.toLowerCase()"
-      >
-        <ul>
-          <li v-for="newsItem in newsCategory" :key="newsItem.id">
-            <div class="box-list" @click.stop="handleClick(newsItem)">
-              <div class="left-box-list">
-                <p class="list-title">{{ newsItem.title }}</p>
-                <p class="list-summary">{{ newsItem.summary }}</p>
-                <p class="list-time">{{ newsItem.date }}</p>
-              </div>
-              <img class="news-image" :src="newsItem.imageUrl" alt="News Image">
+  <el-tabs v-model="activeName" style="max-width: 70%; margin: auto" class="container" @tab-click="handleTabClick">
+    <el-tab-pane
+        v-for="category in categories"
+        :key="category.id"
+        :label="category.name"
+        :name="category.id"
+    >
+      <ul>
+        <li v-for="newsItem in getNewsItemsForCategory(category)" :key="newsItem.id">
+          <div class="box-list" @click.stop="handleNewsClick(newsItem)">
+            <div class="left-box-list">
+              <p class="list-title">{{ newsItem.title }}</p>
+              <p class="list-summary">{{ stripHtmlTags(newsItem.summary) }}</p>
+              <p class="list-time">{{ newsItem.date }}</p>
             </div>
-            <el-divider/>
-          </li>
-        </ul>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+            <img class="news-image" :src="newsItem.imageUrl" alt="News Image"  v-default-image>
+          </div>
+          <el-divider />
+        </li>
+      </ul>
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
-import {useRouter} from "vue-router";
-const activeName = ref('通知公告')
-const newsData = ref({
-  通知公告:[
-    {
-      id:1,
-      title: '季节新闻1',
-      date: '2024年9月23日',
-      summary: '秋天，这个季节像是大自然最细腻的画师，在不经意间将世界涂抹成一幅斑斓的画卷。它没有春天那样生机勃勃，也没有夏天的热情奔放，更没有冬天的银装素裹，但它却有着自己独特的韵味——宁静、成熟而又充满诗意。\n' +
-          '当第一缕凉风轻拂过脸颊，我们知道，秋天来了。这是一年中最宜人的季节，天空如洗，蓝得深邃而纯净，白云悠悠地飘动着，像是蓝天上随意勾勒的几笔白墨。空气中弥漫着淡淡的桂花香，偶尔还能闻到远处果园里成熟的果香，这些气息交织在一起，构成了一首无言的诗篇。\n' +
-          '树叶开始变得丰富多彩，从翠绿到金黄，再到火红，每一片叶子都承载着岁月的故事，讲述着属于它们自己的生命历程。走在铺满落叶的小径上，脚下发出沙沙的声音，仿佛是秋天独有的乐章，让人的心灵得到了前所未有的宁静与放松。\n' +
-          '在这个季节里，最令人愉悦的莫过于那恰到好处的温度了。早晚微凉，午间温暖，这样的天气最适合穿上一件薄薄的毛衣，或是披上一条柔软的围巾，漫步在街头巷尾，感受着每一寸肌肤与自然亲密接触的惬意。人们的心情似乎也因为这样舒适的气候而变得轻松愉快起来，笑容更加灿烂，生活节奏也不自觉地放慢了几分。\n' +
-          '秋天是一个收获的季节，它不仅带来了丰收的喜悦，还赠予了我们一段温馨而美好的时光。让我们在这宜人的季节里，细细品味生活的每一刻，感受那份来自大自然最真挚的馈赠。当最后一抹夏末的暑气随着日落渐渐消散，秋天便悄无声息地降临了。这是一个富有诗意的季节，它以一种平和而优雅的姿态，缓缓铺开了它的画卷。不同于春之生机勃发，夏之热情似火，冬之静谧纯洁，秋以其特有的方式，为这个世界带来了一份成熟与内敛。\n' +
-          '清晨，当第一缕晨光穿透薄雾，落在大地之上，一切都显得那么宁静而美好。此时的空气，带着些许凉意，却也异常清新。走在这样的早晨，你会发现自己不自觉地深呼吸，想要将这份纯净的气息全部纳入胸膛。树叶的颜色开始变化，由绿转黄，再由黄变红，最终落尽繁华，只留下光秃秃的枝丫，等待来年的重生。每一片落叶，都是秋天的使者，它们用生命最后的色彩，为这个世界增添了无限的温暖与希望。\n' +
-          '午后的阳光，不再那么炽热，而是温和地洒在大地上，给人以舒适的感觉。',
-      imageUrl: 'https://bj.bcebos.com/bjh-pixel/169827013028013977_5_ainote_new.jpg'
-    },
-    {
-      id:2,
-      title: '体育新闻2',
-      date: '2024年9月22日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://pic.rmb.bdstatic.com/50252becb3b391b2cb68ddde4a9c5d9b.jpeg'
-    },
-    {
-      id:3,
-      title: '科技新闻3',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641'
-    },
-    {
-      id:4,
-      title: '科技新闻4',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img1.baidu.com/it/u=655643694,820713725&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=729'
-    },
-    {
-      id:5,
-      title: '科技新闻5',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://desk-fd.zol-img.com.cn/t_s960x600c5/g2/M00/00/00/ChMlWV0v7jyIHLj_AAgsbG2bHDcAAL5lQE1rfYACCyE751.jpg'
-    },
-    {
-      id:11,
-      title: '季节新闻6',
-      date: '2024年9月23日',
-      summary: '秋天，这个季节像是大自然最细腻的画师，在不经意间将世界涂抹成一幅斑斓的画卷。它没有春天那样生机勃勃，也没有夏天的热情奔放，更没有冬天的银装素裹，但它却有着自己独特的韵味——宁静、成熟而又充满诗意。\n' +
-          '当第一缕凉风轻拂过脸颊，我们知道，秋天来了。这是一年中最宜人的季节，天空如洗，蓝得深邃而纯净，白云悠悠地飘动着，像是蓝天上随意勾勒的几笔白墨。空气中弥漫着淡淡的桂花香，偶尔还能闻到远处果园里成熟的果香，这些气息交织在一起，构成了一首无言的诗篇。\n' +
-          '树叶开始变得丰富多彩，从翠绿到金黄，再到火红，每一片叶子都承载着岁月的故事，讲述着属于它们自己的生命历程。走在铺满落叶的小径上，脚下发出沙沙的声音，仿佛是秋天独有的乐章，让人的心灵得到了前所未有的宁静与放松。\n' +
-          '在这个季节里，最令人愉悦的莫过于那恰到好处的温度了。早晚微凉，午间温暖，这样的天气最适合穿上一件薄薄的毛衣，或是披上一条柔软的围巾，漫步在街头巷尾，感受着每一寸肌肤与自然亲密接触的惬意。人们的心情似乎也因为这样舒适的气候而变得轻松愉快起来，笑容更加灿烂，生活节奏也不自觉地放慢了几分。\n' +
-          '秋天是一个收获的季节，它不仅带来了丰收的喜悦，还赠予了我们一段温馨而美好的时光。让我们在这宜人的季节里，细细品味生活的每一刻，感受那份来自大自然最真挚的馈赠。当最后一抹夏末的暑气随着日落渐渐消散，秋天便悄无声息地降临了。这是一个富有诗意的季节，它以一种平和而优雅的姿态，缓缓铺开了它的画卷。不同于春之生机勃发，夏之热情似火，冬之静谧纯洁，秋以其特有的方式，为这个世界带来了一份成熟与内敛。\n' +
-          '清晨，当第一缕晨光穿透薄雾，落在大地之上，一切都显得那么宁静而美好。此时的空气，带着些许凉意，却也异常清新。走在这样的早晨，你会发现自己不自觉地深呼吸，想要将这份纯净的气息全部纳入胸膛。树叶的颜色开始变化，由绿转黄，再由黄变红，最终落尽繁华，只留下光秃秃的枝丫，等待来年的重生。每一片落叶，都是秋天的使者，它们用生命最后的色彩，为这个世界增添了无限的温暖与希望。\n' +
-          '午后的阳光，不再那么炽热，而是温和地洒在大地上，给人以舒适的感觉。这个时候，最适合找一处安静的地方，或是在公园的长椅上，或是在自家的阳台上，捧一本书，泡一杯茶，静静地享受这难得的悠闲时光。偶尔抬头望望天，你会发现，秋天的天空特别高远，云朵也更加洁白，仿佛是大自然最好的画家，用最简单的颜色，勾勒出最美的图案。\n' +
-          '秋天，还是一个收获的季节。田野里，金黄色的稻谷随风摇曳，果园中，苹果、梨子挂满枝头，一派丰收的景象。农人们忙碌的身影穿梭其间，脸上洋溢着满足的笑容。这不仅仅是因为物质上的富足，更是因为经过一年的努力之后，终于迎来了回报的时刻。这种喜悦，是任何东西都无法替代的。\n' +
-          '在这样的季节里，人们的心灵似乎也被净化了。孩子们在落叶堆里嬉戏打闹，老人们坐在家门口晒太阳，年轻人则三三两两地散步于公园之中。每个人的脸上都洋溢着轻松和愉快，仿佛整个世界都被这份和谐与美好所包围。\n' +
-          '秋天，就是这样一种神奇的存在。它用自己独特的方式，告诉我们生命的美好不仅仅在于绽放的瞬间，更在于那些平凡而真实的日常。当我们学会欣赏身边的每一份美好，珍惜每一次相遇，或许，这就是秋天给予我们最宝贵的礼物吧。\n',
-      imageUrl: 'https://bj.bcebos.com/bjh-pixel/169827013028013977_5_ainote_new.jpg'
-    },
-    {
-      id:12,
-      title: '体育新闻7',
-      date: '2024年9月22日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://pic.rmb.bdstatic.com/50252becb3b391b2cb68ddde4a9c5d9b.jpeg'
-    },
-    {
-      id:13,
-      title: '科技新闻8',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://inews.gtimg.com/om_bt/OGlQWfsaAoKkuCcMZ2o9IVEPqd-72DQy5EAN02XBHUwfYAA/641'
-    },
-    {
-      id:14,
-      title: '科技新闻9',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img1.baidu.com/it/u=655643694,820713725&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=729'
-    },
-    {
-      id:15,
-      title: '科技新闻10',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://desk-fd.zol-img.com.cn/t_s960x600c5/g2/M00/00/00/ChMlWV0v7jyIHLj_AAgsbG2bHDcAAL5lQE1rfYACCyE751.jpg'
-    },
-  ],
-  赛事资讯:[
-    {
-      id:6,
-      title: '科技新闻6',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img2.woyaogexing.com/2023/05/05/1601bcb82e9858e21149cf64086a21db.jpg'
-    },
-    {
-      id:7,
-      title: '体育新闻7',
-      date: '2024年9月22日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img2.woyaogexing.com/2023/05/05/6280b93c7eb748a24466bd0d3021e3a9.jpg'
-    },
-    {
-      id:8,
-      title: '科技新闻8',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img2.woyaogexing.com/2023/05/05/113da83a57b3661c3170c2571007f8e5.jpg'
-    },
-    {
-      id:9,
-      title: '科技新闻9',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://img1.baidu.com/it/u=515359320,1010066691&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=810'
-    },
-    {
-      id:10,
-      title: '科技新闻10',
-      date: '2024年9月23日',
-      summary: '你有没有想过，是否能用更轻量的方式开发出与Electron相同功能的桌面应用？毕竟，虽然Electron确实强大，但它那几百MB的安装包和资源消耗对许多小型项目来说太过头了。',
-      imageUrl: 'https://q6.itc.cn/images01/20240613/84d2e170b23b47be86f17ec5009febf9.jpeg'
-    },
-  ],
-});
-const router = useRouter();
-const handleTabClick = (tab) => {
-  const categoryName = tab.name
+import { ref, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { getColumnListApi, queryEssayListApi } from '@/api/news'
+let categories = ref([])
+let newsItems = ref({})
+let activeName = ref('')
+const router = useRouter()
+
+//使用正则表达式转换html标签文本
+function stripHtmlTags(html) {
+  return html.replace(/<[^>]*>/g, '');
+}
+
+// 获取栏目信息
+const fetchColumnList = async () => {
+  const response = await getColumnListApi()
+  if (response.success && response.result) {
+    categories.value = response.result.filter(category => category.isShow === '1')
+    // 尝试立即加载第一个栏目的新闻列表
+    if (categories.value.length > 0) {
+      await fetchNewsList(categories.value[0].id)
+      activeName.value = categories.value[0].id
+    }
+  }
 }
+
+// 栏目新闻列表查询
+const fetchNewsList = async (categoryId) => {
+  try {
+    const response = await queryEssayListApi(categoryId)
+    console.log(response.success,'daaaaaaa')
+    console.log(response.result.records,'ddddddd')
+    if (response.success && response.result.records) {
+      newsItems.value[categoryId] = response.result.records.map(data => ({
+        id: data.id,
+        title: data.title,
+        date: data.publishTime,
+        summary: data.content,
+        imageUrl: data.comimg ? getAbsoluteImagePath(data.comimg) : ''
+      }))
+    }
+  } catch (error) {
+    console.error('获取新闻列表失败', error)
+  }
+}
+
+//获取图片完整地址
+const getAbsoluteImagePath = (relativePath) => {
+  const baseImageUrl = 'https://localhost:18085/jeecg-boot/'; // 替换为实际的服务器地址
+  return baseImageUrl + relativePath;
+};
+
+// 获取指定栏目的新闻列表
+const getNewsItemsForCategory = (category) => {
+  return newsItems.value[category.id] || []
+}
+
+// 初始化加载栏目列表
+onMounted(() => {
+  fetchColumnList()
+})
+
+// 当选项卡改变时更新当前显示的新闻列表
+const handleTabClick = async (tab) => {
+  const categoryId = tab.props.name
+  if (!newsItems.value[categoryId]?.length) {
+    await fetchNewsList(categoryId)
+  }
+  activeName.value = categoryId
+}
+
 // 处理新闻条目的点击事件
-const handleClick = (newsItem) => {
+const handleNewsClick = (newsItem) => {
   router.push({
     name: 'newsDetail',
     params: { id: newsItem.id.toString() },
-    query: { ...newsItem }
   })
 }
+
 </script>
 
 <style scoped>

From 761e5144f7f5838195fc3cb5e33b00c3c94229f3 Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Thu, 26 Sep 2024 13:23:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E7=A1=AE=E8=AE=A4/?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/person.ts                         | 12 ++++-
 src/permissions.ts                        |  2 +-
 src/utils/asyncHint.ts                    | 65 +++++++++++++++++++++++
 src/views/projectName/index.vue           |  6 ++-
 src/views/registrationGroup/index.vue     | 43 +++++++++------
 src/views/registrationPersonage/index.vue | 45 ++++++++++++----
 6 files changed, 144 insertions(+), 29 deletions(-)
 create mode 100644 src/utils/asyncHint.ts

diff --git a/src/api/person.ts b/src/api/person.ts
index 9abd9e8..8379273 100644
--- a/src/api/person.ts
+++ b/src/api/person.ts
@@ -12,6 +12,7 @@ enum api {
     PAGE_XSFXBG = '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/xsfxbg', // 个人能力报告
     competition = '/AnnualCompPoint/annualCompPoint/findcompp', // 比赛项目列表
     competitionOne = '/AnnualCompPoint/annualCompPoint/findcomppxq', // 比赛项目单个
+    signUp = '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/edit', // 年度比赛项目报名 POST 
 }
 export const getlEvaluateApi = (params: Record<'pageNo' | 'pageSize', number>) => request.get(api.liststu, { params });
 export const getlIntegralApi = (params: Record<'pageNo' | 'pageSize', number>) => request.get(api.integral, { params });
@@ -23,4 +24,13 @@ export const getXsfxbgApi = (params = {}) => {
 };
 
 export const getCompetitionApi = (id: string) => request.get(api.competition, { params: { id } });
-export const getCompetitionOneApi = (id: string) => request.get(api.competitionOne, { params: { id } });
\ No newline at end of file
+export const getCompetitionOneApi = (id: string) => request.get(api.competitionOne, { params: { id } });
+
+interface SignUpData {
+    annualCompid: string,
+    entryFormat: '团队' | '个人',
+    id: string,
+    instructorSheetList?: any[],
+    teamManagementList?: any[],
+}
+export const getSignUpApi = (data: SignUpData) => request.post(api.signUp, data);
\ No newline at end of file
diff --git a/src/permissions.ts b/src/permissions.ts
index 6ae7270..be9ab25 100644
--- a/src/permissions.ts
+++ b/src/permissions.ts
@@ -9,7 +9,7 @@ router.beforeEach(async (to, form, next) => {
   if (useuserStore.token) {
     if (to.path === '/login') {
       next({ path: '/' })
-    } else {
+    } else {      
       if (!Object.keys(useuserStore.userInfo).length) {
         useuserStore.getUserInfo()
         next()
diff --git a/src/utils/asyncHint.ts b/src/utils/asyncHint.ts
new file mode 100644
index 0000000..2ef0fbe
--- /dev/null
+++ b/src/utils/asyncHint.ts
@@ -0,0 +1,65 @@
+import { ElMessage, MessageOptions } from "element-plus";
+
+enum indexs {
+    fulfilled,
+    Rejected
+}
+
+interface Options {
+    onFulfilled?: Function;
+    onRejected?: Function;
+    onFinish?: Function;
+    // 是否需要提示：[ 成功时的 , 失败时的]。
+    // 默认：[true, true]
+    isNeedPrompts?: boolean[];
+    // 提示配置：[成功时的 , 失败时的]
+    msgObjs?: MessageOptions[];
+    // 提示配置的快捷message配置：[ 成功时的 , 失败时的]。
+    // 默认：['成功', '失败']
+    msgs?: string[];
+    [key: string]: any;
+}
+
+
+export function getHint(pro: Promise<any>, options: Options = {}) {
+    const ful = indexs.fulfilled;
+    const rej = indexs.Rejected;
+    const { isNeedPrompts, msgs } = options;
+
+    const opt: Options = {
+        ...options,
+        isNeedPrompts: Object.assign([true, true], isNeedPrompts),
+        msgs: Object.assign(['成功', '失败'], msgs),
+    }
+
+    const onFulfilled = (res: any) => {
+        if (opt.isNeedPrompts?.[ful]) {
+            ElMessage({
+                message: opt.msgs?.[ful],
+                type: 'success',
+                ...opt.msgObjs?.[ful]
+            });
+        }
+        if (opt.onFulfilled) opt.onFulfilled(res);
+    }
+    const onRejected = (err: Error) => {
+        if (opt.isNeedPrompts?.[rej]) {
+            ElMessage({
+                message: opt.msgs?.[rej],
+                type: 'error',
+                ...opt.msgObjs?.[rej]
+            });
+        }
+
+        if (opt.onRejected) opt.onRejected(err);
+    }
+    const onFinish = () => {
+        console.log(opt, opt.onFinish);
+
+        if (opt.onFinish) opt.onFinish();
+    }
+
+    pro.then(onFulfilled).catch(onRejected).finally(onFinish);
+
+    return pro;
+}
\ No newline at end of file
diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue
index 3453585..f93d2c4 100644
--- a/src/views/projectName/index.vue
+++ b/src/views/projectName/index.vue
@@ -80,7 +80,11 @@ function handleSub() {
         })
         return
     }
-    router.push({ path: '/registrationPersonage', query: { id: route.query.id } })
+    // Y:团队赛 N:个人赛
+    let path;
+    if (data.value.entryForm === 'Y') path = '/registrationGroup';
+    else path = '/registrationPersonage';
+    router.push({ path, query: { id: route.query.id } })
 }
 
 getData();
diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index 8bb593f..2ee996b 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -84,25 +84,29 @@
                 </div>
                 <div class="info-box">
                     <div class="label">姓名</div>
-                    <div class="text">王不留行</div>
+                    <div class="text">{{ info.realname }}</div>
                 </div>
 
                 <div class="info-box">
                     <div class="label">姓别</div>
-                    <div class="text">男</div>
+                    <div class="text">{{ pasSex(info.sex) }}</div>
                 </div>
 
                 <div class="info-box">
                     <div class="label">学号</div>
-                    <div class="text">2023010236</div>
+                    <div class="text">{{ info.workNo }}</div>
                 </div>
 
                 <div class="info-box">
                     <div class="label">手机号</div>
-                    <div class="text">17725633652</div>
+                    <div class="text">{{ info.phone }}</div>
                 </div>
 
                 <div class="info-box">
+                    <div class="label">邮箱</div>
+                    <div class="text">{{ info.email }}</div>
+                </div>
+                <!-- <div class="info-box">
                     <div class="label">院系</div>
                     <div class="text">国际教育学院</div>
                 </div>
@@ -125,7 +129,7 @@
                 <div class="info-box remark">
                     <div class="label">其它备注</div>
                     <div class="text">无</div>
-                </div>
+                </div> -->
             </div>
         </el-card>
         <el-card class="list" :body-style="{ padding: 0 }">
@@ -164,17 +168,22 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, toRefs } from 'vue';
+import userStore from '@/store/module/user';
+const user = userStore();
+
+// 用户信息
+const { userInfo: info } = toRefs(user);
+
+// 解析性别
+function pasSex(num: number) {
+    if (num == 1) return '男'
+    else if (num == 2) return '女'
+    else return '保密'
+}
 
 const input = ref('');
-interface User {
-    id: number          // id
-    stuNum: string      // 学号
-    name: string         // 姓名
-    department: string  // 院系
-    phone: string      // 手机号
-}
-const tableData: User[] = [
+const tableData = [
     {
         id: 1,
         stuNum: '20230101',
@@ -446,13 +455,13 @@ function handleChange(currentPage: number, pageSize: number) {
     }
 
     .center {
-        height: 388px;
+        // height: 388px;
         border-radius: 6px 6px 6px 6px;
         margin-bottom: 25px;
 
         .personage-info {
-            margin: 30px 0 0 32px;
-            width: 780px;
+            margin: 30px;
+            // width: 780px;
             display: flex;
             flex-wrap: wrap;
             justify-content: space-between;
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 3312568..1754f73 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -103,6 +103,10 @@
                 </div>
 
                 <div class="info-box">
+                    <div class="label">邮箱</div>
+                    <div class="text">{{ info.email }}</div>
+                </div>
+                <!-- <div class="info-box">
                     <div class="label">院系</div>
                     <div class="text">国际教育学院</div>
                 </div>
@@ -125,25 +129,27 @@
                 <div class="info-box remark">
                     <div class="label">其它备注</div>
                     <div class="text">无</div>
-                </div>
+                </div> -->
             </div>
         </el-card>
 
         <div class="bottom">
             <el-button class="btn">取消报名</el-button>
-            <el-button class="btn cyan">确认报名</el-button>
+            <el-button class="btn cyan" :loading="subLoading" @click="submit">确认报名</el-button>
         </div>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { toRef } from 'vue';
+import { ref, toRefs, watch } from 'vue';
+import { getSignUpApi } from '@/api/person';
+import { getHint } from '@/utils/asyncHint';
+import { useRoute } from 'vue-router';
 import userStore from '@/store/module/user';
-
 const user = userStore();
+const route = useRoute();
 
-const info = toRef(user.userInfo);
-console.log("🚀 ~ info:", user.userInfo)
+const { userInfo: info } = toRefs(user);
 
 // 解析性别
 function pasSex(num: number) {
@@ -151,6 +157,27 @@ function pasSex(num: number) {
     else if (num == 2) return '女'
     else return '保密'
 }
+
+// 确认报名数据及逻辑
+const upData = ref<Parameters<typeof getSignUpApi>[0]>({
+    annualCompid: route.query.id as string,
+    entryFormat: '个人',
+    id: ''
+});
+watch(() => info.value.id, newVal => upData.value.id = newVal);
+
+const subLoading = ref(false);
+const options = {
+    onFinish() {
+        subLoading.value = false
+    },
+    msgs: ['报名成功', '报名失败,请重新报名']
+};
+
+async function submit() {
+    subLoading.value = true;
+    await getHint(getSignUpApi(upData.value), options);
+}
 </script>
 
 <style lang="scss" scoped>
@@ -348,14 +375,14 @@ function pasSex(num: number) {
     }
 
     .center {
-        height: 388px;
+        // height: 388px;
         border-radius: 6px 6px 6px 6px;
         margin-bottom: 25px;
         position: relative;
 
         .personage-info {
-            margin: 30px 0 0 32px;
-            width: 780px;
+            margin: 30px;
+            // width: 780px;
             display: flex;
             flex-wrap: wrap;
             justify-content: space-between;

From fe73766095bc27fa5f3b7c987cfa2a0364dfeb2c Mon Sep 17 00:00:00 2001
From: significative <163999932+significative@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:48:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=8A=A5=E5=90=8Dapi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/person.ts                         | 33 ++++++++----
 src/utils/asyncHint.ts                    |  2 -
 src/views/projectName/index.vue           |  3 +-
 src/views/registrationPersonage/index.vue | 61 ++++++++++++++++-------
 4 files changed, 68 insertions(+), 31 deletions(-)

diff --git a/src/api/person.ts b/src/api/person.ts
index 95fec01..27ad773 100644
--- a/src/api/person.ts
+++ b/src/api/person.ts
@@ -1,5 +1,14 @@
 import request from '@/utils/requset'
-
+function f(callback: Function) {
+    return (...arg: any[]) => {
+        return new Promise((resolve, reject) => {
+            callback(...arg).then((res: any) => {
+                if (res.code >= 200 && res.code < 300) resolve(res)
+                else reject(res)
+            }).catch(reject);
+        })
+    }
+}
 
 enum api {
     liststu = '/abilityEvaluation/personalAbilityEvaluationCollect/liststu', // 个人能力评价列表
@@ -9,17 +18,19 @@ enum api {
     competitionOne = '/AnnualCompPoint/annualCompPoint/findcomppxq', // 比赛项目单个
     signUp = '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/edit', // 年度比赛项目报名 POST 
 }
-export const getlEvaluateApi = (params: Record<'pageNo' | 'pageSize', number>) => request.get(api.liststu, { params });
-export const getlIntegralApi = (params: Record<'pageNo' | 'pageSize', number>) => request.get(api.integral, { params });
+export const getlEvaluateApi = f((params: Record<'pageNo' | 'pageSize', number>) => request.get(api.liststu, { params }));
+export const getlIntegralApi = f((params: Record<'pageNo' | 'pageSize', number>) => request.get(api.integral, { params }));
 
-export const getXsfxbgApi = (params = {}) => {
-    const par = { recreateFlag: false, annualid: '' };
-    Object.assign(par, params);
-    return request.get(api.PAGE_XSFXBG, { params: par });
-};
+export const getXsfxbgApi = f(
+    (params = {}) => {
+        const par = { recreateFlag: false, annualid: '' };
+        Object.assign(par, params);
+        return request.get(api.PAGE_XSFXBG, { params: par });
+    }
+);
 
-export const getCompetitionApi = (id: string) => request.get(api.competition, { params: { id } });
-export const getCompetitionOneApi = (id: string) => request.get(api.competitionOne, { params: { id } });
+export const getCompetitionApi = f((id: string) => request.get(api.competition, { params: { id } }));
+export const getCompetitionOneApi = f((id: string) => request.get(api.competitionOne, { params: { id } }));
 
 interface SignUpData {
     annualCompid: string,
@@ -28,4 +39,4 @@ interface SignUpData {
     instructorSheetList?: any[],
     teamManagementList?: any[],
 }
-export const getSignUpApi = (data: SignUpData) => request.post(api.signUp, data);
\ No newline at end of file
+export const getSignUpApi = f((data: SignUpData) => request.post(api.signUp, data));
\ No newline at end of file
diff --git a/src/utils/asyncHint.ts b/src/utils/asyncHint.ts
index 2ef0fbe..e1be234 100644
--- a/src/utils/asyncHint.ts
+++ b/src/utils/asyncHint.ts
@@ -54,8 +54,6 @@ export function getHint(pro: Promise<any>, options: Options = {}) {
         if (opt.onRejected) opt.onRejected(err);
     }
     const onFinish = () => {
-        console.log(opt, opt.onFinish);
-
         if (opt.onFinish) opt.onFinish();
     }
 
diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue
index f93d2c4..cf585aa 100644
--- a/src/views/projectName/index.vue
+++ b/src/views/projectName/index.vue
@@ -84,7 +84,8 @@ function handleSub() {
     let path;
     if (data.value.entryForm === 'Y') path = '/registrationGroup';
     else path = '/registrationPersonage';
-    router.push({ path, query: { id: route.query.id } })
+    
+    router.push({ path, query: { id: route.query.id,objName:data.value.objName } })
 }
 
 getData();
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 1754f73..b6948e1 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -79,7 +79,7 @@
                 <div class="head">
                     <div class="title">个人信息</div>
                     <div class="icon">
-                        <img src="../../assets/images/ellipsis.png" alt="">
+                        <!-- <img src="../../assets/images/ellipsis.png" alt=""> -->
                     </div>
                 </div>
                 <div class="info-box">
@@ -106,6 +106,12 @@
                     <div class="label">邮箱</div>
                     <div class="text">{{ info.email }}</div>
                 </div>
+                <div class="info-box">
+                    <div class="label">队伍名称</div>
+                    <div class="text">
+                        <el-input v-model="upData.teamName"></el-input>
+                    </div>
+                </div>
                 <!-- <div class="info-box">
                     <div class="label">院系</div>
                     <div class="text">国际教育学院</div>
@@ -134,20 +140,21 @@
         </el-card>
 
         <div class="bottom">
-            <el-button class="btn">取消报名</el-button>
+            <el-button class="btn" @click="() => router.push('/')">取消报名</el-button>
             <el-button class="btn cyan" :loading="subLoading" @click="submit">确认报名</el-button>
         </div>
     </div>
 </template>
 
 <script lang="ts" setup>
-import { ref, toRefs, watch } from 'vue';
+import { ref, toRefs } from 'vue';
 import { getSignUpApi } from '@/api/person';
-import { getHint } from '@/utils/asyncHint';
-import { useRoute } from 'vue-router';
+import { ElMessage } from 'element-plus';
+import { useRoute, useRouter } from 'vue-router';
 import userStore from '@/store/module/user';
 const user = userStore();
 const route = useRoute();
+const router = useRouter();
 
 const { userInfo: info } = toRefs(user);
 
@@ -160,23 +167,43 @@ function pasSex(num: number) {
 
 // 确认报名数据及逻辑
 const upData = ref<Parameters<typeof getSignUpApi>[0]>({
-    annualCompid: route.query.id as string,
+    annualCompid: route.query.objName as string,
     entryFormat: '个人',
-    id: ''
+    id: route.query.id,
+    instructorSheetList: [],
+    teamManagementList: [{ realname: "", captain: "", teamSeq: "", userId: "" }],
+    teamName: ""
 });
-watch(() => info.value.id, newVal => upData.value.id = newVal);
 
-const subLoading = ref(false);
-const options = {
-    onFinish() {
-        subLoading.value = false
-    },
-    msgs: ['报名成功', '报名失败,请重新报名']
-};
 
+const subLoading = ref(false);
 async function submit() {
-    subLoading.value = true;
-    await getHint(getSignUpApi(upData.value), options);
+    upData.value.teamManagementList[0].realname = info.value.realname
+    upData.value.teamManagementList[0].userId = info.value.id
+    if (!upData.value.teamName) {
+        ElMessage({
+            message: '队伍名称不能为空',
+            type: 'warning'
+        })
+        return
+    }
+    try {
+        subLoading.value = true;
+        const res: any = await getSignUpApi(upData.value);
+
+        ElMessage({
+            message: res?.message || res?.result || '报名成功',
+            type: 'success'
+        })
+    } catch (error) {
+        ElMessage({
+            // @ts-ignore
+            message: error?.message,
+            type: 'error'
+        })
+    } finally {
+        subLoading.value = false
+    }
 }
 </script>