diff --git a/AES-front/src/api/admin.js b/AES-front/src/api/admin.js index 6ede440..811aabb 100644 --- a/AES-front/src/api/admin.js +++ b/AES-front/src/api/admin.js @@ -63,4 +63,11 @@ export default { responseType: 'blob', params: config, }), + getAssistantByClassIdPage: (data) => request.post('/adminusers/getAssistantByClassIdPage', data), + deleteClassAssistant: (data) => request.post('/assistantClass/deleteClassAssistant', data), + findAdminuserByAccount: (data) => + request.post('/adminusers/findAdminuserByAccount', data, { noNeedToken: true }), + addClassAssistant: (data) => request.post('/assistantClass/addClassAssistant', data), + getAssistantNotBelongClass: (data) => + request.post('/adminusers/getAssistantNotBelongClass', data), } diff --git a/AES-front/src/views/admin/class/class-assistant-add.vue b/AES-front/src/views/admin/class/class-assistant-add.vue index f9c2730..7fb7b85 100644 --- a/AES-front/src/views/admin/class/class-assistant-add.vue +++ b/AES-front/src/views/admin/class/class-assistant-add.vue @@ -46,8 +46,10 @@ \ No newline at end of file diff --git a/AES-front/src/views/admin/class/class-assistant-list.vue b/AES-front/src/views/admin/class/class-assistant-list.vue index 67c735e..a5c79ef 100644 --- a/AES-front/src/views/admin/class/class-assistant-list.vue +++ b/AES-front/src/views/admin/class/class-assistant-list.vue @@ -62,9 +62,7 @@ const classInfoValue = ref({ pageNum:paginationReactive.page, pageSize:paginationReactive.pageSize, }); -const onAdd = ()=>{ - router.push({name: 'ClassAssistantAdd',params:{clId}}) -} + const columns = [ { key: 'no', @@ -128,8 +126,11 @@ const onChangePage = (page) => { queryByPage() } } -const onDetailedAssistant = async (classId)=>{ - const {id} = classId +const onAdd = ()=>{ + router.push({name: 'ClassAssistantAdd',params:{clId}}) +} +const onDetailedAssistant = async (assistantId)=>{ + const {id} = assistantId await router.push({name: 'ClassAssistantDetail', params: {clId: id}}) } const onPasswordAssistant= async (classId)=>{ @@ -142,7 +143,7 @@ const onDeleteAssistant = async (classId)=>{ const ids=classInfoValue.value.classId const idss=parseInt(ids) try { - const res = await api.deleteClassAssistan({ + const res = await api.deleteClassAssistant({ classId:idss, assistantId:id, }) diff --git a/AES-front/src/views/admin/class/class-list.vue b/AES-front/src/views/admin/class/class-list.vue index 7dfd6d7..dbdf6da 100644 --- a/AES-front/src/views/admin/class/class-list.vue +++ b/AES-front/src/views/admin/class/class-list.vue @@ -32,7 +32,7 @@ - 添加课程班级 + 添加班级 diff --git a/AES-front/src/views/admin/class/components/class-assistant-add.vue b/AES-front/src/views/admin/class/components/class-assistant-add.vue index 989cdb0..bde92ba 100644 --- a/AES-front/src/views/admin/class/components/class-assistant-add.vue +++ b/AES-front/src/views/admin/class/components/class-assistant-add.vue @@ -67,7 +67,7 @@ const path=ref('') const route = useRoute() const router = useRouter() const userStore = useUserStore() -const ids=userStore.getSchoolId() +// const ids=userStore.getSchoolId() const loading = ref(true) const {clId}=route.params const assistantInfoValue = ref({ @@ -93,14 +93,14 @@ const Add=async ()=>{ password:sha256(assistantInfoValue.value.password.trim()).toString(), sessionId: generateRandomString(64)+assistantInfoValue.value.password.trim(), no:assistantInfoValue.value.no, - schoolId:ids + // schoolId:ids }) if (res.code==='400'){ }else { if (res.data !== null) { const res1 = await api.findAdminuserByAccount({ account: assistantInfoValue.value.account, - schoolId: ids + // schoolId: ids }) await api.addClassAssistant({ classId: clId, diff --git a/AES-front/src/views/admin/class/components/class-assistant-select.vue b/AES-front/src/views/admin/class/components/class-assistant-select.vue index 37ee424..1f4ba95 100644 --- a/AES-front/src/views/admin/class/components/class-assistant-select.vue +++ b/AES-front/src/views/admin/class/components/class-assistant-select.vue @@ -62,7 +62,6 @@