diff --git a/admin/src/app/api/classroom.ts b/admin/src/app/api/classroom.ts index 5dc3aa8f..6c0c9415 100644 --- a/admin/src/app/api/classroom.ts +++ b/admin/src/app/api/classroom.ts @@ -66,4 +66,12 @@ export function getWithPersonnelList(params: Record) { export function getAllClassroomList() { return request.get('classroom/classroom_all') } + +export function getClassroompeople($class_id: number) { + return request.get(`classroom/getClassroompeople/${$class_id}`) +} + +export function getClassroompeopleCount($class_id: number,params: Record) { + return request.get(`classroom/getClassroompeopleCount/${$class_id}`,{params}) +} // USER_CODE_END -- class diff --git a/admin/src/app/api/course.ts b/admin/src/app/api/course.ts index 25de668c..7aecce08 100644 --- a/admin/src/app/api/course.ts +++ b/admin/src/app/api/course.ts @@ -62,4 +62,7 @@ export function deleteCourse(id: number) { }) } +export function getAllCourseList(params: Record) { + return request.get(`course/getAllCourseList`, { params }) +} // USER_CODE_END -- course diff --git a/admin/src/app/api/course_schedule.ts b/admin/src/app/api/course_schedule.ts index fc141be0..b9ab655b 100644 --- a/admin/src/app/api/course_schedule.ts +++ b/admin/src/app/api/course_schedule.ts @@ -62,7 +62,7 @@ export function deleteCourseSchedule(id: number) { * @returns */ export function getTimetables(params: Record) { - return request.get(`course_schedule/course_schedule/timetables`, { params }) + return request.get(`course_schedule/timetables`, { params }) } // USER_CODE_END -- course_schedule diff --git a/admin/src/app/api/customer_resources.ts b/admin/src/app/api/customer_resources.ts index bd5cba65..e43e8779 100644 --- a/admin/src/app/api/customer_resources.ts +++ b/admin/src/app/api/customer_resources.ts @@ -72,3 +72,7 @@ export function fpEdit(params: Record) { showSuccessMessage: true, }) } + +export function getWithCoachList(params: Record) { + return request.get('customer_resources/coach_person', { params }) +} diff --git a/admin/src/app/api/lesson_course_teaching.ts b/admin/src/app/api/lesson_course_teaching.ts index cdb92a95..05234155 100644 --- a/admin/src/app/api/lesson_course_teaching.ts +++ b/admin/src/app/api/lesson_course_teaching.ts @@ -328,4 +328,15 @@ export function getWithPersonnelDataList(params: Record) { return request.get('lesson_course_teaching/personnel_data_all', { params }) } +export function getWithTestPaperList(params: Record) { + return request.get('lesson_course_teaching/test_paper', { params }) +} + +export function setBindingTestPaperModule(params: Record) { + return request.put( + `lesson_course_teaching/binding_test_module/${params.id}`, + params + ) +} + // USER_CODE_END -- lesson_course_teaching diff --git a/admin/src/app/lang/zh-cn/children_like.children_like.json b/admin/src/app/lang/zh-cn/children_like.children_like.json index 53760f42..84047d83 100644 --- a/admin/src/app/lang/zh-cn/children_like.children_like.json +++ b/admin/src/app/lang/zh-cn/children_like.children_like.json @@ -33,5 +33,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/lang/zh-cn/course.course.json b/admin/src/app/lang/zh-cn/course.course.json index ee23f55d..1e9f94ba 100644 --- a/admin/src/app/lang/zh-cn/course.course.json +++ b/admin/src/app/lang/zh-cn/course.course.json @@ -23,5 +23,13 @@ "updateCourse": "编辑课程", "courseDeleteTips": "确定要删除该数据吗?", "startDate": "请选择开始时间", - "endDate": "请选择结束时间" + "endDate": "请选择结束时间", + "pending": "待开始", + "upcoming": "即将开始", + "ongoing": "进行中", + "completed": "已结束", + "autoSchedule": "自动排课", + "autoSchedulePlaceholder": "请选择是否自动排课", + "yes": "是", + "no": "否" } diff --git a/admin/src/app/lang/zh-cn/course_schedule.course_schedule.json b/admin/src/app/lang/zh-cn/course_schedule.course_schedule.json index 6b02e8a0..383fadd2 100644 --- a/admin/src/app/lang/zh-cn/course_schedule.course_schedule.json +++ b/admin/src/app/lang/zh-cn/course_schedule.course_schedule.json @@ -1,29 +1,37 @@ { "id": "课程安排编号", "idPlaceholder": "请输入课程安排编号", - "campusId": "校区ID", - "campusIdPlaceholder": "请输入校区ID", - "venueId": "场地ID", - "venueIdPlaceholder": "请输入场地ID", + "campusId": "校区", + "campusIdPlaceholder": "请选择校区", + "venueId": "场地", + "venueIdPlaceholder": "请选择场地", "courseDate": "上课日期", - "courseDatePlaceholder": "请输入上课日期", + "courseDatePlaceholder": "请选择上课日期", "timeSlot": "上课时段", - "timeSlotPlaceholder": "请输入上课时段", - "courseId": "课程ID", - "courseIdPlaceholder": "请输入课程ID", - "coachId": "上课教练ID", - "coachIdPlaceholder": "请输入上课教练ID", - "participants": "参与人员列表", - "participantsPlaceholder": "请输入参与人员列表", - "studentIds": "上课学生列表", - "studentIdsPlaceholder": "请输入上课学生列表", + "timeSlotPlaceholder": "请选择上课时段", + "courseId": "课程", + "courseIdPlaceholder": "请选择课程", + "coachId": "上课教练", + "coachIdPlaceholder": "请选择上课教练", + "participants": "参与人员", + "participantsPlaceholder": "请选择参与人员", + "studentIds": "参与学生", + "studentIdsPlaceholder": "请选择参与学生", "availableCapacity": "根据场地容量判断的可安排学员位置数量", "availableCapacityPlaceholder": "请输入根据场地容量判断的可安排学员位置数量", - "status": "课程状态:", - "statusPlaceholder": "请输入课程状态:", + "status": "课程状态", + "statusPlaceholder": "请选择课程状态", "addCourseSchedule": "添加课程安排", "updateCourseSchedule": "编辑课程安排", "courseScheduleDeleteTips": "确定要删除该数据吗?", "startDate": "请选择开始时间", - "endDate": "请选择结束时间" + "endDate": "请选择结束时间", + "pending": "待开始", + "upcoming": "即将开始", + "ongoing": "进行中", + "completed": "已结束", + "autoSchedule": "自动排课", + "autoSchedulePlaceholder": "请选择是否自动排课", + "yes": "是", + "no": "否" } diff --git a/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json b/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json index a117ae63..b8fcaee5 100644 --- a/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json +++ b/admin/src/app/lang/zh-cn/future_ontent.future_ontent.json @@ -33,5 +33,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json b/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json index d356f840..6bc40b55 100644 --- a/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json +++ b/admin/src/app/lang/zh-cn/instructional_material.instructional_material.json @@ -35,5 +35,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json b/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json index 397b408a..fea74b24 100644 --- a/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json +++ b/admin/src/app/lang/zh-cn/lesson_course_teaching.lesson_course_teaching.json @@ -43,5 +43,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json b/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json index e28539b2..d91bb07e 100644 --- a/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json +++ b/admin/src/app/lang/zh-cn/physical_testing.physical_testing.json @@ -35,5 +35,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json b/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json index 03681348..fdac05a3 100644 --- a/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json +++ b/admin/src/app/lang/zh-cn/professional_skills.professional_skills.json @@ -41,5 +41,9 @@ "bindingModule": "绑定模块", "url1": "图片上传", "url2": "文件上传", - "url3": "视频上传" + "url3": "视频上传", + "addBindingTestPaper": "绑定试卷", + "totalScore": "总分", + "selectionMode": "题目选择模式", + "passingScore": "合格分数" } diff --git a/admin/src/app/views/binding_personnel/binding_personnel.vue b/admin/src/app/views/binding_personnel/binding_personnel.vue index 92cb8c88..4a5bc7a0 100644 --- a/admin/src/app/views/binding_personnel/binding_personnel.vue +++ b/admin/src/app/views/binding_personnel/binding_personnel.vue @@ -83,16 +83,16 @@ :show-overflow-tooltip="true" /> - - - + + + + + + + + + +
{ + if(multipleSelection.value.length == 0) { + ElMessage.error('请选择数据'); + return; + } let data = { id: BindingId.value, user_permission: multipleSelection.value diff --git a/admin/src/app/views/binding_test_paper/binding_test_paper.vue b/admin/src/app/views/binding_test_paper/binding_test_paper.vue new file mode 100644 index 00000000..9c5a32a0 --- /dev/null +++ b/admin/src/app/views/binding_test_paper/binding_test_paper.vue @@ -0,0 +1,333 @@ + + + + + + diff --git a/admin/src/app/views/children_like/children_like.vue b/admin/src/app/views/children_like/children_like.vue index cf8d5777..bfb41655 100644 --- a/admin/src/app/views/children_like/children_like.vue +++ b/admin/src/app/views/children_like/children_like.vue @@ -127,7 +127,7 @@ @@ -290,7 +295,7 @@ @@ -456,7 +466,7 @@ @@ -503,6 +518,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> +
@@ -529,6 +548,7 @@ import EditJump from '@/app/views/children_like/components/Jump-lesson-library-e import EditEn from '@/app/views/children_like/components/en-course-teaching-edit.vue' import { useRoute } from 'vue-router' import bindingPersonnel from '@/app/views/binding_personnel/binding_personnel.vue' +import bindingTestPaper from '@/app/views/binding_test_paper/binding_test_paper.vue' const route = useRoute() const pageName = route.meta.title const active = 'CourseSyllabus' @@ -601,11 +621,16 @@ const editEnTeachingLibraryDialog: Record | null = ref(null) const editBasketballTeachingLibraryDialog: Record | null = ref(null) const BindingPersonnelDialog: Record | null = ref(null) - +const BindingTestPaperDialog: Record | null = ref(null) const addBindingPersonnel = (row) => { BindingPersonnelDialog.value.setFormData(row) BindingPersonnelDialog.value.showDialog = true } + +const addBindingTestPaper = (row) => { + BindingTestPaperDialog.value.setFormData(row) + BindingTestPaperDialog.value.showDialog = true +} /** * 获取课程教学大纲列表 */ diff --git a/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue b/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue deleted file mode 100644 index e96f5d5f..00000000 --- a/admin/src/app/views/children_like/components/basketball-course-teaching-edit.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/children_like/components/ninja-teaching-edit.vue b/admin/src/app/views/children_like/components/ninja-teaching-edit.vue deleted file mode 100644 index 327814fe..00000000 --- a/admin/src/app/views/children_like/components/ninja-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/children_like/components/physical-teaching-edit.vue b/admin/src/app/views/children_like/components/physical-teaching-edit.vue deleted file mode 100644 index 0177ef23..00000000 --- a/admin/src/app/views/children_like/components/physical-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/children_like/components/security-teaching-edit.vue b/admin/src/app/views/children_like/components/security-teaching-edit.vue deleted file mode 100644 index eb1b1582..00000000 --- a/admin/src/app/views/children_like/components/security-teaching-edit.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue deleted file mode 100644 index b4460209..00000000 --- a/admin/src/app/views/children_like/components/strengthen-course-teaching-edit.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/children_like/physical_testing.vue b/admin/src/app/views/children_like/physical_testing.vue deleted file mode 100644 index 7b1c94c8..00000000 --- a/admin/src/app/views/children_like/physical_testing.vue +++ /dev/null @@ -1,1032 +0,0 @@ - - - - - diff --git a/admin/src/app/views/course_schedule/components/course-schedule-edit.vue b/admin/src/app/views/course_schedule/components/course-schedule-edit.vue index 8c7d63d8..4b106f05 100644 --- a/admin/src/app/views/course_schedule/components/course-schedule-edit.vue +++ b/admin/src/app/views/course_schedule/components/course-schedule-edit.vue @@ -15,93 +15,107 @@ v-loading="loading" > - + > + + - + > + + - - + style="width: 100%" + allow-create + filterable + > + + - + > + + - - - - - - - - - - - - - + > + + - - + + + {{ t('yes') }} + {{ t('no') }} + @@ -120,7 +134,7 @@ - + - diff --git a/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue b/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue deleted file mode 100644 index 5f43ae54..00000000 --- a/admin/src/app/views/future_ontent/components/ninja-teaching-edit.vue +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue b/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue deleted file mode 100644 index 0177ef23..00000000 --- a/admin/src/app/views/future_ontent/components/physical-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/future_ontent/components/security-teaching-edit.vue b/admin/src/app/views/future_ontent/components/security-teaching-edit.vue deleted file mode 100644 index 86549c73..00000000 --- a/admin/src/app/views/future_ontent/components/security-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue deleted file mode 100644 index f15da0e8..00000000 --- a/admin/src/app/views/future_ontent/components/strengthen-course-teaching-edit.vue +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/future_ontent/future_ontent.vue b/admin/src/app/views/future_ontent/future_ontent.vue index 930aba9a..fca561b0 100644 --- a/admin/src/app/views/future_ontent/future_ontent.vue +++ b/admin/src/app/views/future_ontent/future_ontent.vue @@ -127,7 +127,7 @@ @@ -290,7 +295,7 @@ @@ -456,7 +466,7 @@ @@ -503,6 +518,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> + - - diff --git a/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue b/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue deleted file mode 100644 index 5f43ae54..00000000 --- a/admin/src/app/views/instructional_material/components/ninja-teaching-edit.vue +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue b/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue deleted file mode 100644 index 0177ef23..00000000 --- a/admin/src/app/views/instructional_material/components/physical-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/instructional_material/components/security-teaching-edit.vue b/admin/src/app/views/instructional_material/components/security-teaching-edit.vue deleted file mode 100644 index 86549c73..00000000 --- a/admin/src/app/views/instructional_material/components/security-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue deleted file mode 100644 index f15da0e8..00000000 --- a/admin/src/app/views/instructional_material/components/strengthen-course-teaching-edit.vue +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/instructional_material/instructional_material.vue b/admin/src/app/views/instructional_material/instructional_material.vue index de2c4b2d..1c7ca2fd 100644 --- a/admin/src/app/views/instructional_material/instructional_material.vue +++ b/admin/src/app/views/instructional_material/instructional_material.vue @@ -125,7 +125,7 @@ @@ -276,7 +281,7 @@ @@ -311,6 +316,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -456,7 +466,7 @@ @@ -626,7 +641,7 @@ @@ -673,6 +693,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> + @@ -697,6 +721,7 @@ import EditJump from '@/app/views/instructional_material/components/Jump-lesson- import EditEn from '@/app/views/instructional_material/components/en-course-teaching-edit.vue' import EditBasketball from '@/app/views/instructional_material/components/basketball-course-teaching-edit.vue' import bindingPersonnel from '@/app/views/binding_personnel/binding_personnel.vue' +import bindingTestPaper from '@/app/views/binding_test_paper/binding_test_paper.vue' import { useRoute } from 'vue-router' const route = useRoute() const pageName = route.meta.title @@ -782,11 +807,17 @@ const editBasketballTeachingLibraryDialog: Record | null = const editStrengthenTeachingLibraryDialog: Record | null = ref(null) const BindingPersonnelDialog: Record | null = ref(null) +const BindingTestPaperDialog: Record | null = ref(null) const addBindingPersonnel = (row) => { BindingPersonnelDialog.value.setFormData(row) BindingPersonnelDialog.value.showDialog = true } + +const addBindingTestPaper = (row) => { + BindingTestPaperDialog.value.setFormData(row) + BindingTestPaperDialog.value.showDialog = true +} /** * 获取热身动作库列表 */ diff --git a/admin/src/app/views/instructional_material/lesson_course_teaching.vue b/admin/src/app/views/instructional_material/lesson_course_teaching.vue deleted file mode 100644 index 8bb5f509..00000000 --- a/admin/src/app/views/instructional_material/lesson_course_teaching.vue +++ /dev/null @@ -1,1952 +0,0 @@ - - - - - diff --git a/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue index b29f2596..ad4623e4 100644 --- a/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue +++ b/admin/src/app/views/lesson_course_teaching/lesson_course_teaching.vue @@ -127,7 +127,7 @@ @@ -263,7 +266,7 @@ @@ -311,6 +314,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -442,7 +450,7 @@ @@ -477,6 +485,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -599,7 +612,7 @@ @@ -647,6 +660,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -792,7 +810,7 @@ @@ -944,7 +967,7 @@ @@ -979,6 +1002,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -1124,7 +1152,7 @@ @@ -1276,7 +1309,7 @@ @@ -1311,6 +1344,11 @@ @click="addBindingPersonnel(row)" >{{ t('addBindingPersonnel') }} + {{ t('addBindingTestPaper') }} @@ -1337,6 +1375,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> + @@ -1367,6 +1409,7 @@ import EditNinja from '@/app/views/lesson_course_teaching/components/ninja-teach import EditSecurity from '@/app/views/lesson_course_teaching/components/security-teaching-edit.vue' import EditPhysical from '@/app/views/lesson_course_teaching/components/physical-teaching-edit.vue' import bindingPersonnel from '@/app/views/binding_personnel/binding_personnel.vue' +import bindingTestPaper from '@/app/views/binding_test_paper/binding_test_paper.vue' import { useRoute } from 'vue-router' const route = useRoute() const pageName = route.meta.title @@ -1506,12 +1549,18 @@ const editNinjaTeachingLibraryDialog: Record | null = ref(null) const editSecurityTeachingLibraryDialog: Record | null = ref(null) const editPhysicalTeachingLibraryDialog: Record | null = ref(null) const BindingPersonnelDialog: Record | null = ref(null) +const BindingTestPaperDialog: Record | null = ref(null) const addBindingPersonnel = (row) => { BindingPersonnelDialog.value.setFormData(row) BindingPersonnelDialog.value.showDialog = true } +const addBindingTestPaper = (row) => { + BindingTestPaperDialog.value.setFormData(row) + BindingTestPaperDialog.value.showDialog = true +} + /** * 获取课程教学大纲列表 */ diff --git a/admin/src/app/views/order_table/order_table.vue b/admin/src/app/views/order_table/order_table.vue index b33c6c88..8a394db9 100644 --- a/admin/src/app/views/order_table/order_table.vue +++ b/admin/src/app/views/order_table/order_table.vue @@ -116,7 +116,7 @@ - - - diff --git a/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue b/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue deleted file mode 100644 index 0177ef23..00000000 --- a/admin/src/app/views/physical_testing/components/physical-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/physical_testing/components/security-teaching-edit.vue b/admin/src/app/views/physical_testing/components/security-teaching-edit.vue deleted file mode 100644 index eb1b1582..00000000 --- a/admin/src/app/views/physical_testing/components/security-teaching-edit.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue b/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue deleted file mode 100644 index b4460209..00000000 --- a/admin/src/app/views/physical_testing/components/strengthen-course-teaching-edit.vue +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/physical_testing/physical_testing.vue b/admin/src/app/views/physical_testing/physical_testing.vue index 08a44b68..9b72fd8a 100644 --- a/admin/src/app/views/physical_testing/physical_testing.vue +++ b/admin/src/app/views/physical_testing/physical_testing.vue @@ -127,7 +127,7 @@ @@ -290,7 +295,7 @@ @@ -456,7 +466,7 @@ @@ -626,7 +641,7 @@ @@ -673,6 +693,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> + @@ -698,6 +722,7 @@ import Edit from '@/app/views/physical_testing/components/lesson-course-teaching import EditJump from '@/app/views/physical_testing/components/Jump-lesson-library-edit.vue' import EditEn from '@/app/views/physical_testing/components/en-course-teaching-edit.vue' import EditBasketball from '@/app/views/physical_testing/components/basketball-course-teaching-edit.vue' +import bindingTestPaper from '@/app/views/binding_test_paper/binding_test_paper.vue' import { useRoute } from 'vue-router' import bindingPersonnel from '@/app/views/binding_personnel/binding_personnel.vue' const route = useRoute() @@ -786,11 +811,16 @@ const editEnTeachingLibraryDialog: Record | null = ref(null) const editBasketballTeachingLibraryDialog: Record | null = ref(null) const BindingPersonnelDialog: Record | null = ref(null) - +const BindingTestPaperDialog: Record | null = ref(null) const addBindingPersonnel = (row) => { BindingPersonnelDialog.value.setFormData(row) BindingPersonnelDialog.value.showDialog = true } + +const addBindingTestPaper = (row) => { + BindingTestPaperDialog.value.setFormData(row) + BindingTestPaperDialog.value.showDialog = true +} /** * 获取课程教学大纲列表 */ diff --git a/admin/src/app/views/physical_testing/professional_skills.vue b/admin/src/app/views/physical_testing/professional_skills.vue deleted file mode 100644 index d6e1d98a..00000000 --- a/admin/src/app/views/physical_testing/professional_skills.vue +++ /dev/null @@ -1,1736 +0,0 @@ - - - - - diff --git a/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue b/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue deleted file mode 100644 index 0177ef23..00000000 --- a/admin/src/app/views/professional_skills/components/physical-teaching-edit.vue +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - diff --git a/admin/src/app/views/professional_skills/future_ontent.vue b/admin/src/app/views/professional_skills/future_ontent.vue deleted file mode 100644 index 20bed8c8..00000000 --- a/admin/src/app/views/professional_skills/future_ontent.vue +++ /dev/null @@ -1,789 +0,0 @@ - - -addPublicLibraryList editPublicLibraryList - - - - diff --git a/admin/src/app/views/professional_skills/professional_skills.vue b/admin/src/app/views/professional_skills/professional_skills.vue index a7e7e2f4..8d4d691e 100644 --- a/admin/src/app/views/professional_skills/professional_skills.vue +++ b/admin/src/app/views/professional_skills/professional_skills.vue @@ -127,7 +127,7 @@ @@ -290,7 +295,7 @@ @@ -456,7 +466,7 @@ @@ -626,7 +641,7 @@ @@ -792,7 +812,7 @@ @@ -958,7 +983,7 @@ @@ -1124,7 +1154,7 @@ @@ -1171,6 +1206,10 @@ ref="BindingPersonnelDialog" @complete="loadLessonCourseTeachingList" /> + @@ -1199,7 +1238,7 @@ import EditBasketball from '@/app/views/professional_skills/components/basketbal import EditStrengthen from '@/app/views/professional_skills/components/strengthen-course-teaching-edit.vue' import EditNinja from '@/app/views/professional_skills/components/ninja-teaching-edit.vue' import EditSecurity from '@/app/views/professional_skills/components/security-teaching-edit.vue' -import EditPhysical from '@/app/views/professional_skills/components/physical-teaching-edit.vue' +import bindingTestPaper from '@/app/views/binding_test_paper/binding_test_paper.vue' import { useRoute } from 'vue-router' import bindingPersonnel from '@/app/views/binding_personnel/binding_personnel.vue' const route = useRoute() @@ -1334,11 +1373,16 @@ const editStrengthenTeachingLibraryDialog: Record | null = const editNinjaTeachingLibraryDialog: Record | null = ref(null) const editSecurityTeachingLibraryDialog: Record | null = ref(null) const BindingPersonnelDialog: Record | null = ref(null) - +const BindingTestPaperDialog: Record | null = ref(null) const addBindingPersonnel = (row) => { BindingPersonnelDialog.value.setFormData(row) BindingPersonnelDialog.value.showDialog = true } + +const addBindingTestPaper = (row) => { + BindingTestPaperDialog.value.setFormData(row) + BindingTestPaperDialog.value.showDialog = true +} /** * 获取课程教学大纲列表 */ diff --git a/admin/src/app/views/timetables/components/schedule-add.vue b/admin/src/app/views/timetables/components/schedule-add.vue index 43607ddd..25f69ba3 100644 --- a/admin/src/app/views/timetables/components/schedule-add.vue +++ b/admin/src/app/views/timetables/components/schedule-add.vue @@ -25,7 +25,7 @@ - - {{ availableCapacity }} - - 班级 @@ -74,16 +70,16 @@ - - - - {{ item.class_name }} - - + + @@ -105,6 +101,28 @@ + + + + +
+
+
+ + {{ item.name }} + +
+
+
+
+ @@ -129,11 +147,11 @@ + + \ No newline at end of file diff --git a/admin/src/app/views/timetables/timetables.vue b/admin/src/app/views/timetables/timetables.vue index 8708989d..8b0665c9 100644 --- a/admin/src/app/views/timetables/timetables.vue +++ b/admin/src/app/views/timetables/timetables.vue @@ -1,7 +1,7 @@