比赛详情页

src/Layout/tabbar/index.vue

@@ -12,9 +12,11 @@
       </div>
       <div class="menu">
           <div @click="$router.push('/')">首页</div>
-          <div @click="$router.push('/')">赛事流程</div>
+          <div @click="$router.push('/news')">比赛新闻</div>
-          <div @click="$router.push('/')">优秀作品</div>
+          <div @click="$router.push('/')">精彩瞬间</div>
-          <div @click="$router.push('/')">相关资讯</div>
+          <div @click="$router.push('/')">阅读心得</div>
+          <div @click="$router.push('/')">经典书籍</div>
+          <div @click="$router.push('/')">文件下载</div>
         </div>
       <div class="right" v-if="!useUserStore.token">
         <!-- <div
@@ -216,7 +218,7 @@ watch(
       // margin-right: 50px; /* 确保右边没有外边距 */
       cursor: pointer;  /* 鼠标悬停时显示为手型 */
       color: #333333;
-      font-family: Microsoft YaHei UI, Microsoft YaHei UI;
+      // font-family: Microsoft YaHei UI, Microsoft YaHei UI;
       font-weight: bold;
       font-style: normal;
       text-transform: none;

src/views/home/index.vue

@@ -421,7 +421,7 @@ export default {
   }
 }
 .content{
-  height: 676px;
+  height: 800px;
   padding-top: 132px;
   padding-left: 350px;
   .content-1{

src/views/raceInfo/index.vue

@@ -41,6 +41,10 @@
                       <div class="label">比赛名称:</div>
                       <div class="text">{{ raceInfo.compName }}</div>
                     </li>
+                    <!-- <li  style="width: 100%;">
+                      <div class="label">比赛阶段:</div>
+                      <div class="text">校赛（报名中）、县赛（未开始）、市赛、省赛</div>
+                    </li> -->
                     <li style="width: 40%">
                       <div class="label">负责人:</div>
                       <div class="text">{{ raceInfo.createBy }}</div>
@@ -96,22 +100,22 @@
       </div>
       <div class="right-history">
         <el-card style="padding: 0">
-          <div class="title">历史比赛</div>
+          <div class="title">比赛新闻</div>
-          <div class="description">往年历史赛事</div>
+          <!-- <div class="description">往年历史赛事</div> -->
           <el-scrollbar height="650px">
             <ul>
-              <li v-for="item in historyRaceList" :key="item.id" >
+              <li v-for="item in historyRaceList" :key="item.columnId ">
-                <div class="year">2024年度</div>
+                <div class="year">{{ item.publishTime }}</div>
-                <div class="name">{{ item.name }}</div>
+                <div class="name" @click="goToNewinfo(item.id)">{{ item.title }}</div>
-                <div class="time">
+                <!-- <div class="time">
                   报名时间:{{ item.starttime }} - {{ item.endtime }}
-                </div>
+                </div> -->
-                <!-- <div class="go-to" @click="goToCompetition(item.id)">
+                <!-- <div class="go-to" @click="goToCompetition(item.columnId)">
                   前往查看
                 </div> -->
-                <div class="icon">
+                <!-- <div class="icon">
                   <img src="../../assets/images/编组.png" alt="" srcset="" />
-                </div>
+                </div> -->
               </li>
             </ul>
           </el-scrollbar>
@@ -120,7 +124,7 @@
     </div>
     <!-- 年度比赛列表 -->
     <div style="margin-top: 30px; font-size: 24px; font-weight: 600">
-      年度比赛项目列表:
+      赛道列表:
     </div>
     <el-card v-if="reacProjectList.length === 0" style="margin-top: 20px">
       <div
@@ -163,13 +167,10 @@
             </div>
             <div class="reac-title">负责部门：{{ item.sysOrgCode }}</div>
             <!-- <div class="reac-project">{{ item.introduction }}</div> -->
-            <div
+            <div class="time">
-              class="time"
+              <div style="padding-bottom: 5px;">开始时间:{{ item.applyStartTime }}</div>
-              style="display: flex; justify-content: space-between"
+              
-            >
+              <div>结束时间:{{ item.applyEndTime }}</div>
-              <div>开始时间:{{ item.applyStartTime }}</div>
-              结束时间:{{ item.applyEndTime }}
-              <div></div>
             </div>
             <!-- <div class="time">
            
@@ -200,6 +201,7 @@ import {
   getHistoryRaceList,
   getProjectId,
 } from '@/api/race'
+import {queryEssayListApi} from '@/api/news'
 import { useRouter, useRoute } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import { pa } from 'element-plus/es/locales.mjs'
@@ -239,7 +241,7 @@ const setImageUrl = (url: string) => {
 const raceInfo = ref<any>({})
 const getraceInfoEvent = async () => {
   const res: any = await getRaceInfo({ id: Route.query.id })
-  console.log(res)
+  console.log(res,'getRaceInfo')
   createfileLink(res.result.compFile)
   raceInfo.value = res.result
 }
@@ -274,15 +276,21 @@ const doLoadFile = (url: any) => {
   window.open(import.meta.env.VITE_APP_BASE_API + '/sys/common/static/' + url)
 }
 
-// 获取年度历史比赛
+// 获取比赛新闻
 const historyRaceList = ref<any>([])
 const getHistoryRaceListEvent = async () => {
-  const res: any = await getHistoryRaceList({ id: Route.query.id })
+  const res: any = await queryEssayListApi( 1717099205205401602n )
-  console.log(res)
+  console.log(res,'queryEssayListApi')
-  historyRaceList.value = res.result
+  historyRaceList.value = res.result.records
 }
 getHistoryRaceListEvent()
 
+//前往比赛新闻
+const goToNewinfo = (id:number) =>{
+  Router.push({
+    path:'/detail/' + id,
+  })
+}
 const fileList = ref<any>([])
 const createfileLink = (url: any) => {
   console.log(url)
@@ -360,7 +368,7 @@ const scrollToPosition = () => {
         .time {
           font-size: 14px;
           color: #8c8b8b;
-          margin-top: 30px;
+          margin-top: 10px;
         }
         .niandu {
           color: #1e2033;
@@ -405,13 +413,14 @@ const scrollToPosition = () => {
         li {
           position: relative;
           width: 100%;
-          height: 140px;
+          height: 100px;
           // background-color: pink;
           color: #333333;
           padding: 15px;
           display: flex;
           flex-direction: column;
           justify-content: space-between;
+          // align-items: center;
           box-shadow: 0rem 0rem 0.05208rem rgba(0, 0, 0, 0.06);
           margin-top: 10px;
           cursor: pointer;
@@ -419,10 +428,11 @@ const scrollToPosition = () => {
             font-size: 12px;
           }
           .name {
-            width: 130px;
+            // width: 130px;
+            height: 30px;
             font-size: 16px;
             font-weight: 600;
-            margin-top: 10px;
+            
           }
           .time {
             font-size: 12px;