前端补正

ruoyi-admin/src/main/java/com/ruoyi/cms/domain/HitRegistrationStudentInfo.java

@@ -62,4 +62,17 @@ public class HitRegistrationStudentInfo extends BaseEntity
 
     /** 逻辑删除0未删除1真删除 */
     private Integer delFlag;
+
+    /** 盲样收件人 */
+    @Excel(name = "盲样收件人")
+    private String sampleConcat;
+
+    /** 盲样收件人电话 */
+    @Excel(name = "盲样收件人电话")
+    private String sampleNumber;
+
+    /** 盲样邮寄地址 */
+    @Excel(name = "盲样邮寄地址")
+    private String sampleAddress;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/cms/domain/vo/HitRegistrationStudentInfoVo.java

@@ -71,6 +71,18 @@ public class HitRegistrationStudentInfoVo extends BaseEntity {
     @Excel(name = "指导老师")
     private List<String> guideNames;
 
+    /** 盲样收件人 */
+    @Excel(name = "盲样收件人")
+    private String sampleConcat;
+
+    /** 盲样收件人电话 */
+    @Excel(name = "盲样收件人电话")
+    private String sampleNumber;
+
+    /** 盲样邮寄地址 */
+    @Excel(name = "盲样邮寄地址")
+    private String sampleAddress;
+
     /** 时间 */
     private Date createTime;
 }

ruoyi-admin/src/main/java/com/ruoyi/cms/export/HitRegistrationStudentInfoExport.java

@@ -48,4 +48,16 @@ public class HitRegistrationStudentInfoExport{
     /** 指导老师姓名集合 */
     @Excel(name = "指导老师")
     private String guideNames;
+
+    /** 盲样收件人 */
+    @Excel(name = "盲样收件人")
+    private String sampleConcat;
+
+    /** 盲样收件人电话 */
+    @Excel(name = "盲样收件人电话")
+    private String sampleNumber;
+
+    /** 盲样邮寄地址 */
+    @Excel(name = "盲样邮寄地址")
+    private String sampleAddress;
 }

ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationStudentInfoMapper.xml

@@ -22,10 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="sampleConcat"    column="sample_concat"    />
+        <result property="sampleNumber"    column="sample_number"    />
+        <result property="sampleAddress"    column="sample_address"    />
     </resultMap>
 
     <sql id="selectHitRegistrationStudentInfoVo">
-        select id, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark, del_flag, create_time, create_by, update_time, update_by from hit_registration_student_info
+        select id, sample_concat, sample_number, sample_address, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark, del_flag, create_time, create_by, update_time, update_by from hit_registration_student_info
     </sql>
 
     <select id="selectHitRegistrationStudentInfoList" parameterType="HitRegistrationStudentInfo" resultMap="HitRegistrationStudentInfoResult">
@@ -69,6 +72,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="sampleConcat != null">sample_concat,</if>
+            <if test="sampleNumber != null">sample_number,</if>
+            <if test="sampleAddress != null">sample_address,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -88,6 +94,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="sampleConcat != null">#{sampleConcat},</if>
+            <if test="sampleNumber != null">#{sampleNumber},</if>
+            <if test="sampleAddress != null">#{sampleAddress},</if>
          </trim>
     </insert>
 
@@ -128,10 +137,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    自定义-->
     <sql id="selectHitRegistrationStudentInfoVoNew">
         select
