Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd
# Conflicts: # frontend/src/pages/activity/registration-form/index.vue
This commit is contained in:
那些花儿
+4
-3
@@ -1,5 +1,6 @@
|
||||
package com.budwk.app.module.activity.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.budwk.app.base.result.Result;
|
||||
@@ -33,7 +34,7 @@ public class ActBigScreenController {
|
||||
private Dao dao;
|
||||
|
||||
@At("")
|
||||
@SaCheckPermission("activity.bigScreen")
|
||||
@SaCheckLogin
|
||||
@Ok("beetl:/platform/activity/bigScreen/index.html")
|
||||
public void index() {
|
||||
}
|
||||
@@ -42,7 +43,7 @@ public class ActBigScreenController {
|
||||
* 获取活动列表及其项目
|
||||
*/
|
||||
@At("/listAct")
|
||||
@SaCheckPermission("activity.bigScreen")
|
||||
@SaCheckLogin
|
||||
public Result listAct() {
|
||||
List<Activity> list = dao.query(Activity.class, Cnd.NEW().desc("startTime"));
|
||||
for (Activity activity : list) {
|
||||
@@ -55,7 +56,7 @@ public class ActBigScreenController {
|
||||
* 获取活动成绩
|
||||
*/
|
||||
@At("/score")
|
||||
@SaCheckPermission("activity.bigScreen")
|
||||
@SaCheckLogin
|
||||
@Ok("json:full")
|
||||
public Result score(Long activityId) {
|
||||
if (activityId == null) {
|
||||
|
||||
+2
-1
@@ -248,8 +248,9 @@ public class ActUserController {
|
||||
add(new ExcelExportEntity("交通方式", "traffic", 20));
|
||||
add(new ExcelExportEntity("自驾车牌号", "carNo", 20));
|
||||
add(new ExcelExportEntity("是否接站", "isStationDesc", 20));
|
||||
add(new ExcelExportEntity("接站地址", "stationAddress", 20));
|
||||
|
||||
add(new ExcelExportEntity("是否参加嘉年华", "isPartyDesc", 20));
|
||||
add(new ExcelExportEntity("是否参加茶叙会", "isPartyDesc", 20));
|
||||
}};
|
||||
response.setContentType("application/octet-stream");
|
||||
response.setHeader("Content-Disposition", "attachment;filename=" + new String((activity.getTitle() + "报名数据表.xlsx").getBytes(StandardCharsets.UTF_8), "ISO8859-1"));
|
||||
|
||||
+3
-1
@@ -125,6 +125,7 @@ public class ActivitySignInQueryController {
|
||||
WHEN 1 THEN '是'
|
||||
WHEN 0 THEN ''
|
||||
END AS isStationDesc,
|
||||
au.stationAddress,
|
||||
CASE au.isParty
|
||||
WHEN 1 THEN '是'
|
||||
WHEN 0 THEN ''
|
||||
@@ -163,7 +164,8 @@ public class ActivitySignInQueryController {
|
||||
add(new ExcelExportEntity("交通方式", "traffic", 20));
|
||||
add(new ExcelExportEntity("自驾车牌号", "carNo", 20));
|
||||
add(new ExcelExportEntity("是否接站", "isStationDesc", 20));
|
||||
add(new ExcelExportEntity("是否参加嘉年华", "isPartyDesc", 20));
|
||||
add(new ExcelExportEntity("接站地址", "stationAddress", 20));
|
||||
add(new ExcelExportEntity("是否参加茶叙会", "isPartyDesc", 20));
|
||||
}};
|
||||
|
||||
response.setContentType("application/octet-stream");
|
||||
|
||||
@@ -150,6 +150,11 @@ public class ActUser extends BaseModel {
|
||||
@Default("0")
|
||||
private Boolean isStation;
|
||||
|
||||
@Column
|
||||
@Comment("接站地址")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 50)
|
||||
private String stationAddress;
|
||||
|
||||
@Column
|
||||
@Comment("自驾车牌号")
|
||||
@ColDefine(type = ColType.VARCHAR, width = 100)
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -66,7 +66,7 @@ module.exports = {
|
||||
console.log(v)
|
||||
if (v.code === 0) {
|
||||
console.log(v.data)
|
||||
insertImgFn('/open/file/upload/download?filepath='+v.data)
|
||||
insertImgFn('https://3skj.ltd/api/open/file/upload/download?filepath='+v.data)
|
||||
// insertImgFn(v.data)
|
||||
} else {
|
||||
this.$message.error(v.msg)
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>趣味运动会大屏</title>
|
||||
<!-- 添加图标库 - 使用更可靠的CDN -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.4.0/css/all.min.css">
|
||||
<link rel="stylesheet" href="/assets/platform/plugins/fontawesome-free/css/all.css">
|
||||
<style>
|
||||
* {
|
||||
margin: 0;
|
||||
@@ -1466,7 +1466,7 @@
|
||||
:class="getRankingClass(getTeamItemRanking(team, item.id))">
|
||||
{{getTeamItemScore(team, item.id)}}
|
||||
<span v-if="getTeamItemRanking(team, item.id)" class="team-ranking">
|
||||
{{getTeamItemRanking(team, item.id)}}
|
||||
<!-- {{getTeamItemRanking(team, item.id)}}-->
|
||||
</span>
|
||||
</td>
|
||||
<td class="team-score" style="text-align: center;">{{calculateTotalScore(team)}}</td>
|
||||
|
||||
@@ -110,7 +110,7 @@ layout("/layouts/platform_1.html"){
|
||||
<!-- <span>{{row.isShowEquip && row.equip?row.equip:'--'}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="是否参加嘉年华" prop="isParty">
|
||||
<el-table-column label="是否参加茶叙会" prop="isParty">
|
||||
<template slot-scope="{row}">
|
||||
{{row.isParty ? '是':''}}
|
||||
</template>
|
||||
|
||||
@@ -100,12 +100,13 @@ layout("/layouts/platform_1.html"){
|
||||
<el-table-column label="交通方式" prop="traffic"></el-table-column>
|
||||
<el-table-column label="自驾车牌号" prop="carNo"></el-table-column>
|
||||
<el-table-column label="是否接站" prop="isStationDesc"></el-table-column>
|
||||
<el-table-column label="接站地址" prop="stationAddress"></el-table-column>
|
||||
<!-- <el-table-column label="所需器材" prop="equip">-->
|
||||
<!-- <template slot-scope="{row}">-->
|
||||
<!-- <span>{{row.isShowEquip && row.equip?row.equip:'--'}}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="是否参加嘉年华" prop="isParty">
|
||||
<el-table-column label="是否参加茶叙会" prop="isParty">
|
||||
<template slot-scope="{row}">
|
||||
{{row.isParty ? '是':''}}
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user