From 7f4f8e41f3c4c8b9106db5ea6a3ecb794bff7f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Mon, 9 Jun 2025 09:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=B7=B3=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.ts                  |  4 +-
 src/views/raceInfo/index.vue | 80 +++++++++++-------------------------
 2 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index a137e0f..4663220 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -60,10 +60,10 @@ const pcHost = new URL(import.meta.env.VITE_APP_PC_URL).host
 
 if (isMobile && currentHost !== mobileHost) {
     console.log('手机端，跳转到移动站')
-    location.href = import.meta.env.VITE_APP_MOBILE_URL
+    // location.href = import.meta.env.VITE_APP_MOBILE_URL
 } else if (!isMobile && currentHost !== pcHost) {
     console.log('电脑端，跳转到 PC 站')
-    location.href = import.meta.env.VITE_APP_PC_URL
+    // location.href = import.meta.env.VITE_APP_PC_URL
 }
 
 
diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue
index 4bc0cf2..e9ab624 100644
--- a/src/views/raceInfo/index.vue
+++ b/src/views/raceInfo/index.vue
@@ -120,7 +120,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
@@ -152,16 +152,16 @@
           </div>
           <div class="reac-info">
             <div class="niandu">
-              <div>{{ item.annualname }}年度</div>
+              <div>{{ item.name }}</div>
               <el-button type="primary" size="small">报名</el-button>
             </div>
             <div
               class="reac-title"
               style="font-weight: 600; color: #000; font-size: 16px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
             >
-              {{ item.name }}
+              {{ item.objName }}
             </div>
-            <div class="reac-title">负责部门：{{ item.compOrgan }}</div>
+            <div class="reac-title">负责部门：{{ item.coorganizer }}</div>
             <!-- <div class="reac-project">{{ item.introduction }}</div> -->
             <div
               class="time"
@@ -252,7 +252,7 @@ const goToCompetition = async (id: any, endTime: string,isOpen:string) => {
     return ElMessage.error('比赛已结束')
   }
   const projectId: any = await getProjectId({ anncmopid: id })
-  console.log(projectId.result)
+  console.log(projectId.result,'12121212')
 
   // return
   Router.push(`/projectName?id=${projectId.result}&bcId=${id}`)