-            id, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark,del_flag, create_time, create_by, update_time, update_by,competition_name, competition_type, leader_names, guide_names
+            id, sample_concat, sample_number, sample_address, competition_id, stu_name, stu_gender, stu_major, stu_number, school_name, division, team_name, leader_ids, guide_ids, remark,del_flag, create_time, create_by, update_time, update_by,competition_name, competition_type, leader_names, guide_names
         from
             (SELECT
-                 s.id, s.competition_id, s.stu_name, s.stu_gender, s.stu_major, s.stu_number, s.school_name, s.division, s.team_name, s.leader_ids, s.guide_ids, s.remark, s.del_flag, s.create_time, s.create_by, s.update_time, s.update_by,c.competition_name, c.competition_type,
+                 s.id, s.competition_id, s.stu_name, s.stu_gender, s.stu_major, s.stu_number, s.school_name, s.division, s.team_name, s.leader_ids, s.guide_ids, s.remark, s.del_flag, s.create_time, s.create_by, s.update_time, s.update_by,c.competition_name, c.competition_type, s.sample_concat, s.sample_number, s.sample_address,
                  CONCAT('[',
                         GROUP_CONCAT(JSON_QUOTE(t.teacher_name) ORDER BY t.teacher_name SEPARATOR ','),
                         ']') AS leader_names
@@ -177,6 +186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="competitionName"    column="competition_name"    />
         <result property="competitionType"    column="competition_type"    />
+        <result property="sampleConcat"    column="sample_concat"    />
+        <result property="sampleNumber"    column="sample_number"    />
+        <result property="sampleAddress"    column="sample_address"    />
         <result property="leaderNames"    column="leader_names" javaType="java.util.List" typeHandler="com.ruoyi.system.handler.MysqlTypeHandler"   />
         <result property="guideNames"    column="guide_names" javaType="java.util.List" typeHandler="com.ruoyi.system.handler.MysqlTypeHandler"    />
     </resultMap>
@@ -194,5 +206,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="teachName != null  and teachName != ''"> and (leader_names like concat('%', #{teachName}, '%') or guide_names like concat('%', #{teachName}, '%'))</if>
         <if test="competitionType != null">and competition_type = #{competitionType}</if>
         <if test="createTime != null">and YEAR(create_time) = YEAR(#{createTime})</if>
+        order by create_time desc
     </select>
 </mapper>

ruoyi-ui/src/api/hit/registrationStudentInfo.js

@@ -50,3 +50,5 @@ export function getTeachInfoByIds(ids){
     method: "get",
   })
 }
+
+

ruoyi-ui/src/api/officialWebsite/registerStudent.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function addTeacher(data){
+  return request({
+    url: "/api/registerStudent/addTeach",
+    method: "post",
+    data
+  })
+}
+
+export function register(data){
+  return request({
+    url: "/api/registerStudent",
+    method: "post",
+    data
+  })
+}

ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue

@@ -174,6 +174,11 @@
             <el-descriptions-item label="教师邮箱">{{item.teacherEmail}}</el-descriptions-item>
             <el-descriptions-item label="教师所在系及专业">{{item.teacherSchool}}</el-descriptions-item>
           </el-descriptions>
+          <el-descriptions title="盲样邮寄地址" style="margin-left: 10%">
+            <el-descriptions-item label="收件人">{{props.row.sampleConcat}}</el-descriptions-item>
+            <el-descriptions-item label="联系电话">{{props.row.sampleNumber}}</el-descriptions-item>
+            <el-descriptions-item label="邮寄地址">{{props.row.sampleAddress}}</el-descriptions-item>
+          </el-descriptions>
         </template>
       </el-table-column>
 <!--      <el-table-column label="比赛名称" align="center" prop="competitionName" />-->

ruoyi-ui/src/views/home.vue

@@ -86,7 +86,7 @@
       <div class="list">
         <swiper ref="mySwiper" :options="swiperOptions1" style="width: 100%">
           <swiper-slide class="gongao-item" v-for="item in this.noticeList"  @click="goDeatail(item)">
-            <div class="bj">
+            <div class="bj" @click="goDeatail(item)">
               <div class="tt">{{ item.contentTitle }}</div>
               <div class="p">
                 <div class="tags">
@@ -733,6 +733,9 @@ export default {
 .gongao .list .gongao-item .bj {
   padding: 20px;
 }
+.bj:hover{
+  cursor: pointer;
+}
 .gongao .list .gongao-item .tt {
   font-size: 20px;
   line-height: 28px;

ruoyi-ui/src/views/officialWebsite/Components/footer.vue

@@ -46,7 +46,7 @@
           <a href="">版权所有：{{ this.baseInfo.copyrightInfo }}</a>
           <a href="">备案信息：{{ this.baseInfo.recordInfo }}</a>
         </div>
-        <div class="right">
+        <div class="right" @click="toTop">
           <div class="">返回顶部</div>
           <img src="../../../assets/gw/top.png" alt="">
         </div>
@@ -73,6 +73,9 @@ export default {
         this.baseInfo = res.data
         this.baseInfo.webImg = process.env.VUE_APP_BASE_API + this.baseInfo.webImg
       })
+    },
+    toTop(){
+      window.scrollTo({ top: 0, behavior: 'smooth' });
     }
   }
 }

ruoyi-ui/src/views/officialWebsite/competition.vue

@@ -22,122 +22,223 @@
       </div>
     </div>
     <div class="committee-cont">
