From c1ad3f3580f2adefb954f806a4445be49c3c2d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 18 Feb 2025 17:12:16 +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/controller/HitRegInfoController.java  |  55 +-
 .../cms/domain/HitCompetitionStudentInfo.java |  18 +
 .../java/com/ruoyi/cms/domain/HitRegInfo.java |   4 +
 .../com/ruoyi/cms/domain/HitRegInfoUser.java  |  14 +
 .../cms/domain/vo/HitRegInfoTeamImportVo.java |  28 +
 .../cms/domain/vo/HitRegInfoUserImportVo.java |  36 ++
 .../ruoyi/cms/service/IHitRegInfoService.java |  29 +-
 .../HitCompetitionStudentInfoServiceImpl.java |  30 +-
 .../service/impl/HitRegInfoServiceImpl.java   | 298 +++++----
 .../impl/HitRegInfoUserServiceImpl.java       |   4 +
 .../HitRegistrationTeachInfoServiceImpl.java  |   1 +
 .../cms/service/impl/HitTeamsServiceImpl.java |  41 +-
 .../controller/common/CommonController.java   |   3 +
 .../cms/HitCompetitionStudentInfoMapper.xml   |  11 +-
 .../resources/mapper/cms/HitRegInfoMapper.xml |   2 +-
 .../cms/HitRegistrationTeachInfoMapper.xml    |   2 +
 .../core/domain/HitRegistrationTeachInfo.java |  11 +
 .../api/officialWebsite/registerStudent.js    |  14 +
 .../src/assets/images/cha_kan_geng_duo.png    | Bin 0 -> 20798 bytes
 ruoyi-ui/src/assets/images/searchgrade.png    | Bin 0 -> 4658 bytes
 .../hit/registrationStudentInfo/index.vue     | 417 +++++++++----
 ruoyi-ui/src/views/hit/teacherInfo/index.vue  |   8 +
 .../officialWebsite/Components/header.vue     | 525 ++++++++--------
 .../src/views/officialWebsite/competition.vue | 569 +++++++++++++-----
 24 files changed, 1459 insertions(+), 661 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoTeamImportVo.java
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoUserImportVo.java
 create mode 100644 ruoyi-ui/src/assets/images/cha_kan_geng_duo.png
 create mode 100644 ruoyi-ui/src/assets/images/searchgrade.png

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
index 34c3b01..223d003 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/controller/HitRegInfoController.java
@@ -6,8 +6,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.ruoyi.cms.domain.vo.HitRegInfoExportVo;
-import com.ruoyi.cms.domain.vo.HitRegInfoVo;
+import com.ruoyi.cms.domain.vo.*;
 import com.ruoyi.common.core.domain.HitRegistrationTeachInfo;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import org.slf4j.Logger;
@@ -30,6 +29,7 @@ import com.ruoyi.cms.domain.HitRegInfo;
 import com.ruoyi.cms.service.IHitRegInfoService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 报名信息Controller
@@ -60,7 +60,6 @@ public class HitRegInfoController extends BaseController
     /**
      * 学生查询报名信息列表
      */
-
     @GetMapping("/studentList")
     public TableDataInfo studentList(HitRegInfo hitRegInfo)
     {
@@ -185,4 +184,54 @@ public class HitRegInfoController extends BaseController
     {
         return toAjax(hitRegInfoService.deleteHitRegInfoByIds(ids));
     }
+
+    /**
+     * 导入个人分数数据模板
+     *
+     * @param response
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil<HitRegInfoUserImportVo> util = new ExcelUtil<>(HitRegInfoUserImportVo.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    /**
+     * 导入个人分数数据
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<HitRegInfoUserImportVo> util = new ExcelUtil<>(HitRegInfoUserImportVo.class);
+        List<HitRegInfoUserImportVo> hitList = util.importExcel(file.getInputStream());
+        String message = hitRegInfoService.importData(hitList);
+        return success(message);
+    }
+
+    /**
+     * 导入团队分数数据模板
+     *
+     * @param response
+     */
+    @PostMapping("/importTeamTemplate")
+    public void importTeamTemplate(HttpServletResponse response) {
+        ExcelUtil<HitRegInfoTeamImportVo> util = new ExcelUtil<>(HitRegInfoTeamImportVo.class);
+        util.importTemplateExcel(response, "用户数据");
+    }
+
+    /**
+     * 导入团队分数数据
+     * @param file
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/importTeamData")
+    public AjaxResult importTeamData(MultipartFile file) throws Exception {
+        ExcelUtil<HitRegInfoTeamImportVo> util = new ExcelUtil<>(HitRegInfoTeamImportVo.class);
+        List<HitRegInfoTeamImportVo> hitList = util.importExcel(file.getInputStream());
+        String message = hitRegInfoService.importTeamData(hitList);
+        return success(message);
+    }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java
index 7e0caa3..2b2c809 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitCompetitionStudentInfo.java
@@ -135,5 +135,23 @@ public class HitCompetitionStudentInfo implements Serializable {
     private HitRegInfo hitRegInfo;
     @TableField(exist = false)
     private String zdTeacherStr;
+    @TableField(exist = false)
+    private boolean isSignUp;
+    /**
+     * 虚拟分
+     */
+    @TableField(exist = false)
+    private BigDecimal virtualScore;
+    /**
+     * 化验分
+     */
+    @TableField(exist = false)
+    private BigDecimal assayScore;
+
+    /**
+     * 团队分
+     */
+    @TableField(exist = false)
+    private BigDecimal teamScore;
 
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java
index d337dd0..80f1f01 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfo.java
@@ -9,6 +9,7 @@ import lombok.Data;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -68,6 +69,9 @@ public class HitRegInfo extends BaseEntity
     //0未审核1审核通过2审核拒绝
     private String auditStatus;
 
+    //团队分
+    private BigDecimal score;
+
     /** 逻辑删除0未删除1真删除 */
     private Long delFlag;
     @TableField(exist = false)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfoUser.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfoUser.java
index 459efc3..05322a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfoUser.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegInfoUser.java
@@ -9,6 +9,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 报名相关人员信息对象 hit_reg_info_user
  *
@@ -40,6 +42,18 @@ public class HitRegInfoUser extends BaseEntity
     @Excel(name = "类型 1 学生 2 指导老师 3领队老师")
     private String type;
 
+    /**
+     * 虚拟分
+     */
+    @Excel(name = "虚拟分")
+    private BigDecimal virtualScore;
+
+    /**
+     * 化验分
+     */
+    @Excel(name = "化验分")
+    private BigDecimal assayScore;
+
     /** 状态0待确认 1已同意 2拒绝 */
     @Excel(name = "状态0待确认 1已同意 2拒绝")
     private String status;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoTeamImportVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoTeamImportVo.java
new file mode 100644
index 0000000..4cc77d0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoTeamImportVo.java
@@ -0,0 +1,28 @@
+package com.ruoyi.cms.domain.vo;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 报名相关人员信息对象 hit_reg_info_user
+ *
+ * @author ruoyi
+ * @date 2024-09-01
+ */
+@Data
+public class HitRegInfoTeamImportVo extends BaseEntity
+{
+    @Excel(name = "团队名称")
+    private String teamName;
+
+    /**
+     * 虚拟分
+     */
+    @Excel(name = "团队分")
+    private BigDecimal score;
+
+    private Long userId;
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoUserImportVo.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoUserImportVo.java
new file mode 100644
index 0000000..ead2b99
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegInfoUserImportVo.java
@@ -0,0 +1,36 @@
+package com.ruoyi.cms.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 报名相关人员信息对象 hit_reg_info_user
+ *
+ * @author ruoyi
+ * @date 2024-09-01
+ */
+@Data
+public class HitRegInfoUserImportVo extends BaseEntity
+{
+    @Excel(name = "手机号")
+    private String mobile;
+
+    /**
+     * 虚拟分
+     */
+    @Excel(name = "虚拟分")
+    private BigDecimal virtualScore;
+    /**
+     * 化验分
+     */
+    @Excel(name = "化验分")
+    private BigDecimal assayScore;
+
+    private Long userId;
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java
index e678c43..39558d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/IHitRegInfoService.java
@@ -1,7 +1,10 @@
 package com.ruoyi.cms.service;
 
 import java.util.List;
+
 import com.ruoyi.cms.domain.HitRegInfo;
+import com.ruoyi.cms.domain.vo.HitRegInfoTeamImportVo;
+import com.ruoyi.cms.domain.vo.HitRegInfoUserImportVo;
 import com.ruoyi.cms.domain.vo.HitRegInfoVo;
 
 /**
@@ -10,8 +13,7 @@ import com.ruoyi.cms.domain.vo.HitRegInfoVo;
  * @author zcy
  * @date 2024-08-20
  */
-public interface IHitRegInfoService
-{
+public interface IHitRegInfoService {
     /**
      * 查询报名信息
      *
@@ -27,6 +29,7 @@ public interface IHitRegInfoService
      * @return 报名信息集合
      */
     public List<HitRegInfo> selectHitRegInfoList(HitRegInfo hitRegInfo);
+
     /**
      * 导出报名信息列表
      *
@@ -50,6 +53,7 @@ public interface IHitRegInfoService
      * @return 结果
      */
     public int updateHitRegInfo(HitRegInfo hitRegInfo);
+
     public int updateHitRegInfo2(HitRegInfo hitRegInfo);
 
     /**
@@ -61,7 +65,7 @@ public interface IHitRegInfoService
     public int deleteHitRegInfoByIds(Long[] ids);
 
 
-    void createRegInfo(String teamName,Integer teamCreatorId,String teacherId,Long teamId);
+    void createRegInfo(String teamName, Integer teamCreatorId, String teacherId, Long teamId);
 
     /**
      * 查询报名信息
@@ -69,7 +73,8 @@ public interface IHitRegInfoService
      * @param
      * @return 报名信息
      */
-    HitRegInfo selectHitByUserId(Long userId,String status);
+    HitRegInfo selectHitByUserId(Long userId, String status);
+
     HitRegInfo selectHitByUserId2(Long userId);
 
 
@@ -84,4 +89,20 @@ public interface IHitRegInfoService
      * @return 修改结果
      */
     int editTeam(HitRegInfo hitRegInfo);
+
+    /**
+     * 导入个人成绩信息
+     *
+     * @param hitList
+     * @return
+     */
+    String importData(List<HitRegInfoUserImportVo> hitList);
+
+    /**
+     * 导入团队成绩信息
+     *
+     * @param hitList
+     * @return
+     */
+    String importTeamData(List<HitRegInfoTeamImportVo> hitList);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
index 1d6b684..2af45d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitCompetitionStudentInfoServiceImpl.java
@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.cms.domain.*;
 import com.ruoyi.cms.domain.vo.HitCompetitionStudentInfoImportVo;
@@ -15,6 +17,7 @@ import com.ruoyi.cms.mapper.HitTeamsMapper;
 import com.ruoyi.cms.service.IHitCompetitionStudentInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.cms.service.IHitRegInfoService;
+import com.ruoyi.cms.service.IHitRegInfoUserService;
 import com.ruoyi.common.core.domain.HitRegistrationTeachInfo;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -25,6 +28,7 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysDictDataService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,6 +67,8 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
     private ISysDictDataService sysDictDataService;
     @Autowired
     private IHitRegInfoService regInfoService;
+    @Autowired
+    private IHitRegInfoUserService hitRegInfoUserService;
     private static final Logger log = LoggerFactory.getLogger(HitCompetitionStudentInfoServiceImpl.class);
 
 
@@ -176,6 +182,12 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
      */
     @Override
     public int updateHitCompetitionStudentInfoUpdate(HitCompetitionStudentInfo hitCompetitionStudentInfo) {
+        if (ObjectUtil.isNotEmpty(hitCompetitionStudentInfo.getPhoneNumber())) {
+            //校验手机号
+            if (!Validator.isMobile(hitCompetitionStudentInfo.getPhoneNumber())) {
+                throw new RuntimeException("手机号格式不正确");
+            }
+        }
         LambdaQueryWrapper<HitCompetitionStudentInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(HitCompetitionStudentInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName());
         queryWrapper.eq(HitCompetitionStudentInfo::getIsPreliminary, true);
@@ -241,11 +253,23 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
 ////            hitCompetitionStudentInfo.setCompetition(hitTeams.getCompetition());
 //        }
         if (ObjectUtils.isEmpty(hitCompetitionStudentInfo)) {
+            hitCompetitionStudentInfo = new HitCompetitionStudentInfo();
+            hitCompetitionStudentInfo.setSignUp(false);
             return new HitCompetitionStudentInfo();
         }
+
+        //查询化验赛和虚拟赛成绩
+        List<HitRegInfoUser> hitRegInfoUsers = hitRegInfoUserService.selectByUserId(user.getUserId());
+        if (CollectionUtils.isNotEmpty(hitRegInfoUsers)) {
+            hitCompetitionStudentInfo.setAssayScore(hitRegInfoUsers.get(0).getAssayScore());
+            hitCompetitionStudentInfo.setVirtualScore(hitRegInfoUsers.get(0).getVirtualScore());
+        }
+
+        hitCompetitionStudentInfo.setSignUp(true);
         String com_region = sysDictDataService.selectDictLabel("com_region", hitCompetitionStudentInfo.getDivision());
         hitCompetitionStudentInfo.setDivisionLabel(com_region);
         //根据学校查询领队老师
+        // TODO 不需要非得今年的老师
         LambdaQueryWrapper<HitRegistrationTeachInfo> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.eq(HitRegistrationTeachInfo::getSchoolName, hitCompetitionStudentInfo.getSchoolName())
                 .likeRight(HitRegistrationTeachInfo::getCreateTime, year).eq(HitRegistrationTeachInfo::getType, 1).eq(HitRegistrationTeachInfo::getStatus, 1);
@@ -283,7 +307,8 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
                 tmpStr = teacher.getUserName() + ",";
             }
             hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1));
-
+            hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos1);
+            hitCompetitionStudentInfo.setTeamScore(hitRegInfos1.getScore());
         } else {
             //查询是否存在已确认团队 审核中
             HitRegInfo hitRegInfos2 = regInfoService.selectHitByUserId(user.getUserId(), "0");
@@ -298,6 +323,8 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
                     tmpStr = teacher.getUserName() + ",";
                 }
                 hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1));
+                hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos2);
+                hitCompetitionStudentInfo.setTeamScore(hitRegInfos2.getScore());
             } else {
                 //查询是否存在待确认团队
                 HitRegInfo hitRegInfos3 = regInfoService.selectHitByUserId(user.getUserId(), "9");
@@ -312,6 +339,7 @@ public class HitCompetitionStudentInfoServiceImpl extends ServiceImpl<HitCompeti
                         tmpStr = tmpStr + teacher.getUserName() + ",";
                     }
                     hitCompetitionStudentInfo.setZdTeacherStr(tmpStr.substring(0, tmpStr.length() - 1));
+                    hitCompetitionStudentInfo.setHitRegInfo(hitRegInfos3);
                 }
             }
         }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
index 9be9f61..0e7764b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
@@ -2,18 +2,23 @@ package com.ruoyi.cms.service.impl;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cms.domain.*;
+import com.ruoyi.cms.domain.vo.HitRegInfoTeamImportVo;
+import com.ruoyi.cms.domain.vo.HitRegInfoUserImportVo;
 import com.ruoyi.cms.domain.vo.HitRegInfoVo;
 import com.ruoyi.cms.mapper.*;
 import com.ruoyi.cms.service.ICmsContentService;
@@ -25,7 +30,10 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.cms.service.IHitRegInfoService;
@@ -38,14 +46,13 @@ import org.springframework.transaction.annotation.Transactional;
  * @date 2024-08-20
  */
 @Service
