dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新代码

Browse Source
This commit is contained in:
xiao-fajia 2024-08-03 13:51:47 +08:00
parent 7659142621
commit 162a246cfb
3 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,11 +34,11 @@ public class HitRegistrationStudentInfoExport{
private String teamName;
/** 大赛名称 */
@Excel(name = "大赛名称")
// @Excel(name = "大赛名称")
private String competitionName;
/** 大赛类型（"0"：团队赛，"1"：个人赛，默认"0"） */
@Excel(name = "大赛类型", readConverterExp = "0=团队赛,1=个人赛")
// @Excel(name = "大赛类型", readConverterExp = "0=团队赛,1=个人赛")
private String competitionType;
/** 带队老师姓名集合 */

1
ruoyi-admin/src/main/resources/mapper/cms/ImitationMapper.xml
View File

@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="imitationCount != null "> and imitation_count = #{imitationCount}</if>
<if test="imitationType != null "> and imitation_type = #{imitationType}</if>
</where>
order by create_time desc
</select>
<select id="selectImitationById" parameterType="Long" resultMap="ImitationResult">

82
ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue
View File

@ -9,20 +9,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="学生性别" prop="stuGender">
<el-select
v-model="queryParams.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-form-item label="学生专业" prop="stuMajor">
<el-input
v-model="queryParams.stuMajor"
@ -47,20 +33,20 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="大赛类型" prop="">
<el-select
v-model="queryParams.competitionType"
placeholder="大赛类型"
clearable
style="width: 125px">
<el-option
v-for="dict in dict.type.competition_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="大赛类型" prop="">-->
<!-- <el-select-->
<!-- v-model="queryParams.competitionType"-->
<!-- placeholder="大赛类型"-->
<!-- clearable-->
<!-- style="width: 125px">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.competition_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="所属赛区" prop="division">
<el-input
v-model="queryParams.division"
@ -85,14 +71,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="大赛名称" prop="competitionName">
<el-input
v-model="queryParams.competitionName"
placeholder="请输入团队名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="大赛名称" prop="competitionName">-->
<!-- <el-input-->
<!-- v-model="queryParams.competitionName"-->
<!-- placeholder="请输入团队名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="大赛年份" prop="competitionYear">
<el-select v-model="queryParams.createTime" placeholder="请选择">
<el-option
@ -103,6 +89,20 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="学生性别" prop="stuGender">
<el-select
v-model="queryParams.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-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>
@ -148,8 +148,8 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="expand">
<template slot-scope="props">
<el-descriptions title="学生信息" style="margin-left: 100px">
<el-descriptions-item label="比赛名称">{{props.row.competitionName}}</el-descriptions-item>
<el-descriptions title="学生信息" style="margin-left: 10%">
<!-- <el-descriptions-item label="比赛名称">{{props.row.competitionName}}</el-descriptions-item>-->
<el-descriptions-item label="学生姓名">{{props.row.stuName}}</el-descriptions-item>
<el-descriptions-item label="学生性别">
<dict-tag :options="dict.type.sys_user_sex" :value="props.row.stuGender"/>
@ -160,14 +160,14 @@
<el-descriptions-item label="所属赛区">{{props.row.division}}</el-descriptions-item>
<el-descriptions-item label="团队名称">{{props.row.teamName}}</el-descriptions-item>
</el-descriptions>
<el-descriptions :title="'领队教师' + (index + 1)" v-for="(item, index) in leaderTeachList" style="margin-left: 100px" v-show="leaderTeachList !== null && leaderTeachList.length !== 0">
<el-descriptions :title="'领队教师' + (index + 1)" v-for="(item, index) in leaderTeachList" style="margin-left: 10%" v-show="leaderTeachList !== null && leaderTeachList.length !== 0">
<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>
<el-descriptions-item label="教师邮箱">{{item.teacherEmail}}</el-descriptions-item>
<el-descriptions-item label="教师所在系及专业">{{item.teacherSchool}}</el-descriptions-item>
</el-descriptions>
<el-descriptions :title="'指导教师' + (index + 1)" v-for="(item, index) in guideTeachList" style="margin-left: 100px" v-show="guideTeachList !== null && guideTeachList.length !== 0">
<el-descriptions :title="'指导教师' + (index + 1)" v-for="(item, index) in guideTeachList" style="margin-left: 10%" v-show="guideTeachList !== null && guideTeachList.length !== 0">
<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>
@ -176,7 +176,7 @@
</el-descriptions>
</template>
</el-table-column>
<el-table-column label="比赛名称" align="center" prop="competitionName" />
<!-- <el-table-column label="比赛名称" align="center" prop="competitionName" />-->
<el-table-column label="学生姓名" align="center" prop="stuName" />
<el-table-column label="学生性别" align="center" prop="stuGender" width="100px">
<template slot-scope="scope">