@@ -308,9 +308,9 @@ const scrollToPosition = () => {
   .top-image {
     width: 100%;
     height: 300px;
-    background: var(--background-color);
+    background-color: skyblue;
     text-align: center;
-    color: var(--text-color);
+    color: #fff;
     font-size: 32px;
     font-weight: 700;
     line-height: 300px;
@@ -319,14 +319,16 @@ const scrollToPosition = () => {
     width: 100%;
     display: grid;
     grid-template-columns: repeat(4, 1fr);
+    // grid-template-rows: repeat(2, 1fr);
+    // gap: 10px;
+    // margin-top: 10px;
     .item {
       width: 340px;
       height: 360px;
-      background-color: var(--card-bg-color);
+      // background-color: pink;
       box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.06);
       cursor: pointer;
       border-radius: 10px;
-      border: 1px solid var(--border-color);
       transition: all 0.2s;
       .image {
         width: 100%;
@@ -334,21 +336,19 @@ const scrollToPosition = () => {
         img {
           width: 100%;
           height: 100%;
-          border-radius: 4px;
         }
       }
       .reac-info {
         padding: 0 8px;
         .reac-title {
           margin-top: 19px;
-          color: var(--text-color);
-          opacity: 0.65;
+          color: #c9c9c9;
           font-size: 12px;
         }
         .reac-project {
           font-size: 16px;
           font-weight: 600;
-          color: var(--text-color);
+          color: #333333;
           margin-top: 10px;
           line-height: 20px;
           height: 60px;
@@ -359,12 +359,11 @@ const scrollToPosition = () => {
         }
         .time {
           font-size: 14px;
-          color: var(--text-color);
-          opacity: 0.65;
+          color: #8c8b8b;
           margin-top: 30px;
         }
         .niandu {
-          color: var(--text-color);
+          color: #1e2033;
           font-size: 18px;
           margin-top: 20px;
           font-weight: 600;
@@ -376,7 +375,6 @@ const scrollToPosition = () => {
     }
     .item:hover {
       transform: translateY(-5px);
-      border-color: var(--primary-color);
     }
     .item:nth-child(n) {
       margin-top: 20px;
@@ -393,13 +391,12 @@ const scrollToPosition = () => {
       width: 300px;
       margin-left: 40px;
       .title {
-        color: var(--text-color);
+        color: #1e2033;
         font-size: 28px;
         font-weight: 600;
       }
       .description {
-        color: var(--text-color);
-        opacity: 0.65;
+        color: #1e2033;
         font-size: 14px;
         margin-top: 15px;
       }
@@ -409,7 +406,8 @@ const scrollToPosition = () => {
           position: relative;
           width: 100%;
           height: 140px;
-          color: var(--text-color);
+          // background-color: pink;
+          color: #333333;
           padding: 15px;
           display: flex;
           flex-direction: column;
@@ -417,13 +415,8 @@ const scrollToPosition = () => {
           box-shadow: 0rem 0rem 0.05208rem rgba(0, 0, 0, 0.06);
           margin-top: 10px;
           cursor: pointer;
-          background: var(--card-bg-color);
-          border: 1px solid var(--border-color);
-          border-radius: 4px;
-          transition: all 0.3s;
           .year {
             font-size: 12px;
-            opacity: 0.65;
           }
           .name {
             width: 130px;
@@ -433,7 +426,6 @@ const scrollToPosition = () => {
           }
           .time {
             font-size: 12px;
-            opacity: 0.45;
           }
           .go-to {
             position: absolute;
@@ -444,9 +436,9 @@ const scrollToPosition = () => {
             line-height: 28px;
             text-align: center;
             font-size: 14px;
-            color: #ffffff;
-            background: var(--primary-color);
-            border-radius: 0 4px 0 4px;
+            color: #f6f5fb;
+            background: url('../../assets/images/left-top.png') no-repeat;
+            background-size: contain;
           }
           .icon {
             position: absolute;
@@ -458,14 +450,6 @@ const scrollToPosition = () => {
             img {
               width: 100%;
               height: 100%;
-              opacity: 0.8;
-            }
-          }
-          &:hover {
-            transform: translateY(-2px);
-            border-color: var(--primary-color);
-            .name {
-              color: var(--primary-color);
             }
           }
         }
@@ -490,14 +474,12 @@ const scrollToPosition = () => {
               display: flex;
               .label {
                 font-size: 16px;
-                color: var(--text-color);
-                opacity: 0.45;
+                color: #aaa;
                 width: 100px;
               }
               .text {
                 font-size: 16px;
                 font-weight: 600;
-                color: var(--text-color);
               }
             }
             li:first-child {
@@ -517,8 +499,7 @@ const scrollToPosition = () => {
         margin-top: 25px;
         .label {
           font-size: 16px;
-          color: var(--text-color);
-          opacity: 0.45;
+          color: #aaa;
         }
         .deaceiption {
           font-size: 16px;
@@ -526,7 +507,6 @@ const scrollToPosition = () => {
           line-height: 26px;
           margin-top: 15px;
           height: 300px;
-          color: var(--text-color);
         }
         .file {
           margin-top: 25px;
@@ -539,16 +519,12 @@ const scrollToPosition = () => {
     width: 100%;
     font-size: 14px;
     line-height: 22px;
-    border: 1px solid var(--border-color);
-    background-color: var(--card-bg-color);
+    border: 1px solid #ccc;
     padding: 20px;
     margin-top: 20px;
-    color: var(--text-color);
     p {
       img {
         width: 100%;
-        border-radius: 4px;
-        border: 1px solid var(--border-color);
       }
     }
   }
@@ -556,12 +532,6 @@ const scrollToPosition = () => {
 :deep(.el-card) {
   width: 100%;
   height: 100%;
-  background-color: var(--card-bg-color);
-  border-color: var(--border-color);
-  color: var(--text-color);
-  .el-card__header {
-    border-bottom: 1px solid var(--border-color);
-  }
 }
 img {
   width: 100%;