-public class HitRegInfoServiceImpl implements IHitRegInfoService
-{
+public class HitRegInfoServiceImpl implements IHitRegInfoService {
     @Autowired
     private HitRegInfoMapper hitRegInfoMapper;
     @Autowired
     private HitRegistrationTeachInfoMapper teachInfoMapper;
     @Autowired
-    private ICmsContentService  insertCmsContent;
+    private ICmsContentService insertCmsContent;
     @Autowired
     private CmsContentMapper cmsContentMapper;
     @Autowired
@@ -61,6 +68,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
     @Autowired
     private HitRegInfoUserMapper hitRegInfoUserMapper;
 
+    private static final Logger log = LoggerFactory.getLogger(HitRegInfoServiceImpl.class);
 
 
     /**
@@ -70,8 +78,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      * @return 报名信息
      */
     @Override
-    public HitRegInfo selectHitRegInfoById(Long id)
-    {
+    public HitRegInfo selectHitRegInfoById(Long id) {
         return hitRegInfoMapper.selectHitRegInfoById(id);
     }
 
@@ -82,46 +89,46 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      * @return 报名信息
      */
     @Override
-    public List<HitRegInfo> selectHitRegInfoList(HitRegInfo hitRegInfo)
-    {
+    public List<HitRegInfo> selectHitRegInfoList(HitRegInfo hitRegInfo) {
         if (ObjectUtil.isEmpty(hitRegInfo.getYear())) {
             //获取当前年
             hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
         }
         Long userId = SecurityUtils.getLoginUser().getUserId();
         //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
-        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId,hitRegInfo.getYear());
+        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear());
         if (teacherInfo != null && teacherInfo.getType().equals("1")) {
             hitRegInfo.setSchoolName(teacherInfo.getSchoolName());
         }
         PageUtils.startPage();
         List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo);
         for (HitRegInfo regInfo : hitRegInfos) {
-            HitRegInfoUser hitRegInfoUser =new HitRegInfoUser();
+            HitRegInfoUser hitRegInfoUser = new HitRegInfoUser();
             hitRegInfoUser.setRegId(regInfo.getId());
             List<HitRegInfoUser> hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser);
             for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
                 switch (regInfoUser.getType()) {
                     case "3": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.setLdTeacher(hitRegistrationTeachInfo);
                         break;
                     }
                     case "2": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
                         break;
                     }
                     case "1":
-                        HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.getStudentUserss().add(studentInfo);
                         break;
                 }
             }
 
         }
-        return  hitRegInfos;
+        return hitRegInfos;
     }
+
     /**
      * 查询报名信息列表
      *
@@ -129,44 +136,43 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      * @return 报名信息
      */
     @Override
-    public List<HitRegInfo> selectHitRegInfoListExport(HitRegInfo hitRegInfo)
-    {
+    public List<HitRegInfo> selectHitRegInfoListExport(HitRegInfo hitRegInfo) {
         if (ObjectUtil.isEmpty(hitRegInfo.getYear())) {
             //获取当前年
             hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
         }
         Long userId = SecurityUtils.getLoginUser().getUserId();
         //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
-        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId,hitRegInfo.getYear());
+        HitRegistrationTeachInfo teacherInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(userId, hitRegInfo.getYear());
         if (teacherInfo != null && teacherInfo.getType().equals("1")) {
             hitRegInfo.setSchoolName(teacherInfo.getSchoolName());
         }
         List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectHitRegInfoList(hitRegInfo);
         for (HitRegInfo regInfo : hitRegInfos) {
-            HitRegInfoUser hitRegInfoUser =new HitRegInfoUser();
+            HitRegInfoUser hitRegInfoUser = new HitRegInfoUser();
             hitRegInfoUser.setRegId(regInfo.getId());
             List<HitRegInfoUser> hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser);
             for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
                 switch (regInfoUser.getType()) {
                     case "3": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.setLdTeacher(hitRegistrationTeachInfo);
                         break;
                     }
                     case "2": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
                         break;
                     }
                     case "1":
-                        HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(),hitRegInfo.getYear());
+                        HitCompetitionStudentInfo studentInfo = hitCompetitionStudentInfoMapper.selectHitCompetitionStudentInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
                         regInfo.getStudentUserss().add(studentInfo);
                         break;
                 }
             }
 
         }
-        return  hitRegInfos;
+        return hitRegInfos;
     }
 
     /**
@@ -177,8 +183,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertHitRegInfo(HitRegInfo hitRegInfo)
-    {
+    public int insertHitRegInfo(HitRegInfo hitRegInfo) {
 //        hitRegInfo.setCreateTime(DateUtils.getNowDate());
 //         hitRegInfoMapper.insertHitRegInfo(hitRegInfo);
 //        for (HitCompetitionStudentInfo hitRegistrationStudentInfo : hitRegInfo.getStudentInfoList()) {
@@ -202,8 +207,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      * @return 结果
      */
     @Override
