diff --git a/admin/.env.development b/admin/.env.development index 3eb397bf..85db1e27 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,5 +1,5 @@ # api请求地址 -VITE_APP_BASE_URL='http://146.56.228.75:20024/adminapi/' +VITE_APP_BASE_URL='http://zhjwxt.cc/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/auto-imports.d.ts b/admin/auto-imports.d.ts index 08908edd..a51b7a66 100644 --- a/admin/auto-imports.d.ts +++ b/admin/auto-imports.d.ts @@ -1,5 +1,5 @@ // Generated by 'unplugin-auto-import' export {} declare global { - + const ElNotification: typeof import('element-plus/es')['ElNotification'] } diff --git a/admin/components.d.ts b/admin/components.d.ts index 266a85b9..e1d612fe 100644 --- a/admin/components.d.ts +++ b/admin/components.d.ts @@ -39,7 +39,6 @@ declare module '@vue/runtime-core' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] - ElPageHeader: typeof import('element-plus/es')['ElPageHeader'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] @@ -47,8 +46,6 @@ declare module '@vue/runtime-core' { ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - 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'] @@ -57,7 +54,6 @@ declare module '@vue/runtime-core' { ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] 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'] diff --git a/admin/src/app/api/departments.ts b/admin/src/app/api/departments.ts index 8b988a86..0bc81e01 100644 --- a/admin/src/app/api/departments.ts +++ b/admin/src/app/api/departments.ts @@ -7,7 +7,7 @@ import request from '@/utils/request' * @returns */ export function getDepartmentsList(params: Record) { - return request.get(`departments/departments`, { params }) + return request.get(`departments/departments`, {params}) } /** @@ -16,7 +16,7 @@ export function getDepartmentsList(params: Record) { * @returns */ export function getDepartmentsInfo(id: number) { - return request.get(`departments/departments/${id}`) + return request.get(`departments/departments/${id}`); } /** @@ -25,10 +25,7 @@ export function getDepartmentsInfo(id: number) { * @returns */ export function addDepartments(params: Record) { - return request.post('departments/departments', params, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.post('departments/departments', params, { showErrorMessage: true, showSuccessMessage: true }) } /** @@ -38,10 +35,7 @@ export function addDepartments(params: Record) { * @returns */ export function editDepartments(params: Record) { - return request.put(`departments/departments/${params.id}`, params, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.put(`departments/departments/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true }) } /** @@ -50,14 +44,11 @@ export function editDepartments(params: Record) { * @returns */ export function deleteDepartments(id: number) { - return request.delete(`departments/departments/${id}`, { - showErrorMessage: true, - showSuccessMessage: true, - }) + return request.delete(`departments/departments/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } -export function getWithDepartmentsList(params: Record) { - return request.get('departments/departments_all', { params }) +export function getWithDepartmentsList(params: Record){ + return request.get('departments/departments_all', {params}) } // USER_CODE_END -- departments 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..2495d5a7 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,15 @@ "addJumpLessonLibrary":"添加套圈游戏", "updateJumpLessonLibrary":"编辑套圈游戏", "addEnTeachingLibrary":"添加鼓励方式", - "editEnTeachingLibrary":"编辑鼓励方式" + "editEnTeachingLibrary":"编辑鼓励方式", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } diff --git a/admin/src/app/lang/zh-cn/departments.departments.json b/admin/src/app/lang/zh-cn/departments.departments.json index 1a00d388..a2040d42 100644 --- a/admin/src/app/lang/zh-cn/departments.departments.json +++ b/admin/src/app/lang/zh-cn/departments.departments.json @@ -1,13 +1,15 @@ { - "id": "部门编号", - "idPlaceholder": "请输入部门编号", - "departmentName": "部门名称", - "departmentNamePlaceholder": "请输入部门名称", - "parentDepartmentId": "上级部门ID", - "parentDepartmentIdPlaceholder": "全部", - "addDepartments": "添加部门", - "updateDepartments": "编辑部门", - "departmentsDeleteTips": "确定要删除该数据吗?", - "startDate": "请选择开始时间", - "endDate": "请选择结束时间" -} + "id":"部门编号", + "idPlaceholder":"请输入部门编号", + "departmentName":"部门名称", + "departmentNamePlaceholder":"请输入部门名称", + "parentDepartmentId":"上级部门ID", + "parentDepartmentIdPlaceholder":"全部", + "createdAt":"创建时间", + "updatedAt":"修改时间", + "addDepartments":"添加部门", + "updateDepartments":"编辑部门", + "departmentsDeleteTips":"确定要删除该数据吗?", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file 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..3566ebed 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,15 @@ "addJumpLessonLibrary":"添加训练视频", "updateJumpLessonLibrary":"编辑训练视频", "addEnTeachingLibrary":"添加课后作业", - "editEnTeachingLibrary":"编辑课后作业" + "editEnTeachingLibrary":"编辑课后作业", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } 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..0beb2d53 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,16 @@ "addEnTeachingLibrary":"添加趣味游戏库", "editEnTeachingLibrary":"编辑趣味游戏库", "addBasketballTeachingLibrary":"添加放松动作库", - "editBasketballTeachingLibrary":"编辑放松动作库" + "editBasketballTeachingLibrary":"编辑放松动作库", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } 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..ebe16501 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,15 @@ "addSecurityTeachingLibrary":"添加少儿安防教案库", "editSecurityTeachingLibrary":"编辑少儿安防教案库", "addPhysicalTeachingLibrary":"添加体能教案库", - "editPhysicalTeachingLibrary":"编辑体能教案库" + "editPhysicalTeachingLibrary":"编辑体能教案库", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } 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..5cc6f360 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,15 @@ "addEnTeachingLibrary":"添加3-6岁体测讲解—解读", "editEnTeachingLibrary":"编辑3-6岁体测讲解—解读", "addBasketballTeachingLibrary":"添加7+岁体测讲解—解读", - "editBasketballTeachingLibrary":"编辑7+岁体测讲解—解读" + "editBasketballTeachingLibrary":"编辑7+岁体测讲解—解读", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } 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..3b2d8422 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,15 @@ "addNinjaTeachingLibrary":"添加安防动作", "editNinjaTeachingLibrary":"编辑安防动作", "addSecurityTeachingLibrary":"添加标准化动作", - "editSecurityTeachingLibrary":"编辑标准化动作" + "editSecurityTeachingLibrary":"编辑标准化动作", + "addBindingPersonnel":"添加绑定人员", + "userName":"姓名", + "userPhone":"电话", + "userStatus":"状态", + "userCreateTime":"创建时间", + "userUpdateTime":"更新时间", + "bindingModule": "绑定模块", + "url1": "图片上传", + "url2": "文件上传", + "url3": "视频上传" } 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/children_like/components/Jump-lesson-library-edit.vue b/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue index 01aeba1a..c0fe6637 100644 --- a/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue +++ b/admin/src/app/views/children_like/components/Jump-lesson-library-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -139,6 +151,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false diff --git a/admin/src/app/views/children_like/components/en-course-teaching-edit.vue b/admin/src/app/views/children_like/components/en-course-teaching-edit.vue index 11d9d853..9fa0bdd0 100644 --- a/admin/src/app/views/children_like/components/en-course-teaching-edit.vue +++ b/admin/src/app/views/children_like/components/en-course-teaching-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -133,6 +145,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false diff --git a/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue b/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue index 28c2c4a2..377654bd 100644 --- a/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue +++ b/admin/src/app/views/children_like/components/lesson-course-teaching-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -134,6 +146,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false diff --git a/admin/src/app/views/departments/components/departments-edit.vue b/admin/src/app/views/departments/components/departments-edit.vue index 4dc66615..e66c2972 100644 --- a/admin/src/app/views/departments/components/departments-edit.vue +++ b/admin/src/app/views/departments/components/departments-edit.vue @@ -1,58 +1,33 @@ diff --git a/admin/src/app/views/departments/departments.vue b/admin/src/app/views/departments/departments.vue index d3e97014..b4b971e4 100644 --- a/admin/src/app/views/departments/departments.vue +++ b/admin/src/app/views/departments/departments.vue @@ -1,140 +1,93 @@ diff --git a/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue b/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue index 4d2a4439..528e4c68 100644 --- a/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue +++ b/admin/src/app/views/future_ontent/components/Jump-lesson-library-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -139,6 +151,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false diff --git a/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue index 3458b8d4..3c362ea8 100644 --- a/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue +++ b/admin/src/app/views/future_ontent/components/en-course-teaching-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -133,6 +145,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false diff --git a/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue b/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue index d059e8cf..dc59c855 100644 --- a/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue +++ b/admin/src/app/views/future_ontent/components/lesson-course-teaching-edit.vue @@ -21,6 +21,18 @@ + + + + + + + + + + + + @@ -134,6 +146,7 @@ const confirm = async (formEl: FormInstance | undefined) => { save(data).then(res => { loading.value = false showDialog.value = false + formData.url = '' emit('complete') }).catch(err => { loading.value = false 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 - -