feat: 移除项目编码手动输入

- 项目编码由后端自动生成
- 移除表单中的项目编码输入框和验证规则

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>

ISSUES.md

@@ -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 响应中读取真实状态
-
----

src/api/martial/activitySchedule.js

@@ -188,15 +188,6 @@ export const saveDispatch = (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',
@@ -206,7 +197,7 @@ export const exportSchedule = (competitionId) => {
   })
 }
 
-
+// Export schedule template 2 (competition time format)
 export const exportScheduleTemplate2 = (competitionId, venueId, venueName, timeSlot) => {
   return request({
     url: '/martial/export/schedule2',

src/views/martial/competition/index.vue

@@ -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>
@@ -647,50 +647,123 @@
               项目列表
             </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.price"
+                    :min="0"
+                    :precision="2"
+                    :step="10"
+                    size="small"
+                    style="width: 100%"
+                    placeholder="0.00"
+                  />
+                  <span v-else style="color: #f56c6c">¥{{ scope.row.price || 0 }}</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>
 
           <!-- 场地配置 -->
@@ -1201,7 +1274,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 {
@@ -1561,16 +1645,20 @@ 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,
+        price: 0,
+        description: ''
+      });
+    },
+
+    handleDeleteProject(index) {
+      this.formData.projects.splice(index, 1);
     },
 
     // 场地配置管理
@@ -1619,10 +1707,10 @@ 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) {
@@ -1706,7 +1794,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 +1814,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，说明是编辑已有的项目
@@ -1966,7 +2053,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;
       }
       // 未开始（默认状态）

src/views/martial/competition/list.vue

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

src/views/martial/dispatch/index.vue

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

src/views/martial/order/index.vue

@@ -261,7 +261,7 @@ export default {
       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
+      if (regStart && regEnd && now >= regStart && now <= regEnd) return 2
       return 1
     },
 

src/views/martial/project/index.vue

@@ -135,10 +135,7 @@
         </el-table-column>
         <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>