-      <div class="tabber-box " v-if="currentActive == 5" >
+      <div class="tabber-box " v-if="currentActive == 6" >
-        <div class="titel_">赛区参赛报名表（本科组）</div>
+        <el-form ref="form" :model="ruleForm" label-width="120px" :rules="rules" class="demo-ruleForm">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="180px" class="demo-ruleForm">
+          <h1 class="tab_title">参赛报名表（本科组）</h1>
-          <div style="display: flex;">
+
-            <el-form-item label="所属赛区" prop="name">
+          <!-- 基础信息-->
-              <el-input style="width: 300px" v-model="ruleForm.name"></el-input>
+          <div class="kuang">
-            </el-form-item>
+          <el-row :gutter="20">
-            <el-form-item label="学校及院系名称" prop="name">
+            <el-col :span="8">
-              <el-input style="width: 300px" v-model="ruleForm.name"></el-input>
+              <el-form-item label="所属赛区" prop="division">
-            </el-form-item>
+                <el-input v-model="ruleForm.division"></el-input>
-            <el-form-item label="参赛团队名称" prop="name">
+              </el-form-item>
-              <el-input style="width: 300px" v-model="ruleForm.name"></el-input>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="学校及院系名称" prop="schoolName">
+                <el-input v-model="ruleForm.schoolName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="参赛团队名称" prop="teamName">
+                <el-input v-model="ruleForm.teamName"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          </div>
+          <!-- 领队老师信息-->
+          <div class="kuang ">
+          <h2 class="tab_title tab_down_line">领队老师</h2>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="姓名" prop="teachers.0.teacherName">
+                <el-input v-model="ruleForm.teachers[0].teacherName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="职务" prop="teachers.0.teacherJob">
+                <el-input v-model="ruleForm.teachers[0].teacherJob"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="手机号" prop="teachers.0.teacherNumber">
+                <el-input v-model="ruleForm.teachers[0].teacherNumber"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="E-mail" prop="teachers.0.teacherEmail">
+                <el-input v-model="ruleForm.teachers[0].teacherEmail"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="所在系及专业" prop="teachers.0.teacherSchool">
+                <el-input v-model="ruleForm.teachers[0].teacherSchool"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          </div>
+
+          <!-- 指导老师①信息-->
+          <div class="kuang ">
+            <h2 class="tab_title tab_down_line">指导老师①</h2>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="teachers.1.teacherName">
+                  <el-input v-model="ruleForm.teachers[1].teacherName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="职务" prop="teachers.1.teacherJob">
+                  <el-input v-model="ruleForm.teachers[1].teacherJob"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号" prop="teachers.1.teacherNumber">
+                  <el-input v-model="ruleForm.teachers[1].teacherNumber"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="E-mail" prop="teachers.1.teacherEmail">
+                  <el-input v-model="ruleForm.teachers[1].teacherEmail"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="所在系及专业" prop="teachers.1.teacherSchool">
+                  <el-input v-model="ruleForm.teachers[1].teacherSchool"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- 指导老师②信息-->
+          <div class="kuang ">
+            <h2 class="tab_title tab_down_line">指导老师②</h2>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="teachers.2.teacherName">
+                  <el-input v-model="ruleForm.teachers[2].teacherName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="职务" prop="teachers.2.teacherJob">
+                  <el-input v-model="ruleForm.teachers[2].teacherJob"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号" prop="teachers.2.teacherNumber">
+                  <el-input v-model="ruleForm.teachers[2].teacherNumber"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="E-mail" prop="teachers.2.teacherEmail">
+                  <el-input v-model="ruleForm.teachers[2].teacherEmail"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="所在系及专业" prop="teachers.2.teacherSchool">
+                  <el-input v-model="ruleForm.teachers[2].teacherSchool"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- 参赛人信息-->
+          <div class="kuang ">
+            <h2 class="tab_title tab_down_line">参赛人信息</h2>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="姓名" prop="stuName">
+                  <el-input v-model="ruleForm.stuName"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="性别" prop="stuGender">
+                  <el-select
+                    v-model="ruleForm.stuGender"
+                    placeholder="学生性别"
+                    clearable
+                    style="width: 125px">
+                    <el-option
+                      v-for="dict in dict.type.sys_user_sex"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="专业" prop="stuMajor">
+                  <el-input v-model="ruleForm.stuMajor"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号" prop="stuNumber">
+                  <el-input v-model="ruleForm.stuNumber"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- 盲样邮寄地址 -->
+          <div class="kuang">
+            <h2 class="tab_title tab_down_line">盲样邮寄地址</h2>
+            <el-row :gutter="20">
+              <el-col :span="8">
+                <el-form-item label="收件人" prop="sampleConcat">
+                  <el-input v-model="ruleForm.sampleConcat"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="联系电话" prop="sampleNumber">
+                  <el-input v-model="ruleForm.sampleNumber"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="邮寄地址" prop="sampleAddress">
+                  <el-input v-model="ruleForm.sampleAddress"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- 提交按钮 -->
+          <div style="text-align: center">
+            <el-form-item>
+              <el-button style="margin-left: -120px" type="primary" @click="submitForm">提交</el-button>
             </el-form-item>
           </div>
