排课部分发送已经完成
This commit is contained in:
parent
7d125a491a
commit
440117b417
|
|
@ -72,3 +72,8 @@ export function courseAvailableRooms(params: Record<string, any>) {
|
|||
export function courseSchedule(params: Record<string, any>) {
|
||||
return request.post({ url: '/course.schedule', params })
|
||||
}
|
||||
|
||||
// 获取已有排课
|
||||
export function courseScheduleList(params: Record<string, any>) {
|
||||
return request.get({ url: '/course.schedule/list', params })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,6 +48,25 @@
|
|||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="当前周数" prop="weekNumber">
|
||||
<el-select
|
||||
v-model="selectedWeekNumber"
|
||||
:disabled="!queryParams.semesterId || weekOptions.length === 0"
|
||||
class="w-[120px]"
|
||||
placeholder="请选择周数"
|
||||
@change="handleWeekChange"
|
||||
>
|
||||
<el-option
|
||||
v-for="week in weekOptions"
|
||||
:key="week"
|
||||
:label="`第${week}周`"
|
||||
:value="week"
|
||||
/>
|
||||
</el-select>
|
||||
<div class="text-xs text-gray-500 ml-2">
|
||||
{{ currentWeekDateInfo }}
|
||||
</div>
|
||||
</el-form-item>
|
||||
<!-- 选中时间段信息显示和清除按钮 -->
|
||||
<el-form-item v-if="selectedTimeSlot" label="已选中时间段">
|
||||
<el-tag type="info" size="large" closable @close="clearSelectedTimeSlot">
|
||||
|
|
@ -138,7 +157,7 @@
|
|||
<div v-else class="space-y-4 max-h-[700px] overflow-y-auto">
|
||||
<el-card
|
||||
v-for="item in getCourseLists.lists"
|
||||
:key="item.id"
|
||||
:key="`course-${item.id}`"
|
||||
shadow="hover"
|
||||
:class="['cursor-pointer transition-all duration-200', selectedCourseId === item.id ? 'selected-card' : 'hover:bg-blue-50']"
|
||||
@click="handleCourseClick(item)"
|
||||
|
|
@ -150,10 +169,13 @@
|
|||
课程：{{ item.courseName }}
|
||||
</h4>
|
||||
</div>
|
||||
<el-tag v-if="selectedCourseId === item.id" size="small" type="info">
|
||||
共{{ item.totalWeeks }}周
|
||||
</el-tag>
|
||||
</div>
|
||||
<div class="flex justify-between text-xs text-gray-600">
|
||||
<span>教师: {{ item.teacherName }}</span>
|
||||
<span>周学时: {{ item.totalWeeks }}</span>
|
||||
<span>总学时: {{ item.totalHours }}</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedCourseId === item.id"
|
||||
|
|
@ -161,19 +183,13 @@
|
|||
>
|
||||
<div class="text-xs text-gray-700">
|
||||
<div class="flex items-center mb-1">
|
||||
<span class="font-medium">总学时:</span>
|
||||
<span>{{ item.totalHours }}</span>
|
||||
<span class="font-medium">周学时:</span>
|
||||
<span>{{ Math.round(item.totalHours / item.totalWeeks) }}</span>
|
||||
</div>
|
||||
<div class="flex items-center">
|
||||
<span class="font-medium">周数:</span>
|
||||
<span>{{ item.totalWeeks }}周</span>
|
||||
<span class="font-medium">任务代码:</span>
|
||||
<span>{{ item.taskCode }}</span>
|
||||
</div>
|
||||
<p
|
||||
class="text-xs text-gray-500"
|
||||
style="color: darkgray"
|
||||
>
|
||||
{{ item.taskCode }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -201,7 +217,7 @@
|
|||
<div v-else class="space-y-4 max-h-[700px] overflow-y-auto">
|
||||
<el-card
|
||||
v-for="item in getRoomLists.lists"
|
||||
:key="item.id"
|
||||
:key="`room-${item.id}`"
|
||||
shadow="hover"
|
||||
:class="['cursor-pointer transition-all duration-200', selectedRoomId === item.id ? 'selected-card' : 'hover:bg-blue-50']"
|
||||
@click="handleClassroomClick(item)"
|
||||
|
|
@ -247,10 +263,18 @@
|
|||
<span class="font-medium mr-2">选中的时间段:</span>
|
||||
<span>{{ getSelectedTimeSlotText() }}</span>
|
||||
</div>
|
||||
<div class="flex items-center mb-2">
|
||||
<span class="font-medium mr-2">具体日期:</span>
|
||||
<span>{{ selectedDate || '请选择周数' }}</span>
|
||||
</div>
|
||||
<div class="flex items-center mb-2">
|
||||
<span class="font-medium mr-2">选中的课程:</span>
|
||||
<span>{{ selectedCourseName || '未选择' }}</span>
|
||||
</div>
|
||||
<div class="flex items-center mb-2">
|
||||
<span class="font-medium mr-2">授课教师:</span>
|
||||
<span>{{ selectedCourseTeacherName || '未选择' }}</span>
|
||||
</div>
|
||||
<div class="flex items-center">
|
||||
<span class="font-medium mr-2">选中的教室:</span>
|
||||
<span>{{ selectedRoomName || '未选择' }}</span>
|
||||
|
|
@ -259,7 +283,7 @@
|
|||
<el-button
|
||||
type="primary"
|
||||
size="large"
|
||||
:disabled="!selectedCourseId"
|
||||
:disabled="!selectedCourseId || !selectedTimeSlot || !selectedWeekNumber"
|
||||
@click="handleScheduleCourse"
|
||||
plain
|
||||
>
|
||||
|
|
@ -268,7 +292,7 @@
|
|||
<el-button
|
||||
type="danger"
|
||||
size="large"
|
||||
:disabled="!selectedTimeSlot.hasCourse"
|
||||
:disabled="!selectedTimeSlot || !selectedTimeSlot.hasCourse"
|
||||
@click="handleRemoveCourse"
|
||||
plain
|
||||
>
|
||||
|
|
@ -281,7 +305,7 @@
|
|||
</div>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import { computed, reactive, ref } from 'vue'
|
||||
import { computed, reactive, ref, onBeforeUnmount } from 'vue'
|
||||
import { Check } from '@element-plus/icons-vue'
|
||||
|
||||
import { classLists } from '@/api/class'
|
||||
|
|
@ -292,8 +316,65 @@ import { timeCurrentSemester } from '@/api/time'
|
|||
import { usePaging } from '@/hooks/usePaging'
|
||||
import feedback from '@/utils/feedback'
|
||||
|
||||
// 星期类型
|
||||
interface WeekDay {
|
||||
label: string
|
||||
value: number
|
||||
}
|
||||
|
||||
// 课程数据类型
|
||||
interface CourseItem {
|
||||
id: number
|
||||
courseId: number
|
||||
courseName: string
|
||||
taskCode: string
|
||||
totalHours: number
|
||||
teacherId: number
|
||||
teacherName: string
|
||||
totalWeeks: number
|
||||
}
|
||||
|
||||
// 教室数据类型
|
||||
interface ClassroomItem {
|
||||
id: number
|
||||
classroomName: string
|
||||
classroomCode: string
|
||||
classroomTypeName: string
|
||||
location: string
|
||||
capacity: number
|
||||
}
|
||||
|
||||
// 选中时间段类型
|
||||
interface SelectedTimeSlot {
|
||||
id: number
|
||||
rowIndex: number
|
||||
dayOfWeek: number
|
||||
startTime: string
|
||||
endTime: string
|
||||
hasCourse: boolean
|
||||
courseData?: any
|
||||
}
|
||||
|
||||
// 学期配置类型
|
||||
interface SemesterConfigItem {
|
||||
id: number
|
||||
academicYear: string
|
||||
semesterCode: string
|
||||
config: string
|
||||
startDate: string
|
||||
endDate: string
|
||||
}
|
||||
|
||||
// 班级数据类型
|
||||
interface ClassItem {
|
||||
id: number
|
||||
className: string
|
||||
classCode: string
|
||||
maxStudentCount: number
|
||||
}
|
||||
|
||||
// 星期数组
|
||||
const weekDays = [
|
||||
const weekDays: WeekDay[] = [
|
||||
{ label: '星期一', value: 1 },
|
||||
{ label: '星期二', value: 2 },
|
||||
{ label: '星期三', value: 3 },
|
||||
|
|
@ -303,19 +384,8 @@ const weekDays = [
|
|||
{ label: '星期日', value: 7 }
|
||||
]
|
||||
|
||||
const getConfigLists = ref<{
|
||||
lists: Array<{
|
||||
id: number
|
||||
academicYear: string
|
||||
semesterCode: string
|
||||
config: string
|
||||
startDate: string
|
||||
endDate: string
|
||||
}>
|
||||
}>({ lists: [] })
|
||||
const getClassLists = ref<{
|
||||
lists: Array<{ id: number; className: string; classCode: string; maxStudentCount: number }>
|
||||
}>({ lists: [] })
|
||||
const getConfigLists = ref<{ lists: SemesterConfigItem[] }>({ lists: [] })
|
||||
const getClassLists = ref<{ lists: ClassItem[] }>({ lists: [] })
|
||||
const classSearchLoading = ref(false)
|
||||
const classSearchTimer = ref<number | null>(null)
|
||||
const activeTab = ref('course')
|
||||
|
|
@ -332,64 +402,122 @@ const getTimeData = ref<{
|
|||
}>
|
||||
}>({ lists: [] })
|
||||
|
||||
// 课程列表数据
|
||||
const getCourseLists = ref<{
|
||||
lists: Array<{
|
||||
id: number
|
||||
courseId: number
|
||||
courseName: string
|
||||
taskCode: string
|
||||
totalHours: number
|
||||
teacherId: number
|
||||
teacherName: string
|
||||
totalWeeks: number
|
||||
}>
|
||||
}>({ lists: [] })
|
||||
// 课程列表数据 - 明确类型
|
||||
const getCourseLists = ref<{ lists: CourseItem[] }>({ lists: [] })
|
||||
// 课程加载状态
|
||||
const courseLoading = ref(false)
|
||||
// 选中的课程ID
|
||||
const selectedCourseId = ref<number | null>(null)
|
||||
// 选中的课程名称
|
||||
const selectedCourseName = computed(() => {
|
||||
if (!selectedCourseId.value) return ''
|
||||
const course = getCourseLists.value.lists.find(item => item.id === selectedCourseId.value)
|
||||
return course ? course.courseName : ''
|
||||
|
||||
// 选中的课程完整对象
|
||||
const selectedCourse = computed(() => {
|
||||
if (!selectedCourseId.value) return null
|
||||
return getCourseLists.value.lists.find(item => item.id === selectedCourseId.value) || null
|
||||
})
|
||||
|
||||
// 教室列表数据
|
||||
const getRoomLists = ref<{
|
||||
lists: Array<{
|
||||
id: number
|
||||
classroomName: string
|
||||
classroomCode: string
|
||||
classroomTypeName: string
|
||||
location: string
|
||||
capacity: number
|
||||
}>
|
||||
}>({ lists: [] })
|
||||
// 教室加载状态
|
||||
// 选中的课程名称
|
||||
const selectedCourseName = computed(() => {
|
||||
return selectedCourse.value?.courseName || '未选择'
|
||||
})
|
||||
|
||||
// 选中的课程教师ID
|
||||
const selectedCourseTeacherId = computed(() => {
|
||||
return selectedCourse.value?.teacherId || null
|
||||
})
|
||||
|
||||
// 选中的课程教师姓名
|
||||
const selectedCourseTeacherName = computed(() => {
|
||||
return selectedCourse.value?.teacherName || '未选择'
|
||||
})
|
||||
|
||||
// 教室列表数据 - 明确类型
|
||||
const getRoomLists = ref<{ lists: ClassroomItem[] }>({ lists: [] })
|
||||
const roomLoading = ref(false)
|
||||
// 选中的教室ID
|
||||
const selectedRoomId = ref<number | null>(null)
|
||||
// 选中的教室名称
|
||||
const selectedRoomName = computed(() => {
|
||||
if (!selectedRoomId.value) return ''
|
||||
if (!selectedRoomId.value) return '未选择'
|
||||
const room = getRoomLists.value.lists.find(item => item.id === selectedRoomId.value)
|
||||
return room ? room.classroomName : ''
|
||||
return room ? room.classroomName : '未选择'
|
||||
})
|
||||
|
||||
// 选中的时间段
|
||||
interface SelectedTimeSlot {
|
||||
id: number
|
||||
rowIndex: number
|
||||
dayOfWeek: number
|
||||
startTime: string
|
||||
endTime: string
|
||||
hasCourse: boolean
|
||||
courseData?: any
|
||||
}
|
||||
const selectedTimeSlot = ref<SelectedTimeSlot | null>(null)
|
||||
|
||||
// 新增：选中的周数
|
||||
const selectedWeekNumber = ref<number>(1)
|
||||
|
||||
// 新增：当前学期配置
|
||||
const currentSemesterConfig = computed(() => {
|
||||
if (!queryParams.semesterId) return null
|
||||
return getConfigLists.value.lists.find(item => item.id.toString() === queryParams.semesterId.toString())
|
||||
})
|
||||
|
||||
// 新增：周数选项
|
||||
const weekOptions = computed(() => {
|
||||
if (!selectedCourse.value) return []
|
||||
const weeks = selectedCourse.value.totalWeeks
|
||||
return Array.from({ length: weeks }, (_, i) => i + 1)
|
||||
})
|
||||
|
||||
// 新增：当前周对应的日期信息
|
||||
const currentWeekDateInfo = computed(() => {
|
||||
if (!selectedWeekNumber.value || !currentSemesterConfig.value) return ''
|
||||
|
||||
const startDate = new Date(currentSemesterConfig.value.startDate)
|
||||
if (isNaN(startDate.getTime())) return '日期格式错误'
|
||||
|
||||
// 计算当前周第一天的日期（星期一）
|
||||
// startDate可能是学期开始日期，我们需要根据周数计算
|
||||
const weekStartDate = new Date(startDate)
|
||||
// 将开始日期调整到星期一
|
||||
const dayOfWeek = weekStartDate.getDay() // 0 = 周日, 1 = 周一, ..., 6 = 周六
|
||||
const daysToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek // 调整到星期一
|
||||
|
||||
// 根据周数计算目标周的第一天（星期一）
|
||||
const targetWeekStart = new Date(weekStartDate)
|
||||
targetWeekStart.setDate(targetWeekStart.getDate() + daysToMonday + (selectedWeekNumber.value - 1) * 7)
|
||||
|
||||
// 格式化日期
|
||||
const formatDate = (date: Date) => {
|
||||
return `${date.getMonth() + 1}月${date.getDate()}日`
|
||||
}
|
||||
|
||||
// 计算本周日期范围
|
||||
const weekEnd = new Date(targetWeekStart)
|
||||
weekEnd.setDate(weekEnd.getDate() + 6) // 周日
|
||||
|
||||
return `${formatDate(targetWeekStart)} - ${formatDate(weekEnd)}`
|
||||
})
|
||||
|
||||
// 新增：选中的具体日期（用于排课）
|
||||
const selectedDate = computed(() => {
|
||||
if (!selectedWeekNumber.value || !currentSemesterConfig.value || !selectedTimeSlot.value) return ''
|
||||
|
||||
const startDate = new Date(currentSemesterConfig.value.startDate)
|
||||
if (isNaN(startDate.getTime())) return '日期格式错误'
|
||||
|
||||
// 计算当前周第一天的日期（星期一）
|
||||
const weekStartDate = new Date(startDate)
|
||||
const dayOfWeek = weekStartDate.getDay() // 0 = 周日, 1 = 周一, ..., 6 = 周六
|
||||
const daysToMonday = dayOfWeek === 0 ? -6 : 1 - dayOfWeek // 调整到星期一
|
||||
|
||||
// 根据周数计算目标周的第一天（星期一）
|
||||
const targetWeekStart = new Date(weekStartDate)
|
||||
targetWeekStart.setDate(targetWeekStart.getDate() + daysToMonday + (selectedWeekNumber.value - 1) * 7)
|
||||
|
||||
// 根据星期几计算具体日期
|
||||
const targetDate = new Date(targetWeekStart)
|
||||
targetDate.setDate(targetDate.getDate() + selectedTimeSlot.value.dayOfWeek - 1) // -1是因为星期一对应dayOfWeek=1
|
||||
|
||||
// 格式化日期为YYYY-MM-DD
|
||||
const year = targetDate.getFullYear()
|
||||
const month = String(targetDate.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(targetDate.getDate()).padStart(2, '0')
|
||||
|
||||
return `${year}-${month}-${day}`
|
||||
})
|
||||
|
||||
const loading = ref(false)
|
||||
const queryParams = reactive({
|
||||
classId: '',
|
||||
|
|
@ -397,27 +525,41 @@ const queryParams = reactive({
|
|||
maxStudentCount: 0
|
||||
})
|
||||
|
||||
// 周数变化处理
|
||||
const handleWeekChange = () => {
|
||||
// 周数变化时，可以在这里处理相关逻辑
|
||||
console.log('周数变化为:', selectedWeekNumber.value)
|
||||
}
|
||||
|
||||
// 班级变化处理
|
||||
const handleClassChange = async () => {
|
||||
// 切换班级时，清空选中的课程、教室、时间段和周数
|
||||
selectedCourseId.value = null
|
||||
selectedRoomId.value = null
|
||||
selectedWeekNumber.value = 1
|
||||
clearSelectedTimeSlot()
|
||||
|
||||
if (queryParams.classId && queryParams.semesterId) {
|
||||
await fetchCourseLists()
|
||||
await fetchRoomLists()
|
||||
}
|
||||
// 切换班级时清空选中
|
||||
clearSelectedTimeSlot()
|
||||
}
|
||||
|
||||
const handleStudentClick = (item: any) => {
|
||||
queryParams.maxStudentCount = item.maxStudentCount || 0
|
||||
}
|
||||
|
||||
// 学期变化处理
|
||||
const handleSemesterChange = async () => {
|
||||
// 切换学期时，清空选中的课程、教室、时间段和周数
|
||||
selectedCourseId.value = null
|
||||
selectedRoomId.value = null
|
||||
selectedWeekNumber.value = 1
|
||||
clearSelectedTimeSlot()
|
||||
|
||||
if (queryParams.classId && queryParams.semesterId) {
|
||||
await fetchCourseLists()
|
||||
}
|
||||
// 切换学期时清空选中
|
||||
clearSelectedTimeSlot()
|
||||
}
|
||||
|
||||
const handleStudentClick = (item: ClassItem) => {
|
||||
queryParams.maxStudentCount = item.maxStudentCount || 0
|
||||
}
|
||||
|
||||
// 获取班级列表
|
||||
|
|
@ -428,19 +570,20 @@ const fetchClassLists = async (params: string) => {
|
|||
})
|
||||
getClassLists.value = res
|
||||
} catch (err) {
|
||||
feedback.msgError('获取课程列表失败')
|
||||
feedback.msgError('获取班级列表失败')
|
||||
getClassLists.value = { lists: [] }
|
||||
} finally {
|
||||
classSearchLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleClassRemoteSearch = (keyword: string) => {
|
||||
if (classSearchTimer.value) clearTimeout(classSearchTimer.value)
|
||||
|
||||
classSearchTimer.value = setTimeout(async () => {
|
||||
classSearchLoading.value = true
|
||||
await fetchClassLists(keyword)
|
||||
}, 300)
|
||||
}, 300) as unknown as number
|
||||
}
|
||||
|
||||
// 获取学期列表
|
||||
|
|
@ -448,9 +591,9 @@ const fetchConfigLists = async () => {
|
|||
try {
|
||||
const res = await configLists()
|
||||
const handleData = JSON.parse(JSON.stringify(res))
|
||||
handleData.lists = handleData.lists.map((item: any) => ({
|
||||
handleData.lists = handleData.lists.map((item: SemesterConfigItem) => ({
|
||||
...item,
|
||||
config: `${item.academicYear}${item.semesterCode == 'SPRING' ? ' 春' : ' 秋'}`
|
||||
config: `${item.academicYear}${item.semesterCode === 'SPRING' ? ' 春' : ' 秋'}`
|
||||
}))
|
||||
getConfigLists.value = handleData
|
||||
await fetchSemester()
|
||||
|
|
@ -472,67 +615,58 @@ const fetchSemester = async () => {
|
|||
|
||||
// 获取课程列表
|
||||
const fetchCourseLists = async () => {
|
||||
if (!queryParams.classId || !queryParams.semesterId) return
|
||||
|
||||
try {
|
||||
courseLoading.value = true
|
||||
// 使用taskLists接口获取课程列表
|
||||
const response = await taskLists({
|
||||
classId: queryParams.classId,
|
||||
semesterId: queryParams.semesterId
|
||||
})
|
||||
// 映射新接口返回的数据格式到组件所需格式
|
||||
const mappedCourses = response.lists.map(
|
||||
(task: {
|
||||
id: any
|
||||
courseId: any
|
||||
courseName: any
|
||||
taskCode: any
|
||||
weeklyHours: number
|
||||
totalWeeks: number
|
||||
teacherId: any
|
||||
teacherName: any
|
||||
}) => ({
|
||||
const mappedCourses: CourseItem[] = response.lists.map(
|
||||
(task: any) => ({
|
||||
id: task.id,
|
||||
courseId: task.courseId,
|
||||
courseName: task.courseName,
|
||||
taskCode: task.taskCode,
|
||||
totalHours: task.weeklyHours * task.totalWeeks, // 总学时=周学时×总周数
|
||||
totalHours: task.weeklyHours * task.totalWeeks,
|
||||
teacherId: task.teacherId,
|
||||
teacherName: task.teacherName,
|
||||
totalWeeks: task.totalWeeks
|
||||
})
|
||||
)
|
||||
getCourseLists.value = { lists: mappedCourses }
|
||||
|
||||
// 课程列表刷新后，校验选中的课程是否仍存在，不存在则清空
|
||||
if (selectedCourseId.value && !mappedCourses.find(item => item.id === selectedCourseId.value)) {
|
||||
selectedCourseId.value = null
|
||||
selectedWeekNumber.value = 1 // 清空周数选择
|
||||
}
|
||||
} catch (err) {
|
||||
console.log('获取课程列表失败', err)
|
||||
console.error('获取课程列表失败', err)
|
||||
feedback.msgError('获取课程列表失败')
|
||||
getCourseLists.value = { lists: [] }
|
||||
} finally {
|
||||
courseLoading.value = false
|
||||
}
|
||||
}
|
||||
// 课程点击处理
|
||||
const handleCourseClick = (course: any) => {
|
||||
|
||||
// 课程点击处理（切换选中/取消选中）
|
||||
const handleCourseClick = (course: CourseItem) => {
|
||||
selectedCourseId.value = selectedCourseId.value === course.id ? null : course.id
|
||||
selectedWeekNumber.value = 1
|
||||
activeTab.value = 'course'
|
||||
}
|
||||
|
||||
// 获取教室列表
|
||||
const fetchRoomLists = async () => {
|
||||
try {
|
||||
roomLoading.value = true
|
||||
// 使用taskLists接口获取教室列表
|
||||
const response = await courseAvailableRooms({
|
||||
num: queryParams.maxStudentCount
|
||||
})
|
||||
// 映射新接口返回的数据格式到组件所需格式
|
||||
const mappedRooms = response.map(
|
||||
(task: {
|
||||
id: number
|
||||
classroomName: string
|
||||
classroomCode: string
|
||||
classroomTypeName: string
|
||||
location: string
|
||||
capacity: number
|
||||
}) => ({
|
||||
const mappedRooms: ClassroomItem[] = response.map(
|
||||
(task: any) => ({
|
||||
id: task.id,
|
||||
classroomName: task.classroomName,
|
||||
classroomCode: task.classroomCode,
|
||||
|
|
@ -542,27 +676,34 @@ const fetchRoomLists = async () => {
|
|||
})
|
||||
)
|
||||
getRoomLists.value = { lists: mappedRooms }
|
||||
|
||||
// 教室列表刷新后，校验选中的教室是否仍存在，不存在则清空
|
||||
if (selectedRoomId.value && !mappedRooms.find(item => item.id === selectedRoomId.value)) {
|
||||
selectedRoomId.value = null
|
||||
}
|
||||
} catch (err) {
|
||||
console.log('获取教室列表失败', err)
|
||||
console.error('获取教室列表失败', err)
|
||||
feedback.msgError('获取教室列表失败')
|
||||
getRoomLists.value = { lists: [] }
|
||||
} finally {
|
||||
roomLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// 教室点击处理
|
||||
const handleClassroomClick = (classroom: any) => {
|
||||
const handleClassroomClick = (classroom: ClassroomItem) => {
|
||||
selectedRoomId.value = selectedRoomId.value === classroom.id ? null : classroom.id
|
||||
activeTab.value = 'classroom'
|
||||
}
|
||||
|
||||
// 处理时间段点击
|
||||
const handleTimeSlotClick = (rowIndex: number, dayOfWeek: number, cellData: any) => {
|
||||
const row = tableData.value[rowIndex]
|
||||
const id = cellData.id
|
||||
const id = cellData?.id || Date.now()
|
||||
const startTime = getRowStartTime(row)
|
||||
const endTime = getRowEndTime(row)
|
||||
|
||||
// 如果点击的是已经选中的时间段，则取消选中
|
||||
// 取消选中（点击已选中的时间段）
|
||||
if (selectedTimeSlot.value &&
|
||||
selectedTimeSlot.value.rowIndex === rowIndex &&
|
||||
selectedTimeSlot.value.dayOfWeek === dayOfWeek) {
|
||||
|
|
@ -581,11 +722,15 @@ const handleTimeSlotClick = (rowIndex: number, dayOfWeek: number, cellData: any)
|
|||
courseData: cellData
|
||||
}
|
||||
|
||||
// 如果有课程数据，自动选中对应的课程
|
||||
// 自动选中对应课程（基于courseId精准匹配）
|
||||
if (cellData && cellData.courseId) {
|
||||
const course = getCourseLists.value.lists.find(item => item.courseId === cellData.courseId)
|
||||
if (course) {
|
||||
selectedCourseId.value = course.id
|
||||
const targetCourse = getCourseLists.value.lists.find(item => item.courseId === cellData.courseId)
|
||||
if (targetCourse) {
|
||||
selectedCourseId.value = targetCourse.id
|
||||
// 如果有课程，设置默认周数为第1周
|
||||
if (targetCourse.totalWeeks > 0) {
|
||||
selectedWeekNumber.value = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -604,40 +749,43 @@ const clearSelectedTimeSlot = () => {
|
|||
|
||||
// 获取选中时间段的显示文本
|
||||
const getSelectedTimeSlotText = () => {
|
||||
if (!selectedTimeSlot.value) return ''
|
||||
|
||||
const dayText = weekDays.find(day => day.value === selectedTimeSlot.value!.dayOfWeek)?.label || ''
|
||||
return `第${selectedTimeSlot.value.rowIndex + 1}节 ${dayText} ${selectedTimeSlot.value.startTime}-${selectedTimeSlot.value.endTime}`
|
||||
const slot = selectedTimeSlot.value
|
||||
if (!slot) return ''
|
||||
const dayText = weekDays.find(day => day.value === slot.dayOfWeek)?.label || ''
|
||||
return `第${slot.rowIndex + 1}节 ${dayText} ${slot.startTime}-${slot.endTime}`
|
||||
}
|
||||
|
||||
// 安排课程
|
||||
const handleScheduleCourse = async () => {
|
||||
if (!selectedTimeSlot.value || !selectedCourseId.value) {
|
||||
feedback.msgError('请先选择时间段和课程')
|
||||
// 增强校验：确保时间段、课程、教师ID、周数都存在
|
||||
if (!selectedTimeSlot.value || !selectedCourseId.value || !selectedCourseTeacherId.value || !selectedWeekNumber.value) {
|
||||
feedback.msgError('请先选择有效的时间段、课程和周数')
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
// 调用排课API
|
||||
// 排课API参数：新增 teacherId 和 date 传递
|
||||
await courseSchedule({
|
||||
timeSlotId: selectedTimeSlot.value.id,
|
||||
courseId: selectedCourseId.value,
|
||||
// date:
|
||||
classroomId: selectedRoomId.value,
|
||||
semesterId: queryParams.semesterId,
|
||||
classId: queryParams.classId,
|
||||
// teacherId:
|
||||
teacherId: selectedCourseTeacherId.value,
|
||||
date: selectedDate.value // 使用计算出的具体日期
|
||||
})
|
||||
|
||||
feedback.msgSuccess('排课成功')
|
||||
// 刷新课表数据
|
||||
await getTimeLists()
|
||||
// 清空选中状态
|
||||
// 清空选中状态，提升用户体验
|
||||
clearSelectedTimeSlot()
|
||||
selectedCourseId.value = null
|
||||
selectedRoomId.value = null
|
||||
selectedWeekNumber.value = 1
|
||||
} catch (error) {
|
||||
feedback.msgError('排课失败')
|
||||
console.error('排课失败', error)
|
||||
feedback.msgError('排课失败，请稍后重试')
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -649,18 +797,15 @@ const handleRemoveCourse = async () => {
|
|||
}
|
||||
|
||||
try {
|
||||
// TODO: 这里调用移除课程API
|
||||
// 示例：await removeCourse({
|
||||
// timeSlotId: selectedTimeSlot.value.timeSlotId
|
||||
// })
|
||||
// TODO: 调用移除课程API
|
||||
// 示例：await removeCourse({ timeSlotId: selectedTimeSlot.value.id })
|
||||
|
||||
feedback.msgSuccess('课程移除成功')
|
||||
// 刷新课表数据
|
||||
await getTimeLists()
|
||||
// 清空选中状态
|
||||
clearSelectedTimeSlot()
|
||||
} catch (error) {
|
||||
feedback.msgError('移除课程失败')
|
||||
console.error('移除课程失败', error)
|
||||
feedback.msgError('移除课程失败，请稍后重试')
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -686,6 +831,7 @@ const getTimeLists = async () => {
|
|||
allLists.value = res
|
||||
return Promise.resolve(res)
|
||||
} catch (err) {
|
||||
console.error('获取时间段列表失败', err)
|
||||
return Promise.reject(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
|
|
|
|||
Loading…
Reference in New Issue