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 4d62e03..35f76d9 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
@@ -95,6 +95,9 @@ public class HitCompetitionStudentInfo implements Serializable {
@ApiModelProperty(value = "个人选拔赛分数")
private BigDecimal trialsScore;
+ @Excel(name = "赛道",readConverterExp = "1=常规赛道,2=产业赛道,3=国际赛道")
+ private Integer racetrack;
+
// @Excel(name = "是否被选为参加地区选拔赛人员", readConverterExp = "false=待审核,true=已入选",type = EXPORT)
@ApiModelProperty(value = "是否被选为参加初赛人员 (0: 否, 1: 是)")
private Boolean isPreliminary;
@@ -160,4 +163,7 @@ public class HitCompetitionStudentInfo implements Serializable {
@TableField(exist = false)
private Boolean isUpdateTeam;
+ @TableField(exist = false)
+ private String racetrackStr;
+
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index b78e34d..a2f60ff 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
-# url: jdbc:mysql://localhost:3306/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
- username: obrhgd
-# username: root
- password: Obr7890&*()
-# password: 123456
+# url: jdbc:mysql://61.156.90.46:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+ url: jdbc:mysql://fn.xuyuncong.fun:3360/hgd_website?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true
+# username: obrhgd
+ username: hgd_website
+# password: Obr7890&*()
+ password: ZSERXa7zHGGfmmBT
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
index 6f80255..5536397 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
@@ -34,21 +34,32 @@
@@ -85,6 +96,7 @@
student_id_card,
trials_score,
is_preliminary,
+ racetrack,
remark,
sex,
del_flag,
@@ -107,6 +119,7 @@
#{studentIdCard},
#{trialsScore},
#{isPreliminary},
+ #{racetrack},
#{remark},
#{sex},
#{delFlag},
diff --git a/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png b/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png
index f0ae4f3..0e97626 100644
Binary files a/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png and b/ruoyi-ui/src/assets/images/cha_kan_geng_duo.png differ
diff --git a/ruoyi-ui/src/assets/images/cha_kan_geng_duo1.png b/ruoyi-ui/src/assets/images/cha_kan_geng_duo1.png
new file mode 100644
index 0000000..f0ae4f3
Binary files /dev/null and b/ruoyi-ui/src/assets/images/cha_kan_geng_duo1.png differ
diff --git a/ruoyi-ui/src/views/hit/stuInfo/index.vue b/ruoyi-ui/src/views/hit/stuInfo/index.vue
index 750aa80..a6be4f2 100644
--- a/ruoyi-ui/src/views/hit/stuInfo/index.vue
+++ b/ruoyi-ui/src/views/hit/stuInfo/index.vue
@@ -30,6 +30,16 @@
+
+
+
+
+
+
搜索
重置
@@ -79,6 +89,7 @@
+
@@ -228,6 +239,20 @@ export default {
ids: [],
// 非单个禁用
single: true,
+ racetrack: [
+ {
+ label: '常规赛道',
+ value: 1
+ },
+ {
+ label: '产业赛道',
+ value: 2
+ },
+ {
+ label: '国际赛道',
+ value: 3
+ },
+ ],
// 非多个禁用
multiple: true,
// 显示搜索条件
@@ -316,6 +341,9 @@ export default {
};
},
created() {
+ // 获取路由中的参数
+ // console.log('路由参数',this.$route.query)
+ // this.queryParams.racetrack = this.$route.query.type
this.getList();
},
methods: {
diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue
index bb393e6..4d2092e 100644
--- a/ruoyi-ui/src/views/officialWebsite/competition.vue
+++ b/ruoyi-ui/src/views/officialWebsite/competition.vue
@@ -79,6 +79,16 @@
+
+
+
+
+
+
@@ -486,10 +496,10 @@