diff --git a/src/api/stuCQS/synchronous-data/sync-class.js b/src/api/stuCQS/synchronous-data/sync-class.js index d99a0e1..831850c 100644 --- a/src/api/stuCQS/synchronous-data/sync-class.js +++ b/src/api/stuCQS/synchronous-data/sync-class.js @@ -22,4 +22,19 @@ export function syncClassinfo() { method: 'post' }) } - +// 新查询班级列表 +export function listBj(query) { + return request({ + url: '/syncdata/classInfoList', + method: 'get', + params: query + }) +} +// 新同步班级信息 +export function syncBjinfo(query) { + return request({ + url: '/syncdata/synchronousClass', + method: 'post', + params:query + }) +} diff --git a/src/views/staff/oneStop/room/roomDetailedStatistics.vue b/src/views/staff/oneStop/room/roomDetailedStatistics.vue index e0e5894..bd224b8 100644 --- a/src/views/staff/oneStop/room/roomDetailedStatistics.vue +++ b/src/views/staff/oneStop/room/roomDetailedStatistics.vue @@ -7,7 +7,7 @@ --> - + @@ -83,7 +83,7 @@ - 导出 + 导出 @@ -235,6 +235,12 @@ export default { this.queryParams.endTime = this.queryParams.rtTimeRange[1] } + // 将多选的部门数组转换为逗号分隔的字符串 + let rtDeparParam = this.queryParams.rtDepar; + if (Array.isArray(this.queryParams.rtDepar) && this.queryParams.rtDepar.length > 0) { + rtDeparParam = this.queryParams.rtDepar.join(','); + } + // 获取各部门预约功能房统计数据 const departmentRes = await getDepartmentReservationCount({ startTime: this.queryParams.startTime, @@ -242,7 +248,7 @@ export default { role: this.queryParams.rtRole, borrower: this.queryParams.rtCreatRole, auditStatus: this.queryParams.auditStatus, - rtDepar: this.queryParams.rtDepar, + rtDepar: rtDeparParam, // 使用转换后的逗号分隔字符串 eventPromoter: this.queryParams.eventPromoter, userName: this.queryParams.userName, }) @@ -254,7 +260,7 @@ export default { role: this.queryParams.rtRole, borrower: this.queryParams.rtCreatRole, auditStatus: this.queryParams.auditStatus, - rtDepar: this.queryParams.rtDepar, + rtDepar: rtDeparParam, // 使用转换后的逗号分隔字符串 eventPromoter: this.queryParams.eventPromoter, userName: this.queryParams.userName, }) diff --git a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue index da86c28..c747882 100644 --- a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue +++ b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue @@ -8,28 +8,25 @@ 搜索 + + + + + + + + 同步数据 重置 - - - 导出 - - 同步数据 - - - - - - - - + - - + + + @@ -38,7 +35,8 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue index c99965c..ba93c13 100644 --- a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue +++ b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue @@ -1,5 +1,15 @@