diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 1492010..2d259c3 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -274,10 +274,11 @@ export default { }); }, //任课老师-数据导出 - exportData() { + exportData(data) { return service({ url: setUpUrls.exportData, method: "POST", + data, responseType: 'arraybuffer', headers: { 'Content-Type': 'application/octet-stream' @@ -1632,11 +1633,6 @@ export default { }, //删除基站 deleteStation(data) { - console.log(service({ - url: setUpUrls.deleteStation, - method: "POST", - data - })) return service({ url: setUpUrls.deleteStation, method: "POST", @@ -1651,4 +1647,36 @@ export default { data }); }, + //教学班班级名册模板下载 + tClassAndStudentTemplate(data) { + return service({ + url: setUpUrls.tClassAndStudentTemplate, + method: "POST", + data + }); + }, + //教学班班级名册导出 + exportTClassAndStudent(data) { + return service({ + url: setUpUrls.exportTClassAndStudent, + method: "POST", + data + }); + }, + // 删除班级信息(新) + deleteClass(data) { + return service({ + url: setUpUrls.deleteClass, + method: "POST", + data + }); + }, + // 清除老师下所有关联班级 + clearTeacherClasses(data) { + return service({ + url: setUpUrls.clearTeacherClasses, + method: "POST", + data + }); + }, }; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index bdee106..823ab16 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -406,28 +406,36 @@ export default { // 删除班级信息 removeClass: "/api_html/school/manager/delClass", - //删除即时测考试 - deleteReport: "/api_html/teaching/deleteReport", - //设置单班科目分析低分区间 - setLowRange: "/api_html/teaching/setLowRange", - //查询即时测多班对比情况详情 - examMultiClassReport: "/api_html/teaching/examMultiClassReport", - //导出即时测多班报表 - exportExamMultiReport: "/api_html/teaching/exportExamMultiReport", - //查询即时测多班默认等级列表 - defaultLevels: "/api_html/teaching/defaultLevels", + //删除即时测考试 + deleteReport: "/api_html/teaching/deleteReport", + //设置单班科目分析低分区间 + setLowRange: "/api_html/teaching/setLowRange", + //查询即时测多班对比情况详情 + examMultiClassReport: "/api_html/teaching/examMultiClassReport", + //导出即时测多班报表 + exportExamMultiReport: "/api_html/teaching/exportExamMultiReport", + //查询即时测多班默认等级列表 + defaultLevels: "/api_html/teaching/defaultLevels", - /** v1.5 */ - //教师/个人版查询答题卡列表的分享数量 - paperShareCount: "/api_html/common/paper/paperShareCount", - //教师/个人版导入备题组卷Word文档 - paperWordUpload: "/api_html/common/paper/upload", - //删除随堂问报表 - deletePaperReport: "/api_html/teaching/deletePaperReport", - //删除基站 - deleteStation: "/api_html/school/manager/deleteStation", - //导出授课端日志 - downloadDeviceLog: "/api_html/school/manager/downloadDeviceLog", + /** v1.5 */ + //教师/个人版查询答题卡列表的分享数量 + paperShareCount: "/api_html/common/paper/paperShareCount", + //教师/个人版导入备题组卷Word文档 + paperWordUpload: "/api_html/common/paper/upload", + //删除随堂问报表 + deletePaperReport: "/api_html/teaching/deletePaperReport", + //删除基站 + deleteStation: "/api_html/school/manager/deleteStation", + //导出授课端日志 + downloadDeviceLog: "/api_html/school/manager/downloadDeviceLog", + // 教学班班级名册模板下载 + tClassAndStudentTemplate: "/api_html/school/manager/tClassAndStudentTemplate", + // 教学班班级名册导出 + exportTClassAndStudent: "/api_html/school/manager/exportTClassAndStudent", + // 删除班级信息(新) + deleteClass: "/api_html/school/manager/deleteClass", + // 清除老师下所有关联班级 + clearTeacherClasses: "/api_html/school/manager/clearTeacherClasses", } diff --git a/src/router/index.js b/src/router/index.js index c7e773c..0d7ff47 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,6 +36,7 @@ const SetUpConglomerate = () => import("@/views/basic/setUp/conglomerate") const SetUpSchool = () => import("@/views/basic/setUp/school") const SetUpTeacher = () => import("@/views/basic/setUp/teacher") const SetUpStudent = () => import("@/views/basic/setUp/student") +const SetUpPersonalSetUpStudent = () => import("@/views/basic/setUp/PersonalStudent") const ArchivedClazz = () => import("@/views/basic/setUp/archivedClazz") const UserInfo = () => import("@/views/basic/userInfo/index") @@ -778,7 +779,7 @@ const addroutersPersonal = [ path: "/setUpStudent", iconCls: "a fa-mortar-board", name: '', - component: SetUpStudent, + component: SetUpPersonalSetUpStudent, children: [] }, ] diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue index 3dcf761..d8f34b4 100644 --- a/src/views/basic/dataSync/index.vue +++ b/src/views/basic/dataSync/index.vue @@ -27,7 +27,7 @@