-    public int updateHitRegInfo(HitRegInfo hitRegInfo)
-    {
+    public int updateHitRegInfo(HitRegInfo hitRegInfo) {
 
         hitRegInfo.setUpdateTime(DateUtils.getNowDate());
         //获取当前年份
@@ -216,11 +220,11 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         //查询数据库是否存在当前年份赛事
         CmsContent contentDB = cmsContentMapper.selectCmsContentByContentTitle(contentTitle);
         //查询赛事通过列表
-        LambdaQueryWrapper<HitRegInfo> queryWrapper =new LambdaQueryWrapper();
-        queryWrapper.eq(HitRegInfo::getAuditStatus,"1").likeRight(BaseEntity::getCreateTime,currentYear)
+        LambdaQueryWrapper<HitRegInfo> queryWrapper = new LambdaQueryWrapper();
+        queryWrapper.eq(HitRegInfo::getAuditStatus, "1").likeRight(BaseEntity::getCreateTime, currentYear)
                 .orderByAsc(HitRegInfo::getDivision).orderByAsc(BaseEntity::getCreateTime);
         List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectList(queryWrapper);
-        if ( contentDB == null) {
+        if (contentDB == null) {
             CmsContent content = new CmsContent();
             content.setCategoryId(1819701569722126336L);
             content.setContentType("0");
@@ -236,7 +240,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         CmsContent content = cmsContentMapper.selectCmsContentByContentTitle(contentTitle);
         //内容头部
         String contentHeader = "<p style=\"box-sizing: border-box; margin-top: 0px; margin-bottom: 0px; padding: 0px; text-align: center;\">\n" +
-                "    <span style=\"box-sizing: border-box;font-size: 24px\"><span style=\"box-sizing: border-box;font-weight: bolder\">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; "+contentTitle+"</span></span>\n" +
+                "    <span style=\"box-sizing: border-box;font-size: 24px\"><span style=\"box-sizing: border-box;font-weight: bolder\">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; " + contentTitle + "</span></span>\n" +
                 "</p>\n" +
                 "<table width=\"1232\" style=\"width: 1185px; margin: 0px auto;\">\n" +
                 "    <tbody style=\"box-sizing: border-box\">\n" +
@@ -264,41 +268,41 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
                 "        </tr>";
         //内容尾部
         String contentFooter = "    </tbody>\n" +
-                "</table>" ;
+                "</table>";
         //内容主体
         String contentDetail = "";
         for (HitRegInfo regInfo : hitRegInfos) {
-        contentDetail = contentDetail + "<tr style=\"box-sizing: border-box;height: 24px\" class=\"firstRow\">\n" +
-        "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
-        "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
-        "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">"+regInfo.getDivision()+"</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
-        "                </p>\n" +
-        "            </td>\n" +
-        "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
-        "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
-        "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">"+regInfo.getSchoolName()+"</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
-        "                </p>\n" +
-        "            </td>\n" +
-        "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
-        "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
-        "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">"+regInfo.getCollegeName()+"</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
-        "                </p>\n" +
-        "            </td>\n" +
-        "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
-        "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
-        "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">"+regInfo.getTeamName()+"</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
-        "                </p>\n" +
-        "            </td>\n" +
-        "        </tr>";
+            contentDetail = contentDetail + "<tr style=\"box-sizing: border-box;height: 24px\" class=\"firstRow\">\n" +
+                    "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
+                    "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
+                    "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">" + regInfo.getDivision() + "</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
+                    "                </p>\n" +
+                    "            </td>\n" +
+                    "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
+                    "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
+                    "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">" + regInfo.getSchoolName() + "</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
+                    "                </p>\n" +
+                    "            </td>\n" +
+                    "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
+                    "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
+                    "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">" + regInfo.getCollegeName() + "</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
+                    "                </p>\n" +
+                    "            </td>\n" +
+                    "            <td width=\"100\" style=\"box-sizing: border-box;border-style: solid;border-color: rgb(0, 112, 192);padding: 0px 7px\">\n" +
+                    "                <p style=\"box-sizing: border-box; text-align: center;\">\n" +
+                    "                    <span style=\"box-sizing: border-box;font-size: 13px;font-family: 宋体\">" + regInfo.getTeamName() + "</span> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;\n" +
+                    "                </p>\n" +
+                    "            </td>\n" +
+                    "        </tr>";
         }
         content.setContentDetail(contentHeader + contentDetail + contentFooter);
         insertCmsContent.updateCmsContent(content);
-        if (hitRegInfo.getAuditStatus().equals("2")){
+        if (hitRegInfo.getAuditStatus().equals("2")) {
             //拒绝就要把信息删掉
             regInfoUserService.deleteHitRegInfoUserByRegId(hitRegInfo.getId());
-          return   hitRegInfoMapper.deleteHitRegInfoById(hitRegInfo.getId());
+            return hitRegInfoMapper.deleteHitRegInfoById(hitRegInfo.getId());
 
-        }else{
+        } else {
             return hitRegInfoMapper.updateHitRegInfo(hitRegInfo);
         }
 
@@ -316,19 +320,19 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
      * @return 结果
      */
     @Override
-    public int deleteHitRegInfoByIds(Long[] ids)
-    {
+    public int deleteHitRegInfoByIds(Long[] ids) {
         return hitRegInfoMapper.deleteHitRegInfoByIds(ids);
     }
 
     /**
      * 创建报名信息
+     *
      * @param teamName
      * @param teamCreatorId
      * @param teacherId
      */
     @Override
-    public void createRegInfo(String teamName,Integer teamCreatorId,String teacherId,Long teamId) {
+    public void createRegInfo(String teamName, Integer teamCreatorId, String teacherId, Long teamId) {
         HitRegInfo hitRegInfo = new HitRegInfo();
         HitCompetitionStudentInfo studentInfo = competitionStudentInfo.selectOne(new QueryWrapper<HitCompetitionStudentInfo>().eq("id", teamCreatorId));
         hitRegInfo.setSchoolName(studentInfo.getSchoolName());
@@ -346,7 +350,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
 
         Long hitRegInfoId = hitRegInfo.getId();
         //创建报名信息后，更新队员信息
-        updateTeamMembersInfo(teamId,hitRegInfoId);
+        updateTeamMembersInfo(teamId, hitRegInfoId);
 
     }
 
@@ -356,8 +360,8 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         SysUser user = SecurityUtils.getLoginUser().getUser();
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
-        HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserId(userId, status,String.valueOf(year));
-        if (ObjectUtils.isNotEmpty(hitRegInfo)){
+        HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserId(userId, status, String.valueOf(year));
+        if (ObjectUtils.isNotEmpty(hitRegInfo)) {
             HitRegInfoUser hitRegInfoUser = new HitRegInfoUser();
             hitRegInfoUser.setRegId(hitRegInfo.getId());
             List<HitRegInfoUser> hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser);
@@ -366,9 +370,9 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
                 return it.getType().equals("1");
             }).collect(Collectors.toList());
             for (HitRegInfoUser regInfoUser : collect) {
-                if (regInfoUser.getUserId().equals(user.getUserId())){
+                if (regInfoUser.getUserId().equals(user.getUserId())) {
                     regInfoUser.setIsOwn("1");
-                }else {
+                } else {
                     regInfoUser.setIsOwn("0");
                 }
             }
@@ -381,7 +385,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
     public HitRegInfo selectHitByUserId2(Long userId) {
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
-        HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserId2(userId,String.valueOf(year));
+        HitRegInfo hitRegInfo = hitRegInfoMapper.selectHitByUserId2(userId, String.valueOf(year));
         if (ObjectUtils.isNotEmpty(hitRegInfo)) {
             HitRegInfoUser hitRegInfoUser = new HitRegInfoUser();
             hitRegInfoUser.setRegId(hitRegInfo.getId());
@@ -397,18 +401,18 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
             //获取当前年
             hitRegInfo.setYear(DateUtil.format(new Date(), "yyyy"));
         }
-            Long userId = SecurityUtils.getLoginUser().getUserId();
-            //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
-            //查询当前学生所在的战队信息
-            HitRegInfoUser hitRegInfoUser1 = hitRegInfoUserMapper.selectOne(new LambdaQueryWrapper<HitRegInfoUser>()
-                    .eq(HitRegInfoUser::getUserId, userId)
-                    .last("limit 1"));
-            if (ObjectUtils.isEmpty(hitRegInfoUser1)) {
-                throw new RuntimeException("您并未参加战队");
-            }
-            if (ObjectUtil.isNotEmpty(hitRegInfoUser1.getType()) && !hitRegInfoUser1.getType().equals("1")) {
-                throw new RuntimeException("请由学生修改");
-            }
+        Long userId = SecurityUtils.getLoginUser().getUserId();
+        //判断当前登陆人是否是领队老师，如果是查询该老师学校下的战队
+        //查询当前学生所在的战队信息
+        HitRegInfoUser hitRegInfoUser1 = hitRegInfoUserMapper.selectOne(new LambdaQueryWrapper<HitRegInfoUser>()
+                .eq(HitRegInfoUser::getUserId, userId)
+                .last("limit 1"));
+        if (ObjectUtils.isEmpty(hitRegInfoUser1)) {
+            throw new RuntimeException("您并未参加战队");
+        }
+        if (ObjectUtil.isNotEmpty(hitRegInfoUser1.getType()) && !hitRegInfoUser1.getType().equals("1")) {
+            throw new RuntimeException("请由学生修改");
+        }
 
 //            HitRegInfo hitRegInfo1 = hitRegInfoMapper.selectOne(new LambdaQueryWrapper<HitRegInfo>()
 //                    .eq(HitRegInfo::getId, hitRegInfoUser1.getRegId())
@@ -423,7 +427,7 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectList(new LambdaQueryWrapper<HitRegInfo>()
                 .eq(HitRegInfo::getId, hitRegInfoUser1.getRegId()));
         for (HitRegInfo regInfo : hitRegInfos) {
-            HitRegInfoUser hitRegInfoUser =new HitRegInfoUser();
+            HitRegInfoUser hitRegInfoUser = new HitRegInfoUser();
             hitRegInfoUser.setRegId(regInfo.getId());
             List<HitRegInfoUser> hitRegInfoUsers = regInfoUserService.selectHitRegInfoUserList(hitRegInfoUser);
             for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
@@ -446,29 +450,33 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
             }
 
         }
-        return  hitRegInfos;
+        return hitRegInfos;
     }
 
     @Override
     public int studentEdit(HitRegInfo hitRegInfo) {
-        HitRegInfo hitRegInfo1 = new HitRegInfo();
-        hitRegInfo1.setId(hitRegInfo.getId());
-        if (ObjectUtil.isNotEmpty(hitRegInfo.getCompetition())) {
-            hitRegInfo1.setCompetition(hitRegInfo.getCompetition());
+        //获取团队信息
+        HitRegInfo hitRegInfo1 = hitRegInfoMapper.selectOne(Wrappers.<HitRegInfo>lambdaQuery().eq(HitRegInfo::getId, hitRegInfo.getId()));
+        if (ObjectUtil.isNull(hitRegInfo1)) {
+            throw new RuntimeException("当前团队不存在");
         }
-        if (ObjectUtil.isNotEmpty(hitRegInfo.getSampleNumber())) {
-            hitRegInfo1.setSampleNumber(hitRegInfo.getSampleNumber());
+        //判断创建时间距离现在是否超过七天
+        if (DateUtil.between(hitRegInfo1.getCreateTime(), new Date(), DateUnit.DAY) > 7) {
+            throw new RuntimeException("当前团队组队已超过七天，无法修改");
         }
-        hitRegInfo1.setSampleAddress(hitRegInfo.getSampleAddress());
-        //判断hitRegInfo.getCompetition()是否包含1
         if (!hitRegInfo.getCompetition().contains("1")) {
-            hitRegInfo1.setSampleAddress("");
+            hitRegInfo.setSampleAddress("");
         }
-
-        if (ObjectUtil.isNotEmpty(hitRegInfo.getSampleConcat())) {
-            hitRegInfo1.setSampleConcat(hitRegInfo.getSampleConcat());
+        //如果手机号不为空校验手机号
+        if (!StringUtils.isEmpty(hitRegInfo.getSampleNumber())) {
+            if (!Validator.isMobile(hitRegInfo.getSampleNumber())) {
+                throw new RuntimeException("请输入正确的手机号");
+            }
         }
-        int i = hitRegInfoMapper.updateById(hitRegInfo1);
+        hitRegInfo.setCreateTime(null);
+        hitRegInfo.setAuditStatus(null);
+        hitRegInfo.setCreateTime(new Date());
+        int i = hitRegInfoMapper.updateById(hitRegInfo);
 
         return i;
     }
@@ -484,27 +492,107 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService
         return hitRegInfoMapper.updateById(hitRegInfo);
     }
 
+    /**
+     * 导入个人成绩信息
+     *
+     * @param hitList
+     * @return
+     */
+    @Override
+    public String importData(List<HitRegInfoUserImportVo> hitList) {
+        //获取当前时间
+        DateTime now = DateUtil.date();
+        //根据手机号查询用户id集合
+        List<String> mobileList = hitList.stream().map(HitRegInfoUserImportVo::getMobile).collect(Collectors.toList());
+        List<HitCompetitionStudentInfo> hitCompetitionStudentInfos = hitCompetitionStudentInfoMapper.selectList(Wrappers.<HitCompetitionStudentInfo>lambdaQuery()
+                .in(HitCompetitionStudentInfo::getPhoneNumber, mobileList)
+                .between(HitCompetitionStudentInfo::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now)));
+
+        //根据手机号将userId赋值给hitList
+        // 创建一个手机号到userId的映射
+        Map<String, Long> mobileToUserIdMap = hitCompetitionStudentInfos.stream()
+                .collect(Collectors.toMap(
+                        HitCompetitionStudentInfo::getPhoneNumber,
+                        HitCompetitionStudentInfo::getUserId
+                ));
+
+        // 根据手机号将userId赋值给hitList
+        hitList.forEach(hit -> {
+            Long userId = mobileToUserIdMap.get(hit.getMobile());
+            if (userId != null) {
+                hit.setUserId(userId);
+            }
+        });
+
+        //更新成绩
+        hitList.stream().forEach(item -> {
+            if (!StringUtils.isEmpty(item.getMobile())) {
+                try {
+                    HitRegInfoUser hitRegInfoUser = BeanUtil.copyProperties(item, HitRegInfoUser.class);
+
+                    hitRegInfoUserMapper.update(hitRegInfoUser, new LambdaUpdateWrapper<HitRegInfoUser>()
+                            .eq(HitRegInfoUser::getUserId, item.getUserId())
+                            .between(HitRegInfoUser::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now)));
+                } catch (Exception e) {
+                    log.error("更新学生信息失败，phoneNumber: " + item.getMobile(), e);
+                }
+            }
+        });
+
+        return "导入完成";
+    }
+
+    /**
+     * 导入团队成绩信息
+     *
+     * @param hitList
+     * @return
+     */
+    @Override
+    public String importTeamData(List<HitRegInfoTeamImportVo> hitList) {
+        if (CollUtil.isEmpty(hitList)) {
+            return "导入内容不能为空";
+        }
+
+        //获取当前时间
+        DateTime now = DateUtil.date();
+        hitList.stream().forEach(item -> {
+            if (!StringUtils.isEmpty(item.getTeamName())) {
+                try {
+                    HitRegInfo hitRegInfo = BeanUtil.copyProperties(item, HitRegInfo.class);
+                    hitRegInfoMapper.update(hitRegInfo, new LambdaUpdateWrapper<HitRegInfo>()
+                            .eq(HitRegInfo::getTeamName, item.getTeamName())
+                            .between(HitRegInfo::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now)));
+                } catch (Exception e) {
+                    log.error("更新学生信息失败，teamName: " + item.getTeamName(), e);
+                }
+            }
+        });
+        return "导入完成";
+    }
+
     /**
      * 更新队员信息
+     *
      * @param teamId
      * @param hitRegInfoId
      */
-    private void updateTeamMembersInfo(Long teamId, Long hitRegInfoId){
+    private void updateTeamMembersInfo(Long teamId, Long hitRegInfoId) {
         LambdaQueryWrapper<HitTeamMembers> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HitTeamMembers::getTeamId,teamId);
+        queryWrapper.eq(HitTeamMembers::getTeamId, teamId);
         List<HitTeamMembers> teamMembers = teamMembersMapper.selectList(queryWrapper);
         for (HitTeamMembers teamMember : teamMembers) {
-            if (teamMember.getTeamResponsibilities()==0){
+            if (teamMember.getTeamResponsibilities() == 0) {
                 LambdaUpdateWrapper<HitCompetitionStudentInfo> updateWrapper = new LambdaUpdateWrapper<>();
-                updateWrapper.eq(HitCompetitionStudentInfo::getId,teamMember.getTeamMemberId());
-                updateWrapper.set(HitCompetitionStudentInfo::getHitRegId,hitRegInfoId);
-                competitionStudentInfo.update(null,updateWrapper);
+                updateWrapper.eq(HitCompetitionStudentInfo::getId, teamMember.getTeamMemberId());
+                updateWrapper.set(HitCompetitionStudentInfo::getHitRegId, hitRegInfoId);
+                competitionStudentInfo.update(null, updateWrapper);
             }
-            if (teamMember.getTeamResponsibilities()==1 || teamMember.getTeamResponsibilities()==2){
+            if (teamMember.getTeamResponsibilities() == 1 || teamMember.getTeamResponsibilities() == 2) {
                 LambdaUpdateWrapper<HitRegistrationTeachInfo> updateWrapper = new LambdaUpdateWrapper<>();
-                updateWrapper.eq(HitRegistrationTeachInfo::getId,teamMember.getTeamMemberId());
-                updateWrapper.set(HitRegistrationTeachInfo::getHitRegId,hitRegInfoId);
-                teachInfoMapper.update(null,updateWrapper);
+                updateWrapper.eq(HitRegistrationTeachInfo::getId, teamMember.getTeamMemberId());
+                updateWrapper.set(HitRegistrationTeachInfo::getHitRegId, hitRegInfoId);
+                teachInfoMapper.update(null, updateWrapper);
             }
         }
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoUserServiceImpl.java
index 217b3d3..1771e49 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoUserServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoUserServiceImpl.java
@@ -5,6 +5,8 @@ import java.util.List;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.cms.domain.HitRegInfo;
 import com.ruoyi.cms.domain.HitRegInfoUser;
@@ -163,8 +165,10 @@ public class HitRegInfoUserServiceImpl implements IHitRegInfoUserService
      */
     @Override
     public List<HitRegInfoUser> selectByUserId(Long id) {
+        DateTime now = DateUtil.date();
         LambdaQueryWrapper<HitRegInfoUser> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(HitRegInfoUser::getUserId,id);
+        queryWrapper.between(HitRegInfoUser::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now));
         return hitRegInfoUserMapper.selectList(queryWrapper);
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java
index 8577d7d..7801700 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegistrationTeachInfoServiceImpl.java
@@ -240,6 +240,7 @@ public class HitRegistrationTeachInfoServiceImpl implements IHitRegistrationTeac
             teachInfo.setRelatedAccounts(user.getUsername());
             teachInfo.setStatus("0");
             teachInfo.setType("1");
+            teachInfo.setFile(user.getHitRegistrationTeachInfo().getFile());
             teachInfo.setTeacherName(user.getNickName());
             teachInfo.setUserId(sysUser.getUserId());
             this.insertHitRegistrationTeachInfo(teachInfo);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java
index aac3921..affeb00 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitTeamsServiceImpl.java
@@ -1,6 +1,10 @@
 package com.ruoyi.cms.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cms.domain.*;
 import com.ruoyi.cms.mapper.HitCompetitionStudentInfoMapper;
 import com.ruoyi.cms.mapper.HitRegInfoMapper;
@@ -24,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -51,24 +56,34 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
 
     /**
      * 初赛报名
+     *
      * @param preliminary
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int  preRegister(Preliminary preliminary) throws Exception {
+    public int preRegister(Preliminary preliminary) throws Exception {
         Calendar calendar = Calendar.getInstance();
         int year = calendar.get(Calendar.YEAR);
+        DateTime now = DateUtil.date();
+
+        //查询当前团队名今年是否存在
+        List<HitRegInfo> hitRegInfos = hitRegInfoMapper.selectList(Wrappers.lambdaQuery(HitRegInfo.class)
+                .between(HitRegInfo::getCreateTime, DateUtil.beginOfYear(now), DateUtil.endOfYear(now)));
+        if (CollUtil.isNotEmpty(hitRegInfos)) {
+            throw new Exception("当前团队名已存在，请修改团队名");
+        }
+
         //判断所选三个队员是否存在待确认
-        if (preliminary.getTeammateOne().equals(preliminary.getTeammateTwo())){
+        if (preliminary.getTeammateOne().equals(preliminary.getTeammateTwo())) {
             throw new Exception("队员不可重复");
         }
         HitRegInfo hitRegInfo1 = regInfoService.selectHitByUserId2(preliminary.getTeammateOne());
-        if (ObjectUtils.isNotEmpty(hitRegInfo1)){
+        if (ObjectUtils.isNotEmpty(hitRegInfo1)) {
             throw new Exception("队员1已存在组队信息，不可重复组队");
         }
         HitRegInfo hitRegInfo2 = regInfoService.selectHitByUserId2(preliminary.getTeammateTwo());
-        if (ObjectUtils.isNotEmpty(hitRegInfo2)){
+        if (ObjectUtils.isNotEmpty(hitRegInfo2)) {
             throw new Exception("队员2已存在组队信息，不可重复组队");
         }
         //获取当前用户信息信息
@@ -77,7 +92,7 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         queryWrapper.eq(HitCompetitionStudentInfo::getUserId, user.getUserId());
         queryWrapper.likeRight(HitCompetitionStudentInfo::getCreateTime, year);
         HitCompetitionStudentInfo hitStu = hitCompetitionStudentInfoMapper.selectOne(queryWrapper);
-        HitRegInfo hitRegInfo =new HitRegInfo();
+        HitRegInfo hitRegInfo = new HitRegInfo();
         hitRegInfo.setSchoolName(preliminary.getSchoolName());
         hitRegInfo.setCollegeName(hitStu.getCollegeName());
         hitRegInfo.setDivision(preliminary.getDivision());
@@ -88,11 +103,11 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         hitRegInfo.setUploadFile(preliminary.getUploadFile());
         hitRegInfo.setAuditStatus("9");
         hitRegInfo.setCreateTime(new Date());
-        log.info("插入数据："+hitRegInfo);
+        log.info("插入数据：" + hitRegInfo);
         hitRegInfo.setCompetition(preliminary.getCompetition());
         int insert = hitRegInfoMapper.insert(hitRegInfo);
         //插入人员信息
-        HitRegInfoUser hitRegInfoUser1 =new  HitRegInfoUser();
+        HitRegInfoUser hitRegInfoUser1 = new HitRegInfoUser();
         hitRegInfoUser1.setRegId(hitRegInfo.getId());
         hitRegInfoUser1.setUserId(user.getUserId());
         hitRegInfoUser1.setUserName(user.getNickName());
@@ -102,7 +117,7 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         regInfoUserMapper.insertHitRegInfoUser(hitRegInfoUser1);
 
         //插入人员信息
-        HitRegInfoUser hitRegInfoUser2 =new  HitRegInfoUser();
+        HitRegInfoUser hitRegInfoUser2 = new HitRegInfoUser();
         hitRegInfoUser2.setRegId(hitRegInfo.getId());
         hitRegInfoUser2.setUserId(preliminary.getTeammateOne());
         SysUser sysUser = userService.selectUserById(preliminary.getTeammateOne());
@@ -113,7 +128,7 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         regInfoUserMapper.insertHitRegInfoUser(hitRegInfoUser2);
 
         //插入人员信息
-        HitRegInfoUser hitRegInfoUser3 =new  HitRegInfoUser();
+        HitRegInfoUser hitRegInfoUser3 = new HitRegInfoUser();
         hitRegInfoUser3.setRegId(hitRegInfo.getId());
         hitRegInfoUser3.setUserId(preliminary.getTeammateTwo());
         SysUser sysUser1 = userService.selectUserById(preliminary.getTeammateTwo());
@@ -123,7 +138,7 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         hitRegInfoUser3.setCreateTime(new Date());
         regInfoUserMapper.insertHitRegInfoUser(hitRegInfoUser3);
 
-        HitRegInfoUser hitRegInfoUser4 =new  HitRegInfoUser();
+        HitRegInfoUser hitRegInfoUser4 = new HitRegInfoUser();
         hitRegInfoUser4.setRegId(hitRegInfo.getId());
         hitRegInfoUser4.setUserId(preliminary.getLeaderTeacher());
         SysUser sysUser2 = userService.selectUserById(preliminary.getLeaderTeacher());
@@ -133,7 +148,7 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         hitRegInfoUser4.setCreateTime(new Date());
         regInfoUserMapper.insertHitRegInfoUser(hitRegInfoUser4);
 
-        HitRegInfoUser hitRegInfoUser5 =new  HitRegInfoUser();
+        HitRegInfoUser hitRegInfoUser5 = new HitRegInfoUser();
         hitRegInfoUser5.setRegId(hitRegInfo.getId());
         hitRegInfoUser5.setUserId(preliminary.getTeacherOne());
         SysUser sysUser3 = userService.selectUserById(preliminary.getTeacherOne());
@@ -142,8 +157,8 @@ public class HitTeamsServiceImpl extends ServiceImpl<HitTeamsMapper, HitTeams> i
         hitRegInfoUser5.setStatus("0");
         hitRegInfoUser5.setCreateTime(new Date());
         regInfoUserMapper.insertHitRegInfoUser(hitRegInfoUser5);
-        if (ObjectUtils.isNotEmpty(preliminary.getTeacherTwo())){
-            HitRegInfoUser hitRegInfoUser6 =new  HitRegInfoUser();
+        if (ObjectUtils.isNotEmpty(preliminary.getTeacherTwo())) {
+            HitRegInfoUser hitRegInfoUser6 = new HitRegInfoUser();
             hitRegInfoUser6.setRegId(hitRegInfo.getId());
             hitRegInfoUser6.setUserId(preliminary.getTeacherTwo());
             SysUser sysUser4 = userService.selectUserById(preliminary.getTeacherTwo());
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index cec5006..435ffd7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.annotation.Anonymous;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +74,7 @@ public class CommonController
     /**
      * 通用上传请求（单个）
      */
+    @Anonymous
     @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file) throws Exception
     {
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
index e970b00..6f80255 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
@@ -60,8 +60,15 @@
     </select>
     <select id="selectHitCompetitionStudentInfoByUserId"
             resultType="com.ruoyi.cms.domain.HitCompetitionStudentInfo" >
-        select  * from hit_competition_student_info
-        where user_id = #{userId} and create_time like concat(#{year},'%')
+        SELECT
+            hcsi.*,hu.virtual_score,hu.assay_score
+        FROM
+            hit_competition_student_info hcsi
+                LEFT JOIN hit_reg_info_user hu ON hu.user_id = hcsi.user_id
+        WHERE
+            hcsi.user_id =  #{userId}
+          AND hcsi.create_time LIKE concat(#{year}, '%')
+          AND hu.create_time LIKE concat(#{year}, '%')
     </select>
 
     <insert id="insertHitCompetitionStudentInfo" parameterType="HitCompetitionStudentInfo" useGeneratedKeys="true" keyProperty="id">
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
index 25a3638..112c198 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectHitRegInfoVo">
-        select id, school_name, college_name, division, team_name, sample_concat, sample_number,audit_status, sample_address, remark, upload_file,ds_file, del_flag, create_time, create_by, update_time, update_by,competition from hit_reg_info
+        select id, school_name, college_name, division, team_name, sample_concat, sample_number,audit_status, sample_address, remark, upload_file,ds_file,score, del_flag, create_time, create_by, update_time, update_by,competition from hit_reg_info
     </sql>
 
     <select id="selectHitRegInfoList" parameterType="HitRegInfo" resultMap="HitRegInfoResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
index 04b0953..bed95b2 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
@@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="division != null and division !='' ">division,</if>
             <if test="relatedAccounts != null and relatedAccounts !='' ">related_accounts,</if>
             <if test="userId != null  ">user_id,</if>
+            <if test="file != null">file,</if>
 
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -114,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="division != null and division !='' ">#{division},</if>
             <if test="relatedAccounts != null and relatedAccounts !='' ">#{relatedAccounts},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="file != null">#{file},</if>
          </trim>
     </insert>
 
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/HitRegistrationTeachInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/HitRegistrationTeachInfo.java
index b67bf93..88433fd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/HitRegistrationTeachInfo.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/HitRegistrationTeachInfo.java
@@ -74,6 +74,17 @@ public class HitRegistrationTeachInfo extends BaseEntity
     @TableField(exist = false)
     private String year;
 
+    public String getFile() {
+        return file;
+    }
+
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    /** 文件 */
+    private String file;
+
     public String getSampleAddress() {
         return SampleAddress;
     }
diff --git a/ruoyi-ui/src/api/officialWebsite/registerStudent.js b/ruoyi-ui/src/api/officialWebsite/registerStudent.js
index 1a1629f..7eee006 100644
--- a/ruoyi-ui/src/api/officialWebsite/registerStudent.js
+++ b/ruoyi-ui/src/api/officialWebsite/registerStudent.js
@@ -105,3 +105,17 @@ export function editRegInfo(data){
   })
 
 }
+export function editCompetitionStudentInfo(data) {
+  return request({
+    url: '/system/hit_stu_info/editInfo',
+    method: 'put',
+    data: data
+  })
+}
+export function updateRegInfo(data) {
+  return request({
+    url: '/system/hit_reg_info/studentEdit',
+    method: 'put',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png b/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ae4f3ca20e7518812d30b865d0935dd0c2759d
GIT binary patch
literal 20798
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/assets/images/searchgrade.png b/ruoyi-ui/src/assets/images/searchgrade.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e93cadf7ba72421a20b1eaeaf48ca964f966086
GIT binary patch
literal 4658
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
index b946c1a..f2c874b 100644
--- a/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
+++ b/ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
@@ -2,30 +2,39 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
       <el-form-item label="学校名称" prop="schoolName">
-        <el-input v-model="queryParams.schoolName" placeholder="请输入学校名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.schoolName" placeholder="请输入学校名称" clearable
+                  @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="学院名称" prop="collegeName">
-        <el-input v-model="queryParams.collegeName" placeholder="请输入学院名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.collegeName" placeholder="请输入学院名称" clearable
+                  @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="所属赛区" prop="division">
-        <el-input v-model="queryParams.division" placeholder="请输入所属赛区" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.division" placeholder="请输入所属赛区" clearable
+                  @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="团队名称" prop="teamName">
-        <el-input v-model="queryParams.teamName" placeholder="请输入团队名称" clearable @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.teamName" placeholder="请输入团队名称" clearable
+                  @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="年份" prop="year">
         <el-date-picker
           v-model="queryParams.year"
           type="year"
-          placeholder="选择年份">
+          placeholder="选择年份"
+        >
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="大赛年份" prop="competitionYear">-->
-<!--        <el-select v-model="queryParams.createTime" placeholder="请选择">-->
-<!--          <el-option v-for="item in yearList" :key="item.value" :label="item.label" :value="item.value">-->
-<!--          </el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="大赛年份" prop="competitionYear">-->
+      <!--        <el-select v-model="queryParams.createTime" placeholder="请选择">-->
+      <!--          <el-option v-for="item in yearList" :key="item.value" :label="item.label" :value="item.value">-->
+      <!--          </el-option>-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置刷新</el-button>
@@ -33,6 +42,28 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport('student')"
+          v-hasPermi="['hit:hitRegInfoUser:import']"
+        >导入学生成绩
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport('team')"
+          v-hasPermi="['hit:hitRegInfoTeam:import']"
+        >导入团队成绩
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -41,18 +72,21 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['hit:hitRegistrationStudentInfo:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
-      <el-col :span="1.5"   v-hasPermi="['hit:open']">
+      <el-col :span="1.5" v-hasPermi="['hit:open']">
         <el-switch v-model="registerStatus" @change="updateRegisterStatus" active-value="1" inactive-value="0"
-          active-text="开启报名" inactive-text="关闭报名" >
+                   active-text="开启报名" inactive-text="关闭报名"
+        >
         </el-switch>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table style="width: 100%; table-layout: auto" v-loading="loading" :data="HitRegistrationStudentInfoList"
-      @selection-change="handleSelectionChange">
+              @selection-change="handleSelectionChange"
+    >
 
       <el-table-column type="expand">
         <template slot-scope="props">
@@ -61,10 +95,14 @@
             <el-descriptions-item label="老师职务">{{ props.row.ldTeacher.teacherJob }}</el-descriptions-item>
             <el-descriptions-item label="老师手机号">{{ props.row.ldTeacher.teacherNumber }}</el-descriptions-item>
             <el-descriptions-item label="老师邮箱">{{ props.row.ldTeacher.teacherEmail }}</el-descriptions-item>
-            <el-descriptions-item label="老师所在系及专业">{{ props.row.ldTeacher.teacherSchool }}</el-descriptions-item>
+            <el-descriptions-item label="老师所在系及专业">{{
+                props.row.ldTeacher.teacherSchool
+              }}
+            </el-descriptions-item>
           </el-descriptions>
           <el-descriptions :title="'指导老师' + (index)" v-for="(item, index) in props.row.zdTeacher"
-            style="margin-left: 10%">
+                           style="margin-left: 10%"
+          >
             <el-descriptions-item label="老师姓名">{{ item.teacherName }}</el-descriptions-item>
             <el-descriptions-item label="老师职务">{{ item.teacherJob }}</el-descriptions-item>
             <el-descriptions-item label="老师手机号">{{ item.teacherNumber }}</el-descriptions-item>
@@ -72,12 +110,17 @@
             <el-descriptions-item label="老师所在系及专业">{{ item.teacherSchool }}</el-descriptions-item>
           </el-descriptions>
           <el-descriptions :title="'学生信息' + (index + 1)" v-for="(item, index) in props.row.studentUserss"
-            style="margin-left: 10%">
+                           style="margin-left: 10%"
+          >
             <!--            <el-descriptions-item label="比赛名称">{{props.row.competitionName}}</el-descriptions-item>-->
             <el-descriptions-item label="学生姓名">{{ item.stuName }}</el-descriptions-item>
             <el-descriptions-item label="学生性别">{{ item.sex }}</el-descriptions-item>
             <el-descriptions-item label="学生专业">{{ item.major }}</el-descriptions-item>
             <el-descriptions-item label="学生手机号">{{ item.phoneNumber }}</el-descriptions-item>
+            <el-descriptions-item label="虚拟赛成绩"><span style="color:red;">{{ item.virtualScore }}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="化验赛成绩"><span style="color:red;">{{ item.assayScore }}</span>
+            </el-descriptions-item>
             <el-descriptions-item label="附件" v-if="item.dsFile">
               <el-link :href="`${baseUrl}${item.dsFile}`" type="primary" :underline="false" target="_blank">
                 <span class="el-icon-document"> 下载 </span>
@@ -93,13 +136,14 @@
           {{ props.row.createTime.substring(0, 4) }}
         </template>
       </el-table-column>
-      <el-table-column label="所属赛区" align="center" prop="division" />
-      <el-table-column label="学校名称" align="center" prop="schoolName" />
-      <el-table-column label="院系名称" align="center" prop="collegeName" />
-      <el-table-column label="团队名称" align="center" prop="teamName" />
-      <el-table-column label="盲样邮寄地址" align="center" prop="sampleAddress" />
-      <el-table-column label="收件人" align="center" prop="sampleConcat" />
-      <el-table-column label="联系电话" align="center" prop="sampleNumber" />
+      <el-table-column label="所属赛区" align="center" prop="division"/>
+      <el-table-column label="学校名称" align="center" prop="schoolName"/>
+      <el-table-column label="院系名称" align="center" prop="collegeName"/>
+      <el-table-column label="团队名称" align="center" prop="teamName"/>
+      <el-table-column label="盲样邮寄地址" align="center" prop="sampleAddress"/>
+      <el-table-column label="收件人" align="center" prop="sampleConcat"/>
+      <el-table-column label="联系电话" align="center" prop="sampleNumber"/>
+      <el-table-column label="分数" align="center" prop="score"/>
       <el-table-column label="附件" align="center" prop="uploadFile">
         <template slot-scope="props">
           <el-link :href="`${baseUrl}${props.row.uploadFile}`" type="primary" :underline="false" target="_blank">
@@ -113,15 +157,27 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="审核状态" align="center" prop="auditStatus" >
+      <el-table-column label="审核状态" align="center" prop="auditStatus">
         <template slot-scope="props">
           <div v-if="props.row.auditStatus == '0'  " style="color:#007bff;"> 待审核</div>
           <div v-if="props.row.auditStatus == '1' " style="color:green;"> 通过</div>
           <div v-if="props.row.auditStatus == '2' " style="color:red;"> 拒绝</div>
-          <div v-if="props.row.registrationInformation && props.row.registrationInformation.status == '0' && props.row.zdTeacherList.includes(userId) && techerType == '0'  && props.row.auditStatus == '9'" style="color:#007bff;"> 待确认</div>
-          <div v-if="props.row.registrationInformation && props.row.registrationInformation.status == '1' && props.row.zdTeacherList.includes(userId) && techerType == '0' && props.row.auditStatus == '9'" style="color:green;"> 已同意</div>
-          <div v-if="props.row.registrationInformation && props.row.registrationInformation.status == '2' && props.row.zdTeacherList.includes(userId) && techerType == '0' && props.row.auditStatus == '9'" style="color:red;"> 已拒绝</div>
-<!--&& props.row.zdTeacherList.includes(userId)-->
+          <div
+            v-if="props.row.registrationInformation && props.row.registrationInformation.status == '0' && props.row.zdTeacherList.includes(userId) && techerType == '0'  && props.row.auditStatus == '9'"
+            style="color:#007bff;"
+          > 待确认
+          </div>
+          <div
+            v-if="props.row.registrationInformation && props.row.registrationInformation.status == '1' && props.row.zdTeacherList.includes(userId) && techerType == '0' && props.row.auditStatus == '9'"
+            style="color:green;"
+          > 已同意
+          </div>
+          <div
+            v-if="props.row.registrationInformation && props.row.registrationInformation.status == '2' && props.row.zdTeacherList.includes(userId) && techerType == '0' && props.row.auditStatus == '9'"
+            style="color:red;"
+          > 已拒绝
+          </div>
+          <!--&& props.row.zdTeacherList.includes(userId)-->
         </template>
       </el-table-column>
 
@@ -136,13 +192,15 @@
         <template slot-scope="scope">
           <el-popconfirm title="确定当前操作？"
                          v-if="techerType != '0' && (scope.row.auditStatus == '0' || scope.row.auditStatus == '2')"
-                         @confirm="auditData(scope.row, '1')">
+                         @confirm="auditData(scope.row, '1')"
+          >
             <el-button size="mini" type="text" slot="reference">通过</el-button>
           </el-popconfirm>
 
           <el-popconfirm title="确定当前操作？" style="margin-left: 10px"
                          v-if="techerType != '0' && (scope.row.auditStatus == '0' || scope.row.auditStatus == '1')"
-                         @confirm="auditData(scope.row, '2')">
+                         @confirm="auditData(scope.row, '2')"
+          >
             <el-button size="mini" type="text" slot="reference">拒绝</el-button>
           </el-popconfirm>
 
@@ -150,14 +208,16 @@
           <!---->
           <el-popconfirm title="确定当前操作"
                          @confirm="submitData(scope.row.registrationInformation,1)"
-                         v-if="techerType == '0' && (scope.row.zdTeacherList) && scope.row.zdTeacherList.includes(userId) && scope.row.auditStatus == '9'">
+                         v-if="techerType == '0' && (scope.row.zdTeacherList) && scope.row.zdTeacherList.includes(userId) && scope.row.auditStatus == '9'"
+          >
             <el-button size="mini" type="text" slot="reference">同意</el-button>
           </el-popconfirm>
-<!---->
+          <!---->
 
           <el-popconfirm title="确定当前操作？" style="margin-left: 10px"
                          v-if="techerType == '0' && (scope.row.zdTeacherList ) && scope.row.zdTeacherList.includes(userId) && scope.row.auditStatus == '9'"
-                         @confirm="submitData(scope.row.registrationInformation,2)">
+                         @confirm="submitData(scope.row.registrationInformation,2)"
+          >
             <el-button size="mini" type="text" slot="reference">拒绝</el-button>
           </el-popconfirm>
 
@@ -192,8 +252,8 @@
         <el-form-item label="联系电话">
           <el-input v-model="currentRow.sampleNumber"></el-input>
         </el-form-item>
-        <el-form-item labe   l="附件">
-          <FileUpload :file-type="['doc','zip', 'docx', 'pdf']" v-model="currentRow.uploadFile" ></FileUpload>
+        <el-form-item labe l="附件">
+          <FileUpload :file-type="['doc','zip', 'docx', 'pdf']" v-model="currentRow.uploadFile"></FileUpload>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -202,8 +262,43 @@
       </span>
     </el-dialog>
 
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport"/>
+            是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+                   @click="importTemplate"
+          >下载模板
+          </el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList" />
+                @pagination="getList"
+    />
     <!-- Existing pagination -->
   </div>
 </template>
@@ -218,20 +313,21 @@ import {
   listHitRegistrationStudentInfoExport,
   getTeachInfoByIds,
   adminUpdateTeamInformation
-} from "@/api/hit/registrationStudentInfo";
+} from '@/api/hit/registrationStudentInfo'
 import { selectBaseInfo, editStatus } from '@/api/cms/baseInfo'
 import { getHitRegistrationTeachInfoByUserId, selectByUserId } from '@/api/hit/teacherInfo'
 import { editRegUser } from '@/api/officialWebsite/registerStudent'
-import {mapState} from "vuex";
+import { mapState } from 'vuex'
+import { getToken } from '@/utils/auth'
 
 export default {
-  name: "HitRegistrationStudentInfo",
+  name: 'HitRegistrationStudentInfo',
   dicts: ['sys_user_sex', 'competition_type'],
   data() {
     return {
       yearList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      registerStatus: "",
+      registerStatus: '',
       leaderTeachList: [],
       guideTeachList: [],
       // 遮罩层
@@ -253,7 +349,7 @@ export default {
       // 报名信息表格数据
       HitRegistrationStudentInfoList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       zdTeacherList: [],
@@ -262,6 +358,21 @@ export default {
       // 修改对话框是否显示
       editDialogVisible: false,
       currentRow: {},
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/system/hit_reg_info/importData'
+      },
+      importType:"student",
 
       // 查询参数
       queryParams: {
@@ -286,38 +397,38 @@ export default {
       // 表单校验
       rules: {
         competitionId: [
-          { required: true, message: "大赛ID不能为空", trigger: "blur" }
+          { required: true, message: '大赛ID不能为空', trigger: 'blur' }
         ],
         stuName: [
-          { required: true, message: "学生姓名不能为空", trigger: "blur" }
+          { required: true, message: '学生姓名不能为空', trigger: 'blur' }
         ],
         stuGender: [
-          { required: true, message: "学生性别不能为空", trigger: "blur" }
+          { required: true, message: '学生性别不能为空', trigger: 'blur' }
         ],
         stuMajor: [
-          { required: true, message: "学生专业不能为空", trigger: "blur" }
+          { required: true, message: '学生专业不能为空', trigger: 'blur' }
         ],
         stuNumber: [
-          { required: true, message: "学生手机号不能为空", trigger: "blur" }
+          { required: true, message: '学生手机号不能为空', trigger: 'blur' }
         ],
         schoolName: [
-          { required: true, message: "学校及院系名称不能为空", trigger: "blur" }
+          { required: true, message: '学校及院系名称不能为空', trigger: 'blur' }
         ],
         division: [
-          { required: true, message: "所属赛区不能为空", trigger: "blur" }
+          { required: true, message: '所属赛区不能为空', trigger: 'blur' }
         ],
         delFlag: [
-          { required: true, message: "逻辑删除0未删除1真删除不能为空", trigger: "blur" }
-        ],
+          { required: true, message: '逻辑删除0未删除1真删除不能为空', trigger: 'blur' }
+        ]
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
     selectBaseInfo().then(res => {
       this.registerStatus = res.data.registerStatus
     })
-    this.yearList = this.years();
+    this.yearList = this.years()
     // 获取当前登陆人的id
     this.userId = this.$store.state.user.id
     this.getTeachInfoByIds(this.userId)
@@ -327,15 +438,15 @@ export default {
   methods: {
     /** 查询报名信息列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       this.queryParams.year = new Date(this.queryParams.year).getFullYear().toString()
       listHitRegistrationStudentInfo(this.queryParams).then(response => {
-        this.HitRegistrationStudentInfoList = response.rows;
+        this.HitRegistrationStudentInfoList = response.rows
         //判断数组是否为空
         if (this.HitRegistrationStudentInfoList.length == 0) {
-          this.loading = false;
+          this.loading = false
         }
-        console.log("报名信息", this.HitRegistrationStudentInfoList);
+        console.log('报名信息', this.HitRegistrationStudentInfoList)
         //for循环this.HitRegistrationStudentInfoList
         if (this.HitRegistrationStudentInfoList.length != 0) {
           for (let i = 0; i < this.HitRegistrationStudentInfoList.length; i++) {
@@ -349,7 +460,7 @@ export default {
                   this.HitRegistrationStudentInfoList[i].registrationInformation = this.registrationInformation[j]
                 }
               }
-              this.HitRegistrationStudentInfoList[i].competitionName = ""
+              this.HitRegistrationStudentInfoList[i].competitionName = ''
               //判断this.HitRegistrationStudentInfoList[i].competition不为空
               if (this.HitRegistrationStudentInfoList[i].competition != null) {
 
@@ -358,52 +469,95 @@ export default {
                 // 循环arr
                 for (let k = 0; k < arr.length; k++) {
                   //判断当前登录用户是否是指导老师
-                  if (arr[k] == "1") {
+                  if (arr[k] == '1') {
                     arr2.push('化验赛')
                     // this.HitRegistrationStudentInfoList[0].competitionName += "化验赛"
-                  } else if (arr[k] == "2") {
+                  } else if (arr[k] == '2') {
                     arr2.push('虚拟赛')
                     // this.HitRegistrationStudentInfoList[0].competitionName += ",虚拟赛"
                   }
                 }
-                this.HitRegistrationStudentInfoList[i].competitionName = this.arrayToString(arr2);
+                this.HitRegistrationStudentInfoList[i].competitionName = this.arrayToString(arr2)
               }
             }
           }
         }
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    /** 导入按钮操作 */
+    handleImport(e) {
+      this.upload.title = '用户导入'
+      this.upload.open = true
+      if (e === 'team') {
+        //团队
+        this.upload.url = process.env.VUE_APP_BASE_API + '/system/hit_reg_info/importTeamData'
+        this.importType = 'team'
+      } else if (e === 'student') {
+        //学生
+        this.upload.url = process.env.VUE_APP_BASE_API + '/system/hit_reg_info/importData'
+        this.importType = 'student'
+      }
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit()
     },
     //查询当前老师的类型
     getTeachInfoByIds(id) {
       getHitRegistrationTeachInfoByUserId(id).then(res => {
         if (res.data) {
-          console.log('当前老师类型', res.data.type);
+          console.log('当前老师类型', res.data.type)
           this.techerType = res.data.type
         }
       }).catch(err => {
-        console.log('查询当前老师的类型失败', err);
+        console.log('查询当前老师的类型失败', err)
       })
       this.fetchRegistrationInformation()
     },
     splitStringToArray(str) {
-      return str.split(',').map(item => item.trim());
+      return str.split(',').map(item => item.trim())
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      let url = 'system/hit_reg_info/importTemplate'
+      let filename = '学生成绩模板_'
+      if (this.importType === 'student') {
+        url = 'system/hit_reg_info/importTemplate'
+        filename = '学生成绩模板_'
+      } else if (this.importType === 'team') {
+        url = 'system/hit_reg_info/importTeamTemplate'
+        filename = '团队成绩模板_'
+      }
+      this.download(url, {}, filename + new Date().getTime() + '.xlsx')
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false
+      this.upload.isUploading = false
+      this.$refs.upload.clearFiles()
+      this.$alert('<div style=\'overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;\'>' + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
+      this.getList()
     },
     //将数组转为字符串
     arrayToString(arr) {
-      return arr.join(',');
+      return arr.join(',')
     },
     //指导老师同意
-    submitData(data,status) {
+    submitData(data, status) {
       data.status = status
 
-        console.log("这是提交的信息", data)
-        editRegUser(data).then(res => {
-          this.$modal.msgSuccess("成功")
-          this.fetchRegistrationInformation()
+      console.log('这是提交的信息', data)
+      editRegUser(data).then(res => {
+        this.$modal.msgSuccess('成功')
+        this.fetchRegistrationInformation()
       })
-      this.getList();
+      this.getList()
 
     },
     //查询当前老师的报名信息
@@ -411,14 +565,14 @@ export default {
       selectByUserId(this.userId).then(res => {
         if (res.data) {
           this.registrationInformation = res.data
-          console.log("这是获取的信息", this.registrationInformation)
+          console.log('这是获取的信息', this.registrationInformation)
         }
       })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -440,19 +594,19 @@ export default {
         updateTime: null,
         updateBy: null,
         createTime: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm('queryForm')
       this.queryParams.createTime = null
-      this.handleQuery();
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -462,57 +616,58 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加报名信息";
+      this.reset()
+      this.open = true
+      this.title = '添加报名信息'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getHitRegistrationStudentInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改报名信息";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '修改报名信息'
+      })
     },
     auditData(data, status) {
       data.auditStatus = status
       updateHitRegistrationStudentInfo(data).then(response => {
-        this.$modal.msgSuccess("成功");
+        this.$modal.msgSuccess('成功')
 
-        this.getList();
-      });
+        this.getList()
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateHitRegistrationStudentInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addHitRegistrationStudentInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除报名信息编号为"' + ids + '"的数据项？').then(function () {
-        return delHitRegistrationStudentInfo(ids);
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除报名信息编号为"' + ids + '"的数据项？').then(function() {
+        return delHitRegistrationStudentInfo(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -535,40 +690,40 @@ export default {
     updateRegisterStatus() {
       editStatus(this.registerStatus).then(res => {
         if (res.code === 200) {
-          this.$modal.msgSuccess(this.registerStatus === "1" ? "报名已开启" : "报名已关闭")
+          this.$modal.msgSuccess(this.registerStatus === '1' ? '报名已开启' : '报名已关闭')
         }
       })
     },
     years() {
-      const currentYear = new Date().getFullYear();
-      const startYear = currentYear - 40; // 假设从当前年份往前 20 年
-      const endYear = currentYear;
-      const years = [];
+      const currentYear = new Date().getFullYear()
+      const startYear = currentYear - 40 // 假设从当前年份往前 20 年
+      const endYear = currentYear
+      const years = []
       for (let year = startYear; year <= endYear; year++) {
         years.push({
           label: year,
-          value: year + "-01-01",
-        });
+          value: year + '-01-01'
+        })
       }
-      return years.sort((a, b) => b.label - a.label);
+      return years.sort((a, b) => b.label - a.label)
     },
     editData(row) {
-      this.currentRow = { ...row };
-      this.editDialogVisible = true;
+      this.currentRow = { ...row }
+      this.editDialogVisible = true
     },
     saveData() {
-      console.log('保存数据', this.currentRow);
+      console.log('保存数据', this.currentRow)
       adminUpdateTeamInformation(this.currentRow).then(response => {
-        this.$modal.msgSuccess("团队信息修改成功");
-        this.editDialogVisible = false;
-        this.getList();
+        this.$modal.msgSuccess('团队信息修改成功')
+        this.editDialogVisible = false
+        this.getList()
       }).catch(error => {
-        this.$modal.msgError("团队信息修改失败");
-      });
-    },
-  },
+        this.$modal.msgError('团队信息修改失败')
+      })
+    }
+  }
 
-};
+}
 
 </script>
 
diff --git a/ruoyi-ui/src/views/hit/teacherInfo/index.vue b/ruoyi-ui/src/views/hit/teacherInfo/index.vue
index 6a61030..b3d1c9a 100644
--- a/ruoyi-ui/src/views/hit/teacherInfo/index.vue
+++ b/ruoyi-ui/src/views/hit/teacherInfo/index.vue
@@ -90,6 +90,13 @@
           <div  style="color:red" v-else>审核拒绝</div>
         </template>
       </el-table-column>
+      <el-table-column label="附件" align="center" prop="file" >
+        <template slot-scope="scope">
+          <el-link :href="`${baseUrl}${scope.row.file}`" type="primary" :underline="false" target="_blank" v-if="scope.row.file">
+            <span class="el-icon-document"> 下载 </span>
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -171,6 +178,7 @@ export default {
       multiple: true,
       // 显示搜索条件
       showSearch: true,
+      baseUrl: process.env.VUE_APP_BASE_API,
       // 总条数
       total: 0,
       // 教师信息表格数据
diff --git a/ruoyi-ui/src/views/officialWebsite/Components/header.vue b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
index d0b2e4b..a585f54 100644
--- a/ruoyi-ui/src/views/officialWebsite/Components/header.vue
+++ b/ruoyi-ui/src/views/officialWebsite/Components/header.vue
@@ -4,7 +4,7 @@
     <!-- left -->
     <div class="d-s" style="width: 20%" @click="toHome">
       <div class="logo-box">
-        <img :src="baseInfo.webImg" />
+        <img :src="baseInfo.webImg"/>
       </div>
       <div class="logo-size">
         {{ this.baseInfo.webName }}
@@ -12,7 +12,9 @@
     </div>
     <!-- tab -->
     <div class="d-s" style="width: 68%;justify-content: space-between">
-      <div class="x-x" :class="{'active' :tabindex == index }" v-for="(item, index) in tablist " :key="index" @click="tabClick(item.jumpUrl, item.id,index)" >
+      <div class="x-x" :class="{'active' :tabindex == index }" v-for="(item, index) in tablist " :key="index"
+           @click="tabClick(item.jumpUrl, item.id,index)"
+      >
         <div>
           <img v-if="item.iconUrl" :src=" imgurl +item.iconUrl " alt="" style="width: 25px;height: 25px">
         </div>
@@ -20,182 +22,207 @@
       </div>
     </div>
     <!-- right -->
-<!--    <div class="d-s" style="font-size: 20px; color: #fff;cursor: pointer;width: 170px;justify-content: flex-end">-->
-<!--      <i class="el-icon-search" v-if="show_search"></i>-->
-<!--      <div style="font-size: 18px;  margin-left: 15px; " v-if="show_search" @click="show_search = !show_search">搜索-->
-<!--      </div>-->
-<!--      <el-input placeholder="输入关键词" v-model="input" style="width: 150px;height: 35px" v-if="!show_search">-->
-<!--        <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
-<!--      </el-input>-->
-<!--      <i class="el-icon-circle-close" v-if="!show_search" style="margin-left: 10px;"-->
-<!--         @click="show_search = true"></i>-->
-<!--    </div>-->
+    <!--    <div class="d-s" style="font-size: 20px; color: #fff;cursor: pointer;width: 170px;justify-content: flex-end">-->
+    <!--      <i class="el-icon-search" v-if="show_search"></i>-->
+    <!--      <div style="font-size: 18px;  margin-left: 15px; " v-if="show_search" @click="show_search = !show_search">搜索-->
+    <!--      </div>-->
+    <!--      <el-input placeholder="输入关键词" v-model="input" style="width: 150px;height: 35px" v-if="!show_search">-->
+    <!--        <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
+    <!--      </el-input>-->
+    <!--      <i class="el-icon-circle-close" v-if="!show_search" style="margin-left: 10px;"-->
+    <!--         @click="show_search = true"></i>-->
+    <!--    </div>-->
     <div class="right-box" v-if="!isLoggedIn">
       <el-button class="login-button" @click="showLoginDialog = true">登录</el-button>
       <el-button class="register-button" @click="registerDialog = true">注册</el-button>
     </div>
     <div class="right-box" v-if="isLoggedIn">
-    <el-dropdown @command="handleCommand">
+      <el-dropdown @command="handleCommand">
       <span class="right-box">
         {{ currentUser }} <i class="el-icon-arrow-down el-icon--right"></i>
       </span>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="logout" divided @click.native="goBack" >进入后台</el-dropdown-item>
-        <el-dropdown-item command="logout" divided @click.native="logout" >退出登录</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-  </div>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item command="logout" divided @click.native="goBack">进入后台</el-dropdown-item>
+          <el-dropdown-item command="logout" divided @click.native="logout">退出登录</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
     <el-dialog title="登录" :visible.sync="showLoginDialog" width="30%" :modal="false">
       <div>
         <el-form :model="loginForm" ref="loginForm">
-        <el-form-item  prop="username">
-          <el-input placeholder="手机号" v-model="loginForm.username" ></el-input>
-        </el-form-item>
-        <el-form-item  prop="password">
-          <el-input placeholder="密码" v-model="loginForm.password" type="password"></el-input>
-        </el-form-item>
-        <el-form-item  prop="code">
-          <el-input v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin">
-            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-          </el-input>
-          <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-        </el-form-item>
-        <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      </el-form>
+          <el-form-item prop="username">
+            <el-input placeholder="手机号" v-model="loginForm.username"></el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input placeholder="密码" v-model="loginForm.password" type="password"></el-input>
+          </el-form-item>
+          <el-form-item prop="code">
+            <el-input v-model="loginForm.code"
+                      auto-complete="off"
+                      placeholder="验证码"
+                      style="width: 63%"
+                      @keyup.enter.native="handleLogin"
+            >
+              <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+            </div>
+          </el-form-item>
+          <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+        </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showLoginDialog = false">取 消</el-button>
         <el-button type="primary" @click="submitLogin">登 录</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="注册"  :close-on-click-modal="false" :visible.sync="registerDialog" width="30%" :modal="false">
+    <el-dialog title="注册" :close-on-click-modal="false" :visible.sync="registerDialog" width="30%" :modal="false">
       <div>
-         <el-form :model="registerForm" :rules="registerRules" ref="registerForm">
-           <el-form-item prop="userType">
-             <el-radio-group v-model="registerForm.userType">
-               <el-radio label="01">学生</el-radio>
-               <el-radio label="02">指导老师</el-radio>
-               <el-radio label="03">领队老师</el-radio>
-             </el-radio-group>
-           </el-form-item>
-           <el-form-item  prop="nickName" >
-             <el-input placeholder="姓名" v-model="registerForm.nickName" type="text"></el-input>
-           </el-form-item>
-        <el-form-item  prop="username">
-          <el-input placeholder="手机号（登录账号）" v-model="registerForm.username" type="text"></el-input>
-        </el-form-item>
+        <el-form :model="registerForm" :rules="registerRules" ref="registerForm">
+          <el-form-item prop="userType">
+            <el-radio-group v-model="registerForm.userType">
+              <el-radio label="01">学生</el-radio>
+              <el-radio label="02">指导老师</el-radio>
+              <el-radio label="03">领队老师</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item prop="nickName">
+            <el-input placeholder="姓名" v-model="registerForm.nickName" type="text"></el-input>
+          </el-form-item>
+          <el-form-item prop="username">
+            <el-input placeholder="手机号（登录账号）" v-model="registerForm.username" type="text"></el-input>
+          </el-form-item>
 
-        <el-form-item  prop="password">
-          <el-input placeholder="密码" v-model="registerForm.password" type="password"></el-input>
-        </el-form-item>
-        <el-form-item prop="confirmPassword">
-          <el-input placeholder="确认密码" v-model="registerForm.confirmPassword" type="password"></el-input>
-        </el-form-item>
-           <el-form-item  prop="hitRegistrationTeachInfo.teacherEmail" v-if="registerForm.userType=='03'||registerForm.userType=='02'">
-             <el-input placeholder="邮箱" v-model="registerForm.hitRegistrationTeachInfo.teacherEmail" type="text"></el-input>
-           </el-form-item>
-<!--           <el-form-item  prop="hitRegistrationTeachInfo.teacherNumber" v-if="registerForm.userType=='03'||registerForm.userType=='02'">-->
-<!--             <el-input placeholder="手机号" v-model="registerForm.hitRegistrationTeachInfo.teacherNumber" type="text"></el-input>-->
-<!--           </el-form-item>-->
-         <el-form-item  prop="hitRegistrationTeachInfo.division" v-if="registerForm.userType=='03'||registerForm.userType=='02'">
-           <el-select v-model="registerForm.hitRegistrationTeachInfo.division" filterable allow-create default-first-option
-                      placeholder="请选择赛区">
-             <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
-                        :value="item.value">
-             </el-option>
-           </el-select>
-         </el-form-item>
-       <el-form-item  prop="hitRegistrationTeachInfo.schoolName" v-if="registerForm.userType=='03'||registerForm.userType=='02'">
-         <el-select v-model="registerForm.hitRegistrationTeachInfo.schoolName" filterable allow-create default-first-option
-                    placeholder="请选择学校名称">
-           <el-option v-for="item in dict.type.school_name" :key="item.value" :label="item.label"
-                      :value="item.value">
-           </el-option>
-         </el-select>
+          <el-form-item prop="password">
+            <el-input placeholder="密码" v-model="registerForm.password" type="password"></el-input>
+          </el-form-item>
+          <el-form-item prop="confirmPassword">
+            <el-input placeholder="确认密码" v-model="registerForm.confirmPassword" type="password"></el-input>
+          </el-form-item>
+          <el-form-item prop="hitRegistrationTeachInfo.teacherEmail"
+                        v-if="registerForm.userType=='03'||registerForm.userType=='02'"
+          >
+            <el-input placeholder="邮箱" v-model="registerForm.hitRegistrationTeachInfo.teacherEmail" type="text"
+            ></el-input>
+          </el-form-item>
+          <!--           <el-form-item  prop="hitRegistrationTeachInfo.teacherNumber" v-if="registerForm.userType=='03'||registerForm.userType=='02'">-->
+          <!--             <el-input placeholder="手机号" v-model="registerForm.hitRegistrationTeachInfo.teacherNumber" type="text"></el-input>-->
+          <!--           </el-form-item>-->
+          <el-form-item prop="hitRegistrationTeachInfo.division"
+                        v-if="registerForm.userType=='03'||registerForm.userType=='02'"
+          >
+            <el-select v-model="registerForm.hitRegistrationTeachInfo.division" filterable allow-create
+                       default-first-option
+                       placeholder="请选择赛区"
+            >
+              <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
+                         :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="hitRegistrationTeachInfo.schoolName"
+                        v-if="registerForm.userType=='03'||registerForm.userType=='02'"
+          >
+            <el-select v-model="registerForm.hitRegistrationTeachInfo.schoolName" filterable allow-create
+                       default-first-option
+                       placeholder="请选择学校名称"
+            >
+              <el-option v-for="item in dict.type.school_name" :key="item.value" :label="item.label"
+                         :value="item.value"
+              >
+              </el-option>
+            </el-select>
 
-       </el-form-item>
-         <el-form-item  prop="hitRegistrationTeachInfo.teacherSchool" v-if="registerForm.userType=='03'||registerForm.userType=='02'">
-           <el-input placeholder="所在系及专业" v-model="registerForm.hitRegistrationTeachInfo.teacherSchool" type="text"></el-input>
-         </el-form-item>
-        <el-form-item  prop="hitRegistrationTeachInfo.teacherJob" v-if="registerForm.userType=='03'||registerForm.userType=='02'">
-          <el-input placeholder="职务" v-model="registerForm.hitRegistrationTeachInfo.teacherJob" type="text"></el-input>
-        </el-form-item>
+          </el-form-item>
+          <el-form-item prop="hitRegistrationTeachInfo.teacherSchool"
+                        v-if="registerForm.userType=='03'||registerForm.userType=='02'"
+          >
+            <el-input placeholder="所在系及专业" v-model="registerForm.hitRegistrationTeachInfo.teacherSchool"
+                      type="text"
+            ></el-input>
+          </el-form-item>
+          <el-form-item prop="hitRegistrationTeachInfo.teacherJob"
+                        v-if="registerForm.userType=='03'||registerForm.userType=='02'"
+          >
+            <el-input placeholder="职务" v-model="registerForm.hitRegistrationTeachInfo.teacherJob" type="text"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="批准盖章文件" prop="hitRegistrationTeachInfo.file" label-width="130px" v-if="registerForm.userType === '03'">
+            <image-upload :limit="1" v-model="registerForm.hitRegistrationTeachInfo.file"></image-upload>
+          </el-form-item>
 
 
-
-        <el-form-item  prop="code" >
-          <el-input v-model="registerForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin">
-            <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
-          </el-input>
-          <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
-        </div>
-        </el-form-item>
-        <el-form-item></el-form-item>
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer">
+          <el-form-item prop="code">
+            <el-input v-model="registerForm.code"
+                      auto-complete="off"
+                      placeholder="验证码"
+                      style="width: 63%"
+                      @keyup.enter.native="handleLogin"
+            >
+              <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon"/>
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+            </div>
+          </el-form-item>
+          <el-form-item></el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
         <el-button @click="showRegisterDialog = false">取 消</el-button>
         <el-button type="primary" @click="submitRegister">注 册</el-button>
       </span>
-  </el-dialog>
+    </el-dialog>
   </div>
 
 </template>
 <script>
-import { getHomeUserInfo ,getTeacherAndStudentInfo} from "@/api/system/user";
+import { getHomeUserInfo, getTeacherAndStudentInfo } from '@/api/system/user'
 import { getBaseInfo, getTab } from '@/api/gw/home'
-import { getCodeImg ,register} from "@/api/login";
-import Cookies from "js-cookie";
+import { getCodeImg, register } from '@/api/login'
+import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth'
+
 export default {
-  dicts: ["sys_user_sex", "school_name","com_region"],
+  dicts: ['sys_user_sex', 'school_name', 'com_region'],
   data() {
 
     const equalToPassword = (rule, value, callback) => {
       if (this.registerForm.password !== value) {
-        callback(new Error("两次输入的密码不一致"));
+        callback(new Error('两次输入的密码不一致'))
       } else {
-        callback();
+        callback()
       }
-    };
+    }
     return {
       isLoggedIn: false, // 是否登录
       value: false,
       currentUser: '', //当前用户
-      codeUrl: "", //验证码地址
+      codeUrl: '', //验证码地址
       showLoginDialog: false, // 是否显示登录对话框
       registerDialog: false, // 是否显示注册对话框
-      baseInfo:"",
+      baseInfo: '',
       imgurl: process.env.VUE_APP_BASE_API,
-      input:'',
+      input: '',
       show_search: true,
-      categoryQuery:{},
-      tabindex:0,
+      categoryQuery: {},
+      tabindex: 0,
       tablist: [
-        {name: '首页'},
-        {name: '中心概括'},
-        {name: '教学资源'},
-        {name: '教学平台'},
-        {name: '教学团队'},
-        {name: '专业委员会'},
-        {name: '教学研讨活动'},
-        {name: '虚仿专业频道'},
-        {name: '大赛风采'},
-        {name: '实践平台'},
-        {name: '合作企业'},
-        {name: '联系我们'},
+        { name: '首页' },
+        { name: '中心概括' },
+        { name: '教学资源' },
+        { name: '教学平台' },
+        { name: '教学团队' },
+        { name: '专业委员会' },
+        { name: '教学研讨活动' },
+        { name: '虚仿专业频道' },
+        { name: '大赛风采' },
+        { name: '实践平台' },
+        { name: '合作企业' },
+        { name: '联系我们' }
       ],
       loginForm: {
         username: '',
@@ -211,56 +238,61 @@ export default {
         code: '',
         confirmPassword: '',
         uuid: '',
-        userType:'01',
-        hitRegistrationTeachInfo:{
-           teacherName: '',
-           teacherJob: '',
-           teacherEmail: '',
-           teacherNumber: '',
-           teacherSchool: '',
-           schoolName: '',
-           division: '',
-           SampleAddress: '',
+        userType: '01',
+        hitRegistrationTeachInfo: {
+          teacherName: '',
+          teacherJob: '',
+          teacherEmail: '',
+          teacherNumber: '',
+          teacherSchool: '',
+          schoolName: '',
+          division: '',
+          SampleAddress: '',
+          file:''
 
         }
       },
       registerRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
+          { required: true, trigger: 'blur', message: '请输入您的账号' },
           { message: '学号不能为空', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, trigger: "blur", message: "请输入您的姓名" },
+          { required: true, trigger: 'blur', message: '请输入您的姓名' },
           { message: '姓名不能为空', trigger: 'blur' }
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          { required: true, trigger: 'blur', message: '请输入您的密码' },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur' }
         ],
         confirmPassword: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, trigger: 'blur', message: '请再次输入您的密码' },
+          { required: true, validator: equalToPassword, trigger: 'blur' }
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
         'hitRegistrationTeachInfo.teacherEmail': [
-          { required: true, trigger: "blur", message: "请输入您的邮箱" },
+          { required: true, trigger: 'blur', message: '请输入您的邮箱' }
         ],
         'hitRegistrationTeachInfo.teacherNumber': [
-          { required: true, trigger: "blur", message: "请输入您的手机号" },
+          { required: true, trigger: 'blur', message: '请输入您的手机号' }
         ],
         'hitRegistrationTeachInfo.division': [
-          { required: true, trigger: "blur", message: "请选择赛区" },
+          { required: true, trigger: 'blur', message: '请选择赛区' }
         ],
         'hitRegistrationTeachInfo.schoolName': [
-          { required: true, trigger: "blur", message: "请选择学校名称" },
+          { required: true, trigger: 'blur', message: '请选择学校名称' }
         ],
         'hitRegistrationTeachInfo.teacherSchool': [
-          { required: true, trigger: "blur", message: "请输入所在系及专业" },
+          { required: true, trigger: 'blur', message: '请输入所在系及专业' }
         ],
         'hitRegistrationTeachInfo.teacherJob': [
-          { required: true, trigger: "blur", message: "请输入您的职务" },
+          { required: true, trigger: 'blur', message: '请输入您的职务' }
         ],
+        'hitRegistrationTeachInfo.file': [
+          //验证文件
+          { required: true, trigger: 'blur', message: '请上传您的批准盖章文件' }
+        ]
       }
     }
   },
@@ -269,126 +301,128 @@ export default {
   },
   created() {
     this.tabindex = this.msg
-    this.getCode();
-    this.getCookie(); // 页面加载完毕调用
-    this.isLoggedIn = getToken()?true:false; // 检查 localStorage 中的登录状态
+    this.getCode()
+    this.getCookie() // 页面加载完毕调用
+    this.isLoggedIn = getToken() ? true : false // 检查 localStorage 中的登录状态
     if (this.isLoggedIn) {
-      this.loadUserInfo();
+      this.loadUserInfo()
     }
   },
   mounted() {
     this.tabindex = this.msg
     // console.log(this.msg)
     // 页面加载完毕调用
-    this.tabLsit();
-    this.getWebBaseInfo();
+    this.tabLsit()
+    this.getWebBaseInfo()
     // 监听窗口关闭事件
-    window.addEventListener('beforeunload', this.handleBeforeUnload);
+    window.addEventListener('beforeunload', this.handleBeforeUnload)
   },
   beforeDestroy() {
     // 组件销毁前移除事件监听
-    window.removeEventListener('beforeunload', this.handleBeforeUnload);
+    window.removeEventListener('beforeunload', this.handleBeforeUnload)
   },
 
-  methods:{
+  methods: {
 
     //用户信息
     loadUserInfo() {
       getHomeUserInfo().then(response => {
-        this.currentUser = response.data.userName;
-        console.log('当前用户名:', this.currentUser);
+        this.currentUser = response.data.userName
+        console.log('当前用户名:', this.currentUser)
         if (this.userInfo.avatar && this.userInfo.avatar != '') {
-          this.userInfo.avatar = process.env.VUE_APP_BASE_API + this.userInfo.avatar;
+          this.userInfo.avatar = process.env.VUE_APP_BASE_API + this.userInfo.avatar
         }
       })
     },
     //验证码
     getCode() {
       getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
-          this.loginForm.uuid = res.uuid;
-          this.registerForm.uuid = res.uuid;
+          this.codeUrl = 'data:image/gif;base64,' + res.img
+          this.loginForm.uuid = res.uuid
+          this.registerForm.uuid = res.uuid
         }
-      });
+      })
     },
     getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
+      const username = Cookies.get('username')
+      const password = Cookies.get('password')
       const rememberMe = Cookies.get('rememberMe')
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
         rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
-      };
+      }
     },
     // 登录
     submitLogin() {
       this.$refs.loginForm.validate(valid => {
-        if (valid) {
-          this.loading = true;
-          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
-            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
-          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove('rememberMe');
-          }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.isLoggedIn = true; // 登录成功后设置标志
-            this.showLoginDialog = false;
-            this.$router.push("/virtually").catch(()=>{});
-            this.loadUserInfo();
-            localStorage.setItem('isLoggedIn', 'true'); // 将登录状态存储在 localStorage
-            console.log('当前用户名:', this.currentUser);
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
+          if (valid) {
+            this.loading = true
+            if (this.loginForm.rememberMe) {
+              Cookies.set('username', this.loginForm.username, { expires: 30 })
+              Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
+              Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
+            } else {
+              Cookies.remove('username')
+              Cookies.remove('password')
+              Cookies.remove('rememberMe')
             }
-          });
+            this.$store.dispatch('Login', this.loginForm).then(() => {
+              this.isLoggedIn = true // 登录成功后设置标志
+              this.showLoginDialog = false
+              this.$router.push('/virtually').catch(() => {
+              })
+              this.loadUserInfo()
+              localStorage.setItem('isLoggedIn', 'true') // 将登录状态存储在 localStorage
+              console.log('当前用户名:', this.currentUser)
+            }).catch(() => {
+              this.loading = false
+              if (this.captchaEnabled) {
+                this.getCode()
+              }
+            })
+          }
         }
-      }
-    );
+      )
     },
     //注册
     submitRegister() {
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           // 验证用户名是否为手机号
-          const phoneRegex = /^1[3-9]\d{9}$/;
+          const phoneRegex = /^1[3-9]\d{9}$/
           if (!phoneRegex.test(this.registerForm.username)) {
-            this.$alert("<font color='red'>请输入有效的手机号。</font>", '系统提示', {
+            this.$alert('<font color=\'red\'>请输入有效的手机号。</font>', '系统提示', {
               dangerouslyUseHTMLString: true,
               type: 'error'
-            });
-            return;
+            })
+            return
           }
-          if (this.registerForm.hitRegistrationTeachInfo){
-            this.registerForm.hitRegistrationTeachInfo.teacherNumber =  this.registerForm.username;
+          if (this.registerForm.hitRegistrationTeachInfo) {
+            this.registerForm.hitRegistrationTeachInfo.teacherNumber = this.registerForm.username
           }
 
-          this.loading = true;
+          this.loading = true
           register(this.registerForm).then(res => {
-            const username = this.registerForm.username;
-            this.registerDialog = false;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
+            const username = this.registerForm.username
+            this.registerDialog = false
+            this.$alert('<font color=\'red\'>恭喜你，您的账号 ' + username + ' 注册成功！</font>', '系统提示', {
               dangerouslyUseHTMLString: true,
               type: 'success'
             }).then(() => {
-              this.$router.push("/virtually");
-            }).catch(() => { });
+              this.$router.push('/virtually')
+            }).catch(() => {
+            })
           }).catch(() => {
-            this.loading = false;
+            this.loading = false
             if (this.captchaEnabled) {
-              this.getCode();
+              this.getCode()
             }
-          });
+          })
         }
-      });
+      })
     },
     //退出登录
     async logout() {
@@ -398,32 +432,33 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          localStorage.removeItem('isLoggedIn'); // 清空 localStorage 中的登录状态
-          location.href = '/index';
+          localStorage.removeItem('isLoggedIn') // 清空 localStorage 中的登录状态
+          location.href = '/index'
         })