-
-          <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;padding: 4px 10px">
-            <div style="font-size: 16px;font-weight: bold">
-              教师信息
-            </div>
-
-            <el-button type="primary" icon="el-icon-plus">新增</el-button>
-
-          </div>
-          <div class="kuang" v-for="(item, index) in ruleForm.teacherlsit" :key="index" >
-            <div class="d-s">
-              <el-form-item label="领队教师姓名" prop="name">
-                <el-input v-model="item.name" style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item label="领队教师职务" prop="name">
-                <el-input v-model="item.duties" style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item label="领队教师手机" prop="name">
-                <el-input v-model="item.tel" style="width: 260px"></el-input>
-              </el-form-item>
-            </div>
-            <div class="d-s">
-              <el-form-item label="领队教师E-mail" prop="name">
-                <el-input v-model="item.Email" style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item label="领队教师所在系及专业" prop="name">
-                <el-input v-model="item.details" style="width: 260px"></el-input>
-              </el-form-item>
-            </div>
-          </div>
-          <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;padding: 4px 10px">
-            <div style="font-size: 16px;font-weight: bold">
-              参赛队员信息
-            </div>
-
-            <el-button type="primary" icon="el-icon-plus">新增</el-button>
-
-          </div>
-          <div class="kuang" v-for="(item, index) in ruleForm.studentlist" :key="index" >
-            <div class="d-s">
-              <el-form-item label="参赛队员姓名" prop="name">
-                <el-input v-model="item.name" style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item label="参赛队员性别" prop="name">
-                <el-input v-model="item.duties" style="width: 260px"></el-input>
-              </el-form-item>
-              <el-form-item label="参赛队员手机号" prop="name">
-                <el-input v-model="item.tel" style="width: 260px"></el-input>
-              </el-form-item>
-            </div>
-            <div class="d-s">
-              <el-form-item label="参赛队员专业" prop="name">
-                <el-input v-model="item.details" style="width: 260px"></el-input>
-              </el-form-item>
-
-            </div>
-          </div>
-          <div style="width: 100%;display: flex;align-items: center;justify-content: space-between;padding: 4px 10px">
-            <div style="font-size: 16px;font-weight: bold">
-              盲样邮寄地址
-            </div>
-
-          </div>
-          <div class="d-s">
-            <el-form-item label="盲样收件人及联系电话" prop="name">
-              <el-input style="width: 300px" v-model="ruleForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="邮寄地址" prop="name">
-              <el-input style="width: 300px" v-model="ruleForm.name"></el-input>
-            </el-form-item>
-          </div>
-
         </el-form>
-        <div style="display: flex;justify-content: center">
-          <el-button type="primary" >确认提交</el-button>
-        </div>
-
       </div>
       <!-- main -->
-      <div v-if="currentActive == 3" v-html="nav[3].children.list[0].contentDetail"></div>
+      <div v-if="currentActive == 3" v-html="nav[currentActive].children.list[0].contentDetail"></div>
       <div v-for="(item, index) in nav " :key=index>
         <div class="about-conts-item1" v-if="currentActive == index">
           <div  v-if="currentActive == 0 || currentActive == 1  " class="neirong" v-html="pageContextList[index]"></div>
-
         </div>
       </div>
       <div v-if="currentActive  == 2 " class="wrapbox">
-        <div class="rsr"    v-for="(item,index) in nav[2].children.list" @click="goDeatail(item)" >
+        <div class="rsr"    v-for="(item,index) in nav[currentActive].children.list" @click="goDeatail(item)" >
           <img  :src=" imgurl + item.contentImg" style="width: 255px;height: 220px">
           <div class="size-t">{{item.contentTitle}}</div>
         </div>
       </div>
       <div v-if="currentActive  == 4 " class="wrapbox">
