From 8872456cff4d3f54efc7ae806e08f0c909f137de Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Tue, 10 Jun 2025 15:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/domain/vo/HitRegInfoExportVo.java     |  4 ++++
 .../cms/HitCompetitionStudentInfoMapper.xml   |  3 ++-
 ruoyi-ui/src/views/cms/editor/index.vue       | 22 ++++++++++++++++---
 ruoyi-ui/src/views/hit/stuInfo/index.vue      | 10 +++++++++
 .../officialWebsite/Components/header.vue     |  6 +++--
 5 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java
index c4d44ed..6c3d8ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoExportVo.java
@@ -26,6 +26,10 @@ public class HitRegInfoExportVo {
     @Excel(name = "团队名称")
     private String teamName;
 
+    /** 赛道 */
+    @Excel(name = "赛道",dictType="com_racetrack")
+    private String racetrack;
+
     /** 盲样邮寄地址 */
     @Excel(name = "盲样邮寄地址")
     private String sampleAddress;
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
index 5b1a86e..52b682e 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
@@ -35,7 +35,7 @@
     <select id="selectHitCompetitionStudentInfoList" parameterType="HitCompetitionStudentInfo"
             resultType="com.ruoyi.cms.domain.HitCompetitionStudentInfo">
         select *
-               from hit_competition_student_info
+        from hit_competition_student_info
         <where>
             <if test="hitRegId != null  and hitRegId != ''">and hit_reg_id = #{hitRegId}</if>
             <if test="stuName != null  and stuName != ''">and stu_name like concat('%', #{stuName}, '%')</if>
@@ -52,6 +52,7 @@
             <if test="studentIdCard != null  and studentIdCard != ''">and student_id_card = #{studentIdCard}</if>
             <if test="trialsScore != null ">and trials_score = #{trialsScore}</if>
             <if test="isPreliminary != null ">and is_preliminary = #{isPreliminary}</if>
+            <if test="nationality != null">and nationality = #{nationality}</if>
             <if test="year != null ">and create_time like concat(#{year},'%')</if>
         </where>
         order by school_name desc
diff --git a/ruoyi-ui/src/views/cms/editor/index.vue b/ruoyi-ui/src/views/cms/editor/index.vue
index a97d85a..2a8a676 100644
--- a/ruoyi-ui/src/views/cms/editor/index.vue
+++ b/ruoyi-ui/src/views/cms/editor/index.vue
@@ -78,6 +78,17 @@
                       </el-input>
                     </el-form-item>
                   </div>
+                  <div class="art-title bg-purple-white">
+                    <el-form-item label="222" prop="summary">
+                      <el-input
+                        type="textarea"
+                        v-model="form.categoryId"
+                        maxlength="360"
+                        show-word-limit
+                      >
+                      </el-input>
+                    </el-form-item>
+                  </div>
                   <!--                  <el-form-item label="附件" prop="accessoryUrl">-->
                   <!--                    <file-upload v-model="form.accessoryUrl"/>-->
                   <!--                  </el-form-item>-->
@@ -181,15 +192,16 @@ export default {
       immediate: true,
       handler() {
         this.reset()
-        this.getCategoryList()
+        // this.getCategoryList()
       }
     },
     '$route.query.contentId': {
       immediate: true,
       handler(val) {
+        console.log('执行监听内容id')
         if (val !== undefined) {
           this.reset()
-          this.getCategoryList()
+          // this.getCategoryList()
           this.getContentById(val)
         }
       }
@@ -270,7 +282,7 @@ export default {
       getLeavesCategoryList().then(response => {
         this.categoryList = response.data
         this.form.categoryId = this.$route.query.categoryId + ''
-        if (!!this.$route.query.categoryId) {
+        if (!this.$route.query.categoryId) {
           // let flag = this.isIdInTree(this.$route.query.categoryId, this.categoryList)
           // if (!flag) {
           //   this.form.categoryId = ''
@@ -350,6 +362,10 @@ export default {
     //保存
     handlerSaveBefore() {
       this.form.status = this.form.id === '' ? '0' : '3'
+      // if (this.form.categoryId === undefined) {
+      //   delete this.form.categoryId // 不传这个字段
+      // }
+
       this.handleSave()
     },
     // 新增
diff --git a/ruoyi-ui/src/views/hit/stuInfo/index.vue b/ruoyi-ui/src/views/hit/stuInfo/index.vue
index 1563477..ef3f043 100644
--- a/ruoyi-ui/src/views/hit/stuInfo/index.vue
+++ b/ruoyi-ui/src/views/hit/stuInfo/index.vue
@@ -30,6 +30,16 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="国籍" prop="nationality">
+        <el-select v-model="queryParams.nationality" placeholder="请选择" clearable>
+          <el-option
+            v-for="item in dict.type.com_nationality"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
 <!--      <el-form-item label="赛道" prop="year">-->
 <!--        <el-select v-model="queryParams.racetrack" placeholder="请选择" clearable>-->
 <!--          <el-option-->
diff --git a/ruoyi-ui/src/views/officialWebsite/Components/header.vue b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
index c97f55f..7dc34a1 100644
--- a/ruoyi-ui/src/views/officialWebsite/Components/header.vue
+++ b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
@@ -146,13 +146,14 @@
 <!--            <image-upload :limit="1" v-model="registerForm.hitRegistrationTeachInfo.file"></image-upload>-->
             <el-upload
               ref="upload"
-              :limit="1"system/hit_reg_info/export
+              :limit="1"
               :headers="upload.headers"
               :action="upload.url + '?updateSupport=' + upload.updateSupport"
               :disabled="upload.isUploading"
               :on-progress="handleFileUploadProgress"
               :on-success="handleFileSuccess"
               :auto-upload="true"
+              :file-list="upload.fileList"
               drag
             >
               <i class="el-icon-upload"></i>
@@ -181,7 +182,7 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer" style="z-index: 5;position: relative">
-        <el-button @click="showRegisterDialog = false">取 消</el-button>
+        <el-button @click="registerDialog = false">取 消</el-button>
         <el-button type="primary" @click="submitRegister">注 册</el-button>
       </span>
     </el-dialog>
@@ -269,6 +270,7 @@ export default {
         title: "",
         // 是否禁用上传
         isUploading: false,
+        fileList: [],
         // 是否更新已经存在的用户数据
         updateSupport: 0,
         // 设置上传的请求头部