Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/hmc_gbhd

# Conflicts:
#	frontend/src/pages/activity/registration-form/index.vue

backend/src/main/java/com/budwk/app/module/activity/controller/ActBigScreenController.java

@@ -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) {

backend/src/main/java/com/budwk/app/module/activity/controller/ActUserController.java

@@ -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"));

backend/src/main/java/com/budwk/app/module/activity/controller/ActivitySignInQueryController.java

@@ -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");

backend/src/main/java/com/budwk/app/module/activity/models/ActUser.java

@@ -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)

backend/src/main/resources/static/components/plugins/textEditor/index.vue

@@ -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)

backend/src/main/resources/views/platform/activity/bigScreen/index.html

@@ -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>

backend/src/main/resources/views/platform/activity/signInUserQuery/index.html

@@ -110,7 +110,7 @@ layout("/layouts/platform_1.html"){
 <!--                    <span>{{row.isShowEquip && row.equip?row.equip:'&#45;&#45;'}}</span>-->
 <!--                </template>-->
 <!--            </el-table-column>-->
-            <el-table-column label="是否参加嘉年华" prop="isParty">
+            <el-table-column label="是否参加茶叙会" prop="isParty">
                 <template slot-scope="{row}">
                     {{row.isParty ? '是':''}}
                 </template>

backend/src/main/resources/views/platform/activity/user/index.html

@@ -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:'&#45;&#45;'}}</span>-->
 <!--				</template>-->
 <!--			</el-table-column>-->
-			<el-table-column label="是否参加嘉年华" prop="isParty">
+			<el-table-column label="是否参加茶叙会" prop="isParty">
 				<template slot-scope="{row}">
 					{{row.isParty ? '是':''}}
 				</template>

frontend/src/pages/activity/registration-form/index.vue

@@ -92,7 +92,8 @@
             <t-form-item label="单位名称">
               <t-input v-model="user.unitName" borderless placeholder="请输入单位名称" readonly></t-input>
             </t-form-item>
-            <t-form-item label="职务" :name="`userList[${index}].position`" :requiredMark="true"
+            <t-form-item label="职务" :name="`userList[${index}].position`"
+                         requiredMark
                        :rules="[{required:true,message: '请输入职务'}]">
               <t-input v-model="user.position" borderless placeholder="请输入职务"></t-input>
             </t-form-item>
@@ -136,6 +137,11 @@
               </t-radio-group>
             </t-form-item>
 
+            <t-form-item v-if="user.isStation" label="接站地址" :name="`userList[${index}].stationAddress`" :rules="[{required:true,message: '请输入接站地址'}]">
+              <t-input v-model="user.stationAddress" borderless placeholder="请输入接站地址" maxlength="50"></t-input>
+            </t-form-item>
+
+
 <!--            <t-form-item label="展示才艺" :name="`userList[${index}].isShowSkill`" :rules="[{required:true,message: '请选择是否展示才艺'}]">-->
 <!--              <t-radio-group v-model="user.isShowSkill" class="radio-box">-->
 <!--                <t-radio :block="false" name="radio" :value="true" label="是"/>-->
@@ -150,7 +156,7 @@
 <!--                <t-input v-model="user.equip" borderless placeholder="请填写才艺所需器材"></t-input>-->
 <!--              </t-form-item>-->
 <!--            </template>-->
-            <t-form-item label="参加嘉年华" :name="`userList[${index}].isParty`" :rules="[{required:true,message: '请选择是否参加嘉年华'}]">
+            <t-form-item label="参加茶叙会" :name="`userList[${index}].isParty`" :rules="[{required:true,message: '请选择是否参加茶叙会'}]">
               <t-radio-group v-model="user.isParty" class="radio-box">
                 <t-radio :block="false" name="radio" :value="true" label="是"/>
                 <t-radio :block="false" name="radio" :value="false" label="否"/>
@@ -1017,7 +1023,6 @@ function closeNoticePopup() {
   height: 44px;
 }
 
-
 ::v-deep .t-form__label--required::before{
   position: absolute;
   left: 8px;

frontend/src/pages/index/index.vue

@@ -2,7 +2,7 @@
   <view class="page-container">
     <view class="header">
       <image class="header-bg"
-             src="/static/img/index.png"
+             src="/static/img/index2.png"
              mode="aspectFill"></image>
     </view>