-        <div class="rsr"   v-for="(item,index) in nav[2].children.list" @click="goDeatail(item)" >
+        <div class="newRsr"   v-for="(item,index) in nav[currentActive].children.list" @click="goDeatail(item)" >
           <img  :src=" imgurl + item.contentImg" style="width: 255px;height: 220px">
           <div class="size-t">{{item.contentTitle}}</div>
         </div>
       </div>
-      <div v-show="currentActive == 2 || currentActive ==4" >
+      <div v-if="currentActive  == 5 " class="wrapbox">
+        <div class="noticeRsr"   v-for="(item,index) in noticeList" @click="goDeatail(item)" >
+            <div >{{item.contentTitle}}</div>
+            <div >{{item.publishDate}}</div>
+        </div>
+      </div>
+      <div v-show="currentActive == 2 || currentActive == 4 || currentActive === 5" >
           <page-util :category-id="categoryId" @event-message="handleDataFromPage" />
       </div>
-      <div class="anniu" v-show="currentActive == 1 " >去报名</div>
+      <div class="anniu" v-if="registerStatus == 1 && currentActive == 0" @click="toRegister" >去报名</div>
     </div>
 
     <footers></footers>
@@ -151,6 +252,8 @@ import { getPageData, getPageColumn,getbaseInfo } from "@/api/officialWebsite/ge
 import footers from '@/views/officialWebsite/Components/footer.vue'
 import headers from '@/views/officialWebsite/Components/header.vue'
 import PageUtil from '@/views/officialWebsite/Components/page'
