diff --git a/admin/.env.development b/admin/.env.development index 3eb397bf..05f4ee20 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,6 +1,6 @@ # api请求地址 VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/' - +# VITE_APP_BASE_URL='https://zh.hnhbty.cn/adminapi/' # 图片服务器地址 VITE_IMG_DOMAIN='' diff --git a/admin/.env.production b/admin/.env.production index 3eb397bf..5f49894b 100644 --- a/admin/.env.production +++ b/admin/.env.production @@ -1,5 +1,6 @@ # api请求地址 VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/' +# VITE_APP_BASE_URL='https://zh.hnhbty.cn/adminapi/' # 图片服务器地址 VITE_IMG_DOMAIN='' diff --git a/admin/components.d.ts b/admin/components.d.ts index b8e1aa56..d3104f82 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -10,8 +10,77 @@ declare module '@vue/runtime-core' { Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default'] DiyLink: typeof import('./src/components/diy-link/index.vue')['default'] Editor: typeof import('./src/components/editor/index.vue')['default'] + ElAlert: typeof import('element-plus/es')['ElAlert'] + ElAside: typeof import('element-plus/es')['ElAside'] + ElAvatar: typeof import('element-plus/es')['ElAvatar'] + ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] + ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] + ElButton: typeof import('element-plus/es')['ElButton'] + ElCard: typeof import('element-plus/es')['ElCard'] + ElCarousel: typeof import('element-plus/es')['ElCarousel'] + ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem'] + ElCascader: typeof import('element-plus/es')['ElCascader'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] + ElCol: typeof import('element-plus/es')['ElCol'] + ElCollapse: typeof import('element-plus/es')['ElCollapse'] + ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem'] + ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] + ElDescriptions: typeof import('element-plus/es')['ElDescriptions'] + ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem'] + ElDialog: typeof import('element-plus/es')['ElDialog'] + ElDrawer: typeof import('element-plus/es')['ElDrawer'] + ElDropdown: typeof import('element-plus/es')['ElDropdown'] + ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] + ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] + ElEmpty: typeof import('element-plus/es')['ElEmpty'] + ElForm: typeof import('element-plus/es')['ElForm'] + ElFormItem: typeof import('element-plus/es')['ElFormItem'] + ElHeader: typeof import('element-plus/es')['ElHeader'] + ElIcon: typeof import('element-plus/es')['ElIcon'] + ElImage: typeof import('element-plus/es')['ElImage'] + ElImageViewer: typeof import('element-plus/es')['ElImageViewer'] + ElInput: typeof import('element-plus/es')['ElInput'] + ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] + ElLink: typeof import('element-plus/es')['ElLink'] + ElMain: typeof import('element-plus/es')['ElMain'] + ElMenu: typeof import('element-plus/es')['ElMenu'] + ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] + ElOption: typeof import('element-plus/es')['ElOption'] + ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] + ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] + ElPagination: typeof import('element-plus/es')['ElPagination'] + ElPopover: typeof import('element-plus/es')['ElPopover'] + ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] + ElRate: typeof import('element-plus/es')['ElRate'] + ElResult: typeof import('element-plus/es')['ElResult'] + ElRow: typeof import('element-plus/es')['ElRow'] + ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] + ElSelect: typeof import('element-plus/es')['ElSelect'] + ElSlider: typeof import('element-plus/es')['ElSlider'] + ElStatistic: typeof import('element-plus/es')['ElStatistic'] + ElStep: typeof import('element-plus/es')['ElStep'] + ElSteps: typeof import('element-plus/es')['ElSteps'] + ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] + ElSwitch: typeof import('element-plus/es')['ElSwitch'] + ElTable: typeof import('element-plus/es')['ElTable'] + ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] + ElTabPane: typeof import('element-plus/es')['ElTabPane'] + ElTabs: typeof import('element-plus/es')['ElTabs'] + ElTag: typeof import('element-plus/es')['ElTag'] + ElTimeline: typeof import('element-plus/es')['ElTimeline'] + ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem'] + ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] + ElTooltip: typeof import('element-plus/es')['ElTooltip'] + ElTree: typeof import('element-plus/es')['ElTree'] + ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] + ElUpload: typeof import('element-plus/es')['ElUpload'] ExportSure: typeof import('./src/components/export-sure/index.vue')['default'] HeatMap: typeof import('./src/components/heat-map/index.vue')['default'] Icon: typeof import('./src/components/icon/index.vue')['default'] @@ -21,7 +90,6 @@ declare module '@vue/runtime-core' { RouterView: typeof import('vue-router')['RouterView'] SelectArea: typeof import('./src/components/select-area/index.vue')['default'] SelectIcon: typeof import('./src/components/select-icon/index.vue')['default'] - TencentMapPicker: typeof import('./src/components/TencentMapPicker.vue')['default'] UploadAttachment: typeof import('./src/components/upload-attachment/index.vue')['default'] UploadFile: typeof import('./src/components/upload-file/index.vue')['default'] UploadImage: typeof import('./src/components/upload-image/index.vue')['default'] @@ -32,4 +100,7 @@ declare module '@vue/runtime-core' { VideoPlayer: typeof import('./src/components/video-player/index.vue')['default'] WebLink: typeof import('./src/components/web-link/web-link.vue')['default'] } + export interface ComponentCustomProperties { + vLoading: typeof import('element-plus/es')['ElLoadingDirective'] + } } diff --git a/admin/src/app/api/lesson_course_teaching.ts b/admin/src/app/api/lesson_course_teaching.ts index 47a54c9d..eb63d041 100644 --- a/admin/src/app/api/lesson_course_teaching.ts +++ b/admin/src/app/api/lesson_course_teaching.ts @@ -233,6 +233,10 @@ export function getLessonCourseTeachingInfo(id: number) { return request.get(`lesson_course_teaching/lesson_course_teaching/${id}`); } +export function setBindingModule(params: Record) { + return request.put(`lesson_course_teaching/binding_module/${params.id}`, params) +} + /** * 删除教研管理 * @param id 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 7cb9540a..e4febb5d 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 @@ -23,5 +23,12 @@ "addJumpLessonLibrary":"添加套圈游戏", "updateJumpLessonLibrary":"编辑套圈游戏", "addEnTeachingLibrary":"添加鼓励方式", - "editEnTeachingLibrary":"编辑鼓励方式" + "editEnTeachingLibrary":"编辑鼓励方式", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } 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 93d37a7b..d0f21b28 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 @@ -23,5 +23,12 @@ "addJumpLessonLibrary":"添加训练视频", "updateJumpLessonLibrary":"编辑训练视频", "addEnTeachingLibrary":"添加课后作业", - "editEnTeachingLibrary":"编辑课后作业" + "editEnTeachingLibrary":"编辑课后作业", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } 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 c2fb9190..e1ed4284 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 @@ -25,6 +25,13 @@ "addEnTeachingLibrary":"添加趣味游戏库", "editEnTeachingLibrary":"编辑趣味游戏库", "addBasketballTeachingLibrary":"添加放松动作库", - "editBasketballTeachingLibrary":"编辑放松动作库" + "editBasketballTeachingLibrary":"编辑放松动作库", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } 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 9dce4991..7d4c4a09 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 @@ -33,5 +33,12 @@ "addSecurityTeachingLibrary":"添加少儿安防教案库", "editSecurityTeachingLibrary":"编辑少儿安防教案库", "addPhysicalTeachingLibrary":"添加体能教案库", - "editPhysicalTeachingLibrary":"编辑体能教案库" + "editPhysicalTeachingLibrary":"编辑体能教案库", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } 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 151ca208..4671b717 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 @@ -25,5 +25,12 @@ "addEnTeachingLibrary":"添加3-6岁体测讲解—解读", "editEnTeachingLibrary":"编辑3-6岁体测讲解—解读", "addBasketballTeachingLibrary":"添加7+岁体测讲解—解读", - "editBasketballTeachingLibrary":"编辑7+岁体测讲解—解读" + "editBasketballTeachingLibrary":"编辑7+岁体测讲解—解读", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } 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 ff3dc10f..c041ca11 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 @@ -31,5 +31,12 @@ "addNinjaTeachingLibrary":"添加安防动作", "editNinjaTeachingLibrary":"编辑安防动作", "addSecurityTeachingLibrary":"添加标准化动作", - "editSecurityTeachingLibrary":"编辑标准化动作" + "editSecurityTeachingLibrary":"编辑标准化动作", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块" } diff --git a/admin/src/app/views/binding_personnel/binding_personnel.vue b/admin/src/app/views/binding_personnel/binding_personnel.vue new file mode 100644 index 00000000..2b7f0126 --- /dev/null +++ b/admin/src/app/views/binding_personnel/binding_personnel.vue @@ -0,0 +1,295 @@ + + + + + + diff --git a/admin/src/app/views/children_like/children_like.vue b/admin/src/app/views/children_like/children_like.vue index 59d5f064..0234901d 100644 --- a/admin/src/app/views/children_like/children_like.vue +++ b/admin/src/app/views/children_like/children_like.vue @@ -72,10 +72,11 @@ - + @@ -159,10 +160,11 @@ - + @@ -246,10 +248,12 @@ - + + @@ -265,6 +269,7 @@ + @@ -279,6 +284,7 @@ import Edit from '@/app/views/children_like/components/lesson-course-teaching-ed import EditJump from '@/app/views/children_like/components/Jump-lesson-library-edit.vue' 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' const route = useRoute() const pageName = route.meta.title; const active = 'CourseSyllabus' @@ -294,7 +300,7 @@ let lessonCourseTeachingTable = reactive({ "status":"", "create_time":[], "update_time":[], - table_type: 27 + "table_type": 27 } }) let JumpLessonLibraryTable = reactive({ @@ -308,7 +314,7 @@ let JumpLessonLibraryTable = reactive({ "status":"", "create_time":[], "update_time":[], - table_type: 28 + "table_type": 28 } }) let EnTeachingLibraryTable = reactive({ @@ -322,7 +328,7 @@ let EnTeachingLibraryTable = reactive({ "status":"", "create_time":[], "update_time":[], - table_type: 29 + "table_type": 29 } }) @@ -347,7 +353,12 @@ const editLessonCourseTeachingDialog: Record | null = ref(null) const editJumpLessonLibraryDialog: Record | null = ref(null) const editEnTeachingLibraryDialog: Record | null = ref(null) const editBasketballTeachingLibraryDialog: Record | null = ref(null) +const BindingPersonnelDialog: Record | null = ref(null) +const addBindingPersonnel = (row) => { + BindingPersonnelDialog.value.setFormData(row) + BindingPersonnelDialog.value.showDialog = true +} /** * 获取课程教学大纲列表 */ @@ -500,52 +511,34 @@ const resetForm = (formEl: FormInstance | undefined, type: number) => { if (!formEl) return formEl.resetFields() if (type === 27) { - lessonCourseTeachingTable = reactive({ - page: 1, - limit: 10, - total: 0, - loading: true, - data: [], - searchParam: { - "title": "", - "status": "", - "create_time": [], - "update_time": [], - table_type: 27 - } - }) + lessonCourseTeachingTable.searchParam.title = '' + lessonCourseTeachingTable.searchParam.status = '' + lessonCourseTeachingTable.searchParam.create_time = '' + lessonCourseTeachingTable.searchParam.update_time = '' + lessonCourseTeachingTable.page = 1 + lessonCourseTeachingTable.limit = 10 + lessonCourseTeachingTable.data = [] + lessonCourseTeachingTable.table_type = 27 loadLessonCourseTeachingList() } else if (type === 28) { - JumpLessonLibraryTable = reactive({ - page: 1, - limit: 10, - total: 0, - loading: true, - data: [], - searchParam: { - "title": "", - "status": "", - "create_time": [], - "update_time": [], - table_type: 28 - } - }) + JumpLessonLibraryTable.searchParam.title = '' + JumpLessonLibraryTable.searchParam.status = '' + JumpLessonLibraryTable.searchParam.create_time = '' + JumpLessonLibraryTable.searchParam.update_time = '' + JumpLessonLibraryTable.page = 1 + JumpLessonLibraryTable.limit = 10 + JumpLessonLibraryTable.data = [] + JumpLessonLibraryTable.table_type = 28 loadJumpLessonLibraryList() } else if (type === 29) { - EnTeachingLibraryTable = reactive({ - page: 1, - limit: 10, - total: 0, - loading: true, - data: [], - searchParam: { - "title": "", - "status": "", - "create_time": [], - "update_time": [], - table_type: 29 - } - }) + EnTeachingLibraryTable.searchParam.title = '' + EnTeachingLibraryTable.searchParam.status = '' + EnTeachingLibraryTable.searchParam.create_time = '' + EnTeachingLibraryTable.searchParam.update_time = '' + EnTeachingLibraryTable.page = 1 + EnTeachingLibraryTable.limit = 10 + EnTeachingLibraryTable.data = [] + EnTeachingLibraryTable.table_type = 29 loadEnTeachingLibraryList() } } diff --git a/admin/src/app/views/future_ontent/future_ontent.vue b/admin/src/app/views/future_ontent/future_ontent.vue index 91cd7c34..6ada2dd4 100644 --- a/admin/src/app/views/future_ontent/future_ontent.vue +++ b/admin/src/app/views/future_ontent/future_ontent.vue @@ -72,10 +72,11 @@ - + @@ -159,10 +160,11 @@ - + @@ -246,10 +248,11 @@ - + @@ -265,12 +268,9 @@ + - - addPublicLibraryList editPublicLibraryList - -