Compare commits

..
15 Commits
Author SHA1 Message Date
Developer 96f3b56eff fix: 修复 API 代理路径,去掉多余的 /api 前缀
continuous-integration/drone/push Build is passing
🤖 Generated with Claude Code
2025-12-13 23:11:31 +08:00
hongjianli 1a99a45729 fix bugs
continuous-integration/drone/push Build is passing
2025-12-13 09:34:06 +08:00
hongjianli 669f29878b fix bugs
continuous-integration/drone/push Build is passing
2025-12-12 17:54:40 +08:00
hongjianli 5b806e29b7 fix bugs
continuous-integration/drone/push Build is failing
2025-12-11 16:56:19 +08:00
hongjianli ab69968bda 修改前端页面
continuous-integration/drone/push Build is failing
2025-12-03 13:51:22 +08:00
hongjianli aa6facf13a fix bugs
continuous-integration/drone/push Build is passing
2025-11-30 12:15:21 +08:00
n72595987@gmail.comandClaude e77e73074a docs: 更新前端项目文档
continuous-integration/drone/push Build is passing
- 修复字符编码问题(之前显示乱码)
- 添加完整的项目说明和技术栈介绍
- 记录 Docker 部署方法和 CI/CD 流程
- 添加常见问题解答(登录接口错误、容器启动失败等)
- 完善生产架构图和网络拓扑说明
- 补充开发规范和配置说明

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 00:24:05 +08:00
n72595987@gmail.comandClaude a65daba7a9 fix: 修复 Drone 部署步骤使用正确的 Dockerfile
continuous-integration/drone/push Build is passing
- 使用 Dockerfile.deploy 而非默认 Dockerfile
- 直接使用 docker run 而不是 docker-compose(避免依赖问题)
- 强制删除旧容器后创建新容器(确保使用新镜像)
- 修复镜像构建后容器没有更新的问题

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 00:05:01 +08:00
n72595987@gmail.comandClaude 134208d510 fix: 修复前端 nginx 配置和 API 基础路径
continuous-integration/drone/push Build is passing
- nginx.conf: 将后端代理地址从 martial-backend 改为 172.21.0.1:8123(宿主机网关)
- .env.production: 移除 VITE_APP_API 的 /api 前缀
- 修复登录时 "No endpoint POST /api/blade-auth/oauth/token" 错误
- 修复容器启动失败 "host not found in upstream martial-backend" 错误

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-30 00:01:30 +08:00
n72595987@gmail.comandClaude cbf161048c fix: 修复前端 API 路径配置
continuous-integration/drone/push Build is passing
- 移除 VITE_APP_API 的 /api 前缀
- BladeX 框架的端点已包含完整路径(/blade-auth, /blade-system 等)
- 修复登录时 "No endpoint POST /api/blade-auth/oauth/token" 错误

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 23:55:30 +08:00
n72595987@gmail.comandClaude 890218199b 修复前端 CI/CD:改为在部署服务器上构建镜像
continuous-integration/drone/push Build is passing
问题:
- plugins/docker 尝试推送镜像到 Docker Hub
- 没有配置认证导致 'denied: requested access to resource is denied'

解决方案:
- 移除 plugins/docker 步骤
- 添加 drone-scp 步骤传输构建产物(dist、Dockerfile、nginx.conf)
- 在部署服务器上执行 docker build
- 直接使用本地镜像启动容器

优势:
- 不需要配置 Docker Hub 认证
- 不需要推送和拉取镜像,更快
- 镜像只存在于部署服务器本地
- 修正健康检查 URL 为 http://154.30.6.21/

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 18:04:56 +08:00
n72595987@gmail.comandClaude 36116e0973 修复前端构建:正确配置 BladeX 私有 npm registry
continuous-integration/drone/push Build is failing
问题:
- Dockerfile 中 npm install 时未复制 .npmrc 文件
- 使用 --registry 参数覆盖了 .npmrc 中的私有 registry 配置
- 导致无法下载 @saber scope 的私有包,报 E401 认证错误

解决方案:
- Dockerfile: 在 npm install 前复制 .npmrc 文件
- Dockerfile: 移除 --registry 参数,使用 .npmrc 中的配置
- .drone.yml: 同样移除 --registry 参数

现在 npm 会正确使用:
- @saber 包 -> https://center.javablade.com (私有 registry)
- 其他包 -> npm 默认源

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 17:57:25 +08:00
n72595987@gmail.comandClaude 1d8d60ccaa 修复 Drone CI 配置:移除 host volumes 以解决 untrusted 仓库问题
continuous-integration/drone/push Build is failing
- 移除 npm-cache volume 挂载
- 同一构建内的步骤仍可共享 node_modules
- 使用国内镜像加速依赖下载

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 17:45:39 +08:00
n72595987@gmail.comandClaude 40b1e48f11 添加 Drone CI/CD 前端自动化部署配置
continuous-integration/drone/push Build encountered an error
1. 新增 .drone.yml 配置文件
   - 自动安装 npm 依赖
   - 自动构建生产版本
   - 构建 Docker 镜像
   - 自动部署到生产服务器
   - 健康检查验证部署成功

2. 新增 Dockerfile
   - 多阶段构建:Node 编译 + Nginx 运行
   - 优化镜像体积,使用 alpine 基础镜像
   - 配置静态资源缓存
   - 添加健康检查

3. 新增 nginx.conf
   - 配置前端路由支持(Vue Router history 模式)
   - 代理 API 请求到后端服务
   - 优化 Gzip 压缩和静态资源缓存
   - 支持 BladeX 系统模块路径代理

现在推送代码后,前端会自动部署到生产环境!

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 17:04:57 +08:00
n72595987@gmail.comandClaude dd9927014e 修复Vite代理配置,解决前后端通信问题
1. 修复后端API代理配置
   - 更新代理目标端口从82改为8123(匹配实际后端端口)
   - 区分BladeX系统模块和业务模块的URL路径处理