+import {addTeacher, register} from '@/api/officialWebsite/registerStudent'
+import {getTab, getbanner} from '@/api/gw/home'
 export default {
   components: {
     headers,
@@ -159,6 +262,7 @@ export default {
     SwiperSlide,
     "page-util": PageUtil
   },
+  dicts: ["sys_user_sex"],
   name: 'HelloWorld',
   props: {
     msg: String
@@ -168,19 +272,72 @@ export default {
       registerStatus:0,
       imgurl:process.env.VUE_APP_BASE_API,
       ruleForm: {
-
+        division: null,
-        name: '',
+        schoolName: null,
-        teacherlsit:[
+        teamName: null,
-          {}
+        teachers: [
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          },
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          },
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          }
         ],
-        studentlist:[
+        stuName: null,
-          {}
+        stuGender: null,
-        ]
+        stuMajor: null,
+        stuNumber: null,
+        leaderIds: [],
+        guideIds: [],
+        sampleConcat: null,
+        sampleNumber: null,
+        sampleAddress: null
       },
       rules: {
-        name: [
+        stuName: [
-          { required: true, message: '请输入活动名称', trigger: 'blur' },
+          { required: true, message: "姓名不能为空", trigger: "blur" }
-          { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        ],
+        stuGender: [
+          { required: true, message: "性别不能为空", trigger: "blur" }
+        ],
+        stuMajor: [
+          { required: true, message: "专业不能为空", trigger: "blur" }
+        ],
+        stuNumber: [
+          { required: true, message: "手机号不能为空", trigger: "blur" }
+        ],
+        schoolName: [
+          { required: true, message: "学校及院系名称不能为空", trigger: "blur" }
+        ],
+        division: [
+          { required: true, message: "所属赛区不能为空", trigger: "blur" }
+        ],
+        teamName: [
+          { required: true, message: "参赛团队名称不能为空", trigger: "blur" }
+        ],
+        sampleConcat: [
+          { required: true, message: "收件人不能为空", trigger: "blur" }
+        ],
+        sampleNumber: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" }
+        ],
+        sampleAddress: [
+          { required: true, message: "邮寄地址不能为空", trigger: "blur" }
         ],
       },
       pageContextList: [],
@@ -195,6 +352,7 @@ export default {
       isMounted: false,
       input4: "",
       categoryId: "",
+      noticeList:[],
     }
   },
   mounted() {
@@ -204,7 +362,9 @@ export default {
   computed: {
 
   },
-
+  created() {
+    this.createRules()
+  },
   methods: {
     goDeatail(data){
       // console.log(data)
@@ -218,6 +378,25 @@ export default {
         window.open(data.link, '_blank');
       }
     },
+    createRules(){
+      for (let i =  0; i < 3; i++){
+        this.rules[`teachers.${i}.teacherName`] = [
+          {required: true, message: '姓名不能为空', trigger: "blur"}
+        ]
+        this.rules[`teachers.${i}.teacherJob`] = [
+          {required: true, message: '职务不能为空', trigger: "blur"}
+        ]
+        this.rules[`teachers.${i}.teacherNumber`] = [
+          {required: true, message: '电话不能为空', trigger: "blur"}
+        ]
+        this.rules[`teachers.${i}.teacherEmail`] = [
+          {required: true, message: 'mail不能为空', trigger: "blur"}
+        ]
+        this.rules[`teachers.${i}.teacherSchool`] = [
+          {required: true, message: '所在系及专业不能为空', trigger: "blur"}
+        ]
+      }
+    },
     // 触发导航
     getCurrentActive(value) {
       if (this.currentActive == value) {
@@ -225,7 +404,7 @@ export default {
       }
 
       this.currentActive = value
-      this.categoryId = this.nav[value].id
+      this.categoryId = value === 5 ? this.getNoticeId() : this.nav[value].id;
       // console.log(this.nav,'nav' )
     },
     initPageData() {
@@ -257,12 +436,97 @@ export default {
       });
 
 
+    },
+    getNoticeId(){
+      getTab().then(res => {
+        const query = {
+          "categoryId": res.data[0].id,
+          "pageNum": 1,
+          "pageSize": 10
+        }
+        getbanner(query).then(res => {
+          this.categoryId = res.data[1].id
+        })
+      })
     },
     handleDataFromPage(data){
       if (this.currentActive === 2 || this.currentActive == 4){
         this.nav[this.currentActive].children.list = data
       }
-    }
+      if (this.currentActive === 5){
+        console.log(data)
+        this.noticeList = data
+      }
+    },
+    toRegister(){
+      if (this.registerStatus === '1') this.currentActive = 6;
+    },
+    submitForm(){
+      this.$refs["form"].validate(valid => {
+        if (valid){
+          const leader = this.ruleForm.teachers[0]
+          const guides = this.ruleForm.teachers.slice(1)
+          addTeacher(leader).then(res => {
+            this.ruleForm.leaderIds.push(res.data)
+          })
+          guides.forEach(item => {
+            addTeacher(item).then(res => {
+              this.ruleForm.guideIds.push(res.data)
+            })
+          })
+          register(this.ruleForm).then(res => {
+            if (res.code === 200){
+              this.reset();
+              this.$modal.msgSuccess("报名成功")
+            }else (
+              this.$modal.msgError("报名失败")
+            )
+          })
+        }else {
+          this.$modal.msgError("信息未填完整")
+        }
+      })
+    },
+    reset(){
+      this.ruleForm = {
+        division: null,
+          schoolName: null,
+          teamName: null,
+          teachers: [
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          },
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          },
+          {
+            teacherName: null,
+            teacherJob: null,
+            teacherNumber: null,
+            teacherEmail: null,
+            teacherSchool: null
+          }
+        ],
+          stuName: null,
+          stuGender: null,
+          stuMajor: null,
+          stuNumber: null,
+          leaderIds: [],
+          guideIds: [],
+          sampleConcat: null,
+          sampleNumber: null,
+          sampleAddress: null
+      }
+      this.resetForm("form");
+    },
   }
 
 }
@@ -404,6 +668,10 @@ export default {
 .rsr{
   width: 20%;
 }
+.newRsr{
+  width: 25%;
+  text-align: center;
+}
 .ny-banner {
   width: 100%;
 }
@@ -735,4 +1003,29 @@ export default {
   height: 50px;
   text-align: center;
 }
+.tab_title{
+  display: inline-block;
+  width: 100%;
+  text-align: center;
+  margin: 0 0 1rem 0;
+  padding: 0.5rem;
+}
+.tab_down_line{
+  border-bottom: 1px solid #ccc;
+}
+.neirong{
+  width: 100%; /* 或者使用具体的像素值 */
+  height: 100%; /* 或者使用具体的像素值 */
+}
+.noticeRsr{
+  width: 100%;
+  padding: 1rem;
+  display: flex;
+  justify-content: space-between;
+  font-size: 20px;
+}
+.noticeRsr:hover{
+  color: #00A0E8;
+  cursor: pointer;
+}
 </style>

ruoyi-ui/src/views/officialWebsite/list.vue

@@ -591,5 +591,6 @@ export default {
 .page-box{
   width: 80%;
   margin: 10px auto;
+  text-align: center;
 }
 </style>