-      }).catch(() => {});
+      }).catch(() => {
+      })
     },
-    goBack(){
-      this.$router.push("/index")
+    goBack() {
+      this.$router.push('/index')
     },
-     // 定义处理窗口关闭前的事件
-     handleBeforeUnload() {
+    // 定义处理窗口关闭前的事件
+    handleBeforeUnload() {
       // 清空localStorage中的isLoggedIn
-      localStorage.removeItem('isLoggedIn');
+      localStorage.removeItem('isLoggedIn')
     },
-    tabClick(url,id,index){
+    tabClick(url, id, index) {
       this.tabindex = index
-      if (url === 'home') url = "gw";
-        this.$router.push({
-          name: url,
-          query:{ id: id }
-        });
+      if (url === 'home') url = 'gw'
+      this.$router.push({
+        name: url,
+        query: { id: id }
+      })
 
     },
     tabLsit() {
       getTab().then(response => {
         if (response.code == 200) {
-          this.tablist = response.data;
+          this.tablist = response.data
           this.categoryQuery.categoryId = this.tablist[0].id
 
         }
@@ -435,9 +470,9 @@ export default {
         this.baseInfo.webImg = process.env.VUE_APP_BASE_API + this.baseInfo.webImg
       })
     },
-    toHome(){
-      this.$router.push("/virtually")
-    },
+    toHome() {
+      this.$router.push('/virtually')
+    }
   }
 }
 </script>
@@ -483,12 +518,14 @@ export default {
   align-items: center;
   cursor: pointer;
 }
+
 .logo-box {
   width: 50px;
   height: 50px;
   //background: #fff;
 }
-.logo-box img{
+
+.logo-box img {
   width: 50px;
   height: 50px;
 }
@@ -500,6 +537,7 @@ export default {
   margin-left: 20px;
 
 }
+
 .x-x {
   cursor: pointer;
   height: 90px;
@@ -507,31 +545,38 @@ export default {
   box-sizing: border-box;
   padding-top: 25px;
 }
-.x-x:hover{
-  background: linear-gradient( 360deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
+
+.x-x:hover {
+  background: linear-gradient(360deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%);
   //border-bottom: 2px solid #fff;
 }
-.active{
-  background: linear-gradient( 360deg, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
+
+.active {
+  background: linear-gradient(360deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%);
   border-bottom: 2px solid #fff !important;
 }
-.bsize{
+
+.bsize {
   font-weight: 500;
   font-size: 16px;
   color: #FFFFFF;
 }
+
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .login-code-img {
   height: 38px;
 }
+
 .el-dialog__title {
   text-align: center;
 }
diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue
index aa215b2..440c570 100644
--- a/ruoyi-ui/src/views/officialWebsite/competition.vue
+++ b/ruoyi-ui/src/views/officialWebsite/competition.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container" style="background: #f6f6f6">
     <div class="top-box">
-      <headers :msg='msg'></headers>
+      <headers :msg="msg"></headers>
 
       <div class="ny-banner">
         <img src="../../assets/gw/dssj.png" alt="">
@@ -16,7 +16,8 @@
         <!--        </div>-->
         <div class="right">
           <div class="nav-item" v-for="(item, index) in nav" v-bind:class="[index === currentActive ? 'active' : '']"
-            @click="getCurrentActive(index)">
+               @click="getCurrentActive(index)"
+          >
             {{ item.categoryName }}
           </div>
         </div>
@@ -36,13 +37,15 @@
             <div class="step-box-title">
               <el-form label-width="80px" :model="signUpForm" :rules="rules" ref="form">
                 <el-form-item label="学号" prop="studentId">
-                  <el-input v-model="signUpForm.studentId" ></el-input>
+                  <el-input v-model="signUpForm.studentId"></el-input>
                 </el-form-item>
                 <el-form-item label="姓名" prop="stuName">
                   <el-input v-model="signUpForm.stuName"></el-input>
                 </el-form-item>
                 <el-form-item label="性别" prop="stuName">
-                  <el-select v-model="signUpForm.sex" filterable allow-create default-first-option placeholder="请选择性别">
+                  <el-select v-model="signUpForm.sex" filterable allow-create default-first-option
+                             placeholder="请选择性别"
+                  >
                     <el-option key="男" label="男" value="男">
                     </el-option>
                     <el-option key="女" label="女" value="女">
@@ -51,17 +54,21 @@
                 </el-form-item>
                 <el-form-item label="所属赛区" prop="division">
                   <el-select v-model="signUpForm.division" filterable allow-create default-first-option
-                    placeholder="请选择学校名称">
+                             placeholder="请选择学校名称"
+                  >
                     <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
-                      :value="item.value">
+                               :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="学校" label-width="80px" prop="schoolName">
                   <el-select v-model="signUpForm.schoolName" filterable allow-create default-first-option
-                    placeholder="请选择学校名称">
+                             placeholder="请选择学校名称"
+                  >
                     <el-option v-for="item in dict.type.school_name" :key="item.value" :label="item.label"
-                      :value="item.value">
+                               :value="item.value"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -99,8 +106,10 @@
             </div>
             <!-- <div class="step-box-title" style="font-size: 20px;margin-top: 8%" v-if="signUpForm.trialsScore == null">成绩仅供参考，最终选择由指导老师和领队老师做决定</div> -->
             <div class="step-box-title" style="font-size: 20px;margin-top: 8%"
-              v-if="signUpForm.trialsScore != null && signUpForm.isPreliminary == false">
-              等待领队老师确认，您的个人成绩为 : {{ signUpForm.trialsScore }}</div>
+                 v-if="signUpForm.trialsScore != null && signUpForm.isPreliminary == false"
+            >
+              等待领队老师确认，您的个人成绩为 : {{ signUpForm.trialsScore }}
+            </div>
             <div style="position: absolute;left: 15%; top: 30%" v-if="signUpForm.trialsScore">
               <div style="font-size: 24px">
                 个人选拔赛成绩：
@@ -132,7 +141,7 @@
                 </div>
                 <div class="d-s">
                   <el-form-item label="领队老师" prop="ldTeacherInfo.teacherName">
-                    <el-input v-model="preliminaryForm.ldTeacherInfo.teacherName"></el-input>
+                    <el-input v-model="preliminaryForm.ldTeacherInfo.teacherName" disabled></el-input>
                   </el-form-item>
 
                   <el-form-item label="团队名称" prop="teamName">
@@ -143,14 +152,16 @@
                   <el-form-item label="队员1" prop="teammateOne">
                     <el-select v-model="preliminaryForm.teammateOne" placeholder="第一个队友">
                       <el-option v-for="item in preliminaryForm.tdStudentList" :key="item.userId" :label="item.stuName"
-                        :value="item.userId">
+                                 :value="item.userId"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="队员2" prop="teammateTwo">
                     <el-select v-model="preliminaryForm.teammateTwo" placeholder="第二个队友">
                       <el-option v-for="item in preliminaryForm.tdStudentList" :key="item.userId" :label="item.stuName"
-                        :value="item.userId">
+                                 :value="item.userId"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -160,14 +171,16 @@
                   <el-form-item label="指导老师1" prop="teacherOne">
                     <el-select v-model="preliminaryForm.teacherOne" placeholder="指导老师1">
                       <el-option v-for="item in preliminaryForm.zdTeacherList" :key="item.userId"
-                        :label="item.teacherName" :value="item.userId">
+                                 :label="item.teacherName" :value="item.userId"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="指导老师2" prop="teacherTwo">
                     <el-select v-model="preliminaryForm.teacherTwo" placeholder="指导老师2">
                       <el-option v-for="item in preliminaryForm.zdTeacherList" :key="item.userId"
-                        :label="item.teacherName" :value="item.userId">
+                                 :label="item.teacherName" :value="item.userId"
+                      >
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -181,7 +194,9 @@
                   </el-form-item>
                 </div>
 
-                <el-form-item v-if="preliminaryForm.competition.includes('1')" label="盲样邮寄地址" prop="sampleAddress">
+                <el-form-item v-if="preliminaryForm.competition.includes('1')" label="盲样邮寄地址"
+                              prop="sampleAddress"
+                >
                   <el-input v-model="preliminaryForm.sampleAddress"></el-input>
                 </el-form-item>
                 <el-form-item label="附件（纸质报名表盖章）" prop="uploadFile" label-width="180px">
@@ -199,11 +214,23 @@
             <el-descriptions class="margin-top" title="团队信息" border>
               <el-descriptions-item label="赛区">{{ preliminaryForm.divisionLabel }}</el-descriptions-item>
               <el-descriptions-item label="学校">{{ preliminaryForm.hitRegInfo.schoolName }}</el-descriptions-item>
-              <el-descriptions-item label="领队老师">{{ preliminaryForm.ldTeacherInfo.teacherName }}</el-descriptions-item>
+              <el-descriptions-item label="领队老师">{{
+                  preliminaryForm.ldTeacherInfo.teacherName
+                }}
+              </el-descriptions-item>
               <el-descriptions-item label="指导老师">{{ preliminaryForm.zdTeacherStr }}</el-descriptions-item>
-              <el-descriptions-item label="样品联系人">{{ preliminaryForm.hitRegInfo.sampleConcat }}</el-descriptions-item>
-              <el-descriptions-item label="联系人手机号">{{ preliminaryForm.hitRegInfo.sampleNumber }}</el-descriptions-item>
-              <el-descriptions-item label="样品邮寄地址">{{ preliminaryForm.hitRegInfo.sampleAddress }}</el-descriptions-item>
+              <el-descriptions-item label="样品联系人">{{
+                  preliminaryForm.hitRegInfo.sampleConcat
+                }}
+              </el-descriptions-item>
+              <el-descriptions-item label="联系人手机号">{{
+                  preliminaryForm.hitRegInfo.sampleNumber
+                }}
+              </el-descriptions-item>
+              <el-descriptions-item label="样品邮寄地址">{{
+                  preliminaryForm.hitRegInfo.sampleAddress
+                }}
+              </el-descriptions-item>
 
             </el-descriptions>
             <el-table :data="preliminaryForm.hitRegInfo.studentUser" border style="width: 100%">
@@ -220,9 +247,13 @@
                 <template slot-scope="scope">
                   <div v-if="scope.row.isOwn == '1'">
                     <el-button size="mini" type="text" icon="el-icon-check"
-                      @click="regChoose(scope.row, 1)">同意</el-button>
+                               @click="regChoose(scope.row, 1)"
+                    >同意
+                    </el-button>
                     <el-button size="mini" type="text" icon="el-icon-close"
-                      @click="regChoose(scope.row, 2)">拒绝</el-button>
+                               @click="regChoose(scope.row, 2)"
+                    >拒绝
+                    </el-button>
                   </div>
 
                 </template>
@@ -232,20 +263,151 @@
             </div>
           </div>
           <div class="step-box" v-if="active == 3">
-            <div class="step-box-title" style="font-size: 20px;margin-top: 8%">地区选拔赛报名提交成功，请通过大赛通知获取通过信息</div>
+            <div class="step-box-title" style="font-size: 20px;margin-top: 8%">
+              地区选拔赛报名提交成功，请通过大赛通知获取通过信息
+            </div>
           </div>
         </div>
 
         <div class="step-box" v-if="active == 4">
           <div class="step-box-title" style="font-size: 18px;margin-top: 8%;color: red">（地区选拔赛前无需上传资料）</div>
           <file-upload style="margin-top: 5%" :fileSize="200" :fileType="['zip', 'rar', '7z']"
-            v-model="preliminaryForm.hitRegInfo.dsFile"></file-upload>
+                       v-model="preliminaryForm.hitRegInfo.dsFile"
+          ></file-upload>
           <div>
             <el-button style="margin-top: 8%" type="primary" @click="fileSubmit">提交</el-button>
           </div>
         </div>
       </div>
 
+      <!-- 成绩查询     -->
+      <div class="tabber-box" v-if="currentActive == 7">
+        <el-tabs v-model="activeTab">
+          <el-tab-pane label="成绩" name="scores">
+            <h3>个人选拔赛成绩</h3>
+            <p style="color: red">{{ studentForm.trialsScore }}</p>
+            <h3 v-if="studentForm.virtualScore">虚拟赛成绩</h3>
+            <p style="color: red" v-if="studentForm.virtualScore">{{ studentForm.virtualScore }}</p>
+            <h3 v-if="studentForm.assayScore">化验赛成绩</h3>
+            <p style="color: red" v-if="studentForm.assayScore">{{ studentForm.assayScore }}</p>
+            <h3 v-if="studentForm.teameScore">团队成绩</h3>
+            <p style="color: red" v-if="studentForm.teameScore">{{ studentForm.teameScore }}</p>
+          </el-tab-pane>
+          <el-tab-pane label="个人信息" name="edit-student">
+            <el-form :model="studentForm" label-width="80px" :rules="rules">
+              <h3>修改学生信息</h3>
+              <el-form-item label="学号" prop="studentId">
+                <el-input v-model="studentForm.studentId"></el-input>
+              </el-form-item>
+              <el-form-item label="姓名" prop="stuName">
+                <el-input v-model="studentForm.stuName"></el-input>
+              </el-form-item>
+              <el-form-item label="性别" prop="stuName">
+                <el-select v-model="studentForm.sex" filterable allow-create default-first-option
+                           placeholder="请选择性别"
+                >
+                  <el-option key="男" label="男" value="男">
+                  </el-option>
+                  <el-option key="女" label="女" value="女">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="所属赛区" prop="division">
+                <el-select v-model="studentForm.division" filterable allow-create default-first-option
+                           placeholder="请选择学校名称"
+                >
+                  <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
+                             :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="学校" label-width="80px" prop="schoolName">
+                <el-select v-model="studentForm.schoolName" filterable allow-create default-first-option
+                           placeholder="请选择学校名称"
+                >
+                  <el-option v-for="item in dict.type.school_name" :key="item.value" :label="item.label"
+                             :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="院系名称" prop="collegeName">
+                <el-input v-model="studentForm.collegeName"></el-input>
+              </el-form-item>
+              <el-form-item label="专业名称" prop="major">
+                <el-input v-model="studentForm.major"></el-input>
+              </el-form-item>
+
+
+              <el-form-item label="手机号" prop="phoneNumber">
+                <el-input v-model="studentForm.phoneNumber">
+                </el-input>
+              </el-form-item>
+              <el-form-item label="邮箱" prop="email">
+                <el-input v-model="studentForm.email"></el-input>
+              </el-form-item>
+              <el-form-item label="学生证/学生卡" prop="studentIdCard" label-width="130px">
+                <image-upload :limit="1" v-model="studentForm.studentIdCard"></image-upload>
+              </el-form-item>
+
+              <el-form-item>
+                <el-button type="primary" @click="editStudentInfo">修改</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="团队信息" name="edit-team" v-if="teamForm">
+            <el-form :model="teamForm" label-width="80px" :rules="preliminaryFormRules">
+              <h3>修改团队信息</h3>
+              <el-form-item label="团队名称">
+                <el-input v-model="teamForm.teamName"></el-input>
+              </el-form-item>
+              <el-form-item label="所属赛区" prop="division">
+                <el-select v-model="teamForm.division" filterable allow-create default-first-option
+                           placeholder="请选择学校名称"
+                >
+                  <el-option v-for="item in dict.type.com_region" :key="item.value" :label="item.label"
+                             :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="学校" label-width="80px" prop="schoolName">
+                <el-select v-model="teamForm.schoolName" filterable allow-create default-first-option
+                           placeholder="请选择学校名称"
+                >
+                  <el-option v-for="item in dict.type.school_name" :key="item.value" :label="item.label"
+                             :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="赛事" prop="competition">
+                <el-checkbox-group v-model="teamForm.competition">
+                  <el-checkbox label="1">化验赛</el-checkbox>
+                  <el-checkbox label="2">虚拟赛</el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+              <el-form-item label="盲样联系人" prop="sampleConcat">
+                <el-input v-model="teamForm.sampleConcat"></el-input>
+              </el-form-item>
+              <el-form-item label="盲样联系人手机号" prop="sampleNumber">
+                <el-input v-model="teamForm.sampleNumber"></el-input>
+              </el-form-item>
+              <el-form-item v-if="teamForm.competition && teamForm.competition.includes('1')" label="盲样邮寄地址"
+                            prop="sampleAddress"
+              >
+                <el-input v-model="teamForm.sampleAddress"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="updateTeamInfo">修改</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
       <!-- main -->
       <div v-show="currentActive == 0 || currentActive == 1" v-html="pageContext"></div>
 
@@ -270,10 +432,13 @@
 
       </div>
       <div v-show="currentActive == 2 || currentActive == 4 || currentActive === 3  || currentActive == 5">
-        <page-util :category-id="categoryId" @event-message="handleDataFromPage" />
+        <page-util :category-id="categoryId" @event-message="handleDataFromPage"/>
       </div>
-      <div class="anniu" v-show="registerStatus == 1 && currentActive == 0" @click="toRegister">
-        <img src="../../assets/images/bhuaa.png" style="width: 140px;height: 88px">
+      <div class="anniu" v-show=" registerStatus == 1 &&currentActive == 0" @click="toRegister">
+        <img src="../../assets/images/bhuaa.png" style="width:140px;height: 88px">
+      </div>
+      <div class="anniu2" v-show="registerStatus == 1 && currentActive == 0 && studentForm.signUp" @click="toQuery">
+        <img src="../../assets/images/cha_kan_geng_duo.png" style="width: 140px;height: 58px">
       </div>
 
     </div>
@@ -283,10 +448,10 @@
 </template>
 
 <script>
-import { getHomeUserInfo } from "@/api/system/user";
-import { Swiper, SwiperSlide } from "vue-awesome-swiper";
-import "swiper/css/swiper.min.css";
-import { getPageData, getCategoryByParentId, getbaseInfo } from "@/api/officialWebsite/getPageData";
+import { getHomeUserInfo } from '@/api/system/user'
+import { Swiper, SwiperSlide } from 'vue-awesome-swiper'
+import 'swiper/css/swiper.min.css'
+import { getPageData, getCategoryByParentId, getbaseInfo } from '@/api/officialWebsite/getPageData'
 import footers from '@/views/officialWebsite/Components/footer.vue'
 import headers from '@/views/officialWebsite/Components/header.vue'
 import PageUtil from '@/views/officialWebsite/Components/page'
@@ -300,161 +465,172 @@ import {
   getTeamMate,
   agreeTeam,
   refuseTeam,
-  editRegInfo
+  editRegInfo, editCompetitionStudentInfo, updateRegInfo
 } from '@/api/officialWebsite/registerStudent'
 import { getTab, getbanner } from '@/api/gw/home'
-import { getToken } from "@/utils/auth";
+import { getToken } from '@/utils/auth'
+
 export default {
   components: {
     headers,
     footers,
     Swiper,
     SwiperSlide,
-    "page-util": PageUtil
+    'page-util': PageUtil
   },
-  dicts: ["sys_user_sex", "school_name", "com_region"],
+  dicts: ['sys_user_sex', 'school_name', 'com_region'],
   name: 'HelloWorld',
 
   data() {
     return {
-      currentUser: "",
+      currentUser: '',
+      // 成绩查询的tab
+      activeTab: 'scores',
       active: 0,//当前激活的tab
       msg: 8,
       registerStatus: 0,
       imgurl: process.env.VUE_APP_BASE_API,
+      //修改学生信息
+      studentForm: {},
+      //修改团队信息
+      teamForm: {
+        competition: []
+      },
       //个人选拔赛表
       signUpForm: {
-        stuName: "",
-        schoolName: "",
-        division: "",
-        collegeName: "",
-        phoneNumber: "",
-        email: "",
-        studentId: "",
-        major: "",
-        hitRegId: "",
-        trialsScore: "",
-        isPreliminary: "",
+        stuName: '',
+        schoolName: '',
+        division: '',
+        collegeName: '',
+        phoneNumber: '',
+        email: '',
+        studentId: '',
+        major: '',
+        hitRegId: '',
+        trialsScore: '',
+        isPreliminary: ''
       },
       //初赛表
       preliminaryForm: {
-        teamName: "",
-        division: "",
-        schoolName: "",
-        teammateOne: "",
-        teammateTwo: "",
-        leaderTeacher: "",
-        teacherOne: "",
-        teacherTwo: "",
-        competition: [],
+        teamName: '',
+        division: '',
+        schoolName: '',
+        teammateOne: '',
+        teammateTwo: '',
+        leaderTeacher: '',
+        teacherOne: '',
+        teacherTwo: '',
+        competition: []
       },
       //队员
       teammateInfo: {
-        teamId: "",
-        teamName: "",
-        teamMateId: "",
-        isAgreeWith: "",
+        teamId: '',
+        teamName: '',
+        teamMateId: '',
+        isAgreeWith: ''
       },
 
       teammateList: [], // 临时用于渲染的队友列表
       teacherList: [], // 临时用于渲染的导师列表
       rules: {
         stuName: [
-          { required: true, message: "姓名不能为空", trigger: "blur" }
+          { required: true, message: '姓名不能为空', trigger: 'blur' }
         ],
         schoolName: [
-          { required: true, message: "学校名称不能为空", trigger: "blur" }
+          { required: true, message: '学校名称不能为空', trigger: 'blur' }
         ],
         studentId: [
-          { required: true, message: "学号不能为空", trigger: "blur" }
+          { required: true, message: '学号不能为空', trigger: 'blur' }
         ],
         collegeName: [
-          { required: true, message: "院系名称不能为空", trigger: "blur" }
+          { required: true, message: '院系名称不能为空', trigger: 'blur' }
         ],
         division: [
-          { required: true, message: "所属赛区不能为空", trigger: "blur" }
+          { required: true, message: '所属赛区不能为空', trigger: 'blur' }
         ],
         major: [
-          { required: true, message: "专业名称不能为空", trigger: "blur" }
+          { required: true, message: '专业名称不能为空', trigger: 'blur' }
         ],
         studentIdCard: [
-          { required: true, message: "学生证/学生卡不能为空", trigger: "blur" }
+          { required: true, message: '学生证/学生卡不能为空', trigger: 'blur' }
         ],
         phoneNumber: [
-          { required: true, message: "手机号不能为空", trigger: "blur" }
+          { required: true, message: '手机号不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
         ],
         email: [
-          { required: true, message: "邮箱不能为空", trigger: "blur" }
+          { required: true, message: '邮箱不能为空', trigger: 'blur' }
         ],
         competition: [
-          { required: true, message: "赛事不能为空", trigger: "blur" }
+          { required: true, message: '赛事不能为空', trigger: 'blur' }
         ]
 
       },
       preliminaryFormRules: {
         divisionLabel: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         schoolName: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         'ldTeacherInfo.teacherName': [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         teamName: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         teammateOne: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         teammateTwo: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         teacherOne: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         // teacherTwo: [
         //   { required: true, message: "不能为空", trigger: "blur" }
         // ],
         sampleConcat: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         sampleNumber: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          // 校验手机号
+          { required: true, message: '不能为空', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
         ],
+
         sampleAddress: [
-          { required: true, message: "不能为空", trigger: "blur" }
+          { required: true, message: '不能为空', trigger: 'blur' }
         ],
         uploadFile: [
-          { required: true, message: "不能为空", trigger: "blur" }
-        ],
+          { required: true, message: '不能为空', trigger: 'blur' }
+        ]
       },
       pageContext: '',
-      nav: [
-      ],
+      nav: [],
       currentActive: 0,
       isMounted: false,
-      input4: "",
-      categoryId: "",
+      input4: '',
+      categoryId: '',
       noticeList: [],
       routeParam: {
-        "categoryId": this.$route.query.id,
-        "pageNum": 1,
-        "pageSize": 10
+        'categoryId': this.$route.query.id,
+        'pageNum': 1,
+        'pageSize': 10
       },
-      otherList: [],
+      otherList: []
     }
   },
   mounted() {
-    console.log('组件创建');
+    console.log('组件创建')
     // 页面加载完毕调用
-    this.initPageData();
-  },
-  computed: {
+    this.initPageData()
   },
+  computed: {},
   created() {
-    console.log('组件创建');
-    this.loadUserInfo();
+    console.log('组件创建')
+    this.loadUserInfo()
 
   },
   methods: {
@@ -462,27 +638,27 @@ export default {
       data.status = status
       console.log(data)
       editRegUser(data).then(res => {
-        this.$modal.msgSuccess("成功")
+        this.$modal.msgSuccess('成功')
         this.fetchRegistrationInformation()
       })
     },
     fileSubmit() {
       editRegInfo(this.preliminaryForm.hitRegInfo).then(res => {
-        this.$modal.msgSuccess("成功")
+        this.$modal.msgSuccess('成功')
         this.fetchRegistrationInformation()
       })
     },
     //将数组转为字符串
     arrayToString(arr) {
-      console.log("执行了")
-      return arr.join(',');
+      console.log('执行了')
+      return arr.join(',')
     },
     //用户信息
     loadUserInfo() {
       if (getToken()) {
         getHomeUserInfo().then(response => {
           // this.signUpForm.studentId = response.data.userName;
-          this.preliminaryForm = response.data;
+          this.preliminaryForm = response.data
 
           this.fetchRegistrationInformation()
         })
@@ -493,54 +669,58 @@ export default {
     fetchRegistrationInformation() {
       getStudentInfoByStuId(this.signUpForm.studentId)
         .then(response => {
-          this.preliminaryForm = response.data;
-          this.preliminaryForm.competition = ["1"]
+          this.preliminaryForm = response.data
+          this.preliminaryForm.competition = ['1']
+          this.teamForm.competition = ['1']
 
-          this.updateSignUpForm(response.data);
+          this.updateSignUpForm(response.data)
+          this.studentForm = response.data
+          this.teamForm = response.data.hitRegInfo
+          if (this.teamForm) {
+            //将字符串转为数组
+            this.teamForm.competition = this.teamForm.competition.split(',')
+          }
 
-          console.log('报名信息:', this.signUpForm);
+          console.log('报名信息:', this.signUpForm)
         })
 
     },
     updateSignUpForm(data) {
-      this.preliminaryForm.division = data.division;
-      this.preliminaryForm.divisionLabel = data.divisionLabel;
-      this.preliminaryForm.ldTeacherInfo = data.ldTeacherInfo;
+      this.preliminaryForm.division = data.division
+      this.preliminaryForm.divisionLabel = data.divisionLabel
+      this.preliminaryForm.ldTeacherInfo = data.ldTeacherInfo
       if (data.ldTeacherInfo) {
-        this.preliminaryForm.leaderTeacher = data.ldTeacherInfo.userId;
+        this.preliminaryForm.leaderTeacher = data.ldTeacherInfo.userId
       } else {
         this.preliminaryForm.ldTeacherInfo = {}
       }
 
-      this.preliminaryForm.schoolName = data.schoolName;
-      this.preliminaryForm.zdTeacherList = data.zdTeacherList;
-      this.preliminaryForm.tdStudentList = data.tdStudentList;
-      this.preliminaryForm.zdTeacherStr = data.zdTeacherStr;
-      this.active = 1;
+      this.preliminaryForm.schoolName = data.schoolName
+      this.preliminaryForm.zdTeacherList = data.zdTeacherList
+      this.preliminaryForm.tdStudentList = data.tdStudentList
+      this.preliminaryForm.zdTeacherStr = data.zdTeacherStr
+      this.active = 1
       if (data.zdStatus == '0') {
-        this.active = 3;
+        this.active = 3
         this.preliminaryForm.hitRegInfo = data.hitRegInfo
-      }
-      else if (data.zdStatus == '1') {
-        this.active = 4;
+      } else if (data.zdStatus == '1') {
+        this.active = 4
         this.preliminaryForm.hitRegInfo = data.hitRegInfo
         if (data.hitRegInfo.dsFile) {
-          this.active = 5;
+          this.active = 5
         }
       } else if (data.zdStatus == '9') {
-        this.active = 2;
+        this.active = 2
         this.preliminaryForm.hitRegInfo = data.hitRegInfo
       } else if (data.id == null) {
-        this.active = 0;
+        this.active = 0
       } else {
-        this.signUpForm = data;
+        this.signUpForm = data
       }
       console.log(data, 433, this.preliminaryForm)
 
-
     },
 
-
     // 触发导航
     getCurrentActive(value) {
       if (this.currentActive == value) {
@@ -548,14 +728,14 @@ export default {
       }
 
       this.currentActive = value
-      this.categoryId = ""
+      this.categoryId = ''
 
       if (value === 0 || value === 1) {
-        this.pageContext = ""
+        this.pageContext = ''
         this.getContentDetail()
       } else {
         this.otherList = []
-        this.categoryId = this.nav[value].id;
+        this.categoryId = this.nav[value].id
       }
     },
     initPageData() {
@@ -577,9 +757,9 @@ export default {
     getNoticeId() {
       getTab().then(res => {
         const query = {
-          "categoryId": res.data[0].id,
-          "pageNum": 1,
-          "pageSize": 10
+          'categoryId': res.data[0].id,
+          'pageNum': 1,
+          'pageSize': 10
         }
         getCategoryByParentId(query.categoryId).then(res => {
           this.categoryId = res.data[1].id
@@ -587,7 +767,7 @@ export default {
       })
     },
     handleDataFromPage(data) {
-      if (this.currentActive === 3 ) {
+      if (this.currentActive === 3) {
         this.otherList = data
       }
       if (this.currentActive === 2 || this.currentActive == 5 || this.currentActive == 4) {
@@ -596,75 +776,112 @@ export default {
     },
     toRegister() {
       if (!getToken()) {
-        this.$modal.msgWarning("报名请先登录系统！")
+        this.$modal.msgWarning('报名请先登录系统！')
 
       } else {
-        if (this.registerStatus === '1') this.currentActive = 6;
+        if (this.registerStatus === '1') this.currentActive = 6
+      }
+
+    },
+    toQuery() {
+      if (!getToken()) {
+        this.$modal.msgWarning('报名请先登录系统！')
+
+      } else {
+        this.currentActive = 7
       }
 
     },
     downloadFile(fileName) {
-      console.log("尝试下载文件...");
-      const attachmentUrl = "/static/" + fileName;
+      console.log('尝试下载文件...')
+      const attachmentUrl = '/static/' + fileName
 
     },
     //个人选拔赛报名
     trialsSubmitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           register(this.signUpForm).then(res => {
             if (res.code === 200) {
-              this.reset();
-              this.$modal.msgSuccess("个人选拔赛报名提交成功")
-              this.next();
-            } else (
-              this.$modal.msgError("报名失败")
-            )
+              this.reset()
+              this.$modal.msgSuccess('个人选拔赛报名提交成功')
+              this.next()
+            } else {
+              (
+                this.$modal.msgError('报名失败')
+              )
+            }
           })
         } else {
-          this.$modal.msgError("信息未填完整")
+          this.$modal.msgError('信息未填完整')
+        }
+      })
+    },
+    //修改学生信息
+    editStudentInfo() {
+      this.studentForm.competition = null
+      this.studentForm.hitRegInfo = null
+      //校验表单
+      editCompetitionStudentInfo(this.studentForm).then(res => {
+        if (res.code === 200) {
+          this.$modal.msgSuccess('修改成功')
+        } else {
+          this.$modal.msgError('修改失败')
         }
       })
     },
     //初赛报名
     preliminarySubmit() {
-      const data = JSON.parse(JSON.stringify(this.preliminaryForm));
-      data.competition = this.arrayToString(data.competition);
-      console.log("个人选拔赛报名",data);
-      this.$refs["form"].validate(valid => {
+      const data = JSON.parse(JSON.stringify(this.preliminaryForm))
+      data.competition = this.arrayToString(data.competition)
+      console.log('个人选拔赛报名', data)
+      this.$refs['form'].validate(valid => {
         if (valid) {
           PreliminaryRegistration(data).then(res => {
             if (res.code === 200) {
-              this.$modal.msgSuccess("地区选拔赛报名提交成功")
+              this.$modal.msgSuccess('地区选拔赛报名提交成功')
               this.fetchRegistrationInformation()
             } else {
-              this.$modal.msgError("报名失败")
+              this.$modal.msgError('报名失败')
             }
           })
         }
       })
     },
+    updateTeamInfo() {
+      const data = JSON.parse(JSON.stringify(this.teamForm))
+      data.competition = this.arrayToString(data.competition)
+      updateRegInfo(data).then(res => {
+        if (res.code === 200) {
+          this.$modal.msgSuccess('团队成功')
+          this.fetchRegistrationInformation()
+        } else {
+          this.$modal.msgError('报名失败')
+        }
+      })
+
+    },
 
     reset() {
       this.signUpForm = {
-        stuName: "",
-        schoolName: "",
-        division: "",
-        collegeName: "",
-        phoneNumber: "",
-        email: "",
-        studentId: "",
-        major: "",
+        stuName: '',
+        schoolName: '',
+        division: '',
+        collegeName: '',
+        phoneNumber: '',
+        email: '',
+        studentId: '',
+        major: ''
 
       },
-        this.resetForm("form");
+        this.resetForm('form')
     },
 
     // 步骤条跳转至下一页
     next() {
-      if (this.active++ > 2) this.active = 0;
+      if (this.active++ > 2) this.active = 0
     }
-  },
+  }
 }
 </script>
 
@@ -683,6 +900,20 @@ export default {
   cursor: pointer;
 }
 
+.anniu2 {
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  color: #fff;
+  position: fixed;
+  right: 25px;
+  bottom: 200px;
+  border-radius: 8px;
+  cursor: pointer;
+}
+
 /* .container {
   background: #F5F5F5;
 } */
@@ -1014,7 +1245,8 @@ export default {
   /* align-items: center; */
 }
 
-.index-footer .footer .logo .footer-contact {}
+.index-footer .footer .logo .footer-contact {
+}
 
 .index-footer .footer .logo .footer-contact .p {
   display: inline-block;
@@ -1254,4 +1486,19 @@ export default {
   float: left;
 
 }
+
+
+/* 成绩查询样式 */
+h3 {
+  margin-bottom: 20px;
+}
+
+.tabber-box1 {
+  box-sizing: border-box;
+  padding: 15px;
+  text-align: center;
+  //border: 1px solid #ccc;
+  width: 50%;
+  border-radius: 5px;
+}
 </style>