班级信息 - 备题组卷数据 + 备题组卷数据 报表数据

@@ -98,10 +98,10 @@ export default { query.exportData = formatDate(times, "yyyy-MM-dd"); query.exportData = query.exportData.replaceAll("-", "") } + console.log({ ...query }) const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData - const data = await exportData(); + const data = await exportData({ ...query }); this.downLoading = false; - console.log(data); if (data) { let blob = new Blob([data], { type: "application/octet-stream" }); const url = URL.createObjectURL(blob); diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue index 59bae44..53a0750 100644 --- a/src/views/basic/device/index.vue +++ b/src/views/basic/device/index.vue @@ -100,7 +100,7 @@ - + @@ -224,7 +224,8 @@
-
+
+

+ + 行政班 + 教学班 + +

{{ item.gradeName }} - （共{{ item.classList.length }}个班） - 科目管理({{ item.subjectNames.length }}) + （共{{ item.classList.length }}个班） + 科目管理({{ + item.subjectNames.length }}) 拖动班级进行排序

- +
  • - +

    {{ clazz.className }}

    @@ -83,12 +52,7 @@
    • - +

    通过Excel名单导入班级名单，点击 @@ -99,18 +63,8 @@ 取 消

    - - + + {{ formClass.gradeName }} @@ -126,34 +80,25 @@ - +
    + + 删 除 + 确 定 取 消 - - 删 除 - + +
    - +

    {{ formClass.gradeName }} （默认科目和已经有任课老师的科目不能删除） @@ -162,54 +107,25 @@

    -

    +

    {{ item.value }} - - - + + + - +

    - - + + @@ -249,7 +165,6 @@ export default { diaClass: false, diaSubject: false, subjectLoading: false, - url: "/api_html/school/manager/importClassAndStudent", formClass: { //修改班级信息 gradeName: "", @@ -269,8 +184,21 @@ export default { subjectNames: [], //已有科目 subjectName: "", //要添加的科目 dataList: [], + + type: 0, //0-行政班/1-教学班(走班) }; }, + computed: { + url: function () { + let href = "" + if (this.type == 0) { + href = "/api_html/school/manager/importClassAndStudent" + } else { + href = "/api_html/school/manager/importTClassAndStudent" + } + return href + } + }, async created() { this.code = localStorage.getItem("csCode") || ""; this._QueryData(); @@ -330,8 +258,8 @@ export default { this.diaClass = true; }, async _RemoveClass() { - const { data, status, info } = await this.$request.removeClass({ - classId: this.formClass.classId, + const { data, status, info } = await this.$request.deleteClass({ + id: this.formClass.classId, }); if (status === 0) { this.$message.success("删除成功"); @@ -341,6 +269,7 @@ export default { this.$message.error(info); } }, + //保存班级信息 _SaveClass() { this.$refs.formClass.validate(async (valid) => { if (valid) { @@ -363,8 +292,8 @@ export default { } }); }, + //添加科目 addSubjectName() { - //添加科目 if (!this.subjectName) { this.$message.warning("请填写科目名称"); return; @@ -405,6 +334,7 @@ export default { this.$message.error(info); } }, + //删除科目 async _DelSubject(obj, index) { if (this.subjectLoading) return; this.subjectLoading = true; @@ -422,8 +352,8 @@ export default { this.$message.error(info); } }, + //保存修改年级信息 async _SaveSubject() { - //保存修改年级信息 if (!this.subjectNames.length) { this.$message.error("请选择科目！"); return; @@ -443,6 +373,7 @@ export default { this.$message.error(info); } }, + //保存排序 async _SaveComponents(classListIds) { this.loading = true; let { status, info } = await this.$request.classSort({ @@ -457,7 +388,10 @@ export default { }, async _QueryData() { this.loading = true; - let { data, status, info } = await this.$request.classManager(); + this.dataList = [] + let { data, status, info } = await this.$request.classManager({ + type: this.type + }); this.loading = false; if (status === 0) { this.dataList = [...data.list] || []; @@ -481,8 +415,10 @@ export default { this.$message.error(info); } }, + //班级名单模版下载 async downExcel() { - let data = await this.$request.classAndStudentTemplate(); + const classAndStudentTemplate = this.type == 0 ? this.$request.classAndStudentTemplate : this.$request.tClassAndStudentTemplate + let data = await classAndStudentTemplate(); if (data && !data.code) { let blob = new Blob([data], { type: "application/vnd.ms-excel;charset=utf-8", @@ -492,9 +428,11 @@ export default { this.$message.error(data.info); } }, + //班级名单下载 async exportTeacherExl() { + const exportClassAndStudent = this.type == 0 ? this.$request.exportClassAndStudent : this.$request.exportTClassAndStudent this.loadingDown = true; - let data = await this.$request.exportClassAndStudent(); + let data = await exportClassAndStudent(); this.loadingDown = false; if (data) { let blob = new Blob([data], { @@ -510,61 +448,80 @@ export default {