+            <span>{{ row.category || '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="eventType" label="项目类型" width="100" align="center">

src/views/martial/registration/index.vue

@@ -162,7 +162,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',
@@ -392,31 +391,6 @@ export default {
         // 预加载项目信息
         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()
         participants.forEach(athlete => {
@@ -436,10 +410,7 @@ export default {
               projectName: project.projectName || project.project_name || '未知项目',
               projectType: projectType === 1 ? '单人' : '集体',
               athleteCount: count,
-              groupCount:
-                projectGroupCount.get(String(projectId)) ||
-                projectGroupCount.get(project.projectName || project.project_name || '') ||
-                '-',
+              groupCount: projectType === 2 ? count : '-', // 集体项目显示组数，单人显示-
               estimatedDuration: project.estimatedDuration || project.estimated_duration || 0,
               projectCode: project.projectCode || project.project_code || ''
             })

src/views/martial/schedule/ExportPreview.vue

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

src/views/martial/schedule/index.vue

@@ -7,13 +7,12 @@
       </div>
       <div class="header-right">
         <el-button
-          v-if="!isScheduleCompleted"
           size="small"
           type="primary"
           :loading="autoArrangeLoading"
           @click="handleAutoArrange"
         >
-          自动编排
+          {{ isScheduleCompleted ? '重新编排' : '自动编排' }}
         </el-button>
         <el-button size="small" type="danger" @click="showExceptionDialog">
           异常组 <el-badge :value="exceptionList.length" :hidden="exceptionList.length === 0" />
@@ -86,8 +85,8 @@
                 <span class="project-title">{{ group.title }}</span>
                 <span class="project-meta">{{ group.type }}</span>
                 <span class="project-meta">{{ getTeamCount(group) }}队</span>
-                <span class="project-meta">{{ group.type === '集体' ? getTeamCount(group) : 1 }}组</span>
-                <!-- <span class="project-meta">{{ group.code }}</span> -->
+                <span class="project-meta">{{ group.items?.length || 0 }}组</span>
+                <span class="project-meta">{{ group.code }}</span>
                 <span class="project-table-no">表号: {{ generateTableNo(group) }}</span>
               </div>
               <div class="project-actions" @click.stop>
@@ -104,7 +103,7 @@
                   </template>
                   <div class="move-popover">
                     <div class="move-label">移动到</div>
-                    <el-select v-model="moveTargetVenueId" placeholder="选择场地" size="small" style="width: 100%; margin-bottom: 10px;" :teleported="false">
+                    <el-select v-model="moveTargetVenueId" placeholder="选择场地" size="small" style="width: 100%; margin-bottom: 10px;">
                       <el-option
                         v-for="venue in venues"
                         :key="venue.id"
@@ -186,7 +185,36 @@
                   >
                     <span class="player-detail-index">{{ playerIndex + 1 }}</span>
                     <span class="player-detail-name">{{ player.playerName }}</span>
-                    <!-- 签到状态和异常操作只在调度功能中显示 -->
+                    <span class="player-detail-status">
+                      <el-tag
+                        :type="player.status === '已签到' ? 'success' : player.status === '异常' ? 'danger' : 'info'"
+                        size="small"
+                      >
+                        {{ player.status || '未签到' }}
+                      </el-tag>
+                    </span>
+                    <span class="player-detail-actions">
+                      <el-button
+                        v-if="(player.status || '未签到') === '未签到'"
+                        link
+                        size="small"
+                        @click="markPlayerAsException(group, team, playerIndex)"
+                        :disabled="isScheduleCompleted"
+                        style="color: #f56c6c;"
+                      >
+                        标记异常
+                      </el-button>
+                      <el-button
+                        v-if="player.status === '异常'"
+                        link
+                        size="small"
+                        @click="removePlayerException(group, team, playerIndex)"
+                        :disabled="isScheduleCompleted"
+                        style="color: #67c23a;"
+                      >
+                        取消异常
+                      </el-button>
+                    </span>
                   </div>
                 </div>
               </div>
@@ -240,7 +268,7 @@
             <el-table-column prop="duration" label="合计时间" width="100" align="center"></el-table-column>
             <el-table-column prop="status" label="状态" width="100" align="center">
               <template #default="scope">
-                <span :class="['status-tag', scope.row.status === 2 ? 'status-completed' : scope.row.status === 1 ? 'status-progress' : 'status-pending']">{{ scope.row.status === 2 ? '已完成' : scope.row.status === 1 ? '进行中' : '未开始' }}</span>
+                <span v-if="scope.row.status" class="status-active">{{ scope.row.status }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -249,7 +277,15 @@
 
       <div class="footer-actions">
         <el-button size="small" @click="handleSaveDraft" v-if="!isScheduleCompleted">保存草稿</el-button>
-        <el-button v-if="isScheduleCompleted" size="small" @click="exportPreviewVisible = true">导出</el-button>
+        <el-dropdown v-if="isScheduleCompleted" @command="handleExportCommand" trigger="click">
+          <el-button size="small">导出 <i class="el-icon-arrow-down el-icon--right"></i></el-button>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item command="template1">模板1 - 详细赛程表</el-dropdown-item>
+              <el-dropdown-item command="template2">模板2 - 比赛时间表</el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
         <el-button size="small" type="primary" @click="handleConfirm" v-if="!isScheduleCompleted">完成编排</el-button>
       </div>
 
@@ -346,13 +382,6 @@
         </span>
       </template>
     </el-dialog>
-    <!-- 导出预览对话框 -->
-    <ExportPreview
-      v-model:visible="exportPreviewVisible"
-      :competition-id="competitionId"
-      :competition-name="competitionInfo.competitionName"
-      :venues="venues"
-    />
   </div>
 </template>
 
@@ -362,12 +391,10 @@ import { getVenuesByCompetition } from '@/api/martial/venue'
 import { getCompetitionDetail } from '@/api/martial/competition'
 import { getScheduleResult, saveAndLockSchedule, saveDraftSchedule, triggerAutoArrange, moveScheduleGroup, exportSchedule, exportScheduleTemplate2 } from '@/api/martial/activitySchedule'
 import { updateCheckInStatus, getScheduleConfig } from '@/api/martial/schedulePlan'
-import ExportPreview from './ExportPreview.vue'
 
 export default {
   name: 'MartialScheduleList',
   components: {
-    ExportPreview,
     ArrowDown,
     ArrowRight
   },
@@ -381,7 +408,6 @@ export default {
       selectedVenueIdForVenueTab: null, // 选中的场地ID（场地Tab）
       confirmDialogVisible: false,
       isScheduleCompleted: false, // 是否已完成编排
-      exportPreviewVisible: false, // 导出预览对话框
       loading: false,
       autoArrangeLoading: false, // 自动编排加载状态
       venues: [], // 场地列表(从后端加载)
@@ -422,7 +448,7 @@ export default {
 
       const filtered = this.competitionGroups.filter(group => {
         console.log(`分组"${group.title}": venueId=${group.venueId}(${typeof group.venueId}), timeSlotIndex=${group.timeSlotIndex}(${typeof group.timeSlotIndex})`)
-        const venueMatch = String(group.venueId) === String(this.selectedVenueId)
+        const venueMatch = group.venueId === this.selectedVenueId || Number(group.venueId) === Number(this.selectedVenueId)
         const timeMatch = group.timeSlotIndex === this.selectedTime
         console.log(`  场地匹配:${venueMatch}, 时间匹配:${timeMatch}`)
         return venueMatch && timeMatch
@@ -446,7 +472,8 @@ export default {
       // 如果选中了场地，进一步过滤
       if (this.selectedVenueIdForVenueTab) {
         groupsInTimeSlot = groupsInTimeSlot.filter(group => {
-          return String(group.venueId) === String(this.selectedVenueIdForVenueTab)
+          return group.venueId === this.selectedVenueIdForVenueTab ||
+                 Number(group.venueId) === Number(this.selectedVenueIdForVenueTab)
         })
       }
 
@@ -456,8 +483,8 @@ export default {
         participant: group.type,
         team: 1, // 队伍数量,可以从分组中计算
         number: group.items?.length || 0, // 参赛人数
-        duration: group.estimatedDuration || 0, // 合计时间
-        status: group.status, // 状态: 0-未开始, 1-进行中, 2-已完成
+        duration: 0, // 合计时间,如果后端有数据可以显示
+        status: group.venueName, // 显示场地名称
         venueName: group.venueName,
         hint: '' // 可以根据需要添加提示信息
       }))
@@ -500,7 +527,7 @@ export default {
         period = hour < 12 ? 1 : 2
       }
 
-      // 3. 获取序号：在同场地同时段中的顺序（与显示顺序一致）
+      // 3. 获取序号：在同场地同时段中的顺序
       const sameSlotGroups = this.competitionGroups.filter(g => {
         const gVenueMatch = String(g.venueId) === String(group.venueId)
         if (!gVenueMatch) return false
@@ -508,7 +535,8 @@ export default {
         const gPeriod = gHour < 12 ? 1 : 2
         return gPeriod === period
       })
-      // 使用原始数组顺序（与显示顺序一致），不再按id排序
+      // 按id排序保持稳定顺序
+      sameSlotGroups.sort((a, b) => (a.id || 0) - (b.id || 0))
       const orderIndex = sameSlotGroups.findIndex(g => g.id === group.id) + 1
 
       // 4. 格式化: 场地(1位) + 时段(1位) + 序号(2位)
@@ -620,22 +648,8 @@ export default {
             playerIds: []
           })
         }
-        // If item has members array (from API), use it as players
-        if (item.members && item.members.length > 0) {
-          item.members.forEach(member => {
-            teamMap.get(key).players.push({
-              id: member.id,
-              playerName: member.name || member.playerName,
-              organization: member.organization,
-              status: member.status
-            })
-            teamMap.get(key).playerIds.push(member.id)
-          })
-        } else {
-          // Fallback: use item itself as player
-          teamMap.get(key).players.push(item)
-          teamMap.get(key).playerIds.push(item.id)
-        }
+        teamMap.get(key).players.push(item)
+        teamMap.get(key).playerIds.push(item.id)
       })
       return Array.from(teamMap.values())
     },
@@ -656,14 +670,6 @@ export default {
 
       const targetVenue = this.venues.find(v => v.id === this.moveTargetVenueId)
 
-      // In draft mode (negative groupId), just update frontend state
-      if (group.id && group.id.toString().startsWith("-")) {
-        group.venueId = this.moveTargetVenueId
-        group.venueName = targetVenue ? targetVenue.venueName : ""
-        this.$message.success(`已移动到 ${group.venueName}`)
-        return
-      }
-
       try {
         // 调用后端API移动分组
         const res = await moveScheduleGroup({
@@ -877,49 +883,6 @@ export default {
       console.log('生成的时间段:', this.timeSlots)
     },
 
-    // 根据实际编排数据更新显示的时间段（只显示有比赛的时段）
-    updateTimeSlotsFromGroups() {
-      if (!this.competitionGroups || this.competitionGroups.length === 0) {
-        return
-      }
-      // 从分组数据中提取实际使用的时段索引
-      const usedTimeSlotIndexes = new Set()
-      this.competitionGroups.forEach(group => {
-        if (group.timeSlotIndex !== null && group.timeSlotIndex !== undefined) {
-          usedTimeSlotIndexes.add(group.timeSlotIndex)
-        }
-      })
-      if (usedTimeSlotIndexes.size === 0) {
-        return
-      }
-      // 保存原始时段用于映射
-      const allSlots = [...this.timeSlots]
-      const filteredSlots = []
-      const indexMapping = {}
-      let newIndex = 0
-      allSlots.forEach((slot, oldIndex) => {
-        if (usedTimeSlotIndexes.has(oldIndex)) {
-          filteredSlots.push(slot)
-          indexMapping[oldIndex] = newIndex
-          newIndex++
-        }
-      })
-      // 更新分组的时段索引
-      this.competitionGroups.forEach(group => {
-        if (group.timeSlotIndex !== null && group.timeSlotIndex !== undefined) {
-          const newIdx = indexMapping[group.timeSlotIndex]
-          if (newIdx !== undefined) {
-            group.timeSlotIndex = newIdx
-          }
-        }
-      })
-      this.timeSlots = filteredSlots
-      console.log("过滤后的时间段:", this.timeSlots)
-      if (this.selectedTime >= this.timeSlots.length) {
-        this.selectedTime = 0
-      }
-    },
-
     // 加载场地列表
     async loadVenues() {
       try {
@@ -981,14 +944,12 @@ export default {
               venueName: group.venueName,
               timeSlot: group.timeSlot,
               timeSlotIndex: group.timeSlotIndex,
-              estimatedDuration: group.estimatedDuration || 0,
               items: (group.participants || []).map(p => ({
                 id: p.id,
                 schoolUnit: p.schoolUnit,
                 playerName: p.playerName,
                 status: p.status || '未签到',
-                sortOrder: p.sortOrder,
-                members: p.members || []
+                sortOrder: p.sortOrder
               }))
             }))
 
@@ -1011,7 +972,6 @@ export default {
             console.log('解析后的competitionGroups:', this.competitionGroups)
             console.log('当前selectedVenueId:', this.selectedVenueId)
             console.log('当前selectedTime:', this.selectedTime)
-            this.updateTimeSlotsFromGroups()
             this.$message.success(data.isDraft ? '已加载草稿数据' : '已加载编排数据')
           } else {
             // 后端还没有数据，使用默认数据进行展示
@@ -1197,7 +1157,6 @@ export default {
             venueName: group.venueName,
             timeSlot: group.timeSlot,
             timeSlotIndex: group.timeSlotIndex,
-              estimatedDuration: group.estimatedDuration || 0,
             participants: group.items.map((item, index) => ({
               id: item.id,
               schoolUnit: item.schoolUnit,
@@ -1314,7 +1273,6 @@ export default {
             venueName: group.venueName,
             timeSlot: group.timeSlot,
             timeSlotIndex: group.timeSlotIndex,
-              estimatedDuration: group.estimatedDuration || 0,
             participants: group.items.map((item, index) => ({
               id: item.id,
               schoolUnit: item.schoolUnit,