diff --git a/src/api/basic/basicclass.ts b/src/api/basic/basicclass.ts index c0fc57f..b8c0c05 100644 --- a/src/api/basic/basicclass.ts +++ b/src/api/basic/basicclass.ts @@ -52,6 +52,18 @@ export const getObj = (id: string | number) => { }); }; +/** + * 获取详情(使用 detail 接口) + * @param id + */ +export const getDetail = (id: string | number) => { + return request({ + url: '/basic/basicclass/detail', + method: 'get', + params: { id } + }); +}; + /** * 删除 * @param id diff --git a/src/api/basic/basicstudent.ts b/src/api/basic/basicstudent.ts index ac31a7a..c9e422a 100644 --- a/src/api/basic/basicstudent.ts +++ b/src/api/basic/basicstudent.ts @@ -442,6 +442,18 @@ export const queryStuBaseByNo = (obj: string | number) => { }); }; +/** + * 学生巡检列表 + * @param query + */ +export const queryStuindex = (query?: any) => { + return request({ + url: '/basic/basicstudent/queryStuindex', + method: 'get', + params: query, + }); +}; + /** * 获取头像列表 */ diff --git a/src/api/stuwork/classhonor.ts b/src/api/stuwork/classhonor.ts index ef54a39..8c1f9f4 100644 --- a/src/api/stuwork/classhonor.ts +++ b/src/api/stuwork/classhonor.ts @@ -78,7 +78,8 @@ export const delObj = (ids: string[]) => { */ export const queryClassHonorByClassCode = (classCode: string | number) => { return request({ - url: `/stuwork/classhonor/queryClassHonorByClassCode/${classCode}`, + url: '/stuwork/classhonor/queryClassHonorByClassCode', method: 'get', + params: { classCode }, }); }; diff --git a/src/api/stuwork/classpublicity.ts b/src/api/stuwork/classpublicity.ts index 156d3d5..90a97e6 100644 --- a/src/api/stuwork/classpublicity.ts +++ b/src/api/stuwork/classpublicity.ts @@ -93,7 +93,8 @@ export const addScore = (data: any) => { */ export const queryDataByClassCode = (classCode: string | number) => { return request({ - url: `/stuwork/classpublicity/queryDataByClassCode/${classCode}`, + url: '/stuwork/classpublicity/queryDataByClassCode', method: 'get', + params: { classCode }, }); }; diff --git a/src/api/stuwork/classroomhygienedailyanalysis.ts b/src/api/stuwork/classroomhygienedailyanalysis.ts new file mode 100644 index 0000000..4483fbf --- /dev/null +++ b/src/api/stuwork/classroomhygienedailyanalysis.ts @@ -0,0 +1,24 @@ +import request from '/@/utils/request'; + +/** + * 获取教室卫生月汇总列表 + */ +export const fetchList = (query: any) => { + return request({ + url: '/stuwork/classroomhygienedailyanalysis/queryClassRoomHygieneDailyAnalysis', + method: 'get', + params: query + }); +}; + +/** + * 获取教室卫生月汇总详情 + */ +export const getObj = (query: any) => { + return request({ + url: '/stuwork/classroomhygienedaily/detail', + method: 'get', + params: query + }); +}; + diff --git a/src/api/stuwork/dormroomstudent.ts b/src/api/stuwork/dormroomstudent.ts index 6f4b6be..3d4490e 100644 --- a/src/api/stuwork/dormroomstudent.ts +++ b/src/api/stuwork/dormroomstudent.ts @@ -5,10 +5,11 @@ import request from '/@/utils/request'; * @param classCode 班级代码 */ export const fearchStuNumByClassCode = (classCode: string | number) => { - return request({ - url: `/stuwork/dormroomstudent/fearchStuNumByClassCode/${classCode}`, - method: 'get', - }); + return request({ + url: '/stuwork/dormroomstudent/fearchStuNumByClassCode', + method: 'get', + params: { classCode }, + }); }; /** diff --git a/src/api/stuwork/stupunlish.ts b/src/api/stuwork/stupunlish.ts index ff799fa..4fc7696 100644 --- a/src/api/stuwork/stupunlish.ts +++ b/src/api/stuwork/stupunlish.ts @@ -79,8 +79,9 @@ export const exportData = (query?: any) => { */ export const queryPunlishNumByClass = (classCode: string | number) => { return request({ - url: `/stuwork/stupunlish/queryPunlishNumByClass/${classCode}`, - method: 'get' + url: '/stuwork/stupunlish/queryPunlishNumByClass', + method: 'get', + params: { classCode } }); }; diff --git a/src/api/stuwork/teachclassroomassign.ts b/src/api/stuwork/teachclassroomassign.ts index 6542fb1..d132acd 100644 --- a/src/api/stuwork/teachclassroomassign.ts +++ b/src/api/stuwork/teachclassroomassign.ts @@ -5,9 +5,10 @@ import request from '/@/utils/request'; * @param classCode 班级代码 */ export const getClassRoomByClassCode = (classCode: string | number) => { - return request({ - url: `/stuwork/teachclassroomassign/getClassRoomByClassCode/${classCode}`, - method: 'get', - }); + return request({ + url: '/stuwork/teachclassroomassign/getClassRoomByClassCode', + method: 'get', + params: { classCode }, + }); }; diff --git a/src/layout/navMenu/horizontal.vue b/src/layout/navMenu/horizontal.vue index b3e147f..a86471f 100644 --- a/src/layout/navMenu/horizontal.vue +++ b/src/layout/navMenu/horizontal.vue @@ -6,7 +6,7 @@ @@ -45,6 +45,10 @@ const props = defineProps({ const chils = computed(() => { return props.chil; }); +// 获取菜单图标,如果没有则返回默认图标 +const getMenuIcon = (icon?: string) => { + return icon && icon.trim() ? icon : 'ele-Menu'; +}; // 打开外部链接 const onALinkClick = (val: RouteItem) => { other.handleOpenLink(val); diff --git a/src/layout/navMenu/vertical.vue b/src/layout/navMenu/vertical.vue index 5561557..af854e8 100644 --- a/src/layout/navMenu/vertical.vue +++ b/src/layout/navMenu/vertical.vue @@ -11,7 +11,7 @@ @@ -19,7 +19,7 @@ + + + diff --git a/src/views/basic/basicstudentavatar/index.vue b/src/views/basic/basicstudentavatar/index.vue index e8c8808..290e23b 100644 --- a/src/views/basic/basicstudentavatar/index.vue +++ b/src/views/basic/basicstudentavatar/index.vue @@ -46,10 +46,30 @@ :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle"> - - - - + + + + + + + + + + + +