diff --git a/src/api/stuCQS/synchronous-data/sync-class.js b/src/api/stuCQS/synchronous-data/sync-class.js index 1bf296f..2079d54 100644 --- a/src/api/stuCQS/synchronous-data/sync-class.js +++ b/src/api/stuCQS/synchronous-data/sync-class.js @@ -22,3 +22,11 @@ export function syncClassinfo() { method: 'post' }) } +// 新查询班级列表 +export function listBj(query) { + return request({ + url: '/syncdata/classInfoList', + method: 'get', + params: query + }) +} diff --git a/src/api/stuCQS/synchronous-data/sync-major.js b/src/api/stuCQS/synchronous-data/sync-major.js index e0e966b..fcc7839 100644 --- a/src/api/stuCQS/synchronous-data/sync-major.js +++ b/src/api/stuCQS/synchronous-data/sync-major.js @@ -22,3 +22,19 @@ export function syncMajorinfo() { method: 'post' }) } +//新查询专业列表 +export function listZhuanYe(query) { + return request({ + url: '/syncdata/getSpecialtyInfoList', + method: 'get', + params: query + }) +} +//同步专业信息 +export function syncZhuanYeInfo() { + return request({ + url: '/syncdata/synchronousSpecialtyInfoList', + method: 'post' + }) +} + diff --git a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue new file mode 100644 index 0000000..49b8692 --- /dev/null +++ b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue @@ -0,0 +1,151 @@ + + + \ No newline at end of file diff --git a/src/views/stuCQS/synchronous-data/sync-instructor/index.vue b/src/views/stuCQS/synchronous-data/sync-instructor/index.vue index 0bd56eb..b7ac131 100644 --- a/src/views/stuCQS/synchronous-data/sync-instructor/index.vue +++ b/src/views/stuCQS/synchronous-data/sync-instructor/index.vue @@ -222,7 +222,6 @@ export default { getList() { this.loading = true listInstructor(this.queryParams).then(response => { - console.log(response.data); this.middleList = response.data this.total = response.total this.loading = false diff --git a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue index 6b2cf00..c99965c 100644 --- a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue +++ b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue @@ -73,20 +73,20 @@ export default { this.loading = false }) }, - /** 导出按钮操作 */ + /** 导出按钮操作 */ handleExport() { this.download('system/middle/export', { ...this.queryParams }, `middle_${new Date().getTime()}.xlsx`) }, //同步数据 - handleSync() { - syncInstructorinfonew().then(res => { + async handleSync() { + let res = await syncInstructorinfonew() + if (res.code == 200) { this.$modal.msgSuccess(res.msg) - }) + } } - + } } - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue b/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue new file mode 100644 index 0000000..7669019 --- /dev/null +++ b/src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue @@ -0,0 +1,110 @@ + + \ No newline at end of file diff --git a/src/views/survey/leave/FdyAll.vue b/src/views/survey/leave/FdyAll.vue index 44bd5b9..8601695 100644 --- a/src/views/survey/leave/FdyAll.vue +++ b/src/views/survey/leave/FdyAll.vue @@ -1,13 +1,9 @@ \ No newline at end of file diff --git a/src/views/survey/leave/fdy.vue b/src/views/survey/leave/fdy.vue index 95eec04..61ce318 100644 --- a/src/views/survey/leave/fdy.vue +++ b/src/views/survey/leave/fdy.vue @@ -136,7 +136,7 @@ - + @@ -149,6 +149,10 @@ + + + + - + @@ -501,7 +505,7 @@ export default { this.$message.info('请选择去向调查') return } - // // 重置页码为1,避免fromIndex > toIndex错误 + // // 重置页码为1,避免fromIndex > toIndex错误 // this.lookParams.pageNum = 1; let loading = fullLoading(this) let res = await listFdyStuLeave(this.lookParams) @@ -564,7 +568,7 @@ export default { } } catch (error) { loading.close() - this.$message.error('驳回失败:' + error.message) + this.$message.error('驳回失败:' + error.message) } }) }, @@ -610,7 +614,7 @@ export default { loading.close() if (res.code == 200) { - this.$message.success('编辑保存成功!') + this.$message.success('编辑保存成功!') // 刷新列表数据 this.getList() } else { @@ -618,7 +622,7 @@ export default { } } catch (error) { loading.close() - this.$message.error('编辑保存失败:' + error.message) + this.$message.error('编辑保存失败:' + error.message) } }, diff --git a/src/views/system/teacher/index.vue b/src/views/system/teacher/index.vue index f3e9363..794e27e 100644 --- a/src/views/system/teacher/index.vue +++ b/src/views/system/teacher/index.vue @@ -190,7 +190,7 @@ :label="dict.value" >{{ dict.label }} --> - +