2. 解决验证码接口404问题
   - 新增 ^/api/blade- 规则处理系统模块(blade-auth、blade-system等)
   - 系统模块需去掉 /api 前缀转发到后端 /blade-auth/* 路径
   - 业务模块保留 /api 前缀转发到后端 /api/martial/* 路径

3. 验证测试结果
   -  /api/blade-auth/oauth/captcha 验证码接口正常
   -  /api/blade-system/tenant/info 租户信息接口正常
   -  /api/martial/competition/list 比赛列表接口正常

现在前端登录页面可以正常获取验证码,所有API接口都能正确访问。

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-29 16:31:05 +08:00
39 changed files with 1267 additions and 6660 deletions
-37
View File
@@ -1,37 +0,0 @@
# 待处理问题
## Issue 1: 调度页面"状态"列数据应从后端获取
### 问题描述
调度页面中的"状态"列(已完赛/未完赛)目前是前端硬编码为 `false`,并非从后端 API 获取的真实状态。
### 当前行为
- 前端在加载调度数据时,将 `completed` 字段默认设置为 `false`
- 所有参赛者的状态都显示为"未完赛"
### 期望行为
- 从后端 API 获取每个参赛者的真实完赛状态
- 正确显示"已完赛"或"未完赛"
### 相关代码
**文件:** `src/views/martial/dispatch/index.vue`
```javascript
// 第320行 - 当前硬编码
completed: false,
// 第69-70行 - 状态显示逻辑
<el-tag v-if="scope.row.completed" type="success" size="small">已完赛</el-tag>
<el-tag v-else type="warning" size="small">未完赛</el-tag>
```
### 待办
- [ ] 后端 API 返回参赛者的完赛状态字段
- [ ] 前端从 API 响应中读取真实状态
---
+248 -50
View File
@@ -1,72 +1,270 @@
# 武术赛事管理系统 - 管理后台
# 武术赛事通 - 前端项目
基于 Vue 3 + Vite + Element Plus 构建的武术比赛管理后台。
基于 Vue 3 + Vite + Element Plus 构建
## 在线访问
## 🌐 在线访问
| 服务 | 地址 |
|------|------|
| 管理后台 | https://martial-admin.aitisai.com |
| 后端 API | https://martial-api.aitisai.com |
- **生产环境**: https://martial.johnsion.club
- **后端 API**: https://martial-api.johnsion.club
- **API 文档**: https://martial-doc.johnsion.club
## 技术栈
## 📦 技术栈
- **框架**: Vue 3.4 (Composition API)
- **构建工具**: Vite 5
- **UI 组件**: Element Plus + Avue
- **状态管理**: Vuex 4
- **UI 组件**: Element Plus
- **表单/表格**: Avue
- **HTTP 库**: Axios
- **路由**: Vue Router 4
- **状态管理**: Vuex 4
- **样式**: Sass/SCSS
## 快速开始
```bash
# 安装依赖
npm install
# 开发环境
npm run dev
# 构建生产版本
npm run build
```
访问 http://localhost:8083
## 项目结构
## 📁 项目结构
```
martial-web/
├── src/
│ ├── views/martial/ # 武术业务页面
│ ├── competition/ # 赛事管理
│ ├── project/ # 项目管理
│ ├── participant/ # 参赛选手
│ ├── judgeInvite/ # 裁判邀请
│ ├── score/ # 评分管理
│ └── ...
── api/ # API 接口
│ ├── router/ # 路由配置
│ └── store/ # 状态管理
├── .env.development # 开发环境配置
├── .env.production # 生产环境配置
── vite.config.js # Vite 配置
│ ├── main.js # 应用入口
│ ├── App.vue # 根组件
│ ├── router/ # 路由配置
│ ├── store/ # Vuex 状态管理
│ ├── views/ # 页面组件
│ ├── components/ # 通用组件
├── api/ # API 接口
── utils/ # 工具函数
├── public/ # 静态资源
├── .env.development # 开发环境配置
├── .env.production # 生产环境配置
├── vite.config.js # Vite 配置
── nginx.conf # Nginx 配置(生产环境容器使用)
├── Dockerfile # 完整构建 Dockerfile
├── Dockerfile.deploy # 部署 Dockerfile
└── .drone.yml # Drone CI/CD 配置
```
## Docker 部署
## 🚀 本地开发
### 环境要求
- Node.js >= 18
- npm >= 9
### 安装依赖
```bash
docker build -t martial-web .
docker run -d -p 8083:80 martial-web
npm install
```
## 相关仓库
### 开发运行
| 仓库 | 说明 |
|------|------|
| [martial-master](https://git.waypeak.work/martial/martial-master) | 后端 API |
| [martial-mini](https://git.waypeak.work/martial/martial-mini) | 用户端小程序 |
| [martial-admin-mini](https://git.waypeak.work/martial/martial-admin-mini) | 裁判端小程序 |
```bash
npm run dev
```
---
访问 http://localhost:5173
**最后更新**: 2024-12-29
### 生产构建
```bash
npm run build
```
构建产物在 `dist/` 目录
### 预览生产构建
```bash
npm run serve
```
## 🐳 Docker 部署
### 方法一:完整构建(开发/测试)
```bash
docker build -t martial/frontend:latest -f Dockerfile .
docker run -d -p 80:80 martial/frontend:latest
```
### 方法二:部署已构建产物(生产推荐)
```bash
# 先本地构建
npm run build
# 使用 Dockerfile.deploy 轻量化部署
docker build -t martial/frontend:latest -f Dockerfile.deploy .
# 运行容器
docker run -d \
--name martial-frontend \
--restart always \
-p 5173:80 \
--network martial_martial-network \
-e TZ=Asia/Shanghai \
martial/frontend:latest
```
## 🔄 CI/CD 自动部署
项目使用 Drone CI/CD 进行自动化部署。
### 部署流程
当推送到 `main` 分支时,自动触发:
1. **安装依赖** - `npm install`
2. **构建项目** - `npm run build`
3. **传输文件** - SCP 上传 dist、Dockerfile.deploy、nginx.conf 到服务器
4. **构建镜像** - 在服务器上执行 `docker build -f Dockerfile.deploy`
5. **部署容器** - 停止旧容器,启动新容器
6. **健康检查** - 验证服务可访问
### 查看构建状态
访问 https://martial-ci.johnsion.club
## ⚙️ 配置说明
### 环境变量
**开发环境** (`.env.development`)
```env
VITE_APP_API=/api # API 前缀(开发时走 Vite 代理)
```
**生产环境** (`.env.production`)
```env
VITE_APP_API= # 留空(因为 BladeX 端点路径已完整)
```
### Nginx 配置
生产环境 nginx 配置(`nginx.conf`):
```nginx
# 前端路由(Vue Router history 模式)
location / {
try_files $uri $uri/ /index.html;
}
# API 代理到后端(通过宿主机网关地址)
location /blade-auth/ {
proxy_pass http://172.21.0.1:8123/blade-auth/;
}
location /blade-system/ {
proxy_pass http://172.21.0.1:8123/blade-system/;
}
location /api/ {
proxy_pass http://172.21.0.1:8123/api/;
}
```
### Vite 配置
开发环境代理配置(`vite.config.js`):
```js
server: {
proxy: {
'/api': {
target: 'http://localhost:8123',
changeOrigin: true
}
}
}
```
## 🔧 常见问题
### 问题1: "No endpoint POST /api/blade-auth/oauth/token"
**原因**: 错误配置 `VITE_APP_API``/api` 前缀,导致请求 `/api/blade-auth/oauth/token`
**解决**: 检查 `.env.production``VITE_APP_API=`(留空)
### 问题2: 容器启动报 "host not found in upstream martial-backend"
**原因**: nginx.conf 中使用 Docker 服务名 `martial-backend`,但容器无法解析
**解决**: 使用宿主机网关地址 `172.21.0.1:8123` 代替
### 问题3: 端口 80 占用
**原因**: 宿主机 Caddy 已占用 80 端口
**解决**: 前端容器使用其他端口(如 5173),由 Caddy 反向代理
## 📝 开发规范
### 代码风格
- 使用 ESLint + Prettier
- 遵循 Vue 3 组合式 API 最佳实践
- 组件命名使用PascalCase
- 文件命名使用kebab-case
### Git 提交规范
```
feat: 新功能
fix: 修复 Bug
docs: 文档更新
style: 代码格式调整
refactor: 重构
perf: 性能优化
test: 测试相关
chore: 构建/工具配置
```
## 🏗️ 生产架构
### 部署拓扑
```
互联网
Cloudflare CDN
Caddy (80/443端口,自动 HTTPS)
martial.johnsion.club → localhost:5173 (前端 Nginx 容器)
├── 静态文件 → 直接返回 Vue 应用
└── /blade-auth, /blade-system, /api → 代理到后端 172.21.0.1:8123
```
### 网络架构
```
Docker Network: martial_martial-network (bridge)
├── martial-frontend (172.21.0.x) - 端口映射 5173:80
├── martial-mysql (172.21.0.x) - 端口映射 33066:3306
└── martial-redis (172.21.0.x) - 端口映射 63379:6379
宿主机:
├── Caddy (80/443) - 反向代理服务
├── Java 后端 (8123) - martial-master 应用
└── Drone CI/CD (8080) - 自动化部署
```
## 🔐 安全考虑
- 生产环境启用 HTTPS 证书(Caddy 自动签发)
- API 接口通过 Nginx 代理,隔离后端
- 敏感配置通过 Drone Secrets 管理
- 容器间网络隔离,仅暴露必要端口
## 📚 相关链接
- [后端仓库](https://git.waypeak.work/martial/martial-master)
- [BladeX 框架](https://bladex.cn)
- [Vue 3 文档](https://cn.vuejs.org/)
- [Element Plus](https://element-plus.org/)
- [Vite 文档](https://vitejs.dev/)
## 👥 贡献者
- **开发者**: JohnSion
- **AI 助手**: Claude Code
-181
View File
@@ -1,181 +0,0 @@
# 裁判邀请功能使用说明
## 功能概述
裁判邀请模块用于为武术赛事邀请裁判,通过生成邀请码的方式让裁判登录系统并回复邀请。
## 完整操作流程
### 1. 准备工作
#### 1.1 创建赛事
- 进入"赛事管理"模块
- 创建新的赛事
- 确保赛事状态为"进行中"
#### 1.2 添加裁判
- 进入"评委管理"模块
- 点击"新增评委"按钮
- 填写裁判基本信息:
- 姓名、性别、手机号、身份证号
- 裁判类型(主裁判/普通裁判)
- 等级/职称
- 擅长项目
- 保存裁判信息
### 2. 生成邀请码
#### 方式一:从评委库导入(推荐)
这是为新裁判生成邀请码的主要方式。
**操作步骤:**
1. 进入"裁判邀请"页面
2. 选择赛事(页面顶部下拉框)
3. 点击"从评委库导入"按钮
4. 在弹出的对话框中:
- 可以搜索裁判(按姓名、手机号、类型)
- 勾选需要邀请的裁判(支持多选)
- 查看已选择的裁判数量
5. 点击"确定导入"按钮
6. 系统自动为选中的裁判批量生成邀请码
7. 生成成功后,邀请列表会自动刷新
**特点:**
- ✅ 支持批量操作
- ✅ 可以搜索和筛选裁判
- ✅ 自动生成邀请码
- ✅ 适合首次邀请裁判
#### 方式二:批量生成邀请码
用于为已有邀请记录但未生成邀请码的裁判批量生成。
**操作步骤:**
1. 在邀请列表中勾选需要生成邀请码的记录
2. 点击"批量生成邀请码"按钮
3. 确认操作
4. 系统为选中的裁判生成邀请码
**注意:**
- ⚠️ 只能为已有邀请记录的裁判生成
- ⚠️ 如果是新裁判,请使用"从评委库导入"
#### 方式三:单个生成邀请码
用于为单个裁判生成或重新生成邀请码。
**操作步骤:**
1. 在邀请列表中找到目标裁判
2. 如果未生成邀请码:点击"生成邀请码"按钮
3. 如果已有邀请码:点击邀请码旁边的刷新图标"重新生成"
4. 邀请码会自动复制到剪贴板
### 3. 发送邀请
生成邀请码后,需要将邀请码发送给裁判:
**发送方式:**
- 📧 邮件:将邀请码通过邮件发送
- 📱 短信:将邀请码通过短信发送
- 💬 微信/其他:通过即时通讯工具发送
**邀请码使用:**
- 裁判收到邀请码后,访问系统登录页面
- 输入邀请码进行登录
- 查看赛事信息并回复邀请(接受/拒绝)
### 4. 管理邀请
#### 4.1 查看邀请状态
邀请状态说明:
- 🟡 **待回复**:已发送邀请,裁判尚未回复
- 🟢 **已接受**:裁判已接受邀请
- 🔴 **已拒绝**:裁判已拒绝邀请
-**已取消**:管理员已取消邀请
#### 4.2 邀请操作
**对于"待回复"状态的邀请:**
- **重发**:重新发送邀请通知
- **提醒**:发送提醒消息催促裁判回复
- **取消**:取消邀请(需填写取消原因)
**对于"已接受"状态的邀请:**
- **确认**:确认裁判参与(可进行后续的场地、项目分配)
**所有邀请:**
- **查看**:查看邀请详细信息
- **复制邀请码**:点击邀请码即可复制
### 5. 统计信息
页面顶部显示四个统计卡片:
- 📊 **总邀请数**:已发送的邀请总数
-**待回复**:等待裁判回复的邀请数
-**已接受**:裁判已接受的邀请数
-**已拒绝**:裁判已拒绝的邀请数
### 6. 导出数据
点击"导出数据"按钮可以导出当前筛选条件下的邀请列表为Excel文件。
## 常见问题
### Q1: 为什么"批量生成邀请码"按钮是灰色的?
**A:** 可能的原因:
1. 未选择赛事
2. 赛事列表正在加载
3. 未勾选任何邀请记录
### Q2: 如何为新裁判生成邀请码?
**A:** 使用"从评委库导入"功能:
1. 先在"评委管理"中添加裁判
2. 在"裁判邀请"页面点击"从评委库导入"
3. 选择裁判并确认导入
### Q3: 邀请码可以重复使用吗?
**A:** 不可以。每个邀请码只能使用一次。如果需要重新邀请,请使用"重新生成"功能。
### Q4: 邀请码有效期是多久?
**A:** 默认有效期为30天。过期后需要重新生成。
### Q5: 如何知道裁判是否收到邀请?
**A:**
- 查看邀请状态,如果裁判已登录并回复,状态会更新
- 可以使用"提醒"功能发送提醒消息
- 建议通过电话或其他方式确认裁判是否收到
## 技术说明
### 邀请码生成规则
- 每个赛事+裁判组合生成唯一邀请码
- 邀请码包含角色信息(主裁判/普通裁判)
- 可以预分配场地和项目
### 数据关联
```
赛事 (Competition)
邀请记录 (JudgeInvite)
裁判 (Judge)
```
### API接口
- 生成邀请码:`POST /api/blade-martial/judgeInvite/generate`
- 批量生成:`POST /api/blade-martial/judgeInvite/generate/batch`
- 重新生成:`PUT /api/blade-martial/judgeInvite/regenerate/{inviteId}`
- 邀请列表:`GET /api/blade-martial/judgeInvite/list`
- 邀请统计:`GET /api/blade-martial/judgeInvite/statistics`
## 更新日志
### 2025-12-13
- ✨ 新增"从评委库导入"功能
- ✨ 支持裁判搜索和筛选
- ✨ 优化邀请码生成流程
- 🐛 修复按钮禁用逻辑问题
- 🐛 修复赛事选择初始化问题
- 💄 优化用户界面和交互体验
-260
View File
@@ -1,260 +0,0 @@
# 赛事列表加载问题排查指南
## 问题现象
- 赛事下拉框显示"无数据"
- 所有按钮(发送邀请、批量生成邀请码等)无法点击
- 页面显示"暂无数据"
## 排查步骤
### 1. 检查浏览器控制台
打开浏览器开发者工具(F12),查看Console标签页:
**查看日志输出:**
```
赛事列表API返回: {...}
解析后的赛事列表: [...]
```
**可能的错误信息:**
- `加载赛事列表失败: Network Error` - 网络连接问题
- `加载赛事列表失败: 404` - API路径错误
- `加载赛事列表失败: 500` - 后端服务错误
### 2. 检查Network请求
在开发者工具的Network标签页中:
1. 刷新页面
2. 找到 `/api/martial/competition/list` 请求
3. 查看请求状态:
- **200**: 请求成功,检查返回数据
- **404**: API路径不存在
- **500**: 后端服务错误
- **Failed**: 网络连接失败
4. 查看Response数据结构:
```json
{
"code": 200,
"data": {
"records": [...], // 赛事列表
"total": 10
}
}
```
### 3. 检查后端服务
#### 3.1 确认后端服务是否启动
**Windows:**
```bash
netstat -ano | findstr 8888
```
**Linux/Mac:**
```bash
netstat -tuln | grep 8888
```
如果没有输出,说明后端服务未启动。
#### 3.2 启动后端服务
进入后端项目目录:
```bash
cd martial-master
mvn spring-boot:run
```
或者使用IDEIDEA/Eclipse)启动。
### 4. 检查数据库数据
#### 4.1 连接数据库
使用数据库客户端(Navicat、DBeaver等)连接:
- Host: 127.0.0.1
- Port: 3306
- Database: martial_db
- Username: root
- Password: 123456
#### 4.2 执行检查SQL
运行项目根目录下的 `check_data.sql` 文件:
```sql
-- 检查赛事数据
SELECT * FROM martial_competition LIMIT 10;
-- 检查赛事总数
SELECT COUNT(*) FROM martial_competition;
```
**如果赛事表为空:**
需要先创建赛事数据。
### 5. 创建测试数据
#### 5.1 创建赛事
进入"赛事管理"页面,点击"新增赛事",填写:
- 赛事名称:测试赛事
- 赛事编码:TEST001
- 主办单位:测试单位
- 地区:北京
- 详细地点:测试地点
- 报名时间:选择日期范围
- 比赛时间:选择日期范围
保存后,赛事列表应该就能显示了。
#### 5.2 创建裁判
进入"评委管理"页面,点击"新增评委",填写:
- 姓名:张三
- 性别:男
- 手机号:13800138000
- 身份证号:110101199001011234
- 裁判类型:普通裁判
- 等级/职称:一级
### 6. 检查API配置
#### 6.1 检查前端API配置
查看 `martial-web/src/axios/index.js` 或类似文件:
```javascript
const baseURL = process.env.VUE_APP_API_BASE_URL || '/api'
```
确认API基础路径配置正确。
#### 6.2 检查代理配置
查看 `martial-web/vite.config.js``vue.config.js`
```javascript
proxy: {
'/api': {
target: 'http://localhost:8888',
changeOrigin: true
}
}
```
确认代理配置指向正确的后端地址。
### 7. 常见问题解决
#### 问题1: CORS跨域错误
**错误信息:**
```
Access to XMLHttpRequest at 'http://localhost:8888/api/...' from origin 'http://localhost:5173' has been blocked by CORS policy
```
**解决方案:**
1. 检查后端CORS配置
2. 使用代理配置
3. 确保前后端端口配置正确
#### 问题2: 404 Not Found
**可能原因:**
1. API路径错误
2. 后端Controller路径配置错误
3. 后端服务未启动
**解决方案:**
1. 检查API路径:`/api/martial/competition/list`
2. 检查后端Controller注解:`@RequestMapping("/martial/competition")`
3. 启动后端服务
#### 问题3: 数据结构不匹配
**现象:**
API返回数据,但前端解析失败。
**解决方案:**
查看控制台日志,确认数据结构:
```javascript
console.log('赛事列表API返回:', res)
console.log('解析后的赛事列表:', records)
```
如果数据结构不对,修改前端解析逻辑。
### 8. 快速测试
#### 8.1 使用Postman测试API
**请求:**
```
GET http://localhost:8888/api/martial/competition/list?current=1&size=10
```
**期望返回:**
```json
{
"code": 200,
"success": true,
"data": {
"records": [
{
"id": 1,
"competitionName": "测试赛事",
"status": 1,
...
}
],
"total": 1
}
}
```
#### 8.2 使用curl测试
```bash
curl -X GET "http://localhost:8888/api/martial/competition/list?current=1&size=10"
```
### 9. 临时解决方案
如果急需使用,可以临时修改代码,手动添加测试数据:
```javascript
// 在 loadCompetitionList 函数中添加
competitionList.value = [
{
id: 1,
competitionName: '测试赛事',
status: 1
}
]
queryParams.competitionId = 1
```
**注意:** 这只是临时方案,不要提交到代码库。
### 10. 联系支持
如果以上步骤都无法解决问题,请提供以下信息:
1. 浏览器控制台完整错误日志
2. Network请求的详细信息(Request/Response
3. 后端服务日志
4. 数据库查询结果
## 修改记录
### 2025-12-13
- ✨ 添加详细的日志输出
- ✨ 优化数据解析逻辑,支持多种返回格式
- ✨ 移除status=1的限制,查询所有赛事
- 📝 创建排查指南文档
+36 -10
View File
@@ -851,6 +851,7 @@
"version": "4.17.12",
"resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz",
"integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
"peer": true,
"dependencies": {
"@types/lodash": "*"
}
@@ -873,6 +874,7 @@
"version": "2.3.4",
"resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
"integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
"peer": true,
"dependencies": {
"@transloadit/prettier-bytes": "0.0.7",
"@uppy/store-default": "^2.1.1",
@@ -901,6 +903,7 @@
"version": "2.1.3",
"resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz",
"integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==",
"peer": true,
"dependencies": {
"@uppy/companion-client": "^2.2.2",
"@uppy/utils": "^4.1.2",
@@ -1055,6 +1058,7 @@
"version": "1.1.7",
"resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
"integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==",
"peer": true,
"dependencies": {
"is-url": "^1.2.4"
},
@@ -1085,6 +1089,7 @@
"version": "1.1.19",
"resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz",
"integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==",
"peer": true,
"dependencies": {
"@types/event-emitter": "^0.3.3",
"event-emitter": "^0.3.5",
@@ -1114,6 +1119,7 @@
"version": "5.1.23",
"resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
"integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
"peer": true,
"dependencies": {
"@uppy/core": "^2.1.1",
"@uppy/xhr-upload": "^2.0.3",
@@ -1470,6 +1476,7 @@
"version": "11.13.1",
"resolved": "https://registry.npmmirror.com/diagram-js/-/diagram-js-11.13.1.tgz",
"integrity": "sha512-6kO0rBN6aBIQiMELfv1oX2Ohes/brlIPuOVZUYAioeWM0EyuazhAXgHeq8iKFt29daU9NGRr4n78esGx8QjtjQ==",
"peer": true,
"dependencies": {
"@bpmn-io/diagram-js-ui": "^0.2.2",
"clsx": "^1.2.1",
@@ -1507,6 +1514,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz",
"integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
"peer": true,
"dependencies": {
"ssr-window": "^3.0.0-alpha.1"
}
@@ -1532,6 +1540,7 @@
"version": "2.7.3",
"resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.7.3.tgz",
"integrity": "sha512-OaqY1kQ2xzNyRFyge3fzM7jqMwux+464RBEqd+ybRV9xPiGxtgnj/sVK4iEbnKnzQIa9XK03DOIFzoToUhu1DA==",
"peer": true,
"dependencies": {
"@ctrl/tinycolor": "^3.4.1",
"@element-plus/icons-vue": "^2.3.1",
@@ -1857,7 +1866,8 @@
"node_modules/is-hotkey": {
"version": "0.2.0",
"resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz",
"integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw=="
"integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==",
"peer": true
},
"node_modules/is-number": {
"version": "7.0.0",
@@ -1932,12 +1942,14 @@
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"peer": true
},
"node_modules/lodash-es": {
"version": "4.17.21",
"resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
"peer": true
},
"node_modules/lodash-unified": {
"version": "1.0.3",
@@ -1952,37 +1964,44 @@
"node_modules/lodash.camelcase": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
"integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==",
"peer": true
},
"node_modules/lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
"peer": true
},
"node_modules/lodash.debounce": {
"version": "4.0.8",
"resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
"integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
"peer": true
},
"node_modules/lodash.foreach": {
"version": "4.5.0",
"resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
"integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
"integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==",
"peer": true
},
"node_modules/lodash.isequal": {
"version": "4.5.0",
"resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
"peer": true
},
"node_modules/lodash.throttle": {
"version": "4.1.1",
"resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==",
"peer": true
},
"node_modules/lodash.toarray": {
"version": "4.4.0",
"resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
"integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw=="
"integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==",
"peer": true
},
"node_modules/magic-string": {
"version": "0.30.10",
@@ -2097,6 +2116,7 @@
"url": "https://github.com/sponsors/ai"
}
],
"peer": true,
"bin": {
"nanoid": "bin/nanoid.cjs"
},
@@ -2288,6 +2308,7 @@
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
"integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
"dev": true,
"peer": true,
"dependencies": {
"@types/estree": "1.0.5"
},
@@ -2346,6 +2367,7 @@
"resolved": "https://registry.npmjs.org/sass/-/sass-1.77.2.tgz",
"integrity": "sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==",
"dev": true,
"peer": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
@@ -2381,6 +2403,7 @@
"version": "0.72.8",
"resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz",
"integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==",
"peer": true,
"dependencies": {
"immer": "^9.0.6",
"is-plain-object": "^5.0.0",
@@ -2402,6 +2425,7 @@
"version": "3.5.1",
"resolved": "https://registry.npmmirror.com/snabbdom/-/snabbdom-3.5.1.tgz",
"integrity": "sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA==",
"peer": true,
"engines": {
"node": ">=8.3.0"
}
@@ -2599,6 +2623,7 @@
"resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz",
"integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==",
"dev": true,
"peer": true,
"dependencies": {
"esbuild": "^0.20.1",
"postcss": "^8.4.38",
@@ -2766,6 +2791,7 @@
"version": "3.4.27",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz",
"integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
"peer": true,
"dependencies": {
"@vue/compiler-dom": "3.4.27",
"@vue/compiler-sfc": "3.4.27",
-32
View File
@@ -183,35 +183,3 @@ export const saveDispatch = (data) => {
data
})
}
/**
* 导出赛程表
* @param {Number} competitionId - 赛事ID
*/
// 预览赛程表数据
export const getScheduleExportPreview = (competitionId, template, venueId) => {
return request({
url: "/api/martial/export/schedule/preview",
method: "get",
params: { competitionId, template, venueId }
})
}
export const exportSchedule = (competitionId) => {
return request({
url: '/martial/export/schedule',
method: 'get',
params: { competitionId },
responseType: 'blob'
})
}
export const exportScheduleTemplate2 = (competitionId, venueId, venueName, timeSlot) => {
return request({
url: '/martial/export/schedule2',
method: 'get',
params: { competitionId, venueId, venueName, timeSlot },
responseType: 'blob'
})
}
-136
View File
@@ -1,136 +0,0 @@
import request from '@/axios';
// ==================== 赛事附件管理接口 ====================
/**
* 获取附件详情
* @param {Number} id - 附件ID
*/
export const getAttachmentDetail = (id) => {
return request({
url: '/api/martial/competition/attachment/detail',
method: 'get',
params: { id }
})
}
/**
* 附件列表查询(分页)
* @param {Number} current - 当前页
* @param {Number} size - 每页条数
* @param {Object} params - 查询参数
*/
export const getAttachmentList = (current, size, params) => {
return request({
url: '/api/martial/competition/attachment/list',
method: 'get',
params: {
current,
size,
...params
}
})
}
/**
* 根据赛事ID和类型获取附件列表
* @param {Number} competitionId - 赛事ID
* @param {String} attachmentType - 附件类型:info-赛事发布, rules-赛事规程, schedule-活动日程, results-成绩, medals-奖牌榜, photos-图片直播
*/
export const getAttachmentsByType = (competitionId, attachmentType) => {
return request({
url: '/api/martial/competition/attachment/getByType',
method: 'get',
params: { competitionId, attachmentType }
})
}
/**
* 根据赛事ID获取所有附件
* @param {Number} competitionId - 赛事ID
*/
export const getAttachmentsByCompetition = (competitionId) => {
return request({
url: '/api/martial/competition/attachment/getByCompetition',
method: 'get',
params: { competitionId }
})
}
/**
* 新增或修改附件
* @param {Object} data - 附件数据
* @param {Number} data.id - ID(修改时必传)
* @param {Number} data.competitionId - 赛事ID
* @param {String} data.attachmentType - 附件类型
* @param {String} data.fileName - 文件名称
* @param {String} data.fileUrl - 文件URL
* @param {Number} data.fileSize - 文件大小(字节)
* @param {String} data.fileType - 文件类型(扩展名)
* @param {Number} data.orderNum - 排序序号
* @param {Number} data.status - 状态(1-启用 0-禁用)
*/
export const submitAttachment = (data) => {
return request({
url: '/api/martial/competition/attachment/submit',
method: 'post',
data
})
}
/**
* 批量保存附件
* @param {Array} attachments - 附件列表
*/
export const batchSubmitAttachments = (attachments) => {
return request({
url: '/api/martial/competition/attachment/batchSubmit',
method: 'post',
data: attachments
})
}
/**
* 删除附件
* @param {String} ids - 附件ID,多个用逗号分隔
*/
export const removeAttachment = (ids) => {
return request({
url: '/api/martial/competition/attachment/remove',
method: 'post',
params: { ids }
})
}
/**
* 删除赛事的指定类型附件
* @param {Number} competitionId - 赛事ID
* @param {String} attachmentType - 附件类型
*/
export const removeAttachmentByType = (competitionId, attachmentType) => {
return request({
url: '/api/martial/competition/attachment/removeByType',
method: 'post',
params: { competitionId, attachmentType }
})
}
// 附件类型常量
export const ATTACHMENT_TYPES = {
INFO: 'info', // 赛事发布
RULES: 'rules', // 赛事规程
SCHEDULE: 'schedule', // 活动日程
RESULTS: 'results', // 成绩
MEDALS: 'medals', // 奖牌榜
PHOTOS: 'photos' // 图片直播
}
// 附件类型标签映射
export const ATTACHMENT_TYPE_LABELS = {
info: '赛事发布',
rules: '赛事规程',
schedule: '活动日程',
results: '成绩',
medals: '奖牌榜',
photos: '图片直播'
}
+2 -2
View File
@@ -45,7 +45,7 @@ export const getDeductionDetail = (id) => {
*/
export const addDeduction = (data) => {
return request({
url: '/api/blade-martial/deductionItem/submit',
url: '/api/blade-martial/deductionItem/save',
method: 'post',
data
})
@@ -57,7 +57,7 @@ export const addDeduction = (data) => {
*/
export const updateDeduction = (data) => {
return request({
url: '/api/blade-martial/deductionItem/submit',
url: '/api/blade-martial/deductionItem/update',
method: 'post',
data
})
+2 -2
View File
@@ -45,7 +45,7 @@ export const getDeductionDetail = (id) => {
*/
export const addDeduction = (data) => {
return request({
url: '/api/blade-martial/deductionItem/submit',
url: '/api/blade-martial/deductionItem/save',
method: 'post',
data
})
@@ -57,7 +57,7 @@ export const addDeduction = (data) => {
*/
export const updateDeduction = (data) => {
return request({
url: '/api/blade-martial/deductionItem/submit',
url: '/api/blade-martial/deductionItem/update',
method: 'post',
data
})
+19 -19
View File
@@ -14,7 +14,7 @@ import request from '@/axios';
*/
export const getJudgeInviteList = (current, size, params) => {
return request({
url: '/api/martial/judgeInvite/list',
url: '/api/blade-martial/judgeInvite/list',
method: 'get',
params: {
current,
@@ -30,7 +30,7 @@ export const getJudgeInviteList = (current, size, params) => {
*/
export const getJudgeInviteDetail = (id) => {
return request({
url: '/api/martial/judgeInvite/detail',
url: '/api/blade-martial/judgeInvite/detail',
method: 'get',
params: { id }
})
@@ -48,7 +48,7 @@ export const getJudgeInviteDetail = (id) => {
*/
export const sendInvite = (data) => {
return request({
url: '/api/martial/judgeInvite/send',
url: '/api/blade-martial/judgeInvite/send',
method: 'post',
data
})
@@ -60,7 +60,7 @@ export const sendInvite = (data) => {
*/
export const updateInvite = (data) => {
return request({
url: '/api/martial/judgeInvite/submit',
url: '/api/blade-martial/judgeInvite/update',
method: 'post',
data
})
@@ -72,7 +72,7 @@ export const updateInvite = (data) => {
*/
export const removeInvite = (ids) => {
return request({
url: '/api/martial/judgeInvite/remove',
url: '/api/blade-martial/judgeInvite/remove',
method: 'post',
params: { ids }
})
@@ -87,7 +87,7 @@ export const removeInvite = (ids) => {
*/
export const batchSendInvites = (data) => {
return request({
url: '/api/martial/judgeInvite/batch-send',
url: '/api/blade-martial/judgeInvite/batch-send',
method: 'post',
data
})
@@ -99,7 +99,7 @@ export const batchSendInvites = (data) => {
*/
export const resendInvite = (id) => {
return request({
url: `/api/martial/judgeInvite/resend/${id}`,
url: `/api/blade-martial/judgeInvite/resend/${id}`,
method: 'post'
})
}
@@ -114,7 +114,7 @@ export const resendInvite = (id) => {
*/
export const replyInvite = (data) => {
return request({
url: '/api/martial/judgeInvite/reply',
url: '/api/blade-martial/judgeInvite/reply',
method: 'post',
data
})
@@ -127,7 +127,7 @@ export const replyInvite = (data) => {
*/
export const cancelInvite = (id, reason) => {
return request({
url: `/api/martial/judgeInvite/cancel/${id}`,
url: `/api/blade-martial/judgeInvite/cancel/${id}`,
method: 'post',
params: { reason }
})
@@ -139,7 +139,7 @@ export const cancelInvite = (id, reason) => {
*/
export const confirmInvite = (id) => {
return request({
url: `/api/martial/judgeInvite/confirm/${id}`,
url: `/api/blade-martial/judgeInvite/confirm/${id}`,
method: 'post'
})
}
@@ -150,7 +150,7 @@ export const confirmInvite = (id) => {
*/
export const getInviteStatistics = (competitionId) => {
return request({
url: '/api/martial/judgeInvite/statistics',
url: '/api/blade-martial/judgeInvite/statistics',
method: 'get',
params: { competitionId }
})
@@ -162,7 +162,7 @@ export const getInviteStatistics = (competitionId) => {
*/
export const getAcceptedJudges = (competitionId) => {
return request({
url: '/api/martial/judgeInvite/accepted-judges',
url: '/api/blade-martial/judgeInvite/accepted-judges',
method: 'get',
params: { competitionId }
})
@@ -175,7 +175,7 @@ export const getAcceptedJudges = (competitionId) => {
*/
export const importFromJudgePool = (competitionId, judgeIds) => {
return request({
url: '/api/martial/judgeInvite/import/pool',
url: '/api/blade-martial/judgeInvite/import/pool',
method: 'post',
params: { competitionId, judgeIds }
})
@@ -187,7 +187,7 @@ export const importFromJudgePool = (competitionId, judgeIds) => {
*/
export const exportInvites = (params) => {
return request({
url: '/api/martial/judgeInvite/export',
url: '/api/blade-martial/judgeInvite/export',
method: 'get',
params,
responseType: 'blob'
@@ -201,7 +201,7 @@ export const exportInvites = (params) => {
*/
export const sendReminder = (id, message) => {
return request({
url: `/api/martial/judgeInvite/reminder/${id}`,
url: `/api/blade-martial/judgeInvite/reminder/${id}`,
method: 'post',
params: { message }
})
@@ -219,7 +219,7 @@ export const sendReminder = (id, message) => {
*/
export const generateInviteCode = (data) => {
return request({
url: '/api/martial/judgeInvite/generate',
url: '/api/blade-martial/judgeInvite/generate',
method: 'post',
data
})
@@ -235,7 +235,7 @@ export const generateInviteCode = (data) => {
*/
export const batchGenerateInviteCode = (data) => {
return request({
url: '/api/martial/judgeInvite/generate/batch',
url: '/api/blade-martial/judgeInvite/generate/batch',
method: 'post',
data
})
@@ -247,7 +247,7 @@ export const batchGenerateInviteCode = (data) => {
*/
export const regenerateInviteCode = (inviteId) => {
return request({
url: `/api/martial/judgeInvite/regenerate/${inviteId}`,
url: `/api/blade-martial/judgeInvite/regenerate/${inviteId}`,
method: 'put'
})
}
@@ -259,7 +259,7 @@ export const regenerateInviteCode = (inviteId) => {
*/
export const getInviteByJudge = (competitionId, judgeId) => {
return request({
url: '/api/martial/judgeInvite/byJudge',
url: '/api/blade-martial/judgeInvite/byJudge',
method: 'get',
params: { competitionId, judgeId }
})
-13
View File
@@ -141,16 +141,3 @@ export const getOrderAmountStats = (orderId) => {
params: { orderId }
})
}
/**
* 获取单位统计
* @param {Number} competitionId - 赛事ID
*/
export const getOrganizationStats = (competitionId) => {
return request({
url: '/api/martial/registrationOrder/organization-stats',
method: 'get',
params: { competitionId }
})
}
+12 -13
View File
@@ -9,9 +9,7 @@ import request from '@/axios';
* @param {Object} params - 查询参数
* @param {Number} params.competitionId - 赛事ID
* @param {String} params.projectName - 项目名称(可选)
* @param {Number} params.category - 分组类别(可选)
* @param {Number} params.eventType - 项目类型(可选)
* @param {Number} params.participantType - 参赛类型(可选,1-单人,2-集体)
* @param {String} params.category - 分组类别(可选)
*/
export const getProjectList = (current, size, params) => {
return request({
@@ -67,16 +65,17 @@ export const updateProject = (data) => {
* @param {Number} data.competitionId - 赛事ID
* @param {String} data.projectName - 项目名称
* @param {String} data.projectCode - 项目编码
* @param {Number} data.category - 分组类别(1-男子,2-女子,3-团体,4-混合)
* @param {Number} data.eventType - 项目类型(1-套路,2-散打,3-器械,4-对练)
* @param {Number} data.participantType - 参赛类型(1-单人,2-集体)
* @param {Number} data.registrationFee - 报名费用
* @param {String} data.registrationStartTime - 报名开始时间
* @param {String} data.registrationEndTime - 报名结束时间
* @param {Number} data.maxParticipants - 最大参赛人数
* @param {Number} data.sortOrder - 排序序号
* @param {String} data.rules - 比赛规则
* @param {String} data.remark - 备注
* @param {String} data.category - 组别(男子组/女子组)
* @param {Number} data.type - 类型(1-个人,2-双人,3-集体)
* @param {Number} data.minParticipants - 最少参赛人数
* @param {Number} data.maxParticipants - 最多参赛人数
* @param {Number} data.minAge - 最小年龄
* @param {Number} data.maxAge - 最大年龄
* @param {Number} data.genderLimit - 性别限制(0-不限,1-仅男,2-仅女)
* @param {Number} data.estimatedDuration - 预估时长(分钟)
* @param {Number} data.price - 报名费用
* @param {Number} data.difficultyCoefficient - 难度系数
* @param {String} data.description - 项目描述
*/
export const submitProject = (data) => {
return request({
+2 -2
View File
@@ -9,7 +9,7 @@ import request from '@/axios';
* @param {Object} params - 查询参数
* @param {String} params.name - 裁判姓名
* @param {String} params.phone - 手机号
* @param {Number} params.refereeType - 裁判类型(1-裁判,2-裁判
* @param {Number} params.refereeType - 裁判类型(1-裁判2-普通裁判)
*/
export const getRefereeList = (current, size, params) => {
return request({
@@ -43,7 +43,7 @@ export const getRefereeDetail = (id) => {
* @param {Number} data.gender - 性别(1-男,2-女)
* @param {String} data.phone - 手机号
* @param {String} data.idCard - 身份证号
* @param {Number} data.refereeType - 裁判类型(1-裁判,2-裁判
* @param {Number} data.refereeType - 裁判类型(1-裁判2-普通裁判)
* @param {String} data.level - 等级/职称
* @param {String} data.specialty - 擅长项目
* @param {String} data.photoUrl - 照片URL
-24
View File
@@ -194,27 +194,3 @@ export const exportSchedulePlans = (params) => {
responseType: 'blob'
})
}
/**
* 更新参赛者签到状态
* @param {Number} participantId - 参赛者ID
* @param {String} status - 状态:未签到/已签到/异常
*/
export const updateCheckInStatus = (participantId, status) => {
return request({
url: '/api/martial/schedule/update-check-in-status',
method: 'post',
data: { participantId, status }
})
}
/**
* 获取赛程配置
* @returns {Promise} 返回赛程配置信息
*/
export const getScheduleConfig = () => {
return request({
url: '/api/martial/schedule/config',
method: 'get'
})
}
+11 -11
View File
@@ -2,7 +2,7 @@ import request from '@/axios';
export const getList = (current, size, params) => {
return request({
url: '/api/blade-system/menu/list',
url: '/blade-system/menu/list',
method: 'get',
params: {
...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
export const getLazyList = (parentId, params) => {
return request({
url: '/api/blade-system/menu/lazy-list',
url: '/blade-system/menu/lazy-list',
method: 'get',
params: {
...params,
@@ -25,7 +25,7 @@ export const getLazyList = (parentId, params) => {
export const getLazyMenuList = (parentId, params) => {
return request({
url: '/api/blade-system/menu/lazy-menu-list',
url: '/blade-system/menu/lazy-menu-list',
method: 'get',
params: {
...params,
@@ -36,7 +36,7 @@ export const getLazyMenuList = (parentId, params) => {
export const getMenuList = (current, size, params) => {
return request({
url: '/api/blade-system/menu/menu-list',
url: '/blade-system/menu/menu-list',
method: 'get',
params: {
...params,
@@ -48,7 +48,7 @@ export const getMenuList = (current, size, params) => {
export const getMenuTree = tenantId => {
return request({
url: '/api/blade-system/menu/tree',
url: '/blade-system/menu/tree',
method: 'get',
params: {
tenantId,
@@ -58,7 +58,7 @@ export const getMenuTree = tenantId => {
export const remove = ids => {
return request({
url: '/api/blade-system/menu/remove',
url: '/blade-system/menu/remove',
method: 'post',
params: {
ids,
@@ -68,7 +68,7 @@ export const remove = ids => {
export const add = row => {
return request({
url: '/api/blade-system/menu/submit',
url: '/blade-system/menu/submit',
method: 'post',
data: row,
});
@@ -76,7 +76,7 @@ export const add = row => {
export const update = row => {
return request({
url: '/api/blade-system/menu/submit',
url: '/blade-system/menu/submit',
method: 'post',
data: row,
});
@@ -84,7 +84,7 @@ export const update = row => {
export const getMenu = id => {
return request({
url: '/api/blade-system/menu/detail',
url: '/blade-system/menu/detail',
method: 'get',
params: {
id,
@@ -94,13 +94,13 @@ export const getMenu = id => {
export const getTopMenu = () =>
request({
url: '/api/blade-system/menu/top-menu',
url: '/blade-system/menu/top-menu',
method: 'get',
});
export const getRoutes = topMenuId =>
request({
url: '/api/blade-system/menu/routes',
url: '/blade-system/menu/routes',
method: 'get',
params: {
topMenuId,
+12 -12
View File
@@ -4,7 +4,7 @@ import website from '@/config/website';
export const loginByUsername = (tenantId, deptId, roleId, username, password, type, key, code) =>
request({
url: '/api/blade-auth/oauth/token',
url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -25,7 +25,7 @@ export const loginByUsername = (tenantId, deptId, roleId, username, password, ty
export const loginBySocial = (tenantId, source, code, state) =>
request({
url: '/api/blade-auth/oauth/token',
url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -42,7 +42,7 @@ export const loginBySocial = (tenantId, source, code, state) =>
export const loginBySso = (state, code) =>
request({
url: '/api/blade-auth/oauth/token',
url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': state,
@@ -58,7 +58,7 @@ export const loginBySso = (state, code) =>
export const refreshToken = (refresh_token, tenantId, deptId, roleId) =>
request({
url: '/api/blade-auth/oauth/token',
url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -75,7 +75,7 @@ export const refreshToken = (refresh_token, tenantId, deptId, roleId) =>
export const registerUser = (tenantId, name, account, password, phone, email) =>
request({
url: '/api/blade-auth/oauth/token',
url: '/blade-auth/oauth/token',
method: 'post',
headers: {
'Tenant-Id': tenantId,
@@ -94,7 +94,7 @@ export const registerUser = (tenantId, name, account, password, phone, email) =>
export const registerGuest = (form, oauthId) =>
request({
url: '/api/blade-system/user/register-guest',
url: '/blade-system/user/register-guest',
method: 'post',
params: {
tenantId: form.tenantId,
@@ -107,40 +107,40 @@ export const registerGuest = (form, oauthId) =>
export const getButtons = () =>
request({
url: '/api/blade-system/menu/buttons',
url: '/blade-system/menu/buttons',
method: 'get',
});
export const getCaptcha = () =>
request({
url: '/api/blade-auth/oauth/captcha',
url: '/blade-auth/oauth/captcha',
method: 'get',
authorization: false,
});
export const logout = () =>
request({
url: '/api/blade-auth/oauth/logout',
url: '/blade-auth/oauth/logout',
method: 'get',
authorization: false,
});
export const getUserInfo = () =>
request({
url: '/api/blade-auth/oauth/user-info',
url: '/blade-auth/oauth/user-info',
method: 'get',
});
export const sendLogs = list =>
request({
url: '/api/blade-auth/oauth/logout',
url: '/blade-auth/oauth/logout',
method: 'post',
data: list,
});
export const clearCache = () =>
request({
url: '/api/blade-auth/oauth/clear-cache',
url: '/blade-auth/oauth/clear-cache',
method: 'get',
authorization: false,
});
-4
View File
@@ -98,10 +98,6 @@ axios.interceptors.request.use(
axios.interceptors.response.use(
res => {
NProgress.done();
// 如果是 blob 类型响应(文件下载),直接返回
if (res.config.responseType === 'blob') {
return res;
}
const status = res.data.code || res.status;
const statusWhiteList = website.statusWhiteList || [];
const message = res.data.msg || res.data.error_description || '系统错误';
+2 -2
View File
@@ -48,7 +48,7 @@ export default [
redirect: '/martial/order/list',
children: [
{
path: 'competition/index',
path: 'competition/list',
name: '赛事管理',
meta: {
keepAlive: false,
@@ -65,7 +65,7 @@ export default [
},
{
path: 'order/list',
name: '赛事管理',
name: '订单管理',
meta: {
keepAlive: false,
},
+19 -2
View File
@@ -188,7 +188,7 @@
</div>
<!-- 活动日程 -->
<!-- <div class="form-section">
<div class="form-section">
<div class="section-title">
<i class="el-icon-date"></i>
活动日程
@@ -290,7 +290,7 @@
</template>
</el-table-column>
</el-table>
</div> -->
</div>
<!-- 项目列表 -->
<div class="form-section">
@@ -361,6 +361,23 @@
</template>
</el-table-column>
<el-table-column
label="参赛人数限制"
width="130"
align="center"
>
<template #default="scope">
<el-input-number
v-if="mode !== 'view'"
v-model="scope.row.maxParticipants"
:min="1"
:max="9999"
size="small"
style="width: 100%"
/>
<span v-else>{{ scope.row.maxParticipants || '不限' }}</span>
</template>
</el-table-column>
<el-table-column
label="项目说明"
+164 -546
View File
@@ -85,10 +85,10 @@
>
<template #default="scope">
<el-tag
:type="getStatusType(calculateStatus(scope.row))"
:type="getStatusType(scope.row.status)"
size="small"
>
{{ getStatusText(calculateStatus(scope.row)) }}
{{ getStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
@@ -370,134 +370,8 @@
</el-form-item>
</div>
<!-- 附件管理 -->
<div class="form-section">
<div class="section-title">
<i class="el-icon-folder-opened"></i>
附件管理
</div>
<!-- 附件类型选项卡 -->
<el-tabs v-model="activeAttachmentTab" type="card">
<el-tab-pane
v-for="tab in attachmentTabs"
:key="tab.type"
:label="tab.label"
:name="tab.type"
>
<div class="attachment-section">
<!-- 上传按钮 -->
<div class="attachment-upload" v-if="currentView !== 'view'">
<el-button
type="primary"
icon="el-icon-upload"
size="small"
@click="handleOpenAttachmentUpload(tab.type)"
>
上传{{ tab.label }}附件
</el-button>
<span class="upload-tip">支持 PDFWordExcel图片等格式单个文件不超过 50MB</span>
</div>
<!-- 附件列表 -->
<el-table
:data="formData.attachments[tab.type] || []"
border
style="width: 100%; margin-top: 15px;"
v-if="(formData.attachments[tab.type] || []).length > 0"
>
<el-table-column
label="文件名"
min-width="200"
show-overflow-tooltip
>
<template #default="scope">
<div class="file-name-cell">
<i :class="getFileIcon(scope.row.fileType)" class="file-icon"></i>
<span>{{ scope.row.fileName }}</span>
</div>
</template>
</el-table-column>
<el-table-column
label="文件大小"
width="120"
align="center"
>
<template #default="scope">
{{ formatFileSize(scope.row.fileSize) }}
</template>
</el-table-column>
<el-table-column
label="上传时间"
width="180"
align="center"
>
<template #default="scope">
{{ scope.row.createTime || '-' }}
</template>
</el-table-column>
<el-table-column
label="排序"
width="100"
align="center"
>
<template #default="scope">
<el-input-number
v-if="currentView !== 'view'"
v-model="scope.row.orderNum"
:min="0"
:max="999"
size="small"
style="width: 80px"
controls-position="right"
/>
<span v-else>{{ scope.row.orderNum }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
width="150"
align="center"
fixed="right"
>
<template #default="scope">
<el-button
type="primary"
link
size="small"
@click="handlePreviewAttachment(scope.row)"
>
预览
</el-button>
<el-button
v-if="currentView !== 'view'"
type="danger"
link
size="small"
@click="handleDeleteAttachment(tab.type, scope.$index)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 空状态 -->
<div class="empty-attachment" v-else>
<i class="el-icon-folder-opened"></i>
<p>暂无{{ tab.label }}附件</p>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
<!-- 活动日程 -->
<!-- <div class="form-section">
<div class="form-section">
<div class="section-title">
<i class="el-icon-date"></i>
活动日程
@@ -638,7 +512,7 @@
</template>
</el-table-column>
</el-table>
</div> -->
</div>
<!-- 项目列表 -->
<div class="form-section">
@@ -647,50 +521,120 @@
项目列表
</div>
<el-alert
title="项目配置提示"
type="info"
:closable="false"
show-icon
style="margin-bottom: 15px;"
>
<template #default>
<p>请先保存赛事基本信息然后前往 <strong>项目管理</strong> 功能配置比赛项目</p>
<el-button
v-if="competitionId"
type="primary"
size="small"
style="margin-top: 10px;"
@click="goToProjectManagement"
>
前往项目管理
</el-button>
</template>
</el-alert>
<el-form-item label="" class="button-right">
<el-button
v-if="currentView !== 'view'"
type="primary"
icon="el-icon-plus"
size="small"
@click="handleAddProject"
>
添加项目
</el-button>
</el-form-item>
<div v-if="formData.projects && formData.projects.length > 0">
<el-table :data="formData.projects" border size="small" style="width: 100%">
<el-table-column prop="projectCode" label="项目编码" width="120" />
<el-table-column prop="projectName" label="项目名称" min-width="150" />
<el-table-column prop="category" label="组别" width="120" />
<el-table-column label="项目类型" width="100" align="center">
<template #default="scope">
<el-tag v-if="scope.row.eventType === 1" type="primary" size="small">套路</el-tag>
<el-tag v-else-if="scope.row.eventType === 2" type="danger" size="small">散打</el-tag>
<el-tag v-else-if="scope.row.eventType === 3" type="success" size="small">器械</el-tag>
<el-tag v-else-if="scope.row.eventType === 4" type="warning" size="small">对练</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="price" label="报名费(元)" width="100" align="center">
<template #default="scope">
<span style="color: #f56c6c">¥{{ scope.row.price || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="maxParticipants" label="容纳人数" width="100" align="center" />
</el-table>
</div>
<el-empty v-else description="暂无项目,请前往项目管理添加" :image-size="60" />
<el-table
:data="formData.projects"
border
style="width: 100%"
>
<el-table-column
label="项目名称"
min-width="150"
>
<template #default="scope">
<el-input
v-if="currentView !== 'view'"
v-model="scope.row.projectName"
placeholder="例如:太极拳"
size="small"
/>
<span v-else>{{ scope.row.projectName }}</span>
</template>
</el-table-column>
<el-table-column
label="项目代码"
width="120"
>
<template #default="scope">
<el-input
v-if="currentView !== 'view'"
v-model="scope.row.projectCode"
placeholder="例如:TJQ001"
size="small"
/>
<span v-else>{{ scope.row.projectCode }}</span>
</template>
</el-table-column>
<el-table-column
label="组别"
width="120"
>
<template #default="scope">
<el-input
v-if="currentView !== 'view'"
v-model="scope.row.category"
placeholder="例如:成年男子组"
size="small"
/>
<span v-else>{{ scope.row.category }}</span>
</template>
</el-table-column>
<el-table-column
label="参赛人数限制"
width="130"
align="center"
>
<template #default="scope">
<el-input-number
v-if="currentView !== 'view'"
v-model="scope.row.maxParticipants"
:min="1"
:max="9999"
size="small"
style="width: 100%"
/>
<span v-else>{{ scope.row.maxParticipants || '不限' }}</span>
</template>
</el-table-column>
<el-table-column
label="项目说明"
min-width="200"
>
<template #default="scope">
<el-input
v-if="currentView !== 'view'"
v-model="scope.row.description"
placeholder="请输入项目说明"
size="small"
/>
<span v-else>{{ scope.row.description }}</span>
</template>
</el-table-column>
<el-table-column
v-if="currentView !== 'view'"
label="操作"
width="80"
align="center"
>
<template #default="scope">
<el-button
type="danger"
link
size="small"
icon="el-icon-delete"
@click="handleDeleteProject(scope.$index)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- 场地配置 -->
@@ -837,22 +781,6 @@
</el-form>
</el-card>
</div>
<!-- 附件上传对话框 -->
<el-dialog
title="上传附件"
v-model="attachmentUploadDialogVisible"
width="555px"
append-to-body
:close-on-click-modal="false"
>
<avue-form
ref="attachmentUploadForm"
:option="attachmentUploadOption"
v-model="attachmentUploadForm"
:upload-after="attachmentUploadAfter"
/>
</el-dialog>
</div>
</template>
@@ -878,15 +806,6 @@ import {
removeVenue,
getVenuesByCompetition
} from '@/api/martial/venue'
import {
getAttachmentsByCompetition,
submitAttachment,
removeAttachment,
batchSubmitAttachments,
ATTACHMENT_TYPES,
ATTACHMENT_TYPE_LABELS
} from '@/api/martial/attachment'
import { getToken } from '@/utils/auth'
export default {
name: 'CompetitionManagement',
@@ -901,40 +820,6 @@ export default {
size: 10,
total: 0
},
// 附件相关数据
activeAttachmentTab: 'info',
attachmentTabs: [
{ type: 'info', label: '赛事发布' },
{ type: 'rules', label: '赛事规程' },
{ type: 'schedule', label: '活动日程' },
{ type: 'results', label: '成绩' },
{ type: 'medals', label: '奖牌榜' },
{ type: 'photos', label: '图片直播' }
],
attachmentUploadDialogVisible: false,
currentAttachmentType: '',
attachmentUploadForm: {},
attachmentUploadOption: {
submitBtn: false,
emptyBtn: false,
column: [
{
label: '附件上传',
prop: 'attachmentFile',
type: 'upload',
drag: true,
loadText: '文件上传中,请稍等',
span: 24,
accept: '.pdf,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.jpg,.jpeg,.png,.gif,.zip,.rar',
tip: '支持 PDF、Word、Excel、PPT、图片、压缩包等格式,单个文件不超过 50MB',
propsHttp: {
res: 'data',
},
action: '/blade-resource/oss/endpoint/put-file'
}
]
},
formData: {
competitionName: '',
competitionCode: '', // 比赛编码
@@ -955,15 +840,7 @@ export default {
awards: '',
schedule: [],
projects: [],
venues: [],
attachments: {
info: [],
rules: [],
schedule: [],
results: [],
medals: [],
photos: []
}
venues: []
},
formRules: {
competitionName: [
@@ -1111,11 +988,10 @@ export default {
try {
this.formData = this.formatBackendData(detailData);
console.log('格式化后的表单数据:', this.formData);
// 加载关联数据:活动日程、项目列表、场地配置、附件
// 加载关联数据:活动日程、项目列表、场地配置
this.loadActivitySchedules();
this.loadProjects();
this.loadVenues();
this.loadAttachments();
} catch (error) {
console.error('格式化数据时出错:', error);
this.$message.error('数据格式化失败: ' + error.message);
@@ -1201,7 +1077,18 @@ export default {
console.log('项目列表长度:', projectList.length);
if (projectList.length > 0) {
this.formData.projects = projectList.map(item => ({ ...item }));
this.formData.projects = projectList.map(item => ({
id: item.id,
projectName: item.projectName,
projectCode: item.projectCode,
category: item.category,
type: item.type,
minParticipants: item.minParticipants,
maxParticipants: item.maxParticipants,
estimatedDuration: item.estimatedDuration,
price: item.price,
description: item.description
}));
console.log('✅ 加载的项目列表:', this.formData.projects);
console.log('✅ 项目数量:', this.formData.projects.length);
} else {
@@ -1251,8 +1138,7 @@ export default {
venueCode: item.venueCode,
capacity: item.capacity,
location: item.location,
remark: item.facilities || '',
venueType: item.venueType || 'indoor'
remark: item.facilities || ''
}));
console.log('✅ 加载的场地列表:', this.formData.venues);
console.log('✅ 场地数量:', this.formData.venues.length);
@@ -1268,213 +1154,6 @@ export default {
});
},
// 加载附件列表
loadAttachments() {
if (!this.competitionId) {
console.warn('loadAttachments: competitionId 为空,跳过加载');
return;
}
console.log('开始加载附件列表,competitionId:', this.competitionId);
getAttachmentsByCompetition(this.competitionId)
.then(res => {
console.log('附件列表返回数据:', res);
const responseData = res.data?.data;
// 初始化附件对象
const attachments = {
info: [],
rules: [],
schedule: [],
results: [],
medals: [],
photos: []
};
if (responseData && Array.isArray(responseData)) {
// 按类型分组
responseData.forEach(item => {
const type = item.attachmentType;
if (attachments[type]) {
attachments[type].push({
id: item.id,
fileName: item.fileName,
fileUrl: item.fileUrl,
fileSize: item.fileSize,
fileType: item.fileType,
orderNum: item.orderNum || 0,
createTime: item.createTime
});
}
});
console.log('✅ 加载的附件列表:', attachments);
} else {
console.log('⚠️ 附件列表为空');
}
this.formData.attachments = attachments;
})
.catch(err => {
console.error('❌ 加载附件列表失败:', err);
// 不显示错误消息,因为可能是新建赛事还没有附件
});
},
// 打开附件上传对话框
handleOpenAttachmentUpload(type) {
this.currentAttachmentType = type;
this.attachmentUploadForm = {};
this.attachmentUploadOption.column[0].headers = { "Blade-Auth": "bearer " + getToken() };
this.attachmentUploadDialogVisible = true;
},
// 附件上传成功回调
attachmentUploadAfter(res, done, loading, column) {
console.log('附件上传响应:', res);
if (res && (res.link || res.url)) {
const fileUrl = res.link || res.url;
const fileName = res.originalName || res.name || this.getFileNameFromUrl(fileUrl);
const fileType = this.getFileExtension(fileName);
const fileSize = res.size || 0;
// 添加到对应类型的附件列表
if (!this.formData.attachments[this.currentAttachmentType]) {
this.formData.attachments[this.currentAttachmentType] = [];
}
this.formData.attachments[this.currentAttachmentType].push({
fileName: fileName,
fileUrl: fileUrl,
fileSize: fileSize,
fileType: fileType,
orderNum: this.formData.attachments[this.currentAttachmentType].length,
isNew: true // 标记为新上传的附件
});
this.$message.success('附件上传成功');
this.attachmentUploadDialogVisible = false;
} else {
this.$message.error('上传失败,未获取到文件地址');
}
done();
},
// 预览附件
handlePreviewAttachment(attachment) {
if (!attachment.fileUrl) {
this.$message.warning('文件地址不存在');
return;
}
window.open(attachment.fileUrl, '_blank');
},
// 删除附件
handleDeleteAttachment(type, index) {
this.$confirm('确定要删除该附件吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const attachment = this.formData.attachments[type][index];
// 如果是已保存的附件,需要调用后端删除
if (attachment.id) {
removeAttachment(attachment.id.toString())
.then(() => {
this.formData.attachments[type].splice(index, 1);
this.$message.success('删除成功');
})
.catch(err => {
console.error('删除附件失败:', err);
this.$message.error('删除失败');
});
} else {
// 新上传的附件直接从列表中移除
this.formData.attachments[type].splice(index, 1);
this.$message.success('删除成功');
}
}).catch(() => {});
},
// 获取文件图标
getFileIcon(fileType) {
const iconMap = {
'pdf': 'el-icon-document',
'doc': 'el-icon-document',
'docx': 'el-icon-document',
'xls': 'el-icon-document',
'xlsx': 'el-icon-document',
'ppt': 'el-icon-document',
'pptx': 'el-icon-document',
'jpg': 'el-icon-picture',
'jpeg': 'el-icon-picture',
'png': 'el-icon-picture',
'gif': 'el-icon-picture',
'zip': 'el-icon-folder',
'rar': 'el-icon-folder'
};
return iconMap[fileType?.toLowerCase()] || 'el-icon-document';
},
// 格式化文件大小
formatFileSize(bytes) {
if (!bytes || bytes === 0) return '0 B';
if (typeof bytes === 'string') return bytes;
const k = 1024;
const sizes = ['B', 'KB', 'MB', 'GB'];
const i = Math.floor(Math.log(bytes) / Math.log(k));
return (bytes / Math.pow(k, i)).toFixed(1) + ' ' + sizes[i];
},
// 从URL获取文件名
getFileNameFromUrl(url) {
if (!url) return 'unknown';
const parts = url.split('/');
return parts[parts.length - 1] || 'unknown';
},
// 获取文件扩展名
getFileExtension(fileName) {
if (!fileName) return '';
const parts = fileName.split('.');
return parts.length > 1 ? parts[parts.length - 1].toLowerCase() : '';
},
// 保存附件
async saveAttachments(competitionId) {
const allAttachments = [];
// 收集所有需要保存的附件
for (const type of Object.keys(this.formData.attachments)) {
const attachments = this.formData.attachments[type] || [];
for (const attachment of attachments) {
// 只保存新上传的附件或已修改的附件
if (attachment.isNew || attachment.isModified) {
allAttachments.push({
id: attachment.id || null,
competitionId: competitionId,
attachmentType: type,
fileName: attachment.fileName,
fileUrl: attachment.fileUrl,
fileSize: attachment.fileSize,
fileType: attachment.fileType,
orderNum: attachment.orderNum || 0,
status: 1
});
}
}
}
if (allAttachments.length === 0) {
return Promise.resolve();
}
console.log('准备保存的附件:', allAttachments);
return batchSubmitAttachments(allAttachments);
},
getStatusText(status) {
const statusMap = {
1: '未开始',
@@ -1497,7 +1176,7 @@ export default {
handleCreate() {
this.$router.push({
path: '/martial/competition/index',
path: '/martial/competition/list',
query: { mode: 'create' }
});
},
@@ -1505,21 +1184,21 @@ export default {
handleView(row) {
console.log(row)
this.$router.push({
path: '/martial/competition/index',
path: '/martial/competition/list',
query: { mode: 'view', id: row.id }
});
},
handleEdit(row) {
this.$router.push({
path: '/martial/competition/index',
path: '/martial/competition/list',
query: { mode: 'edit', id: row.id }
});
},
switchToEdit() {
this.$router.push({
path: '/martial/competition/index',
path: '/martial/competition/list',
query: { mode: 'edit', id: this.competitionId }
});
},
@@ -1561,16 +1240,19 @@ export default {
this.formData.schedule.splice(index, 1);
},
// 项目列表管理 - 跳转到项目管理页面
goToProjectManagement() {
if (this.competitionId) {
this.$router.push({
path: '/martial/project/list',
query: { competitionId: this.competitionId }
});
} else {
this.$message.warning('请先保存赛事基本信息');
}
// 项目列表管理
handleAddProject() {
this.formData.projects.push({
projectName: '',
projectCode: '',
category: '',
maxParticipants: null,
description: ''
});
},
handleDeleteProject(index) {
this.formData.projects.splice(index, 1);
},
// 场地配置管理
@@ -1619,19 +1301,16 @@ export default {
savePromises.push(this.saveActivitySchedules(savedCompetitionId));
}
// 2. 项目列表 - 已移至项目管理功能配置
// if (this.formData.projects && this.formData.projects.length > 0) {
// savePromises.push(this.saveProjects(savedCompetitionId));
// }
// 2. 保存项目列表
if (this.formData.projects && this.formData.projects.length > 0) {
savePromises.push(this.saveProjects(savedCompetitionId));
}
// 3. 保存场地配置
if (this.formData.venues && this.formData.venues.length > 0) {
savePromises.push(this.saveVenues(savedCompetitionId));
}
// 4. 保存附件
savePromises.push(this.saveAttachments(savedCompetitionId));
// 等待所有保存操作完成
if (savePromises.length > 0) {
Promise.all(savePromises)
@@ -1706,7 +1385,9 @@ export default {
},
async saveProjects(competitionId) {
const projects = this.formData.projects.filter(item => item.projectName);
const projects = this.formData.projects.filter(item =>
item.projectName && item.projectCode
);
if (projects.length === 0) {
return Promise.resolve();
@@ -1724,19 +1405,16 @@ export default {
const promises = projects.map(project => {
const projectData = {
...project,
competitionId: finalCompetitionId,
projectName: project.projectName,
projectCode: project.projectCode,
category: project.category || '',
eventType: project.eventType || 1,
type: project.type || 1,
type: project.type || 1, // 默认个人项目
minParticipants: project.minParticipants || 1,
maxParticipants: project.maxParticipants || 100,
maxParticipants: project.maxParticipants || 1,
estimatedDuration: project.estimatedDuration || 5,
price: project.price || 0,
sortOrder: project.sortOrder || 0,
description: project.description || '',
rules: project.rules || ''
description: project.description || ''
};
// 如果有 id,说明是编辑已有的项目
@@ -1777,8 +1455,7 @@ export default {
venueCode: venue.venueCode,
capacity: venue.capacity || 100,
location: venue.location || '',
facilities: venue.remark || '',
venueType: venue.venueType || 'indoor'
facilities: venue.remark || ''
};
// 如果有 id,说明是编辑已有的场地
@@ -1795,7 +1472,7 @@ export default {
backToList() {
this.$router.push({
path: '/martial/competition/index'
path: '/martial/competition/list'
});
// 路由跳转后,在 initPage 中会自动加载列表
},
@@ -1821,15 +1498,7 @@ export default {
awards: '',
schedule: [],
projects: [],
venues: [],
attachments: {
info: [],
rules: [],
schedule: [],
results: [],
medals: [],
photos: []
}
venues: []
};
},
@@ -1966,7 +1635,7 @@ export default {
return 3;
}
// 报名中
if (regStart && regEnd && now >= regStart && now <= new Date(regEnd.getFullYear(), regEnd.getMonth(), regEnd.getDate(), 23, 59, 59)) {
if (regStart && regEnd && now >= regStart && now <= regEnd) {
return 2;
}
// 未开始(默认状态)
@@ -2120,55 +1789,4 @@ export default {
width: 100%;
}
}
// 附件管理样式
.attachment-section {
padding: 10px 0;
}
.attachment-upload {
display: flex;
align-items: center;
gap: 15px;
.upload-tip {
font-size: 12px;
color: #909399;
}
}
.file-name-cell {
display: flex;
align-items: center;
gap: 8px;
.file-icon {
font-size: 18px;
color: #409eff;
}
}
.empty-attachment {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 40px 0;
color: #909399;
i {
font-size: 48px;
margin-bottom: 10px;
opacity: 0.5;
}
p {
margin: 0;
font-size: 14px;
}
}
:deep(.el-tabs__content) {
padding: 10px 0;
}
</style>
+4 -4
View File
@@ -60,10 +60,10 @@
>
<template #default="scope">
<el-tag
:type="getStatusType(calculateStatus(scope.row))"
:type="getStatusType(scope.row.status)"
size="small"
>
{{ getStatusText(calculateStatus(scope.row)) }}
{{ getStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
@@ -284,7 +284,7 @@
</div>
<!-- 活动日程 -->
<!-- <div class="form-section">
<div class="form-section">
<div class="section-title">
<i class="el-icon-date"></i>
活动日程
@@ -386,7 +386,7 @@
</template>
</el-table-column>
</el-table>
</div> -->
</div>
</el-form>
<div slot="footer" class="dialog-footer">
+64 -183
View File
@@ -3,47 +3,19 @@
<!-- 搜索区域 -->
<el-card shadow="never" class="search-card">
<el-form :inline="true" :model="queryParams" class="search-form">
<el-form-item label="选择赛事" required>
<el-select
v-model="queryParams.competitionId"
placeholder="请选择赛事"
clearable
filterable
:loading="competitionLoading"
:disabled="competitionLoading"
style="width: 250px"
@change="handleCompetitionChange"
>
<template #empty>
<div style="padding: 20px; text-align: center; color: #909399;">
<p>暂无赛事数据</p>
<p style="font-size: 12px; margin-top: 5px;">
请先在"赛事管理"中创建赛事
</p>
</div>
</template>
<el-option
v-for="item in competitionList"
:key="item.id"
:label="item.competitionName"
:value="String(item.id)"
/>
</el-select>
</el-form-item>
<el-form-item label="所属项目">
<el-select
v-model="queryParams.projectId"
placeholder="请选择项目"
clearable
filterable
:disabled="!queryParams.competitionId"
style="width: 250px"
>
<el-option
v-for="item in projectList"
:key="item.id"
:label="item.projectName"
:value="String(item.id)"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -68,31 +40,21 @@
<el-card shadow="never" class="toolbar-card">
<div class="toolbar">
<div class="toolbar-left">
<el-button
type="primary"
:icon="Plus"
:disabled="!queryParams.competitionId"
@click="handleAdd"
>
<el-button type="primary" :icon="Plus" @click="handleAdd">
新增扣分项
</el-button>
<el-button
type="danger"
:icon="Delete"
:disabled="!selection.length || !queryParams.competitionId"
:disabled="!selection.length"
@click="handleBatchDelete"
>
批量删除
</el-button>
<!-- <el-button type="success" :icon="DocumentCopy" @click="handleClone">
<el-button type="success" :icon="DocumentCopy" @click="handleClone">
克隆扣分项
</el-button> -->
<el-button
type="warning"
:icon="Download"
:disabled="!queryParams.competitionId"
@click="handleExport"
>
</el-button>
<el-button type="warning" :icon="Download" @click="handleExport">
导出模板
</el-button>
</div>
@@ -103,12 +65,7 @@
</el-icon>
</el-tooltip>
<el-tooltip content="刷新" placement="top">
<el-button
circle
:icon="Refresh"
:disabled="!queryParams.competitionId"
@click="fetchData"
/>
<el-button circle :icon="Refresh" @click="fetchData" />
</el-tooltip>
</div>
</div>
@@ -146,14 +103,14 @@
show-overflow-tooltip
/>
<el-table-column
prop="deductionPoint"
prop="deductionPoints"
label="扣分值(分)"
width="120"
align="center"
>
<template #default="{ row }">
<el-tag type="danger" effect="dark">
-{{ row.deductionPoint }}
-{{ row.deductionPoints }}
</el-tag>
</template>
</el-table-column>
@@ -178,6 +135,9 @@
<el-button link type="primary" :icon="Edit" @click="handleEdit(row)">
编辑
</el-button>
<el-button link type="success" :icon="DocumentCopy" @click="handleCloneSingle(row)">
克隆
</el-button>
<el-button link type="danger" :icon="Delete" @click="handleDelete(row)">
删除
</el-button>
@@ -213,22 +173,6 @@
:rules="rules"
label-width="120px"
>
<el-form-item label="所属赛事" prop="competitionId">
<el-select
v-model="form.competitionId"
placeholder="请选择赛事"
filterable
disabled
style="width: 100%"
>
<el-option
v-for="item in competitionList"
:key="item.id"
:label="item.competitionName"
:value="String(item.id)"
/>
</el-select>
</el-form-item>
<el-form-item label="所属项目" prop="projectId">
<el-select
v-model="form.projectId"
@@ -240,7 +184,7 @@
v-for="item in projectList"
:key="item.id"
:label="item.projectName"
:value="String(item.id)"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -251,9 +195,9 @@
maxlength="100"
/>
</el-form-item>
<el-form-item label="扣分值(分)" prop="deductionPoint">
<el-form-item label="扣分值(分)" prop="deductionPoints">
<el-input-number
v-model="form.deductionPoint"
v-model="form.deductionPoints"
:min="0.1"
:max="10"
:precision="1"
@@ -317,7 +261,7 @@
v-for="item in projectList.filter(p => p.id !== cloneForm.sourceProjectId)"
:key="item.id"
:label="item.projectName"
:value="String(item.id)"
:value="item.id"
/>
</el-select>
</el-form-item>
@@ -351,6 +295,7 @@ import {
Delete,
Edit,
Download,
DocumentCopy,
InfoFilled,
Rank
} from '@element-plus/icons-vue'
@@ -365,7 +310,6 @@ import {
import { getProjectList } from '@/api/martial/project'
import dayjs from 'dayjs'
import Sortable from 'sortablejs'
import { getCompetitionList } from '@/api/martial/competition'
// 数据定义
const loading = ref(false)
@@ -380,25 +324,21 @@ const cloneDialogVisible = ref(false)
const dialogTitle = ref('')
const formRef = ref(null)
const cloneFormRef = ref(null)
const competitionList = ref([])
const competitionLoading = ref(false)
// 查询参数
const queryParams = reactive({
current: 1,
size: 10,
competitionId: null,
projectId: null,
itemName: '',
projectId: '',
itemName: ''
})
// 表单数据
const form = reactive({
id: null,
competitionId: null,
projectId: null,
itemName: '',
deductionPoint: 0.5,
projectId: '',
itemName: '',
deductionPoints: 0.5,
sortOrder: 0,
description: ''
})
@@ -413,9 +353,6 @@ const cloneForm = reactive({
// 表单验证规则
const rules = {
competitionId: [
{ required: true, message: '请选择赛事', trigger: 'change' }
],
projectId: [
{ required: true, message: '请选择所属项目', trigger: 'change' }
],
@@ -423,7 +360,7 @@ const rules = {
{ required: true, message: '请输入扣分项名称', trigger: 'blur' },
{ min: 2, max: 100, message: '长度在 2 到 100 个字符', trigger: 'blur' }
],
deductionPoint: [
deductionPoints: [
{ required: true, message: '请输入扣分值', trigger: 'blur' }
],
sortOrder: [
@@ -438,90 +375,31 @@ const cloneRules = {
]
}
// 加载赛事列表
const loadCompetitionList = async () => {
competitionLoading.value = true
// 加载项目列表
const loadProjectList = async () => {
try {
const resCompe = await getCompetitionList(1, 1000, {})
const recordsCompe = resCompe.data?.data?.records || []
competitionList.value = recordsCompe
if (recordsCompe.length === 0) {
console.warn('赛事列表为空,请先在"赛事管理"中创建赛事')
}
} catch (error) {
console.error('加载赛事列表失败:', error)
ElMessage.error('加载赛事列表失败')
} finally {
competitionLoading.value = false
}
}
// 加载项目列表(根据赛事ID
const loadProjectList = async (competitionId) => {
if (!competitionId) {
projectList.value = []
return
}
try {
const res = await getProjectList(1, 1000, { competitionId })
// 根据axios响应拦截器的处理,数据在 res.data.data.records 中
const records = res.data?.data?.records || []
projectList.value = records
if (records.length === 0) {
console.warn('该赛事下暂无项目,请先在"轮编管理"中创建项目')
const res = await getProjectList(1, 1000, {})
if (res.data && res.data.records) {
projectList.value = res.data.records
}
} catch (error) {
console.error('加载项目列表失败:', error)
ElMessage.error('加载项目列表失败')
}
}
// 赛事选择变化
const handleCompetitionChange = (competitionId) => {
// 清空项目选择和表格数据
queryParams.projectId = null
tableData.value = []
total.value = 0
// 加载该赛事下的项目
if (competitionId) {
loadProjectList(competitionId)
// 自动查询数据
fetchData()
} else {
projectList.value = []
}
}
// 查询数据
const fetchData = async () => {
// 必须选择赛事才能查询
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
loading.value = true
try {
// 过滤掉空字符串的参数
const params = {}
Object.keys(queryParams).forEach(key => {
if (queryParams[key] !== '' && queryParams[key] !== null && queryParams[key] !== undefined) {
params[key] = queryParams[key]
}
})
const res = await getDeductionList(
queryParams.current,
queryParams.size,
params
queryParams
)
// 根据axios响应拦截器的处理,数据在 res.data.data 中
const data = res.data?.data || {}
tableData.value = data.records || []
total.value = data.total || 0
if (res.data) {
tableData.value = res.data.records || []
total.value = res.data.total || 0
}
} catch (error) {
ElMessage.error('获取数据失败')
console.error(error)
@@ -538,48 +416,28 @@ const handleSearch = () => {
// 重置
const handleReset = () => {
const competitionId = queryParams.competitionId
Object.assign(queryParams, {
current: 1,
size: 10,
competitionId: competitionId,
projectId: null,
itemName: '',
projectId: '',
itemName: ''
})
if (competitionId) {
fetchData()
}
fetchData()
}
// 新增
const handleAdd = () => {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
dialogTitle.value = '新增扣分项'
resetForm()
form.competitionId = queryParams.competitionId
dialogVisible.value = true
}
// 编辑
const handleEdit = async (row) => {
const handleEdit = (row) => {
dialogTitle.value = '编辑扣分项'
Object.keys(form).forEach((key) => {
form[key] = row[key]
})
// Convert competitionId to string for el-select matching
if (form.competitionId) {
form.competitionId = String(form.competitionId)
}
if (form.projectId) {
form.projectId = String(form.projectId)
}
// Load project list for the competition first
if (form.competitionId) {
await loadProjectList(form.competitionId)
}
dialogVisible.value = true
}
@@ -622,6 +480,29 @@ const handleBatchDelete = () => {
.catch(() => {})
}
// 克隆单个扣分项
const handleCloneSingle = (row) => {
cloneForm.sourceProjectId = row.projectId
cloneForm.sourceProjectName = row.projectName
cloneForm.targetProjectId = ''
cloneForm.itemCount = 1
cloneDialogVisible.value = true
}
// 克隆扣分项(批量)
const handleClone = () => {
if (!queryParams.projectId) {
ElMessage.warning('请先选择源项目(通过搜索筛选)')
return
}
const sourceProject = projectList.value.find(p => p.id === queryParams.projectId)
cloneForm.sourceProjectId = queryParams.projectId
cloneForm.sourceProjectName = sourceProject?.projectName || ''
cloneForm.targetProjectId = ''
cloneForm.itemCount = total.value
cloneDialogVisible.value = true
}
// 提交克隆
const handleCloneSubmit = async () => {
@@ -687,10 +568,9 @@ const handleDialogClose = () => {
const resetForm = () => {
Object.assign(form, {
id: null,
competitionId: null,
projectId: null,
projectId: '',
itemName: '',
deductionPoint: 0.5,
deductionPoints: 0.5,
sortOrder: 0,
description: ''
})
@@ -759,7 +639,8 @@ const formatDate = (date) => {
// 生命周期
onMounted(() => {
loadCompetitionList()
loadProjectList()
fetchData()
initSortable()
})
</script>
+13 -50
View File
@@ -130,7 +130,6 @@ export default {
selectedVenueId: null,
venues: [], // 场地列表
timeSlots: [], // 时间段列表
timeSlotIndexMap: {}, // 显示索引到实际时间段索引的映射
dispatchGroups: [], // 调度分组列表
hasChanges: false, // 是否有未保存的更改
originalData: null // 原始数据(用于取消时恢复)
@@ -156,13 +155,12 @@ export default {
async checkScheduleStatus() {
try {
const res = await getScheduleResult(this.competitionId)
const scheduleData = res.data?.data
const isCompleted = scheduleData?.isCompleted || false
const scheduleStatus = res.data?.data?.scheduleStatus || res.data?.scheduleStatus || 0
console.log('编排完成状态:', isCompleted)
console.log('编排状态:', scheduleStatus)
// 如果编排未完成,提示用户并返回
if (!isCompleted) {
// 如果编排未完成(状态不是2,提示用户并返回
if (scheduleStatus !== 2) {
this.$message.warning('请先完成编排并锁定后,才能进行调度操作')
// 延迟返回上一页
setTimeout(() => {
@@ -190,16 +188,8 @@ export default {
const data = res.data?.data
if (data) {
// 获取编排数据以确定有项目的时间段
let scheduleGroups = []
try {
const scheduleRes = await getScheduleResult(this.competitionId)
scheduleGroups = scheduleRes.data?.data?.competitionGroups || scheduleRes.data?.data?.scheduleGroups || []
} catch (e) {
console.warn('获取编排数据失败:', e)
}
// 生成时间段(只显示有项目的时间段)
this.generateTimeSlots(data.competitionStartTime || data.competition_start_time, data.competitionEndTime || data.competition_end_time, scheduleGroups)
// 生成时间段
this.generateTimeSlots(data.competitionStartTime || data.competition_start_time, data.competitionEndTime || data.competition_end_time)
}
} catch (err) {
console.error('加载赛事信息失败', err)
@@ -209,29 +199,17 @@ export default {
}
},
// 生成时间段列表(只显示有项目的时间段)
generateTimeSlots(startTime, endTime, scheduleGroups) {
// 生成时间段列表
generateTimeSlots(startTime, endTime) {
if (!startTime || !endTime) {
this.timeSlots = ['2025年11月6日 上午8:30', '2025年11月6日 下午13:30']
this.timeSlotIndexMap = { 0: 0, 1: 1 }
return
}
// 从编排数据中提取实际有项目的时间段索引
const usedTimeSlotIndices = new Set()
if (scheduleGroups && scheduleGroups.length > 0) {
scheduleGroups.forEach(group => {
if (group.timeSlotIndex !== undefined && group.timeSlotIndex !== null) {
usedTimeSlotIndices.add(group.timeSlotIndex)
}
})
}
const allSlots = []
const slots = []
const start = new Date(startTime)
const end = new Date(endTime)
let currentDate = new Date(start)
let slotIndex = 0
while (currentDate <= end) {
const year = currentDate.getFullYear()
@@ -239,28 +217,13 @@ export default {
const day = currentDate.getDate()
const dateStr = `${year}${month}${day}`
allSlots.push({ label: `${dateStr} 上午8:30`, index: slotIndex++ })
allSlots.push({ label: `${dateStr} 下午13:30`, index: slotIndex++ })
slots.push(`${dateStr} 上午8:30`)
slots.push(`${dateStr} 下午13:30`)
currentDate.setDate(currentDate.getDate() + 1)
}
// 如果有编排数据,只显示有项目的时间段
if (usedTimeSlotIndices.size > 0) {
const filteredSlots = allSlots.filter(slot => usedTimeSlotIndices.has(slot.index))
this.timeSlots = filteredSlots.map(slot => slot.label)
// 保存映射关系:显示索引 -> 实际时间段索引
this.timeSlotIndexMap = {}
filteredSlots.forEach((slot, displayIndex) => {
this.timeSlotIndexMap[displayIndex] = slot.index
})
} else {
this.timeSlots = allSlots.map(slot => slot.label)
this.timeSlotIndexMap = {}
allSlots.forEach((slot, displayIndex) => {
this.timeSlotIndexMap[displayIndex] = slot.index
})
}
this.timeSlots = slots
},
// 加载场地列表
@@ -305,7 +268,7 @@ export default {
const res = await getDispatchData({
competitionId: this.competitionId,
venueId: this.selectedVenueId,
timeSlotIndex: this.timeSlotIndexMap[this.selectedTime] !== undefined ? this.timeSlotIndexMap[this.selectedTime] : this.selectedTime
timeSlotIndex: this.selectedTime
})
if (res.data.success) {
+274 -450
View File
@@ -9,19 +9,9 @@
placeholder="请选择赛事"
clearable
filterable
:loading="competitionLoading"
:disabled="competitionLoading"
style="width: 250px"
@change="handleCompetitionChange"
>
<template #empty>
<div style="padding: 20px; text-align: center; color: #909399;">
<p>暂无赛事数据</p>
<p style="font-size: 12px; margin-top: 5px;">
请先在"赛事管理"中创建赛事
</p>
</div>
</template>
<el-option
v-for="item in competitionList"
:key="item.id"
@@ -51,6 +41,19 @@
<el-option label="三级" value="三级" />
</el-select>
</el-form-item>
<el-form-item label="邀请状态">
<el-select
v-model="queryParams.inviteStatus"
placeholder="请选择"
clearable
style="width: 130px"
>
<el-option label="待回复" :value="0" />
<el-option label="已接受" :value="1" />
<el-option label="已拒绝" :value="2" />
<el-option label="已取消" :value="3" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" :icon="Search" @click="handleSearch">
搜索
@@ -60,30 +63,82 @@
</el-form>
</el-card>
<!-- 统计卡片 -->
<el-row :gutter="20" class="stats-row">
<el-col :span="6">
<el-card shadow="hover" class="stats-card">
<div class="stats-content">
<div class="stats-icon" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%)">
<el-icon :size="30"><User /></el-icon>
</div>
<div class="stats-info">
<div class="stats-value">{{ statistics.totalInvites || 0 }}</div>
<div class="stats-label">总邀请数</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stats-card">
<div class="stats-content">
<div class="stats-icon" style="background: linear-gradient(135deg, #fccb90 0%, #d57eeb 100%)">
<el-icon :size="30"><Clock /></el-icon>
</div>
<div class="stats-info">
<div class="stats-value">{{ statistics.pendingCount || 0 }}</div>
<div class="stats-label">待回复</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stats-card">
<div class="stats-content">
<div class="stats-icon" style="background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%)">
<el-icon :size="30"><CircleCheck /></el-icon>
</div>
<div class="stats-info">
<div class="stats-value">{{ statistics.acceptedCount || 0 }}</div>
<div class="stats-label">已接受</div>
</div>
</div>
</el-card>
</el-col>
<el-col :span="6">
<el-card shadow="hover" class="stats-card">
<div class="stats-content">
<div class="stats-icon" style="background: linear-gradient(135deg, #ff9a9e 0%, #fecfef 100%)">
<el-icon :size="30"><CircleClose /></el-icon>
</div>
<div class="stats-info">
<div class="stats-value">{{ statistics.rejectedCount || 0 }}</div>
<div class="stats-label">已拒绝</div>
</div>
</div>
</el-card>
</el-col>
</el-row>
<!-- 工具栏 -->
<el-card shadow="never" class="toolbar-card">
<div class="toolbar">
<div class="toolbar-left">
<el-button
type="warning"
:icon="FolderOpened"
:disabled="competitionLoading || queryParams.competitionId === null || queryParams.competitionId === ''"
:loading="competitionLoading"
@click="handleImportFromPool"
>
<el-button type="primary" :icon="Plus" @click="handleSendInvite">
发送邀请
</el-button>
<el-button type="success" :icon="DocumentCopy" @click="handleBatchGenerateCode">
批量生成邀请码
</el-button>
<el-button type="warning" :icon="FolderOpened" @click="handleImportFromPool">
从评委库导入
</el-button>
<el-button
:icon="Download"
:disabled="competitionLoading || queryParams.competitionId === null || queryParams.competitionId === ''"
@click="handleExport"
>
<el-button :icon="Download" @click="handleExport">
导出数据
</el-button>
</div>
<div class="toolbar-right">
<el-tooltip content="刷新" placement="top">
<el-button circle :icon="Refresh" :disabled="competitionLoading" @click="fetchData" />
<el-button circle :icon="Refresh" @click="fetchData" />
</el-tooltip>
</div>
</div>
@@ -99,15 +154,15 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="judgeName" label="评委姓名" />
<el-table-column prop="judgeLevel" label="评委等级" align="center">
<el-table-column prop="judgeName" label="评委姓名" width="120" />
<el-table-column prop="judgeLevel" label="评委等级" width="100" align="center">
<template #default="{ row }">
<el-tag :type="getLevelType(row.judgeLevel)" size="small">
{{ row.judgeLevel }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="inviteCode" label="邀请码" align="center">
<el-table-column prop="inviteCode" label="邀请码" width="200" align="center">
<template #default="{ row }">
<!-- 已有邀请码显示邀请码 + 重新生成按钮 -->
<div v-if="row.inviteCode" style="display: flex; align-items: center; justify-content: center; gap: 8px;">
@@ -143,27 +198,66 @@
</el-button>
</template>
</el-table-column>
<el-table-column prop="venueName" label="负责场地" align="center">
<el-table-column prop="contactPhone" label="联系电话" width="130" />
<el-table-column prop="contactEmail" label="联系邮箱" min-width="180" show-overflow-tooltip />
<el-table-column prop="inviteStatus" label="邀请状态" width="100" align="center">
<template #default="{ row }">
<span>{{ row.venueName || "全部场地" }}</span>
</template>
</el-table-column>
<el-table-column prop="refereeType" label="裁判类型" align="center">
<template #default="{ row }">
<el-tag :type="row.refereeType === 1 ? 'danger' : (row.refereeType === 3 ? 'warning' : 'primary')" size="small">
{{ row.refereeType === 1 ? '主裁判' : (row.refereeType === 3 ? '总裁' : '裁判员') }}
<el-tag :type="getStatusType(row.inviteStatus)" size="small">
{{ getStatusText(row.inviteStatus) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="contactPhone" label="联系电话" />
<el-table-column prop="contactEmail" label="擅长项目" show-overflow-tooltip />
<el-table-column label="操作" width="150" align="center" fixed="right">
<el-table-column prop="inviteTime" label="邀请时间" width="160" align="center">
<template #default="{ row }">
{{ formatDateTime(row.inviteTime) }}
</template>
</el-table-column>
<el-table-column prop="replyTime" label="回复时间" width="160" align="center">
<template #default="{ row }">
{{ row.replyTime ? formatDateTime(row.replyTime) : '-' }}
</template>
</el-table-column>
<el-table-column prop="replyNote" label="回复备注" min-width="150" show-overflow-tooltip />
<el-table-column label="操作" width="280" align="center" fixed="right">
<template #default="{ row }">
<el-button
v-if="row.inviteStatus === 0"
link
type="primary"
:icon="Refresh"
@click="handleResend(row)"
>
重发
</el-button>
<el-button
v-if="row.inviteStatus === 0"
link
type="warning"
:icon="Bell"
@click="handleReminder(row)"
>
提醒
</el-button>
<el-button
v-if="row.inviteStatus === 0"
link
type="danger"
:icon="Close"
@click="handleCancel(row)"
>
取消
</el-button>
<el-button link type="primary" :icon="View" @click="handleView(row)">
查看
</el-button>
<el-button link type="danger" :icon="Delete" @click="handleDelete(row)">
删除
<el-button
v-if="row.inviteStatus === 1"
link
type="success"
:icon="CircleCheck"
@click="handleConfirm(row)"
>
确认
</el-button>
</template>
</el-table-column>
@@ -182,129 +276,6 @@
/>
</div>
</el-card>
<!-- 裁判选择对话框 -->
<el-dialog
v-model="judgeDialogVisible"
title="从评委库导入"
width="900px"
:close-on-click-modal="false"
>
<!-- 场地和项目选择 -->
<el-form :inline="true" class="venue-project-form" style="margin-bottom: 15px; padding: 15px; background: #f5f7fa; border-radius: 8px;">
<el-form-item label="分配场地" required>
<el-select
v-model="importForm.venueId"
placeholder="请选择场地"
clearable
style="width: 200px"
>
<el-option
v-for="item in venueList"
:key="item.id"
:label="item.venueName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form>
<!-- 搜索表单 -->
<el-form :inline="true" :model="judgeQueryParams" class="judge-search-form">
<el-form-item label="姓名">
<el-input
v-model="judgeQueryParams.name"
placeholder="请输入姓名"
clearable
style="width: 150px"
/>
</el-form-item>
<el-form-item label="手机号">
<el-input
v-model="judgeQueryParams.phone"
placeholder="请输入手机号"
clearable
style="width: 150px"
/>
</el-form-item>
<el-form-item label="裁判类型">
<el-select
v-model="judgeQueryParams.refereeType"
placeholder="请选择"
clearable
style="width: 130px"
>
<el-option label="主裁判" :value="1" />
<el-option label="裁判员" :value="2" />
<el-option label="总裁" :value="3" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" :icon="Search" @click="handleJudgeSearch">
搜索
</el-button>
<el-button :icon="Refresh" @click="handleJudgeReset">重置</el-button>
</el-form-item>
</el-form>
<!-- 裁判列表 -->
<el-table
v-loading="judgeLoading"
:data="judgeList"
stripe
border
max-height="400"
@selection-change="handleJudgeSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="name" label="姓名" width="100" />
<el-table-column prop="gender" label="性别" width="80" align="center">
<template #default="{ row }">
{{ row.gender === 1 ? '男' : '女' }}
</template>
</el-table-column>
<el-table-column prop="phone" label="手机号" width="130" />
<el-table-column prop="refereeType" label="裁判类型" width="100" align="center">
<template #default="{ row }">
<el-tag :type="row.refereeType === 1 ? 'danger' : (row.refereeType === 3 ? 'warning' : 'primary')" size="small">
{{ row.refereeType === 1 ? '主裁判' : (row.refereeType === 3 ? '总裁' : '裁判员') }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="level" label="等级/职称" width="120" />
<el-table-column prop="specialty" label="擅长项目" min-width="150" show-overflow-tooltip />
</el-table>
<!-- 分页 -->
<div class="judge-pagination">
<el-pagination
v-model:current-page="judgeQueryParams.current"
v-model:page-size="judgeQueryParams.size"
:page-sizes="[10, 20, 50]"
:total="judgeTotal"
layout="total, sizes, prev, pager, next"
@size-change="loadJudgeList"
@current-change="loadJudgeList"
/>
</div>
<template #footer>
<div class="dialog-footer">
<span style="margin-right: auto; color: #909399;">
已选择 {{ selectedJudges.length }} 位裁判
</span>
<el-button @click="judgeDialogVisible = false">取消</el-button>
<el-button
type="primary"
:disabled="selectedJudges.length === 0"
@click="handleConfirmImport"
>
确定导入
</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
@@ -314,24 +285,36 @@ import { ElMessage, ElMessageBox } from 'element-plus'
import {
Search,
Refresh,
Plus,
Delete,
Download,
DocumentCopy,
FolderOpened,
Upload,
View,
Close,
Bell,
CircleCheck,
CircleClose,
User,
Clock
} from '@element-plus/icons-vue'
import {
getJudgeInviteList,
sendInvite,
batchSendInvites,
resendInvite,
cancelInvite,
confirmInvite,
getInviteStatistics,
importFromJudgePool,
exportInvites,
sendReminder,
generateInviteCode,
batchGenerateInviteCode,
regenerateInviteCode,
removeInvite
regenerateInviteCode
} from '@/api/martial/judgeInvite'
import { getCompetitionList } from '@/api/martial/competition'
import { getVenuesByCompetition } from '@/api/martial/venue'
import { getProjectsByCompetition } from '@/api/martial/project'
import { getRefereeList } from '@/api/martial/referee'
import dayjs from 'dayjs'
// 数据状态
@@ -340,32 +323,6 @@ const tableData = ref([])
const total = ref(0)
const selection = ref([])
const competitionList = ref([])
const competitionLoading = ref(false) // 赛事列表加载状态
// 裁判选择对话框
const judgeDialogVisible = ref(false)
// 场地和项目列表
const venueList = ref([])
const filterVenueList = ref([])
const projectList = ref([])
// 导入表单
const importForm = reactive({
venueId: null,
projectIds: []
})
const judgeLoading = ref(false)
const judgeList = ref([])
const judgeTotal = ref(0)
const selectedJudges = ref([])
const judgeQueryParams = reactive({
current: 1,
size: 10,
name: '',
phone: '',
refereeType: null
})
// 统计数据
const statistics = ref({
@@ -379,74 +336,37 @@ const statistics = ref({
const queryParams = reactive({
current: 1,
size: 10,
competitionId: null,
competitionId: '',
judgeName: '',
judgeLevel: '',
inviteStatus: '',
venueId: null
inviteStatus: ''
})
// 加载赛事列表
const loadCompetitionList = async () => {
competitionLoading.value = true
try {
// 查询所有赛事
const res = await getCompetitionList(1, 1000, {})
// 根据axios响应拦截器的处理,数据结构为: res.data.data.records
// res.data = 后端返回的整个JSON对象 { code, success, data, msg }
// res.data.data = 后端返回的data字段 { records, total, size, current, pages }
// res.data.data.records = 实际的赛事列表数组
const records = res.data?.data?.records || []
competitionList.value = records
if (competitionList.value.length > 0) {
// 如果没有选中赛事,自动选择第一个
if (queryParams.competitionId === null || queryParams.competitionId === '') {
const res = await getCompetitionList(1, 1000, { status: 1 })
if (res.data && res.data.records) {
competitionList.value = res.data.records
if (competitionList.value.length > 0 && !queryParams.competitionId) {
queryParams.competitionId = competitionList.value[0].id
handleCompetitionChange(queryParams.competitionId)
}
} else {
ElMessage.warning('暂无可用赛事,请先创建赛事')
}
} catch (error) {
console.error('加载赛事列表失败:', error)
ElMessage.error(`加载赛事列表失败: ${error.response?.data?.msg || error.message || '请检查网络连接'}`)
} finally {
competitionLoading.value = false
}
}
// 赛事切换
const handleCompetitionChange = async (competitionId) => {
// 重置场地筛选
queryParams.venueId = null
// 加载该赛事的场地列表用于筛选
await loadFilterVenueList()
const handleCompetitionChange = (competitionId) => {
fetchData()
loadStatistics()
}
// 加载筛选用的场地列表
const loadFilterVenueList = async () => {
if (!queryParams.competitionId) {
filterVenueList.value = []
return
}
try {
const res = await getVenuesByCompetition(queryParams.competitionId)
const venueData = res.data?.data || res.data || {}
filterVenueList.value = venueData.records || []
} catch (error) {
console.error('加载场地列表失败:', error)
filterVenueList.value = []
}
}
// 加载统计数据
const loadStatistics = async () => {
if (queryParams.competitionId === null || queryParams.competitionId === '') return
if (!queryParams.competitionId) return
try {
const res = await getInviteStatistics(queryParams.competitionId)
@@ -460,7 +380,7 @@ const loadStatistics = async () => {
// 获取数据
const fetchData = async () => {
if (queryParams.competitionId === null || queryParams.competitionId === '') return
if (!queryParams.competitionId) return
loading.value = true
try {
@@ -469,10 +389,10 @@ const fetchData = async () => {
queryParams.size,
queryParams
)
// 根据axios响应拦截器的处理,数据在 res.data.data 中
const data = res.data?.data || {}
tableData.value = data.records || []
total.value = data.total || 0
if (res.data) {
tableData.value = res.data.records || []
total.value = res.data.total || 0
}
} catch (error) {
ElMessage.error('加载数据失败')
console.error(error)
@@ -494,185 +414,101 @@ const handleReset = () => {
size: 10,
judgeName: '',
judgeLevel: '',
inviteStatus: '',
venueId: null
inviteStatus: ''
})
fetchData()
}
// 从评委库导入
const handleImportFromPool = async () => {
if (competitionLoading.value) {
ElMessage.warning('赛事列表加载中,请稍候...')
return
}
if (competitionList.value.length === 0) {
ElMessage.warning('暂无可用赛事,请先创建赛事')
return
}
if (queryParams.competitionId === null || queryParams.competitionId === '') {
// 发送邀请
const handleSendInvite = async () => {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
// 重置导入表单
importForm.venueId = null
importForm.projectIds = []
// 加载场地和项目列表
await loadVenueAndProjectList()
// 打开裁判选择对话框
judgeDialogVisible.value = true
selectedJudges.value = []
loadJudgeList()
// TODO: 打开发送邀请对话框
ElMessage.info('请先生成邀请码,然后通过邮件/短信发送给评委')
}
// 加载场地和项目列表
const loadVenueAndProjectList = async () => {
try {
// 并行加载场地和项目
const [venueRes, projectRes] = await Promise.all([
getVenuesByCompetition(queryParams.competitionId),
getProjectsByCompetition(queryParams.competitionId)
])
// 处理场地数据
const venueData = venueRes.data?.data || venueRes.data || {}
venueList.value = venueData.records || []
// 处理项目数据
const projectData = projectRes.data?.data || projectRes.data || {}
projectList.value = projectData.records || []
if (venueList.value.length === 0) {
ElMessage.warning('该赛事暂无场地,请先添加场地')
}
if (projectList.value.length === 0) {
ElMessage.warning('该赛事暂无项目,请先添加项目')
}
} catch (error) {
console.error('加载场地/项目列表失败:', error)
ElMessage.error('加载场地/项目列表失败')
}
}
// 加载裁判列表
const loadJudgeList = async () => {
judgeLoading.value = true
try {
const params = {}
if (judgeQueryParams.name) {
params.name = judgeQueryParams.name
}
if (judgeQueryParams.phone) {
params.phone = judgeQueryParams.phone
}
if (judgeQueryParams.refereeType !== null && judgeQueryParams.refereeType !== '') {
params.refereeType = judgeQueryParams.refereeType
}
const res = await getRefereeList(
judgeQueryParams.current,
judgeQueryParams.size,
params
)
if (res.data && res.data.data && res.data.data.records) {
judgeList.value = res.data.data.records
judgeTotal.value = res.data.data.total || 0
} else if (res.data && res.data.records) {
judgeList.value = res.data.records
judgeTotal.value = res.data.total || 0
}
} catch (error) {
console.error('加载裁判列表失败:', error)
ElMessage.error('加载裁判列表失败')
} finally {
judgeLoading.value = false
}
}
// 裁判搜索
const handleJudgeSearch = () => {
judgeQueryParams.current = 1
loadJudgeList()
}
// 裁判搜索重置
const handleJudgeReset = () => {
judgeQueryParams.name = ''
judgeQueryParams.phone = ''
judgeQueryParams.refereeType = null
judgeQueryParams.current = 1
loadJudgeList()
}
// 裁判选择改变
const handleJudgeSelectionChange = (val) => {
selectedJudges.value = val
}
// 确认导入裁判
const handleConfirmImport = async () => {
if (selectedJudges.value.length === 0) {
ElMessage.warning('请至少选择一位裁判')
// 从评委库导入
const handleImportFromPool = async () => {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
// 验证场地和项目
if (!importForm.venueId) {
ElMessage.warning('请选择分配的场地')
return
}
try {
await ElMessageBox.confirm(
`确定为选中的 ${selectedJudges.value.length} 位裁判生成邀请码吗?`,
'确认导入',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'info'
// TODO: 打开评委选择对话框
ElMessage.info('请先在评委管理中添加评委,然后在此处生成邀请码')
} catch (error) {
ElMessage.error('导入失败')
}
}
// 重发
const handleResend = async (row) => {
try {
await resendInvite(row.id)
ElMessage.success('重发成功')
fetchData()
} catch (error) {
ElMessage.error('重发失败')
}
}
// 提醒
const handleReminder = async (row) => {
try {
await sendReminder(row.id, '请尽快回复邀请')
ElMessage.success('提醒发送成功')
} catch (error) {
ElMessage.error('提醒发送失败')
}
}
// 取消邀请
const handleCancel = async (row) => {
try {
const { value: reason } = await ElMessageBox.prompt('请输入取消原因', '取消邀请', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPlaceholder: '请输入取消原因',
inputValidator: (value) => {
if (!value || value.trim() === '') {
return '请输入取消原因'
}
return true
}
)
loading.value = true
const judgeIds = selectedJudges.value.map(item => item.id)
const res = await batchGenerateInviteCode({
competitionId: queryParams.competitionId,
judgeIds: judgeIds,
role: 'judge',
venueId: importForm.venueId,
// projects不传,裁判默认负责整个场地
expireDays: 30
})
// 根据axios响应拦截器的处理,数据在 res.data.data 中
const invites = res.data?.data || []
if (Array.isArray(invites) && invites.length > 0) {
ElMessage.success(`成功为 ${invites.length} 位裁判生成邀请码`)
judgeDialogVisible.value = false
await fetchData()
await loadStatistics()
} else if (Array.isArray(invites) && invites.length === 0) {
ElMessage.warning('所有裁判都已有有效邀请码,无需重复生成')
} else {
ElMessage.error(res.data?.msg || '生成邀请码失败')
}
await cancelInvite(row.id, reason)
ElMessage.success('取消成功')
fetchData()
loadStatistics()
} catch (error) {
if (error !== 'cancel') {
console.error('导入裁判失败:', error)
ElMessage.error(error.response?.data?.msg || error.message || '导入裁判失败')
ElMessage.error('取消失败')
}
} finally {
loading.value = false
}
}
// 确认
const handleConfirm = async (row) => {
ElMessageBox.confirm('确认接受该评委的邀请回复?', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
try {
await confirmInvite(row.id)
ElMessage.success('确认成功')
fetchData()
} catch (error) {
ElMessage.error('确认失败')
}
})
.catch(() => {})
}
// 查看
const handleView = async (row) => {
try {
@@ -711,27 +547,19 @@ const handleView = async (row) => {
/**
* 生成单个邀请码
* 注意:此功能仅用于已有邀请记录但未生成邀请码的情况
* 如果需要为新裁判生成邀请码,请使用"从评委库导入"功能
*/
const handleGenerateCode = async (row) => {
if (queryParams.competitionId === null || queryParams.competitionId === '') {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
// 检查是否有judgeId
if (!row.judgeId) {
ElMessage.error('数据异常:缺少裁判ID,请使用"从评委库导入"功能')
return
}
try {
loading.value = true
const res = await generateInviteCode({
competitionId: queryParams.competitionId,
judgeId: row.judgeId,
role: row.refereeType === 1 ? 'chief_judge' : (row.refereeType === 3 ? 'general_judge' : 'judge'), // 根据评委类型设置角色
role: row.refereeType === 1 ? 'chief_judge' : 'judge', // 根据评委类型设置角色
venueId: row.venueId || null,
projects: row.projects ? JSON.stringify(row.projects) : null,
expireDays: 30
@@ -794,31 +622,52 @@ const handleRegenerateCode = async (row) => {
}
/**
* 删除邀请记录
* 批量生成邀请码
*/
const handleDelete = async (row) => {
const handleBatchGenerateCode = async () => {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return
}
if (selection.value.length === 0) {
ElMessage.warning('请先选择评委')
return
}
try {
await ElMessageBox.confirm(
`确定要删除评委"${row.judgeName}"的邀请记录吗?`,
'删除确认',
`确定为选中的 ${selection.value.length} 位评委批量生成邀请码吗?`,
'批量生成邀请码',
{
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
type: 'info'
}
)
loading.value = true
await removeInvite(row.id)
ElMessage.success('删除成功')
const judgeIds = selection.value.map(item => item.judgeId)
// 刷新列表和统计数据
await fetchData()
await loadStatistics()
const res = await batchGenerateInviteCode({
competitionId: queryParams.competitionId,
judgeIds: judgeIds,
role: 'judge',
expireDays: 30
})
if (res.data && Array.isArray(res.data)) {
ElMessage.success(`成功生成 ${res.data.length} 个邀请码`)
// 刷新列表
await fetchData()
await loadStatistics()
} else {
ElMessage.error(res.msg || '批量生成失败')
}
} catch (error) {
if (error !== 'cancel') {
console.error('删除失败:', error)
ElMessage.error(error.response?.data?.msg || error.message || '删除失败')
console.error('批量生成邀请码失败:', error)
ElMessage.error(error.response?.data?.msg || error.message || '批量生成邀请码失败')
}
} finally {
loading.value = false
@@ -927,12 +776,8 @@ const fallbackCopyToClipboard = (text, label) => {
}
// 挂载
onMounted(async () => {
await loadCompetitionList()
// 加载筛选用的场地列表
if (queryParams.competitionId) {
await loadFilterVenueList()
}
onMounted(() => {
loadCompetitionList()
})
</script>
@@ -1009,25 +854,4 @@ onMounted(async () => {
justify-content: flex-end;
}
}
// 裁判选择对话框样式
.judge-search-form {
margin-bottom: 15px;
.el-form-item {
margin-bottom: 0;
}
}
.judge-pagination {
margin-top: 15px;
display: flex;
justify-content: flex-end;
}
.dialog-footer {
display: flex;
align-items: center;
justify-content: flex-end;
}
</style>
Binary file not shown.
+7 -19
View File
@@ -2,7 +2,7 @@
<div class="martial-order-container">
<el-card shadow="hover">
<div class="page-header">
<h2 class="page-title">赛事管理</h2>
<h2 class="page-title">订单管理</h2>
</div>
<el-form :inline="true" :model="searchForm" class="search-form">
<el-form-item>
@@ -60,8 +60,8 @@
</el-table-column>
<el-table-column prop="status" label="状态" width="90" align="center">
<template #default="scope">
<el-tag :type="getStatusType(calculateStatus(scope.row))" size="small">
{{ getStatusText(calculateStatus(scope.row)) }}
<el-tag :type="getStatusType(scope.row.status)" size="small">
{{ getStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
@@ -73,6 +73,7 @@
type="warning"
size="small"
@click="handleDispatch(scope.row)"
:disabled="!isScheduleCompleted(scope.row.id)"
:title="isScheduleCompleted(scope.row.id) ? '进入调度' : '请先完成编排'"
>
调度
@@ -181,13 +182,13 @@ export default {
try {
const res = await getScheduleResult(competition.id)
if (res.data?.data) {
this.scheduleStatusMap[competition.id] = res.data.data.isCompleted || false
this.$set(this.scheduleStatusMap, competition.id, res.data.data.isCompleted || false)
} else {
this.scheduleStatusMap[competition.id] = false
this.$set(this.scheduleStatusMap, competition.id, false)
}
} catch (err) {
// 如果获取失败,默认为未完成
this.scheduleStatusMap[competition.id] = false
this.$set(this.scheduleStatusMap, competition.id, false)
}
}
},
@@ -252,19 +253,6 @@ export default {
return `${start} ~ ${end}`
},
// 根据时间计算赛事状态
calculateStatus(row) {
const now = new Date()
const regStart = row.registrationStartTime ? new Date(row.registrationStartTime) : null
const regEnd = row.registrationEndTime ? new Date(row.registrationEndTime) : null
const compStart = row.competitionStartTime ? new Date(row.competitionStartTime) : null
const compEnd = row.competitionEndTime ? new Date(row.competitionEndTime) : null
if (compEnd && now > compEnd) return 4
if (compStart && now >= compStart) return 3
if (regStart && regEnd && now >= regStart && now <= new Date(regEnd.getFullYear(), regEnd.getMonth(), regEnd.getDate(), 23, 59, 59)) return 2
return 1
},
getStatusType(status) {
const statusMap = {
1: 'info', // 未开始
-355
View File
@@ -1,355 +0,0 @@
<template>
<div class="martial-order-container">
<el-card shadow="hover">
<div class="page-header">
<h2 class="page-title">订单管理</h2>
</div>
<el-form :inline="true" :model="searchForm" class="search-form">
<el-form-item>
<el-input
v-model="searchForm.keyword"
placeholder="搜索赛事名称"
clearable
size="small"
style="width: 240px"
>
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
<el-form-item>
<el-select
v-model="searchForm.status"
placeholder="赛事状态"
clearable
size="small"
style="width: 180px"
>
<el-option label="未开始" :value="1"></el-option>
<el-option label="报名中" :value="2"></el-option>
<el-option label="进行中" :value="3"></el-option>
<el-option label="已结束" :value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="handleSearch">查询</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="tableData"
border
stripe
size="small"
style="width: 100%"
>
<el-table-column type="index" label="序号" width="60" align="center"></el-table-column>
<el-table-column prop="competitionName" label="赛事名称" min-width="200" show-overflow-tooltip></el-table-column>
<el-table-column prop="competitionCode" label="赛事编号" width="150"></el-table-column>
<el-table-column prop="organizer" label="主办单位" min-width="150" show-overflow-tooltip></el-table-column>
<el-table-column prop="location" label="举办地点" width="120"></el-table-column>
<el-table-column prop="registrationTime" label="报名时间" width="180" show-overflow-tooltip>
<template #default="scope">
<span>{{ formatDateRange(scope.row.registrationStartTime, scope.row.registrationEndTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="competitionTime" label="比赛时间" width="180" show-overflow-tooltip>
<template #default="scope">
<span>{{ formatDateRange(scope.row.competitionStartTime, scope.row.competitionEndTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="90" align="center">
<template #default="scope">
<el-tag :type="getStatusType(scope.row.status)" size="small">
{{ getStatusText(scope.row.status) }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="320" align="center" fixed="right">
<template #default="scope">
<el-button type="primary" size="small" @click="handleRegistrationDetail(scope.row)">报名详情</el-button>
<el-button type="success" size="small" @click="handleSchedule(scope.row)">编排</el-button>
<el-button
type="warning"
size="small"
@click="handleDispatch(scope.row)"
:title="isScheduleCompleted(scope.row.id) ? '进入调度' : '请先完成编排'"
>
调度
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
class="pagination"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="pagination.current"
:page-sizes="[10, 20, 50, 100]"
:page-size="pagination.size"
layout="total, sizes, prev, pager, next"
:total="pagination.total"
small
></el-pagination>
</el-card>
</div>
</template>
<script>
import { getCompetitionList } from '@/api/martial/competition'
import { getScheduleResult } from '@/api/martial/activitySchedule'
export default {
name: 'MartialOrderList',
data() {
return {
loading: false,
searchForm: {
keyword: '',
status: null
},
tableData: [],
pagination: {
current: 1,
size: 10,
total: 0
},
scheduleStatusMap: {} // 存储每个赛事的编排状态
}
},
mounted() {
this.loadCompetitionList()
},
activated() {
// 当页面被激活时(从其他页面返回),重新加载编排状态
if (this.tableData.length > 0) {
this.loadScheduleStatus()
}
},
methods: {
// 加载赛事列表
loadCompetitionList() {
this.loading = true
const params = {}
if (this.searchForm.keyword) {
params.competitionName = this.searchForm.keyword
}
if (this.searchForm.status !== null && this.searchForm.status !== '') {
params.status = this.searchForm.status
}
getCompetitionList(this.pagination.current, this.pagination.size, params)
.then(res => {
console.log('赛事列表返回数据:', res)
const responseData = res.data?.data
if (responseData && responseData.records) {
// 处理赛事数据,兼容驼峰和下划线命名
this.tableData = responseData.records.map(competition => ({
id: competition.id,
competitionName: competition.competitionName || competition.competition_name,
competitionCode: competition.competitionCode || competition.competition_code,
organizer: competition.organizer,
location: competition.location,
venue: competition.venue,
registrationStartTime: competition.registrationStartTime || competition.registration_start_time,
registrationEndTime: competition.registrationEndTime || competition.registration_end_time,
competitionStartTime: competition.competitionStartTime || competition.competition_start_time,
competitionEndTime: competition.competitionEndTime || competition.competition_end_time,
status: competition.status,
createTime: competition.createTime || competition.create_time
}))
this.pagination.total = responseData.total || 0
// 加载每个赛事的编排状态
this.loadScheduleStatus()
}
})
.catch(err => {
console.error('加载赛事列表失败', err)
this.$message.error('加载赛事列表失败')
})
.finally(() => {
this.loading = false
})
},
// 加载编排状态
async loadScheduleStatus() {
for (const competition of this.tableData) {
try {
const res = await getScheduleResult(competition.id)
if (res.data?.data) {
this.$set(this.scheduleStatusMap, competition.id, res.data.data.isCompleted || false)
} else {
this.$set(this.scheduleStatusMap, competition.id, false)
}
} catch (err) {
// 如果获取失败,默认为未完成
this.$set(this.scheduleStatusMap, competition.id, false)
}
}
},
// 检查编排是否完成
isScheduleCompleted(competitionId) {
return this.scheduleStatusMap[competitionId] === true
},
handleSearch() {
this.pagination.current = 1
this.loadCompetitionList()
},
handleSizeChange(size) {
this.pagination.size = size
this.pagination.current = 1
this.loadCompetitionList()
},
handleCurrentChange(current) {
this.pagination.current = current
this.loadCompetitionList()
},
// 查看报名详情 - 传递赛事ID
handleRegistrationDetail(row) {
this.$router.push({
path: '/martial/registration/detail',
query: { competitionId: row.id }
})
},
// 编排 - 传递赛事ID
handleSchedule(row) {
this.$router.push({
path: '/martial/schedule/list',
query: { competitionId: row.id }
})
},
// 调度 - 传递赛事ID
handleDispatch(row) {
// 检查编排是否完成
if (!this.isScheduleCompleted(row.id)) {
this.$message.warning('请先完成编排后再进行调度')
return
}
this.$router.push({
path: '/martial/dispatch/list',
query: { competitionId: row.id }
})
},
// 格式化日期范围
formatDateRange(startTime, endTime) {
if (!startTime || !endTime) return '-'
// 简单格式化,只显示日期部分
const start = startTime.split(' ')[0]
const end = endTime.split(' ')[0]
return `${start} ~ ${end}`
},
getStatusType(status) {
const statusMap = {
1: 'info', // 未开始
2: 'success', // 报名中
3: 'warning', // 进行中
4: 'info' // 已结束
}
return statusMap[status] || 'info'
},
getStatusText(status) {
const statusMap = {
1: '未开始',
2: '报名中',
3: '进行中',
4: '已结束'
}
return statusMap[status] || '未知'
}
}
}
</script>
<style lang="scss" scoped>
.martial-order-container {
min-height: 100%;
padding: 15px;
background: #fff;
.page-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 15px;
.page-title {
margin: 0;
font-size: 18px;
font-weight: 600;
color: #2c3e50;
}
}
.tip-message {
display: flex;
gap: 12px;
padding: 10px 14px;
margin-bottom: 15px;
background: linear-gradient(90deg, #ffd54f 0%, #ffecb3 100%);
border: 1px solid #ffc107;
border-radius: 4px;
box-shadow: 0 2px 4px rgba(255, 193, 7, 0.2);
.tip-header {
flex-shrink: 0;
.tip-number {
display: inline-flex;
align-items: center;
justify-content: center;
width: 18px;
height: 18px;
background: #ff9800;
color: #fff;
font-size: 11px;
font-weight: bold;
border-radius: 50%;
}
}
.tip-content {
flex: 1;
color: #5d4037;
font-size: 12px;
line-height: 1.5;
.tip-subtitle {
margin-top: 3px;
color: #6d4c41;
font-size: 11px;
font-style: italic;
}
}
}
.search-form {
margin-bottom: 15px;
}
.amount-text {
color: #e6a23c;
font-weight: 600;
font-size: 14px;
}
.pagination {
margin-top: 15px;
text-align: right;
}
}
</style>
+2 -5
View File
@@ -94,14 +94,11 @@
</el-table-column>
<el-table-column
prop="age"
label="年龄"
width="80"
align="center"
>
<template #default="scope">
{{ scope.row.age === -1 || scope.row.age === null || scope.row.age === undefined ? '--' : scope.row.age }}
</template>
</el-table-column>
/>
<el-table-column
prop="organization"
-990
View File
@@ -1,990 +0,0 @@
<template>
<div class="participant-container">
<!-- 列表视图 -->
<div v-if="currentView === 'list'" class="list-view">
<el-card shadow="hover">
<div class="list-header">
<h2 class="page-title">参赛选手管理</h2>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">
添加选手
</el-button>
</div>
<el-form :inline="true" :model="searchForm" class="search-form">
<el-form-item>
<el-input
v-model="searchForm.keyword"
placeholder="搜索选手姓名"
clearable
size="small"
style="width: 240px"
>
<template #prefix>
<i class="el-input__icon el-icon-search"></i>
</template>
</el-input>
</el-form-item>
<el-form-item>
<el-select v-model="searchForm.competitionId" placeholder="选择赛事" clearable size="small" style="width: 200px">
<el-option label="全部赛事" :value="null" />
<el-option
v-for="item in allCompetitionOptions"
:key="item.id"
:label="item.competitionName"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="handleSearch">查询</el-button>
<el-button size="small" @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="displayList"
border
stripe
style="width: 100%"
class="data-table"
>
<el-table-column
type="index"
label="序号"
width="60"
align="center"
/>
<el-table-column
prop="playerName"
label="选手姓名"
width="120"
/>
<el-table-column
prop="competitionName"
label="所属赛事"
min-width="180"
show-overflow-tooltip
/>
<el-table-column
prop="projectName"
label="参赛项目"
width="120"
/>
<el-table-column
prop="category"
label="组别"
width="100"
/>
<el-table-column
label="性别"
width="80"
align="center"
>
<template #default="scope">
<el-tag :type="scope.row.gender === 1 ? 'primary' : 'danger'" size="small">
{{ scope.row.gender === 1 ? '男' : '女' }}
</el-tag>
</template>
</el-table-column>
<el-table-column
prop="age"
label="年龄"
width="80"
align="center"
/>
<el-table-column
prop="organization"
label="所属单位"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
prop="contactPhone"
label="联系电话"
width="120"
/>
<el-table-column
prop="orderNum"
label="出场顺序"
width="100"
align="center"
/>
<el-table-column
label="操作"
width="220"
fixed="right"
align="center"
>
<template #default="scope">
<el-button
type="primary"
link
size="small"
icon="el-icon-view"
@click="handleView(scope.row)"
>
查看
</el-button>
<el-button
type="warning"
link
size="small"
icon="el-icon-edit"
@click="handleEdit(scope.row)"
>
编辑
</el-button>
<el-button
type="danger"
link
size="small"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<el-pagination
v-if="pagination.total > 0"
@size-change="handleSizeChange"
@current-change="handlePageChange"
:current-page="pagination.current"
:page-sizes="[10, 20, 50, 100]"
:page-size="pagination.size"
:total="pagination.total"
layout="total, sizes, prev, pager, next, jumper"
style="margin-top: 20px; text-align: right"
/>
</el-card>
</div>
<!-- 表单视图 -->
<div v-else class="form-view">
<el-card shadow="hover" v-loading="loading">
<div class="page-header">
<el-button
icon="el-icon-arrow-left"
@click="backToList"
>
返回列表
</el-button>
<h2 class="page-title">{{ pageTitle }}</h2>
<div class="header-actions" v-if="currentView !== 'view'">
<el-button @click="backToList">取消</el-button>
<el-button type="primary" @click="handleSave">
{{ currentView === 'create' ? '创建' : '保存' }}
</el-button>
</div>
<div class="header-actions" v-else>
<el-button type="primary" @click="switchToEdit">编辑</el-button>
</div>
</div>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="120px"
:disabled="currentView === 'view'"
class="participant-form"
>
<!-- 基本信息 -->
<div class="form-section">
<div class="section-title">
<i class="el-icon-user"></i>
基本信息
</div>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="选手姓名" prop="playerName">
<el-input
v-model="formData.playerName"
placeholder="请输入选手姓名"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="性别" prop="gender">
<el-radio-group v-model="formData.gender">
<el-radio :label="1">男</el-radio>
<el-radio :label="2">女</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age">
<el-input-number
v-model="formData.age"
:min="6"
:max="100"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="身份证号" prop="idCard">
<el-input
v-model="formData.idCard"
placeholder="请输入身份证号"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="contactPhone">
<el-input
v-model="formData.contactPhone"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="所属单位" prop="organization">
<el-input
v-model="formData.organization"
placeholder="请输入所属单位"
/>
</el-form-item>
</div>
<!-- 赛事信息 -->
<div class="form-section">
<div class="section-title">
<i class="el-icon-trophy"></i>
赛事信息
</div>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="所属赛事" prop="competitionId">
<el-select
v-model="formData.competitionId"
placeholder="请选择赛事"
style="width: 100%"
@change="handleCompetitionChange"
>
<el-option
v-for="item in availableCompetitionOptions"
:key="item.id"
:label="item.competitionName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参赛项目" prop="projectId">
<el-select
v-model="formData.projectId"
placeholder="请选择参赛项目"
style="width: 100%"
@change="handleProjectChange"
>
<el-option
v-for="item in projectOptions"
:key="item.id"
:label="item.projectName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="组别" prop="category">
<el-input
v-model="formData.category"
placeholder="例如:成年男子组"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出场顺序" prop="orderNum">
<el-input-number
v-model="formData.orderNum"
:min="1"
:max="9999"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 其他信息 -->
<div class="form-section">
<div class="section-title">
<i class="el-icon-document"></i>
其他信息
</div>
<el-form-item label="选手简介" prop="introduction">
<el-input
v-model="formData.introduction"
type="textarea"
:rows="4"
placeholder="请输入选手简介"
maxlength="500"
show-word-limit
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
:rows="3"
placeholder="请输入备注"
/>
</el-form-item>
</div>
</el-form>
</el-card>
</div>
</div>
</template>
<script>
import { getCompetitionList } from '@/api/martial/competition'
import { getInfoPublishList } from '@/api/martial/infoPublish'
import { getProjectsByCompetition } from '@/api/martial/project'
import {
getParticipantList,
getParticipantDetail,
addParticipant,
updateParticipant,
removeParticipant
} from '@/api/martial/participant'
export default {
name: 'ParticipantManagement',
data() {
return {
loading: false,
currentView: 'list', // list, create, edit, view
participantId: null,
searchForm: {
keyword: '',
competitionId: null
},
pagination: {
current: 1,
size: 10,
total: 0
},
competitionOptions: [], // 已发布的可报名赛事列表(用于新建)
allCompetitionOptions: [], // 所有赛事列表(用于搜索和编辑)
projectOptions: [], // 项目列表
participantList: [],
formData: {
orderId: null,
competitionId: null,
competitionName: '',
playerName: '',
gender: 1,
age: null,
contactPhone: '',
organization: '',
idCard: '',
projectId: null,
category: '',
orderNum: 1,
introduction: '',
remark: '',
attachments: []
},
formRules: {
playerName: [
{ required: true, message: '请输入选手姓名', trigger: 'blur' }
],
gender: [
{ required: true, message: '请选择性别', trigger: 'change' }
],
age: [
{ required: true, message: '请输入年龄', trigger: 'blur' }
],
contactPhone: [
{ required: true, message: '请输入联系电话', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
],
competitionId: [
{ required: true, message: '请选择赛事', trigger: 'change' }
],
projectId: [
{ required: true, message: '请选择参赛项目', trigger: 'change' }
]
}
};
},
computed: {
pageTitle() {
const titleMap = {
create: '添加参赛选手',
edit: '编辑参赛选手',
view: '查看参赛选手'
};
return titleMap[this.currentView] || '参赛选手信息';
},
displayList() {
return this.participantList;
},
// 根据不同模式返回不同的赛事选项
availableCompetitionOptions() {
// 编辑和查看模式:显示所有赛事(因为可能编辑已过报名期的选手)
if (this.currentView === 'edit' || this.currentView === 'view') {
return this.allCompetitionOptions;
}
// 新建模式:只显示可报名的赛事
return this.competitionOptions;
}
},
watch: {
'$route.query': {
handler(query) {
this.initPage();
},
immediate: true
}
},
mounted() {
this.loadAvailableCompetitions();
this.loadAllCompetitions();
},
methods: {
initPage() {
const { mode, id } = this.$route.query;
this.currentView = mode || 'list';
// 不使用 parseInt,保持 ID 为字符串避免精度丢失
this.participantId = id || null;
if (this.currentView === 'list') {
this.loadParticipantList();
} else if (this.currentView !== 'list' && this.participantId) {
this.loadParticipantData();
} else if (this.currentView === 'create') {
this.resetFormData();
}
},
// 加载可报名的赛事(从已发布的信息中获取)
loadAvailableCompetitions() {
getInfoPublishList(1, 100, { isPublished: 1 })
.then(res => {
console.log('已发布信息列表返回数据:', res);
const responseData = res.data?.data;
if (responseData && responseData.records) {
const publishedCompetitionIds = new Set(
responseData.records
.filter(item => item.competitionId)
.map(item => item.competitionId)
);
console.log('已发布的赛事ID列表:', Array.from(publishedCompetitionIds));
if (publishedCompetitionIds.size > 0) {
this.loadPublishedCompetitions(Array.from(publishedCompetitionIds));
} else {
// 如果没有发布信息,直接加载所有赛事作为可报名赛事
console.log('没有已发布信息,加载所有赛事');
this.loadPublishedCompetitions([]);
}
}
})
.catch(err => {
console.error('加载已发布信息列表失败', err);
// 出错时也加载所有赛事
this.loadPublishedCompetitions([]);
});
},
// 加载已发布的赛事详细信息,并过滤出可报名的赛事
loadPublishedCompetitions(competitionIds) {
getCompetitionList(1, 100, {})
.then(res => {
console.log('赛事列表返回数据:', res);
const responseData = res.data?.data;
if (responseData && responseData.records) {
const now = new Date();
this.competitionOptions = responseData.records
.filter(item => {
// 如果没有发布信息(competitionIds为空数组),则显示所有在报名期内的赛事
if (competitionIds.length > 0 && !competitionIds.includes(item.id)) {
return false;
}
// 检查报名时间
if (!item.registrationStartTime || !item.registrationEndTime) {
return false;
}
const regStart = new Date(item.registrationStartTime);
const regEnd = new Date(item.registrationEndTime);
return now >= regStart && now <= regEnd;
})
.map(item => ({
id: item.id,
competitionName: item.competitionName,
registrationStartTime: item.registrationStartTime,
registrationEndTime: item.registrationEndTime
}));
console.log('可报名的赛事列表:', this.competitionOptions);
if (this.competitionOptions.length === 0) {
console.log('当前没有可以报名的赛事(报名时间范围外)');
}
}
})
.catch(err => {
console.error('加载赛事列表失败', err);
this.$message.error('加载赛事列表失败');
});
},
// 加载所有赛事(用于搜索过滤)
loadAllCompetitions() {
getCompetitionList(1, 100, {})
.then(res => {
const responseData = res.data?.data;
if (responseData && responseData.records) {
this.allCompetitionOptions = responseData.records.map(item => ({
id: item.id,
competitionName: item.competitionName
}));
}
})
.catch(err => {
console.error('加载所有赛事失败', err);
});
},
loadParticipantList() {
this.loading = true;
const params = {};
if (this.searchForm.keyword) {
params.playerName = this.searchForm.keyword;
}
if (this.searchForm.competitionId) {
params.competitionId = this.searchForm.competitionId;
}
getParticipantList(null, this.pagination.current, this.pagination.size, params)
.then(res => {
console.log('参赛人员列表返回数据:', res);
const responseData = res.data?.data;
if (responseData && responseData.records) {
this.participantList = responseData.records;
this.pagination.total = responseData.total || 0;
}
})
.catch(err => {
console.error('加载参赛人员列表失败', err);
this.$message.error('加载参赛人员列表失败');
})
.finally(() => {
this.loading = false;
});
},
loadParticipantData() {
if (!this.participantId) return;
this.loading = true;
getParticipantDetail(this.participantId)
.then(res => {
const detailData = res.data?.data;
if (detailData) {
this.formData = { ...detailData };
// 将 attachments 字符串转换为数组(前端需要数组格式)
if (typeof this.formData.attachments === 'string') {
try {
this.formData.attachments = JSON.parse(this.formData.attachments);
} catch (e) {
console.warn('解析 attachments 失败,使用空数组', e);
this.formData.attachments = [];
}
} else if (!this.formData.attachments) {
this.formData.attachments = [];
}
// 加载该赛事的项目列表
if (detailData.competitionId) {
this.loadProjectsByCompetition(detailData.competitionId);
}
}
})
.catch(err => {
console.error('加载参赛人员详情失败', err);
this.$message.error('加载参赛人员详情失败');
})
.finally(() => {
this.loading = false;
});
},
handlePageChange(current) {
this.pagination.current = current;
this.loadParticipantList();
},
handleSizeChange(size) {
this.pagination.size = size;
this.pagination.current = 1;
this.loadParticipantList();
},
handleSearch() {
this.pagination.current = 1;
this.loadParticipantList();
},
handleReset() {
this.searchForm = {
keyword: '',
competitionId: null
};
this.pagination.current = 1;
this.loadParticipantList();
},
handleCreate() {
this.$router.push({
path: '/martial/participant/list',
query: { mode: 'create' }
});
},
handleView(row) {
this.$router.push({
path: '/martial/participant/list',
query: { mode: 'view', id: row.id }
});
},
handleEdit(row) {
this.$router.push({
path: '/martial/participant/list',
query: { mode: 'edit', id: row.id }
});
},
switchToEdit() {
this.$router.push({
path: '/martial/participant/list',
query: { mode: 'edit', id: this.participantId }
});
},
handleDelete(row) {
this.$confirm('确定要删除该选手吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.loading = true;
removeParticipant(row.id.toString())
.then(res => {
this.$message.success('删除成功');
this.loadParticipantList();
})
.catch(err => {
console.error('删除失败', err);
this.$message.error('删除失败');
})
.finally(() => {
this.loading = false;
});
}).catch(() => {});
},
handleCompetitionChange(competitionId) {
// 从可用的选项列表中查找赛事
const competition = this.availableCompetitionOptions.find(item => item.id === competitionId);
if (competition) {
this.formData.competitionName = competition.competitionName;
}
// 加载该赛事的项目列表
this.loadProjectsByCompetition(competitionId);
// 清空已选项目
this.formData.projectId = null;
},
handleProjectChange(projectId) {
const project = this.projectOptions.find(item => item.id === projectId);
if (project) {
// 自动填充组别信息
if (project.category && !this.formData.category) {
this.formData.category = project.category;
}
}
},
loadProjectsByCompetition(competitionId) {
if (!competitionId) {
this.projectOptions = [];
return;
}
console.log('加载赛事项目,赛事ID:', competitionId);
getProjectsByCompetition(competitionId)
.then(res => {
console.log('项目列表返回数据:', res);
const responseData = res.data?.data;
// 兼容两种数据格式:分页数据(有records)和直接数组
let projectList = [];
if (responseData) {
if (Array.isArray(responseData)) {
// 直接是数组
projectList = responseData;
console.log('返回的是直接数组,长度:', projectList.length);
} else if (responseData.records && Array.isArray(responseData.records)) {
// 分页数据
projectList = responseData.records;
console.log('返回的是分页数据,记录数:', projectList.length);
} else {
console.warn('未知的数据格式:', responseData);
}
}
if (projectList.length > 0) {
this.projectOptions = projectList.map(item => ({
id: item.id,
projectName: item.projectName,
projectCode: item.projectCode,
category: item.category
}));
console.log('可选项目列表:', this.projectOptions);
} else {
this.projectOptions = [];
console.log('该赛事没有项目数据');
this.$message.warning('该赛事还没有配置项目,请先添加项目');
}
})
.catch(err => {
console.error('加载项目列表失败', err);
this.$message.error('加载项目列表失败: ' + (err.message || '未知错误'));
this.projectOptions = [];
});
},
handleSave() {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.loading = true;
// 确保有赛事名称
if (!this.formData.competitionName) {
const competition = this.availableCompetitionOptions.find(item => item.id === this.formData.competitionId);
if (competition) {
this.formData.competitionName = competition.competitionName;
}
}
const submitData = { ...this.formData };
console.log('=== 提交前的 formData ===', this.formData);
console.log('formData.orderId:', this.formData.orderId);
// 将 attachments 数组转换为 JSON 字符串(后端需要 String 类型)
if (Array.isArray(submitData.attachments)) {
submitData.attachments = JSON.stringify(submitData.attachments);
}
// 临时方案: 如果没有 orderId,使用 competitionId 作为 orderId
// 警告: 这是临时解决方案,后续应修改数据库表结构或后端逻辑
if (!submitData.orderId && submitData.competitionId) {
submitData.orderId = submitData.competitionId;
console.warn('⚠️ 临时方案: 使用 competitionId 作为 orderId', submitData.competitionId);
}
console.log('=== 提交的数据 submitData ===', submitData);
console.log('submitData.orderId:', submitData.orderId);
if (this.currentView === 'create') {
// 新建
addParticipant(submitData)
.then(res => {
this.$message.success('添加成功');
this.backToList();
})
.catch(err => {
console.error('添加失败', err);
this.$message.error('添加失败');
})
.finally(() => {
this.loading = false;
});
} else if (this.currentView === 'edit') {
// 编辑
submitData.id = this.participantId;
updateParticipant(submitData)
.then(res => {
this.$message.success('保存成功');
this.backToList();
})
.catch(err => {
console.error('保存失败', err);
this.$message.error('保存失败');
})
.finally(() => {
this.loading = false;
});
}
} else {
this.$message.error('请完善必填信息');
}
});
},
backToList() {
this.$router.push({
path: '/martial/participant/list'
});
},
resetFormData() {
this.formData = {
orderId: null,
competitionId: null,
competitionName: '',
playerName: '',
gender: 1,
age: null,
contactPhone: '',
organization: '',
idCard: '',
projectId: null,
category: '',
orderNum: 1,
introduction: '',
remark: '',
attachments: []
};
}
}
};
</script>
<style lang="scss" scoped>
.participant-container {
padding: 20px;
background: #fff;
border-radius: 8px;
min-height: calc(100vh - 120px);
}
.list-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: 2px solid #f0f0f0;
}
.page-title {
margin: 0;
font-size: 24px;
font-weight: 600;
color: #333;
}
.search-form {
margin-bottom: 20px;
}
.data-table {
:deep(.el-table__header) {
th {
background-color: #fafafa;
color: #333;
font-weight: 600;
}
}
:deep(.el-button--text) {
padding: 0 8px;
}
}
.page-header {
display: flex;
align-items: center;
gap: 20px;
margin-bottom: 30px;
padding-bottom: 20px;
border-bottom: 2px solid #f0f0f0;
.page-title {
flex: 1;
margin: 0;
font-size: 24px;
font-weight: 600;
color: #333;
}
.header-actions {
display: flex;
gap: 10px;
}
}
.participant-form {
max-width: 1200px;
}
.form-section {
margin-bottom: 30px;
padding: 20px;
background: #fafafa;
border-radius: 8px;
&:last-child {
margin-bottom: 0;
}
}
.section-title {
display: flex;
align-items: center;
gap: 8px;
margin-bottom: 20px;
font-size: 16px;
font-weight: 600;
color: #333;
i {
color: #dc2626;
font-size: 18px;
}
}
:deep(.el-form-item) {
margin-bottom: 18px;
}
</style>
+128 -129
View File
@@ -28,12 +28,17 @@
/>
</el-form-item>
<el-form-item label="分组类别">
<el-input
<el-select
v-model="queryParams.category"
placeholder="请输入分组类别"
placeholder="请选择分组类别"
clearable
style="width: 150px"
/>
>
<el-option label="男子" value="1" />
<el-option label="女子" value="2" />
<el-option label="团体" value="3" />
<el-option label="混合" value="4" />
</el-select>
</el-form-item>
<el-form-item label="项目类型">
<el-select
@@ -42,21 +47,10 @@
clearable
style="width: 150px"
>
<el-option label="套路" :value="1" />
<el-option label="散打" :value="2" />
<el-option label="器械" :value="3" />
<el-option label="对练" :value="4" />
</el-select>
</el-form-item>
<el-form-item label="参赛类型">
<el-select
v-model="queryParams.type"
placeholder="请选择参赛类型"
clearable
style="width: 150px"
>
<el-option label="单人" :value="1" />
<el-option label="集体" :value="2" />
<el-option label="套路" value="1" />
<el-option label="散打" value="2" />
<el-option label="器械" value="3" />
<el-option label="对练" value="4" />
</el-select>
</el-form-item>
<el-form-item>
@@ -128,56 +122,60 @@
min-width="180"
show-overflow-tooltip
/>
<el-table-column label="所属赛事" min-width="150" show-overflow-tooltip>
<template #default="{ row }">
{{ getCompetitionName(row.competitionId) }}
</template>
</el-table-column>
<el-table-column
prop="competitionName"
label="所属赛事"
min-width="150"
show-overflow-tooltip
/>
<el-table-column prop="category" label="分组类别" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.category == 1" type="primary" size="small">男子</el-tag>
<el-tag v-else-if="row.category == 2" type="danger" size="small">女子</el-tag>
<el-tag v-else-if="row.category == 3" type="success" size="small">混合</el-tag>
<span v-else>-</span>
<el-tag v-if="row.category === 1" type="primary">男子</el-tag>
<el-tag v-else-if="row.category === 2" type="danger">女子</el-tag>
<el-tag v-else-if="row.category === 3" type="success">团体</el-tag>
<el-tag v-else-if="row.category === 4" type="warning">混合</el-tag>
</template>
</el-table-column>
<el-table-column prop="eventType" label="项目类型" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.eventType === 1" type="primary" size="small">套路</el-tag>
<el-tag v-else-if="row.eventType === 2" type="danger" size="small">散打</el-tag>
<el-tag v-else-if="row.eventType === 3" type="success" size="small">器械</el-tag>
<el-tag v-else-if="row.eventType === 4" type="warning" size="small">对练</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="type" label="参赛类型" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.type === 1" type="success" size="small">单人</el-tag>
<el-tag v-else-if="row.type === 2" type="warning" size="small">集体</el-tag>
<span v-if="row.eventType === 1">套路</span>
<span v-else-if="row.eventType === 2">散打</span>
<span v-else-if="row.eventType === 3">器械</span>
<span v-else-if="row.eventType === 4">对练</span>
</template>
</el-table-column>
<el-table-column
prop="price"
prop="registrationFee"
label="报名费(元)"
width="110"
align="center"
>
<template #default="{ row }">
<span style="color: #f56c6c">¥{{ row.price || 0 }}</span>
<span style="color: #f56c6c">¥{{ row.registrationFee || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="estimatedDuration" label="预计时长" width="100" align="center">
<el-table-column label="报名时间" width="180" align="center">
<template #default="{ row }">
<span>{{ row.estimatedDuration || 5 }}分钟</span>
<div v-if="row.registrationStartTime && row.registrationEndTime">
<div style="font-size: 12px">
{{ formatDate(row.registrationStartTime) }}
</div>
<div style="font-size: 12px"></div>
<div style="font-size: 12px">
{{ formatDate(row.registrationEndTime) }}
</div>
</div>
<span v-else style="color: #909399">未设置</span>
</template>
</el-table-column>
<el-table-column label="单位容纳人数" width="120" align="center">
<el-table-column label="报名人数" width="120" align="center">
<template #default="{ row }">
{{ row.maxParticipants || 0 }}
<span :style="{ color: row.currentCount >= row.maxParticipants ? '#f56c6c' : '#67c23a' }">
{{ row.currentCount || 0 }}
</span>
/ {{ row.maxParticipants || 0 }}
</template>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
@@ -249,6 +247,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="项目编码" prop="projectCode">
<el-input
v-model="form.projectCode"
placeholder="请输入项目编码"
maxlength="50"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
@@ -290,31 +297,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参赛类型" prop="type">
<el-select
v-model="form.type"
placeholder="请选择参赛类型"
style="width: 100%"
>
<el-option label="单人" :value="1" />
<el-option label="集体" :value="2" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="预计时长(分钟)" prop="estimatedDuration">
<el-input-number
v-model="form.estimatedDuration"
:min="1"
:max="120"
placeholder="每人/队预计比赛时长"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报名费(元)" prop="registrationFee">
<el-input-number
@@ -329,7 +311,33 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单位容纳人数" prop="maxParticipants">
<el-form-item label="报名开始时间" prop="registrationStartTime">
<el-date-picker
v-model="form.registrationStartTime"
type="datetime"
placeholder="选择开始时间"
style="width: 100%"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报名结束时间" prop="registrationEndTime">
<el-date-picker
v-model="form.registrationEndTime"
type="datetime"
placeholder="选择结束时间"
style="width: 100%"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="最大参赛人数" prop="maxParticipants">
<el-input-number
v-model="form.maxParticipants"
:min="1"
@@ -387,7 +395,7 @@
{{ detailData.projectName }}
</el-descriptions-item>
<el-descriptions-item label="所属赛事">
{{ getCompetitionName(detailData.competitionId) }}
{{ detailData.competitionName }}
</el-descriptions-item>
<el-descriptions-item label="分组类别">
<el-tag v-if="detailData.category === 1" type="primary">男子</el-tag>
@@ -401,19 +409,21 @@
<span v-else-if="detailData.eventType === 3">器械</span>
<span v-else-if="detailData.eventType === 4">对练</span>
</el-descriptions-item>
<el-descriptions-item label="参赛类型">
<el-tag v-if="detailData.type === 1" type="success" size="small">单人</el-tag>
<el-tag v-else-if="detailData.type === 2" type="warning" size="small">集体</el-tag>
</el-descriptions-item>
<el-descriptions-item label="报名费">
<span style="color: #f56c6c; font-weight: bold">
¥{{ detailData.registrationFee || 0 }}
</span>
</el-descriptions-item>
<el-descriptions-item label="单位容纳人数">
<el-descriptions-item label="报名开始时间">
{{ formatDate(detailData.registrationStartTime) }}
</el-descriptions-item>
<el-descriptions-item label="报名结束时间">
{{ formatDate(detailData.registrationEndTime) }}
</el-descriptions-item>
<el-descriptions-item label="最大参赛人数">
{{ detailData.maxParticipants }}
</el-descriptions-item>
<el-descriptions-item label="报名人数">
<el-descriptions-item label="当前报名人数">
<span :style="{
color: detailData.currentCount >= detailData.maxParticipants ? '#f56c6c' : '#67c23a',
fontWeight: 'bold'
@@ -450,7 +460,8 @@ import {
} from '@element-plus/icons-vue'
import {
getProjectList,
submitProject,
addProject,
updateProject,
removeProject,
importProjects,
exportProjects
@@ -479,8 +490,7 @@ const queryParams = reactive({
competitionId: '',
projectName: '',
category: '',
eventType: '',
type: ''
eventType: ''
})
// 表单数据
@@ -491,9 +501,9 @@ const form = reactive({
projectName: '',
category: null,
eventType: null,
type: null,
estimatedDuration: 5,
registrationFee: 0,
registrationStartTime: '',
registrationEndTime: '',
maxParticipants: 100,
sortOrder: 0,
rules: '',
@@ -515,6 +525,10 @@ const rules = {
competitionId: [
{ required: true, message: '请选择所属赛事', trigger: 'change' }
],
projectCode: [
{ required: true, message: '请输入项目编码', trigger: 'blur' },
{ min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
],
projectName: [
{ required: true, message: '请输入项目名称', trigger: 'blur' },
{ min: 2, max: 100, message: '长度在 2 到 100 个字符', trigger: 'blur' }
@@ -525,26 +539,36 @@ const rules = {
eventType: [
{ required: true, message: '请选择项目类型', trigger: 'change' }
],
estimatedDuration: [
{ required: true, message: '请输入预计时长', trigger: 'blur' }
],
type: [
{ required: true, message: '请选择参赛类型', trigger: 'change' }
],
registrationFee: [
{ required: true, message: '请输入报名费', trigger: 'blur' }
],
registrationStartTime: [
{ required: true, message: '请选择报名开始时间', trigger: 'change' }
],
registrationEndTime: [
{ required: true, message: '请选择报名结束时间', trigger: 'change' },
{
validator: (rule, value, callback) => {
if (value && form.registrationStartTime && value <= form.registrationStartTime) {
callback(new Error('结束时间必须大于开始时间'))
} else {
callback()
}
},
trigger: 'change'
}
],
maxParticipants: [
{ required: true, message: '请输入单位容纳人数', trigger: 'blur' }
{ required: true, message: '请输入最大参赛人数', trigger: 'blur' }
]
}
// 加载赛事列表
const loadCompetitionList = async () => {
try {
const res = await getCompetitionList(1, 1000, {})
if (res.data && res.data.data && res.data.data.records) {
competitionList.value = res.data.data.records
const res = await getCompetitionList(1, 1000, { status: 1 })
if (res.data && res.data.records) {
competitionList.value = res.data.records
}
} catch (error) {
console.error('加载赛事列表失败:', error)
@@ -555,22 +579,14 @@ const loadCompetitionList = async () => {
const fetchData = async () => {
loading.value = true
try {
// Only pass parameters that backend supports
const params = {
competitionId: queryParams.competitionId || undefined,
projectName: queryParams.projectName || undefined,
category: queryParams.category || undefined,
eventType: queryParams.eventType || undefined,
type: queryParams.type || undefined
}
const res = await getProjectList(
queryParams.current,
queryParams.size,
params
queryParams
)
if (res.data && res.data.data) {
tableData.value = res.data.data.records || []
total.value = res.data.data.total || 0
if (res.data) {
tableData.value = res.data.records || []
total.value = res.data.total || 0
}
} catch (error) {
ElMessage.error('获取数据失败')
@@ -594,8 +610,7 @@ const handleReset = () => {
competitionId: '',
projectName: '',
category: '',
eventType: '',
type: ''
eventType: ''
})
fetchData()
}
@@ -608,15 +623,11 @@ const handleAdd = () => {
}
// 编辑
const handleEdit = async (row) => {
const handleEdit = (row) => {
dialogTitle.value = '编辑项目'
Object.keys(form).forEach((key) => {
form[key] = row[key]
})
// 处理字段名映射:后端返回 price,表单使用 registrationFee
if (row.price !== undefined) {
form.registrationFee = row.price
}
dialogVisible.value = true
}
@@ -673,16 +684,11 @@ const handleSubmit = async () => {
if (valid) {
submitLoading.value = true
try {
// 构建提交数据,确保字段名与后端一致
const submitData = {
...form,
price: form.registrationFee // 后端使用 price 字段
}
if (form.id) {
await submitProject(submitData)
await updateProject(form)
ElMessage.success('修改成功')
} else {
await submitProject(submitData)
await addProject(form)
ElMessage.success('新增成功')
}
dialogVisible.value = false
@@ -715,9 +721,9 @@ const resetForm = () => {
projectName: '',
category: null,
eventType: null,
type: null,
estimatedDuration: 5,
registrationFee: 0,
registrationStartTime: '',
registrationEndTime: '',
maxParticipants: 100,
sortOrder: 0,
rules: '',
@@ -782,13 +788,6 @@ const handleExport = async () => {
}
}
// 根据ID获取赛事名称
const getCompetitionName = (competitionId) => {
if (!competitionId) return '-'
const competition = competitionList.value.find(item => item.id === competitionId)
return competition ? competition.competitionName : '-'
}
// 格式化日期
const formatDate = (date) => {
if (!date) return '-'
-931
View File
@@ -1,931 +0,0 @@
<template>
<div class="project-container">
<!-- 搜索区域 -->
<el-card shadow="never" class="search-card">
<el-form :inline="true" :model="queryParams" class="search-form">
<el-form-item label="赛事">
<el-select
v-model="queryParams.competitionId"
placeholder="请选择赛事"
clearable
filterable
style="width: 200px"
>
<el-option
v-for="item in competitionList"
:key="item.id"
:label="item.competitionName"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="项目名称">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
style="width: 200px"
/>
</el-form-item>
<el-form-item label="分组类别">
<el-input
v-model="queryParams.category"
placeholder="请输入分组类别"
clearable
style="width: 150px"
/>
</el-form-item>
<el-form-item label="项目类型">
<el-select
v-model="queryParams.eventType"
placeholder="请选择项目类型"
clearable
style="width: 150px"
>
<el-option label="套路" :value="1" />
<el-option label="散打" :value="2" />
<el-option label="器械" :value="3" />
<el-option label="对练" :value="4" />
</el-select>
</el-form-item>
<el-form-item label="参赛类型">
<el-select
v-model="queryParams.type"
placeholder="请选择参赛类型"
clearable
style="width: 150px"
>
<el-option label="单人" :value="1" />
<el-option label="集体" :value="2" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" :icon="Search" @click="handleSearch">
查询
</el-button>
<el-button :icon="Refresh" @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<!-- 工具栏 -->
<el-card shadow="never" class="toolbar-card">
<div class="toolbar">
<div class="toolbar-left">
<el-button type="primary" :icon="Plus" @click="handleAdd">
新增项目
</el-button>
<el-button
type="danger"
:icon="Delete"
:disabled="!selection.length"
@click="handleBatchDelete"
>
批量删除
</el-button>
<el-upload
:action="uploadUrl"
:headers="uploadHeaders"
:before-upload="beforeUpload"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
:show-file-list="false"
accept=".xlsx,.xls"
>
<el-button type="success" :icon="Upload">导入Excel</el-button>
</el-upload>
<el-button type="warning" :icon="Download" @click="handleExport">
导出Excel
</el-button>
</div>
<div class="toolbar-right">
<el-tooltip content="刷新" placement="top">
<el-button circle :icon="Refresh" @click="fetchData" />
</el-tooltip>
</div>
</div>
</el-card>
<!-- 数据表格 -->
<el-card shadow="never" class="table-card">
<el-table
v-loading="loading"
:data="tableData"
stripe
border
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
prop="projectCode"
label="项目编码"
width="120"
align="center"
/>
<el-table-column
prop="projectName"
label="项目名称"
min-width="180"
show-overflow-tooltip
/>
<el-table-column label="所属赛事" min-width="150" show-overflow-tooltip>
<template #default="{ row }">
{{ getCompetitionName(row.competitionId) }}
</template>
</el-table-column>
<el-table-column prop="category" label="分组类别" width="100" align="center">
<template #default="{ row }">
<span>{{ row.category || '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="eventType" label="项目类型" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.eventType === 1" type="primary" size="small">套路</el-tag>
<el-tag v-else-if="row.eventType === 2" type="danger" size="small">散打</el-tag>
<el-tag v-else-if="row.eventType === 3" type="success" size="small">器械</el-tag>
<el-tag v-else-if="row.eventType === 4" type="warning" size="small">对练</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="type" label="参赛类型" width="100" align="center">
<template #default="{ row }">
<el-tag v-if="row.type === 1" type="success" size="small">单人</el-tag>
<el-tag v-else-if="row.type === 2" type="warning" size="small">集体</el-tag>
</template>
</el-table-column>
<el-table-column
prop="price"
label="报名费(元)"
width="110"
align="center"
>
<template #default="{ row }">
<span style="color: #f56c6c">¥{{ row.price || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="estimatedDuration" label="预计时长" width="100" align="center">
<template #default="{ row }">
<span>{{ row.estimatedDuration || 5 }}分钟</span>
</template>
</el-table-column>
<el-table-column label="单位容纳人数" width="120" align="center">
<template #default="{ row }">
{{ row.maxParticipants || 0 }}
</template>
</el-table-column>
<el-table-column label="所属场地" width="120" align="center">
<template #default="{ row }">
<span>{{ getVenueName(row.venueId) }}</span>
</template>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
width="160"
align="center"
>
<template #default="{ row }">
{{ formatDate(row.createTime) }}
</template>
</el-table-column>
<el-table-column label="操作" width="200" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" :icon="Edit" @click="handleEdit(row)">
编辑
</el-button>
<el-button link type="primary" :icon="View" @click="handleView(row)">
查看
</el-button>
<el-button link type="danger" :icon="Delete" @click="handleDelete(row)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<div class="pagination-container">
<el-pagination
v-model:current-page="queryParams.current"
v-model:page-size="queryParams.size"
:page-sizes="[10, 20, 50, 100]"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="fetchData"
@current-change="fetchData"
/>
</div>
</el-card>
<!-- 新增/编辑弹窗 -->
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="800px"
:close-on-click-modal="false"
@close="handleDialogClose"
>
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-width="120px"
>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="所属赛事" prop="competitionId">
<el-select
v-model="form.competitionId"
placeholder="请选择赛事"
filterable
style="width: 100%"
@change="handleCompetitionChangeInForm"
>
<el-option
v-for="item in competitionList"
:key="item.id"
:label="item.competitionName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属场地" prop="venueId">
<el-select
v-model="form.venueId"
placeholder="请选择场地"
clearable
style="width: 100%"
>
<el-option
v-for="item in venueList"
:key="item.id"
:label="item.venueName"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目编码" prop="projectCode">
<el-input
v-model="form.projectCode"
placeholder="请输入项目编码"
maxlength="50"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="form.projectName"
placeholder="请输入项目名称"
maxlength="100"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="分组类别" prop="category">
<el-select
v-model="form.category"
placeholder="请选择分组类别"
style="width: 100%"
>
<el-option label="男子" :value="1" />
<el-option label="女子" :value="2" />
<el-option label="团体" :value="3" />
<el-option label="混合" :value="4" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="项目类型" prop="eventType">
<el-select
v-model="form.eventType"
placeholder="请选择项目类型"
style="width: 100%"
>
<el-option label="套路" :value="1" />
<el-option label="散打" :value="2" />
<el-option label="器械" :value="3" />
<el-option label="对练" :value="4" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="参赛类型" prop="type">
<el-select
v-model="form.type"
placeholder="请选择参赛类型"
style="width: 100%"
>
<el-option label="单人" :value="1" />
<el-option label="集体" :value="2" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="预计时长(分钟)" prop="estimatedDuration">
<el-input-number
v-model="form.estimatedDuration"
:min="1"
:max="120"
placeholder="每人/队预计比赛时长"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="报名费(元)" prop="registrationFee">
<el-input-number
v-model="form.registrationFee"
:min="0"
:precision="2"
:step="10"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单位容纳人数" prop="maxParticipants">
<el-input-number
v-model="form.maxParticipants"
:min="1"
:max="1000"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="排序序号" prop="sortOrder">
<el-input-number
v-model="form.sortOrder"
:min="0"
style="width: 100%"
/>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="比赛规则" prop="rules">
<el-input
v-model="form.rules"
type="textarea"
:rows="4"
placeholder="请输入比赛规则说明"
maxlength="500"
show-word-limit
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
:rows="3"
placeholder="请输入备注信息"
maxlength="200"
show-word-limit
/>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" :loading="submitLoading" @click="handleSubmit">
确定
</el-button>
</template>
</el-dialog>
<!-- 查看详情弹窗 -->
<el-dialog v-model="detailVisible" title="项目详情" width="700px">
<el-descriptions :column="2" border>
<el-descriptions-item label="项目编码">
{{ detailData.projectCode }}
</el-descriptions-item>
<el-descriptions-item label="项目名称">
{{ detailData.projectName }}
</el-descriptions-item>
<el-descriptions-item label="所属赛事">
{{ getCompetitionName(detailData.competitionId) }}
</el-descriptions-item>
<el-descriptions-item label="分组类别">
<el-tag v-if="detailData.category === 1" type="primary">男子</el-tag>
<el-tag v-else-if="detailData.category === 2" type="danger">女子</el-tag>
<el-tag v-else-if="detailData.category === 3" type="success">团体</el-tag>
<el-tag v-else-if="detailData.category === 4" type="warning">混合</el-tag>
</el-descriptions-item>
<el-descriptions-item label="项目类型">
<span v-if="detailData.eventType === 1">套路</span>
<span v-else-if="detailData.eventType === 2">散打</span>
<span v-else-if="detailData.eventType === 3">器械</span>
<span v-else-if="detailData.eventType === 4">对练</span>
</el-descriptions-item>
<el-descriptions-item label="参赛类型">
<el-tag v-if="detailData.type === 1" type="success" size="small">单人</el-tag>
<el-tag v-else-if="detailData.type === 2" type="warning" size="small">集体</el-tag>
</el-descriptions-item>
<el-descriptions-item label="报名费">
<span style="color: #f56c6c; font-weight: bold">
¥{{ detailData.registrationFee || 0 }}
</span>
</el-descriptions-item>
<el-descriptions-item label="单位容纳人数">
{{ detailData.maxParticipants }}
</el-descriptions-item>
<el-descriptions-item label="已报名人数">
<span :style="{
color: detailData.currentCount >= detailData.maxParticipants ? '#f56c6c' : '#67c23a',
fontWeight: 'bold'
}">
{{ detailData.currentCount || 0 }}
</span>
</el-descriptions-item>
<el-descriptions-item label="创建时间" :span="2">
{{ formatDate(detailData.createTime) }}
</el-descriptions-item>
<el-descriptions-item label="比赛规则" :span="2">
{{ detailData.rules || '暂无' }}
</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">
{{ detailData.remark || '暂无' }}
</el-descriptions-item>
</el-descriptions>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, onMounted, computed } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import {
Search,
Refresh,
Plus,
Delete,
Edit,
View,
Upload,
Download
} from '@element-plus/icons-vue'
import {
getProjectList,
submitProject,
removeProject,
importProjects,
exportProjects
} from '@/api/martial/project'
import { getCompetitionList } from '@/api/martial/competition'
import { getVenuesByCompetition } from '@/api/martial/venue'
import { getToken } from '@/utils/auth'
import dayjs from 'dayjs'
// 数据定义
const loading = ref(false)
const submitLoading = ref(false)
const tableData = ref([])
const total = ref(0)
const selection = ref([])
const competitionList = ref([])
const venueList = ref([])
const allVenuesCache = ref(new Map()) // 全局场地缓存
const dialogVisible = ref(false)
const detailVisible = ref(false)
const dialogTitle = ref('')
const formRef = ref(null)
const detailData = ref({})
// 查询参数
const queryParams = reactive({
current: 1,
size: 10,
competitionId: '',
projectName: '',
category: '',
eventType: '',
type: ''
})
// 表单数据
const form = reactive({
id: null,
competitionId: '',
venueId: null,
projectCode: '',
projectName: '',
category: null,
eventType: null,
type: null,
estimatedDuration: 5,
registrationFee: 0,
maxParticipants: 100,
sortOrder: 0,
rules: '',
remark: ''
})
// 上传配置
const uploadUrl = computed(() => {
return import.meta.env.VITE_APP_BASE_URL + '/api/blade-martial/project/import'
})
const uploadHeaders = computed(() => {
return {
'Blade-Auth': 'bearer ' + getToken()
}
})
// 表单验证规则
const rules = {
competitionId: [
{ required: true, message: '请选择所属赛事', trigger: 'change' }
],
projectCode: [
{ required: true, message: '请输入项目编码', trigger: 'blur' },
{ min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
],
projectName: [
{ required: true, message: '请输入项目名称', trigger: 'blur' },
{ min: 2, max: 100, message: '长度在 2 到 100 个字符', trigger: 'blur' }
],
category: [
{ required: true, message: '请选择分组类别', trigger: 'change' }
],
eventType: [
{ required: true, message: '请选择项目类型', trigger: 'change' }
],
estimatedDuration: [
{ required: true, message: '请输入预计时长', trigger: 'blur' }
],
type: [
{ required: true, message: '请选择参赛类型', trigger: 'change' }
],
registrationFee: [
{ required: true, message: '请输入报名费', trigger: 'blur' }
],
maxParticipants: [
{ required: true, message: '请输入单位容纳人数', trigger: 'blur' }
]
}
// 加载赛事列表
const loadCompetitionList = async () => {
try {
const res = await getCompetitionList(1, 1000, {})
if (res.data && res.data.data && res.data.data.records) {
competitionList.value = res.data.data.records
}
} catch (error) {
console.error('加载赛事列表失败:', error)
}
}
// 表单中赛事变更时加载场地列表
const handleCompetitionChangeInForm = async (competitionId) => {
form.venueId = null
venueList.value = []
if (competitionId) {
try {
const res = await getVenuesByCompetition(competitionId)
venueList.value = res.data?.data?.records || []
} catch (error) {
console.error('加载场地列表失败:', error)
}
}
}
// 查询数据
const fetchData = async () => {
loading.value = true
try {
// Only pass parameters that backend supports
const params = {
competitionId: queryParams.competitionId || undefined,
projectName: queryParams.projectName || undefined,
category: queryParams.category || undefined,
eventType: queryParams.eventType || undefined,
type: queryParams.type || undefined
}
const res = await getProjectList(
queryParams.current,
queryParams.size,
params
)
if (res.data && res.data.data) {
tableData.value = res.data.data.records || []
total.value = res.data.data.total || 0
// 加载项目对应的场地信息
await loadVenuesForProjects(tableData.value)
}
} catch (error) {
ElMessage.error('获取数据失败')
console.error(error)
} finally {
loading.value = false
}
}
// 加载项目对应的场地信息
const loadVenuesForProjects = async (projects) => {
// 获取所有不同的赛事ID
const competitionIds = [...new Set(projects.map(p => p.competitionId).filter(Boolean))]
for (const compId of competitionIds) {
try {
const res = await getVenuesByCompetition(compId)
const venues = res.data?.data?.records || []
// 缓存场地信息
venues.forEach(v => {
allVenuesCache.value.set(v.id, v.venueName)
})
} catch (err) {
console.error('加载场地失败:', err)
}
}
}
// 搜索
const handleSearch = () => {
queryParams.current = 1
fetchData()
}
// 重置
const handleReset = () => {
Object.assign(queryParams, {
current: 1,
size: 10,
competitionId: '',
projectName: '',
category: '',
eventType: '',
type: ''
})
fetchData()
}
// 新增
const handleAdd = () => {
dialogTitle.value = '新增项目'
resetForm()
dialogVisible.value = true
}
// 编辑
const handleEdit = async (row) => {
dialogTitle.value = '编辑项目'
Object.keys(form).forEach((key) => {
form[key] = row[key]
})
// 处理字段名映射:后端返回 price,表单使用 registrationFee
if (row.price !== undefined) {
form.registrationFee = row.price
}
// 加载该赛事的场地列表
if (row.competitionId) {
try {
const res = await getVenuesByCompetition(row.competitionId)
venueList.value = res.data?.data?.records || []
} catch (error) {
console.error('加载场地列表失败:', error)
}
}
dialogVisible.value = true
}
// 查看
const handleView = (row) => {
detailData.value = { ...row }
detailVisible.value = true
}
// 删除
const handleDelete = (row) => {
ElMessageBox.confirm('确定要删除该项目吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
try {
await removeProject(row.id)
ElMessage.success('删除成功')
fetchData()
} catch (error) {
ElMessage.error('删除失败')
}
})
.catch(() => {})
}
// 批量删除
const handleBatchDelete = () => {
ElMessageBox.confirm(`确定要删除选中的 ${selection.value.length} 个项目吗?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(async () => {
try {
const ids = selection.value.map((item) => item.id).join(',')
await removeProject(ids)
ElMessage.success('删除成功')
fetchData()
} catch (error) {
ElMessage.error('删除失败')
}
})
.catch(() => {})
}
// 提交表单
const handleSubmit = async () => {
if (!formRef.value) return
await formRef.value.validate(async (valid) => {
if (valid) {
submitLoading.value = true
try {
// 构建提交数据,确保字段名与后端一致
const submitData = {
...form,
price: form.registrationFee // 后端使用 price 字段
}
if (form.id) {
await submitProject(submitData)
ElMessage.success('修改成功')
} else {
await submitProject(submitData)
ElMessage.success('新增成功')
}
dialogVisible.value = false
fetchData()
} catch (error) {
ElMessage.error(form.id ? '修改失败' : '新增失败')
} finally {
submitLoading.value = false
}
}
})
}
// 选择变化
const handleSelectionChange = (val) => {
selection.value = val
}
// 关闭弹窗
const handleDialogClose = () => {
resetForm()
}
// 重置表单
const resetForm = () => {
Object.assign(form, {
id: null,
competitionId: '',
projectCode: '',
projectName: '',
category: null,
eventType: null,
type: null,
estimatedDuration: 5,
registrationFee: 0,
maxParticipants: 100,
sortOrder: 0,
rules: '',
remark: ''
})
if (formRef.value) {
formRef.value.clearValidate()
}
}
// 上传前检查
const beforeUpload = (file) => {
if (!queryParams.competitionId) {
ElMessage.warning('请先选择赛事')
return false
}
const isExcel =
file.type === 'application/vnd.ms-excel' ||
file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
if (!isExcel) {
ElMessage.error('只能上传 Excel 文件!')
return false
}
const isLt5M = file.size / 1024 / 1024 < 5
if (!isLt5M) {
ElMessage.error('文件大小不能超过 5MB!')
return false
}
return true
}
// 上传成功
const handleUploadSuccess = (response) => {
if (response.success) {
ElMessage.success('导入成功')
fetchData()
} else {
ElMessage.error(response.msg || '导入失败')
}
}
// 上传失败
const handleUploadError = () => {
ElMessage.error('导入失败')
}
// 导出
const handleExport = async () => {
try {
const res = await exportProjects(queryParams)
const blob = new Blob([res], {
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
})
const link = document.createElement('a')
link.href = window.URL.createObjectURL(blob)
link.download = `项目列表_${dayjs().format('YYYYMMDDHHmmss')}.xlsx`
link.click()
window.URL.revokeObjectURL(link.href)
ElMessage.success('导出成功')
} catch (error) {
ElMessage.error('导出失败')
}
}
// 根据ID获取赛事名称
const getCompetitionName = (competitionId) => {
if (!competitionId) return '-'
const competition = competitionList.value.find(item => item.id === competitionId)
return competition ? competition.competitionName : '-'
}
const getVenueName = (venueId) => {
if (!venueId) return '-'
// 先从当前场地列表查找
let venue = venueList.value.find(item => item.id === venueId)
if (venue) return venue.venueName
// 再从全局缓存查找
if (allVenuesCache.value.has(venueId)) {
return allVenuesCache.value.get(venueId)
}
return '-'
}
// 格式化日期
const formatDate = (date) => {
if (!date) return '-'
return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
}
// 生命周期
onMounted(() => {
loadCompetitionList()
fetchData()
})
</script>
<style scoped lang="scss">
.project-container {
padding: 20px;
.search-card,
.toolbar-card,
.table-card {
margin-bottom: 20px;
}
.search-form {
.el-form-item {
margin-bottom: 0;
}
}
.toolbar {
display: flex;
justify-content: space-between;
align-items: center;
.toolbar-left {
display: flex;
gap: 10px;
}
}
.pagination-container {
margin-top: 20px;
display: flex;
justify-content: flex-end;
}
}
</style>
+6 -18
View File
@@ -33,9 +33,8 @@
<el-form-item>
<el-select v-model="searchForm.refereeType" placeholder="裁判类型" clearable size="small" style="width: 150px">
<el-option label="全部" :value="null"></el-option>
<el-option label="裁判" :value="1"></el-option>
<el-option label="裁判" :value="2"></el-option>
<el-option label="总裁" :value="3"></el-option>
<el-option label="裁判" :value="1"></el-option>
<el-option label="普通裁判" :value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
@@ -64,8 +63,8 @@
<el-table-column prop="idCard" label="身份证号" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="refereeType" label="裁判类型" width="100" align="center">
<template #default="scope">
<el-tag :type="scope.row.refereeType === 1 ? 'danger' : (scope.row.refereeType === 3 ? 'warning' : 'primary')" size="small">
{{ scope.row.refereeType === 1 ? '主裁判' : (scope.row.refereeType === 3 ? '总裁' : '裁判') }}
<el-tag :type="scope.row.refereeType === 1 ? 'danger' : 'primary'" size="small">
{{ scope.row.refereeType === 1 ? '主裁判' : '普通裁判' }}
</el-tag>
</template>
</el-table-column>
@@ -138,24 +137,13 @@
<el-form-item label="裁判类型" prop="refereeType">
<el-select v-model="formData.refereeType" placeholder="请选择裁判类型" style="width: 100%">
<el-option label="主裁判" :value="1"></el-option>
<el-option label="裁判" :value="2"></el-option>
<el-option label="总裁" :value="3"></el-option>
<el-option label="普通裁判" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="等级/职称" prop="level">
<el-select
v-model="formData.level"
placeholder="请选择等级"
clearable
style="width: 130px"
>
<el-option label="国家级" value="国家级" />
<el-option label="一级" value="一级" />
<el-option label="二级" value="二级" />
<el-option label="三级" value="三级" />
</el-select>
<el-input v-model="formData.level" placeholder="请输入等级/职称" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
+41 -78
View File
@@ -101,10 +101,12 @@
<div v-if="scope.row.hint" class="row-hint">{{ scope.row.hint }}</div>
</template>
</el-table-column>
<el-table-column prop="singleCount" label="单人项目" width="100" align="center"></el-table-column>
<el-table-column prop="teamCount" label="集体项目" width="100" align="center"></el-table-column>
<el-table-column prop="male" label="" width="60" align="center"></el-table-column>
<el-table-column prop="female" label="" width="60" align="center"></el-table-column>
<el-table-column prop="category" label="类别" width="80"></el-table-column>
<el-table-column prop="individual" label="2队" width="60" align="center"></el-table-column>
<el-table-column prop="dual" label="2组" width="60" align="center"></el-table-column>
<el-table-column prop="team1101" label="1101" width="60" align="center"></el-table-column>
<el-table-column prop="workers" label="工作人员" width="90" align="center"></el-table-column>
<el-table-column prop="female" label="女性组别" width="90" align="center"></el-table-column>
<el-table-column prop="total" label="合计" width="60" align="center">
<template #default="scope">
<span class="total-num">+{{ scope.row.total }}</span>
@@ -123,11 +125,10 @@
<div v-if="scope.row.hint" class="row-hint">{{ scope.row.hint }}</div>
</template>
</el-table-column>
<el-table-column prop="projectType" label="人/集体" width="100" align="center"></el-table-column>
<el-table-column prop="athleteCount" label="人数/集体" width="100" align="center"></el-table-column>
<el-table-column prop="groupCount" label="数" width="80" align="center"></el-table-column>
<el-table-column prop="estimatedDuration" label="时长(分)" width="100" align="center"></el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="120" align="center"></el-table-column>
<el-table-column prop="participantCategory" label="人/单位" width="100"></el-table-column>
<el-table-column prop="teamCount" label="队伍" width="80" align="center"></el-table-column>
<el-table-column prop="singleTeamPeople" label="单位型号人数" width="120" align="center"></el-table-column>
<el-table-column prop="estimatedDuration" label="剩下显时(公共)" width="150" align="center"></el-table-column>
</el-table>
</div>
@@ -162,7 +163,6 @@ import {
import { getCompetitionDetail } from '@/api/martial/competition'
import { getProjectDetail } from '@/api/martial/project'
import { getParticipantList } from '@/api/martial/participant'
import { getScheduleResult } from '@/api/martial/activitySchedule'
export default {
name: 'MartialRegistrationDetail',
@@ -335,113 +335,76 @@ export default {
const participants = await this.getParticipants()
console.log('参赛人员列表返回:', participants)
// 预加载项目信息
await this.preloadProjectInfo(participants)
// 按单位分组统计
const unitMap = new Map()
participants.forEach(p => {
// 兼容驼峰和下划线命名
const unit = p.organization || p.teamName || p.team_name || '未知单位'
const projectId = p.projectId || p.project_id
const project = this.projectCache.get(projectId)
const projectType = project ? (project.type || 1) : 1 // 1=单人, 2=集体
if (!unitMap.has(unit)) {
unitMap.set(unit, {
schoolUnit: unit,
singleCount: 0,
teamCount: 0,
male: 0,
category: '',
individual: 0,
dual: 0,
team1101: 0,
workers: 0,
female: 0,
total: 0
})
}
const stat = unitMap.get(unit)
stat.total++
// 按项目类型统计
if (projectType === 1) {
stat.singleCount++
} else {
stat.teamCount++
}
// 按性别统计
if (p.gender === 1) {
stat.male++
} else if (p.gender === 2) {
stat.female++
}
if (p.gender === 2) stat.female++
})
this.participantsData = Array.from(unitMap.values())
} catch (err) {
console.error('加载参赛人员统计失败', err)
this.$message.warning('加载参赛人员统计失败')
// 使用空数组作为默认值
this.participantsData = []
}
},
// 加载项目时间统计(该赛事的所有项目及参赛人数)
// 加载项目时间统计(该赛事的所有项目及参赛人数)
async loadProjectTimeStats() {
try {
// 使用缓存的参赛者列表
const participants = await this.getParticipants()
// 预加载项目信息
await this.preloadProjectInfo(participants)
// 获取编排数据,统计每个项目的分组数
let projectGroupCount = new Map()
try {
const scheduleRes = await getScheduleResult(this.competitionId)
const scheduleData = scheduleRes.data?.data
const scheduleGroups = scheduleData?.competitionGroups || scheduleData?.scheduleGroups || []
scheduleGroups.forEach(group => {
const groupProjectId = group.projectId
let key = null
if (groupProjectId && groupProjectId !== -1 && groupProjectId !== '-1') {
key = String(groupProjectId)
} else if (group.title) {
key = group.title.split(' ')[0]
}
if (key) {
projectGroupCount.set(key, (projectGroupCount.get(key) || 0) + 1)
}
})
} catch (scheduleErr) {
console.warn("获取编排数据失败,组数将显示为-:", scheduleErr)
}
// 按项目ID分组统计人数
const projectAthleteCount = new Map()
// 2. 按项目ID分组
const projectMap = new Map()
participants.forEach(athlete => {
// 兼容驼峰和下划线命名
const projectId = athlete.projectId || athlete.project_id
if (projectId) {
projectAthleteCount.set(projectId, (projectAthleteCount.get(projectId) || 0) + 1)
if (!projectMap.has(projectId)) {
projectMap.set(projectId, [])
}
projectMap.get(projectId).push(athlete)
}
})
// 从缓存中获取项目信息并构建统计数据
// 3. 从缓存中获取项目信息并统计(项目信息已经在 loadRegistrationStats 中预加载)
const projectStats = []
for (const [projectId, count] of projectAthleteCount) {
for (const [projectId, athleteList] of projectMap) {
const project = this.projectCache.get(projectId)
if (project) {
const projectType = project.type || 1 // 1=单人, 2=集体
projectStats.push({
projectName: project.projectName || project.project_name || '未知项目',
projectType: projectType === 1 ? '单人' : '集体',
athleteCount: count,
groupCount:
projectGroupCount.get(String(projectId)) ||
projectGroupCount.get(project.projectName || project.project_name || '') ||
'-',
estimatedDuration: project.estimatedDuration || project.estimated_duration || 0,
projectCode: project.projectCode || project.project_code || ''
participantCategory: project.category || '',
teamCount: 1, // 简化处理,设为1
singleTeamPeople: athleteList.length,
estimatedDuration: project.estimatedDuration || project.estimated_duration || 0
})
} else {
// 如果缓存中没有(理论上应该发生),添加基本信息
projectStats.push({
projectName: `项目ID:${projectId}`,
participantCategory: '',
teamCount: 1,
singleTeamPeople: athleteList.length,
estimatedDuration: 0
})
}
}
@@ -454,7 +417,7 @@ export default {
}
},
// 加载金额统计(该赛事所有单位的报名金额)
// 加载金额统计(该赛事所有单位的报名金额)
async loadAmountStats() {
try {
// 使用缓存的参赛者列表
@@ -1,145 +0,0 @@
<template>
<el-dialog
title="导出预览"
:model-value="visible"
@update:model-value="handleVisibleChange"
width="90%"
top="5vh"
:before-close="handleClose"
>
<div class="export-options">
<el-form :inline="true" size="small">
<el-form-item label="导出模板">
<el-select v-model="exportTemplate" placeholder="选择模板" style="width: 200px">
<el-option label="模板1-详细赛程表" value="template1" />
<el-option label="模板2-比赛时间表" value="template2" />
</el-select>
</el-form-item>
<el-form-item label="场地" v-if="exportTemplate === 'template2'">
<el-select v-model="selectedVenue" placeholder="选择场地" style="width: 150px">
<el-option label="全部场地" :value="null" />
<el-option v-for="venue in venues" :key="venue.id" :label="venue.venueName" :value="venue.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="loadPreviewData" :loading="loading">刷新预览</el-button>
</el-form-item>
</el-form>
</div>
<div class="preview-table" v-loading="loading">
<el-table v-if="exportTemplate === 'template1'" :data="previewData" border stripe max-height="500" style="width: 100%">
<el-table-column prop="scheduleDate" label="比赛日期" width="120" />
<el-table-column prop="timeSlot" label="时间段" width="100" />
<el-table-column prop="venueName" label="场地" width="120" />
<el-table-column prop="projectName" label="项目名称" width="180" />
<el-table-column prop="category" label="组别" width="80" />
<el-table-column prop="athleteName" label="运动员姓名" width="120" />
<el-table-column prop="teamName" label="单位/队伍" width="150" />
<el-table-column prop="sortOrder" label="出场顺序" width="90" />
<el-table-column prop="status" label="状态" width="80" />
</el-table>
<el-table v-if="exportTemplate === 'template2'" :data="previewData" border stripe max-height="500" style="width: 100%">
<el-table-column prop="sequenceNo" label="序号" width="80" />
<el-table-column prop="projectName" label="项目" width="200" />
<el-table-column prop="participantCount" label="人数" width="80" />
<el-table-column prop="groupCount" label="组数" width="80" />
<el-table-column prop="durationMinutes" label="时间" width="80" />
<el-table-column prop="tableNo" label="表号" width="100" />
</el-table>
<div v-if="previewData.length === 0 && !loading" class="empty-tip">暂无数据</div>
</div>
<div class="preview-stats" v-if="previewData.length > 0">
<span> {{ previewData.length }} 条记录</span>
</div>
<template #footer>
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" @click="handleExport" :loading="exporting">确认导出</el-button>
</template>
</el-dialog>
</template>
<script>
import { getScheduleExportPreview, exportSchedule, exportScheduleTemplate2 } from '@/api/martial/activitySchedule'
export default {
name: 'ExportPreview',
props: {
visible: { type: Boolean, default: false },
competitionId: { type: [String, Number], required: true },
competitionName: { type: String, default: '' },
venues: { type: Array, default: () => [] }
},
emits: ['update:visible'],
data() {
return {
exportTemplate: 'template1',
selectedVenue: null,
previewData: [],
loading: false,
exporting: false
}
},
watch: {
visible(val) { if (val) this.loadPreviewData() },
exportTemplate() { this.loadPreviewData() },
selectedVenue() { if (this.exportTemplate === 'template2') this.loadPreviewData() }
},
methods: {
handleVisibleChange(val) { this.$emit('update:visible', val) },
async loadPreviewData() {
this.loading = true
try {
const res = await getScheduleExportPreview(this.competitionId, this.exportTemplate, this.selectedVenue)
this.previewData = res.data?.data || res.data || []
} catch (error) {
console.error('加载预览数据失败:', error)
this.$message.error('加载预览数据失败')
this.previewData = []
} finally {
this.loading = false
}
},
async handleExport() {
this.exporting = true
try {
let res, filename
if (this.exportTemplate === 'template1') {
res = await exportSchedule(this.competitionId)
filename = '赛程表_' + (this.competitionName || this.competitionId) + '.xlsx'
} else {
const venue = this.venues.find(v => v.id === this.selectedVenue)
const venueName = venue ? venue.venueName : null
res = await exportScheduleTemplate2(this.competitionId, this.selectedVenue, venueName, null)
filename = '比赛时间_' + (venueName || '全部场地') + '_' + (this.competitionName || this.competitionId) + '.xlsx'
}
const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
const link = document.createElement('a')
link.href = window.URL.createObjectURL(blob)
link.download = filename
link.click()
window.URL.revokeObjectURL(link.href)
this.$message.success('导出成功')
this.handleClose()
} catch (error) {
console.error('导出失败:', error)
this.$message.error('导出失败')
} finally {
this.exporting = false
}
},
handleClose() { this.$emit('update:visible', false) }
}
}
</script>
<style scoped>
.export-options { margin-bottom: 20px; padding: 15px; background: #f5f7fa; border-radius: 4px; }
.preview-table { min-height: 300px; }
.preview-stats { margin-top: 15px; color: #666; font-size: 14px; }
.empty-tip { text-align: center; padding: 60px 0; color: #999; }
</style>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+111 -80
View File
@@ -94,8 +94,7 @@
<el-table-column label="总裁判分数" width="120" align="center" fixed="right">
<template #default="scope">
<span v-if="scope.row.scoreStatus === 2" class="total-score">{{ formatScore(scope.row.chiefJudgeScore) }}</span>
<span v-else class="pending-score">待确认</span>
<span class="total-score">{{ formatScore(scope.row.totalScore) }}</span>
</template>
</el-table-column>
@@ -154,17 +153,7 @@
<div class="total-score-display">
<span class="label">总分</span>
<template v-if="currentDetail.scoreStatus === 2">
<span class="value">{{ formatScore(currentDetail.chiefJudgeScore) }}</span>
<div class="calculation-note">(主裁判已确认)</div>
</template>
<template v-else>
<span class="value pending">待确认最终得分</span>
<div class="calculation-note">
裁判员评分: {{ formatScore(currentDetail.totalScore) }}
<span v-if="currentDetail.judgeScores.length > 2">(去掉最高最低分后平均)</span>
</div>
</template>
<span class="value">{{ formatScore(currentDetail.totalScore) }}</span>
</div>
</div>
</div>
@@ -193,6 +182,96 @@ export default {
projectOptions: [],
venueOptions: [],
scoreList: [],
allTableData: [
{
id: 1,
projectName: '男子组陈氏太极拳',
venueName: '第一场地',
playerName: '张三',
teamName: '少林寺武术大学院',
idCard: '123456789000000000',
playerNo: '123-4567898275',
judgeScores: [8.906, 8.905, 8.908, 8.907, 8.906],
totalScore: 8.907
},
{
id: 2,
projectName: '女子组长拳',
venueName: '第一场地',
playerName: '李四',
teamName: '武当武术学院',
idCard: '123456789000000001',
playerNo: '123-4567898276',
judgeScores: [9.125, 9.130, 9.128, 9.126, 9.129],
totalScore: 9.128
},
{
id: 3,
projectName: '男子组陈氏太极拳',
venueName: '第二场地',
playerName: '王五',
teamName: '峨眉武术协会',
idCard: '123456789000000002',
playerNo: '123-4567898277',
judgeScores: [8.550, 8.548, 8.552, 8.551, 8.549],
totalScore: 8.550
},
{
id: 4,
projectName: '女子组双剑(含长穗双剑)',
venueName: '第一场地',
playerName: '赵六',
teamName: '昆仑武术馆',
idCard: '123456789000000003',
playerNo: '123-4567898278',
judgeScores: [9.245, 9.248, 9.246, 9.247, 9.249],
totalScore: 9.247
},
{
id: 5,
projectName: '男子组杨氏太极拳',
venueName: '第三场地',
playerName: '孙七',
teamName: '华山武术学校',
idCard: '123456789000000004',
playerNo: '123-4567898279',
judgeScores: [8.785, 8.788, 8.786, 8.787, 8.785],
totalScore: 8.786
},
{
id: 6,
projectName: '女子组刀术',
venueName: '第二场地',
playerName: '周八',
teamName: '少林寺武术大学院',
idCard: '123456789000000005',
playerNo: '123-4567898280',
judgeScores: [8.925, 8.928, 8.926, 8.927, 8.925],
totalScore: 8.926
},
{
id: 7,
projectName: '男子组棍术',
venueName: '第四场地',
playerName: '吴九',
teamName: '武当武术学院',
idCard: '123456789000000006',
playerNo: '123-4567898281',
judgeScores: [9.015, 9.018, 9.016, 9.017, 9.015],
totalScore: 9.016
},
{
id: 8,
projectName: '女子组枪术',
venueName: '第三场地',
playerName: '郑十',
teamName: '峨眉武术协会',
idCard: '123456789000000007',
playerNo: '123-4567898282',
judgeScores: [8.665, 8.668, 8.666, 8.667, 8.665],
totalScore: 8.666
}
],
tableData: [],
pagination: {
current: 1,
@@ -266,22 +345,25 @@ export default {
try {
const res = await getScoreList(this.pagination.current, this.pagination.size, params)
console.log('评分列表返回数据:', res)
console.log('===== 调试:后端返回的数据结构 =====')
const responseData = res.data?.data
if (responseData && responseData.records) {
// 过滤掉 projectId 为 null 的无效记录
const validScores = responseData.records.filter(score => {
if (!score.projectId) {
console.warn('发现无效评分记录(projectId为空):', score)
return false
}
return true
})
if (responseData && responseData.records && responseData.records.length > 0) {
console.log('第一条评分记录:', responseData.records[0])
console.log('记录字段:', Object.keys(responseData.records[0]))
console.log('是否包含 projectName:', 'projectName' in responseData.records[0])
console.log('是否包含 venueName:', 'venueName' in responseData.records[0])
console.log('是否包含 playerName:', 'playerName' in responseData.records[0])
console.log('projectId 值:', responseData.records[0].projectId)
console.log('venueId 值:', responseData.records[0].venueId)
console.log('athleteId 值:', responseData.records[0].athleteId)
}
console.log('======================================')
this.scoreList = validScores
if (responseData && responseData.records) {
this.scoreList = responseData.records
// 补充关联数据(项目名称、场地名称、选手名称)
await this.enrichScoreData(validScores)
await this.enrichScoreData(responseData.records)
// 按选手分组评分数据
this.processScoreData(this.scoreList)
@@ -384,12 +466,6 @@ export default {
const athleteMap = new Map()
scores.forEach(score => {
// 确保 projectId 存在
if (!score.projectId) {
console.warn('跳过无效评分记录:', score)
return
}
const key = `${score.athleteId}-${score.projectId}`
if (!athleteMap.has(key)) {
athleteMap.set(key, {
@@ -404,9 +480,7 @@ export default {
playerNo: score.playerNo || '',
judgeScores: [],
scoreDetails: [],
totalScore: 0,
chiefJudgeScore: score.chiefJudgeScore,
scoreStatus: score.scoreStatus || 0
totalScore: 0
})
}
@@ -421,10 +495,11 @@ export default {
})
})
// 计算总分(去掉最高最低分后的平均分)
// 计算总分(平均分)
this.tableData = Array.from(athleteMap.values()).map(athlete => {
if (athlete.judgeScores.length > 0) {
athlete.totalScore = this.calculateFinalScore(athlete.judgeScores)
const sum = athlete.judgeScores.reduce((a, b) => a + b, 0)
athlete.totalScore = sum / athlete.judgeScores.length
}
return athlete
})
@@ -441,34 +516,6 @@ export default {
this.judgeColumns = Array(maxJudges).fill(null)
},
/**
* 计算最终得分
* 规则:
* - 如果裁判数 <= 2,直接取平均值
* - 如果裁判数 > 2,去掉最高分和最低分后取平均值
*/
calculateFinalScore(scores) {
if (!scores || scores.length === 0) {
return 0
}
// 如果只有1-2个裁判,直接取平均值
if (scores.length <= 2) {
const sum = scores.reduce((a, b) => a + b, 0)
return sum / scores.length
}
// 3个及以上裁判,去掉最高分和最低分
const sortedScores = [...scores].sort((a, b) => a - b)
// 去掉第一个(最低分)和最后一个(最高分)
const validScores = sortedScores.slice(1, -1)
// 计算平均值
const sum = validScores.reduce((a, b) => a + b, 0)
return sum / validScores.length
},
// 查询
handleSearch() {
this.pagination.current = 1
@@ -573,16 +620,6 @@ export default {
}
.total-score {
}
.pending-score {
color: #e6a23c;
font-weight: 500;
}
.value.pending {
color: #e6a23c;
font-weight: 500;
color: #1b7c5e;
font-weight: 700;
font-size: 14px;
@@ -626,12 +663,6 @@ export default {
font-weight: 700;
color: #1b7c5e;
}
.calculation-note {
margin-top: 8px;
font-size: 12px;
color: #999;
}
}
}
}
+1 -1
View File
@@ -59,7 +59,7 @@
<i class="el-icon-s-order"></i>
</div>
<div class="card-info">
<h3>赛事管理</h3>
<h3>订单管理</h3>
<p>查看和管理订单</p>
</div>
<i class="card-arrow el-icon-arrow-right"></i>
+1 -2
View File
@@ -14,8 +14,7 @@ export default ({ mode, command }) => {
__INTLIFY_PROD_DEVTOOLS__: false,
},
server: {
port: 8083,
host: '0.0.0.0',
port: 2888,
proxy: {
'/api': {
target: 'http://localhost:8123',