From e371f2dca0d39d5e80f13bc3d8a20351a3c8a051 Mon Sep 17 00:00:00 2001 From: 梁保满 Date: Fri, 3 Mar 2023 17:49:24 +0800 Subject: [PATCH] 软件下载，学校，班级老师等报表导入导出，学生画像接口联调 --- src/api/apis/apis.js | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- src/api/urls/apis.js | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------- src/assets/images/img404/bg404.jpg | Bin 0 -> 36647 bytes src/assets/images/img404/i404.png | Bin 0 -> 17165 bytes src/assets/images/img404/sign.png | Bin 0 -> 433534 bytes src/assets/img404/bg404.jpg | Bin 36647 -> 0 bytes src/assets/img404/i404.png | Bin 17165 -> 0 bytes src/assets/img404/sign.png | Bin 433534 -> 0 bytes src/router/index.js | 57 +++++++++++++++++++++++++++++++++++++++++---------------- src/utils/index.js | 11 +++++++---- src/views/admin/clientVersion/components/upLoad.vue | 4 ++-- src/views/admin/clientVersion/components/upLoadImg.vue | 2 +- src/views/admin/clientVersion/index.vue | 73 +++++++++++++++++++++++++++++++++++++++++++++++++------------------------ src/views/admin/device/index.vue | 51 ++++++++++++++++++++------------------------------- src/views/admin/device/log.vue | 2 +- src/views/examinationPaper/add.vue | 2184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/examinationPaper/edit.vue | 1260 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/examinationPaper/index.vue | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/examinationPaper/recycle.vue | 448 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/index/mainIndex.vue | 21 ++++++++++++++++++++- src/views/personal/ask/index.vue | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/down/index.vue | 37 ++++++++++++++++++++++++++++++++----- src/views/personal/examinationPaper/add.vue | 2057 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/examinationPaper/edit.vue | 1199 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/examinationPaper/index.vue | 469 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/examinationPaper/recycle.vue | 418 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/portrait/detail.vue | 371 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/portrait/index.vue | 333 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/personal/setUp/student.vue | 12 +++--------- src/views/personal/test/index.vue | 4 +++- src/views/portrait/detail.vue | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/portrait/index.vue | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/standard/ask/analysis.vue | 474 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/views/standard/ask/index.vue | 649 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/standard/setUp/school.vue | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- src/views/standard/setUp/student.vue | 26 +++++++++++++------------- src/views/standard/setUp/teacher.vue | 63 ++++++++++++++++++++++++++++++++++++++++++++++----------------- src/views/standard/test/analysis.vue | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------- src/views/standard/test/editAnswer.vue | 908 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/standard/test/index.vue | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------- vue.config.js | 1 - 41 files changed, 6697 insertions(+), 6915 deletions(-) create mode 100644 src/assets/images/img404/bg404.jpg create mode 100644 src/assets/images/img404/i404.png create mode 100644 src/assets/images/img404/sign.png delete mode 100644 src/assets/img404/bg404.jpg delete mode 100644 src/assets/img404/i404.png delete mode 100644 src/assets/img404/sign.png create mode 100644 src/views/examinationPaper/add.vue create mode 100644 src/views/examinationPaper/edit.vue create mode 100644 src/views/examinationPaper/index.vue create mode 100644 src/views/examinationPaper/recycle.vue delete mode 100644 src/views/personal/examinationPaper/add.vue delete mode 100644 src/views/personal/examinationPaper/edit.vue delete mode 100644 src/views/personal/examinationPaper/index.vue delete mode 100644 src/views/personal/examinationPaper/recycle.vue delete mode 100644 src/views/personal/portrait/detail.vue delete mode 100644 src/views/personal/portrait/index.vue create mode 100644 src/views/portrait/detail.vue create mode 100644 src/views/portrait/index.vue delete mode 100644 src/views/standard/test/editAnswer.vue diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 97b5242..7cd5ae0 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -443,6 +443,50 @@ export default { data, }); }, + // 导入学生答题器文件上传 + importStudentClicker(data) { + return service({ + url: setUpUrls.importStudentClicker, + method: "POST", + data, + }); + }, + // 班级名册模板下载 + classAndStudentTemplate(data) { + return service({ + url: setUpUrls.classAndStudentTemplate, + method: "POST", + data, + responseType: 'arraybuffer', + }); + }, + // 班级名册导出 + exportClassAndStudent(data) { + return service({ + url: setUpUrls.exportClassAndStudent, + method: "POST", + data, + responseType: 'arraybuffer', + }); + }, + // 教师模板下载 + teacherTemplate(data) { + return service({ + url: setUpUrls.teacherTemplate, + method: "POST", + data, + }); + }, + // 教师导出 + exportTeacher(data) { + return service({ + url: setUpUrls.exportTeacher, + method: "POST", + data, + responseType: 'arraybuffer', + }); + }, + // 删除学生 delStudent(data) { return service({ @@ -938,9 +982,9 @@ export default { }); }, // 分页查询课时报表列表 - pPersonal(data) { + pPeriodReportList(data) { return service({ - url: setUpUrls.pPersonal, + url: setUpUrls.pPeriodReportList, method: "POST", data }); @@ -1177,6 +1221,14 @@ export default { data }); }, + //删除授课端版本 + delVersion(data) { + return service({ + url: setUpUrls.delVersion, + method: "POST", + data + }); + }, //基站统计数据 pStationReport(data) { return service({ @@ -1234,7 +1286,7 @@ export default { responseType: 'arraybuffer', }); }, - //班级名册导出 + //上传图片 puploadImg(data) { return service({ url: setUpUrls.uploadImg, @@ -1242,4 +1294,28 @@ export default { data, }); }, + //学生测练统计 + studentExamReport(data) { + return service({ + url: setUpUrls.studentExamReport, + method: "POST", + data, + }); + }, + //查询最新的授课端应用版本 + pLatestVersion(data) { + return service({ + url: setUpUrls.pLatestVersion, + method: "POST", + data, + }); + }, + //载指定版本授课端 + pGetAppDownloadUrl(data) { + return service({ + url: setUpUrls.pGetAppDownloadUrl, + method: "POST", + data, + }); + }, }; diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index bc29003..598ea81 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -24,7 +24,7 @@ export default { cTExportPhaseInteractiveReport: "/api_html/class/manager/exportPhaseInteractiveReport", //班主任- 导出阶段测练报表 cTExportPhaseExamReport: "/api_html/class/manager/exportPhaseExamReport", - + //任课老师-查询管理班级 tClassList: "/api_html/teaching/classList", //任课老师-查询管理班级授课科目 @@ -110,6 +110,19 @@ export default { addStudent: "/api_html/school/manager/addStudent", // 导入学生答题器绑定模板下载地址 studentClickerTemplateUrl: "/api_html/school/manager/studentClickerTemplateUrl", + // 导入学生答题器文件上传 + importStudentClicker: "/api_html/school/manager/importStudentClicker", + // 班级名册模板下载 + classAndStudentTemplate: "/api_html/school/manager/classAndStudentTemplate", + // 班级名册导出 + exportClassAndStudent: "/api_html/school/manager/exportClassAndStudent", + // 教师模板下载 + teacherTemplate: "/api_html/school/manager/teacherTemplate", + // 教师导入 + importTeacher: "/api_html/school/manager/importTeacher", + // 教师导出 + exportTeacher: "/api_html/school/manager/exportTeacher", + // 删除学生 delStudent: "/api_html/school/manager/delStudent", // 查询学校教师列表 @@ -201,121 +214,129 @@ export default { syncUser: "/api_html/tenant/syncUser", - // 个人版首页统计数据 - personalIndex:"/api_html/personal/index", - // 个人信息 - getInfo:"/api_html/personal/personalInfo", - // 修改个人信息 - modifyInfo:"/api_html/personal/modifyInfo", - // 查询班级列表 - pClassList:"/api_html/personal/classList", - // 查询科目列表 - pSubjectList:"/api_html/personal/subjectList", - // 查询学生列表 - pStudentList:"/api_html/personal/studentList", - // 新增或修改班级 - pSaveClass:"/api_html/personal/saveClass", - // 删除班级 - pDelClass:"/api_html/personal/delClass", - // 增加学生 - pAddStudent:"/api_html/personal/addStudent", - // 删除学生 - pDelStudent:"/api_html/personal/delStudent", - // 查询答题卡类型列表 - pPaperTagList:"/api_html/personal/paperTagList", - // 查询答题卡列表 - pPaperList:"/api_html/personal/paperList", - // 查询答题卡详情 - pPaperDetail:"/api_html/personal/paperDetail", - // 增加答题卡 - pAddPaper:"/api_html/personal/addPaper", - // 修改答题卡 - pModifyPaper:"/api_html/personal/modifyPaper", - // 删除答题卡 - pDelPaper:"/api_html/personal/delPaper", - // 增加答题卡类型 - pAddPaperType:"/api_html/personal/addPaperType", - // 修改答题卡类型 - pModifyPaperType:"/api_html/personal/modifyPaperType", - // 删除答题卡类型 - pDelPaperType:"/api_html/personal/delPaperType", - // 分页查询课时报表列表 - pPeriodReportList:"/api_html/personal/periodReportList", - // 查询阶段问答报表 - pPhaseAnswerReport:"/api_html/personal/phaseAnswerReport", - // 查询阶段互动报表 - pPhaseInteractiveReport:"/api_html/personal/phaseInteractiveReport", - // 查询课时题目列表 - pPeriodQuestionList:"/api_html/personal/periodQuestionList", - // 设置课时报表答案 - pSetPeriodAnswer:"/api_html/personal/setPeriodAnswer", - // 查询课时报表详情 - pPeriodDetail:"/api_html/personal/periodDetail", - // 分页查询课时题目统计列表 - pPeriodQuestionReport:"/api_html/personal/periodQuestionReport", - // 查询课时学生答题明细 - pPeriodStudentReport:"/api_html/personal/periodStudentReport", - // 导出阶段报表 - pExportPhaseReport:"/api_html/personal/exportPhaseReport", - // 分页查询即时测报表 - pExamReportList:"/api_html/personal/examReportList", - // 查询阶段测练报表 - pPhaseExamReport:"/api_html/personal/phaseExamReport", - // 查询即时测报表题目列表 - pExamQuestionList:"/api_html/personal/examQuestionList", - // 设置即时测报表答案 - pSetExamAnswer:"/api_html/personal/setExamAnswer", - // 查询即时测报表详情 - pExamDetail:"/api_html/personal/examDetail", - // 下载导入主观题分模板 - pSubjectiveScoreTemplate:"/api_html/personal/subjectiveScoreTemplate", - // 导入主观题得分 - pImportSubjectiveScore:"/api_html/personal/importSubjectiveScore", - // 分页查询即时测题目统计 - pExamQuestionReport:"/api_html/personal/examQuestionReport", - // 查询即时测学生统计 - pExamStudentReport:"/api_html/personal/examStudentReport", - // 重新判分 - pReScore:"/api_html/personal/reScore", - // 导出单课时报表 - pExportPeriodReport:"/api_html/personal/exportPeriodReport", - // 导出阶段测练报表 - pExportPhaseExamReport:"/api_html/personal/exportPhaseExamReport", - // 导出单卷测练报表 - pExportExamReport:"/api_html/personal/exportExamReport", - // 数据导出 - pExportData:"/api_html/personal/exportData", - // 数据导入 - pImportData:"/api_html/personal/importData", + // 个人版首页统计数据 + personalIndex: "/api_html/personal/index", + // 个人信息 + getInfo: "/api_html/personal/personalInfo", + // 修改个人信息 + modifyInfo: "/api_html/personal/modifyInfo", + // 查询班级列表 + pClassList: "/api_html/personal/classList", + // 查询科目列表 + pSubjectList: "/api_html/personal/subjectList", + // 查询学生列表 + pStudentList: "/api_html/personal/studentList", + // 新增或修改班级 + pSaveClass: "/api_html/personal/saveClass", + // 删除班级 + pDelClass: "/api_html/personal/delClass", + // 增加学生 + pAddStudent: "/api_html/personal/addStudent", + // 删除学生 + pDelStudent: "/api_html/personal/delStudent", + // 查询答题卡类型列表 + pPaperTagList: "/api_html/personal/paperTagList", + // 查询答题卡列表 + pPaperList: "/api_html/personal/paperList", + // 查询答题卡详情 + pPaperDetail: "/api_html/personal/paperDetail", + // 增加答题卡 + pAddPaper: "/api_html/personal/addPaper", + // 修改答题卡 + pModifyPaper: "/api_html/personal/modifyPaper", + // 删除答题卡 + pDelPaper: "/api_html/personal/delPaper", + // 增加答题卡类型 + pAddPaperType: "/api_html/personal/addPaperType", + // 修改答题卡类型 + pModifyPaperType: "/api_html/personal/modifyPaperType", + // 删除答题卡类型 + pDelPaperType: "/api_html/personal/delPaperType", + // 分页查询课时报表列表 + pPeriodReportList: "/api_html/personal/periodReportList", + // 查询阶段问答报表 + pPhaseAnswerReport: "/api_html/personal/phaseAnswerReport", + // 查询阶段互动报表 + pPhaseInteractiveReport: "/api_html/personal/phaseInteractiveReport", + // 查询课时题目列表 + pPeriodQuestionList: "/api_html/personal/periodQuestionList", + // 设置课时报表答案 + pSetPeriodAnswer: "/api_html/personal/setPeriodAnswer", + // 查询课时报表详情 + pPeriodDetail: "/api_html/personal/periodDetail", + // 分页查询课时题目统计列表 + pPeriodQuestionReport: "/api_html/personal/periodQuestionReport", + // 查询课时学生答题明细 + pPeriodStudentReport: "/api_html/personal/periodStudentReport", + // 导出阶段报表 + pExportPhaseReport: "/api_html/personal/exportPhaseReport", + // 分页查询即时测报表 + pExamReportList: "/api_html/personal/examReportList", + // 查询阶段测练报表 + pPhaseExamReport: "/api_html/personal/phaseExamReport", + // 查询即时测报表题目列表 + pExamQuestionList: "/api_html/personal/examQuestionList", + // 设置即时测报表答案 + pSetExamAnswer: "/api_html/personal/setExamAnswer", + // 查询即时测报表详情 + pExamDetail: "/api_html/personal/examDetail", + // 下载导入主观题分模板 + pSubjectiveScoreTemplate: "/api_html/personal/subjectiveScoreTemplate", + // 导入主观题得分 + pImportSubjectiveScore: "/api_html/personal/importSubjectiveScore", + // 分页查询即时测题目统计 + pExamQuestionReport: "/api_html/personal/examQuestionReport", + // 查询即时测学生统计 + pExamStudentReport: "/api_html/personal/examStudentReport", + // 重新判分 + pReScore: "/api_html/personal/reScore", + // 导出单课时报表 + pExportPeriodReport: "/api_html/personal/exportPeriodReport", + // 导出阶段测练报表 + pExportPhaseExamReport: "/api_html/personal/exportPhaseExamReport", + // 导出单卷测练报表 + pExportExamReport: "/api_html/personal/exportExamReport", + // 数据导出 + pExportData: "/api_html/personal/exportData", + // 数据导入 + pImportData: "/api_html/personal/importData", - /** 平台管理 */ - //账户管理 - tenantPage:"/api_html/system/tenantPage", - //修改账号 - updateTenant:"/api_html/system/updateTenant", - //新增租户账号 - addTenant:"/api_html/system/addTenant", - // 授课端版本管理 - versionPage:"/api_html/system/versionPage", - // 新增授课端版本 - addVersion:"/api_html/system/addVersion", - // 基站统计数据 - pStationReport:"/api_html/system/stationReport", - // 答题器统计数据 - pKeyboardReport:"/api_html/system/keyboardReport", - // 查询设备列表 - pDeviceList:"/api_html/system/deviceList", - // 查询设备详情 - pDeviceDetail:"/api_html/system/deviceDetail", - // 查询设备日志列表 - pDeviceLogList:"/api_html/system/deviceLogList", - // 文件上传 - uploadApp:"/file/uploadApp", - // 图片上传 - uploadImg:"/file/uploadImg", - // 班级名册导入 - studentTemplateUrl:"/api_html/personal/studentTemplateUrl", - // 班级名册导出 - exportStudent:"/api_html/personal/exportStudent", + /** 平台管理 */ + //账户管理 + tenantPage: "/api_html/system/tenantPage", + //修改账号 + updateTenant: "/api_html/system/updateTenant", + //新增租户账号 + addTenant: "/api_html/system/addTenant", + // 授课端版本管理 + versionPage: "/api_html/system/versionPage", + // 新增授课端版本 + addVersion: "/api_html/system/addVersion", + // 删除授课端版本 + delVersion: "/api_html/system/delVersion", + // 基站统计数据 + pStationReport: "/api_html/system/stationReport", + // 答题器统计数据 + pKeyboardReport: "/api_html/system/keyboardReport", + // 查询设备列表 + pDeviceList: "/api_html/system/deviceList", + // 查询设备详情 + pDeviceDetail: "/api_html/system/deviceDetail", + // 查询设备日志列表 + pDeviceLogList: "/api_html/system/deviceLogList", + // 文件上传 + uploadApp: "/file/uploadApp", + // 图片上传 + uploadImg: "/file/uploadImg", + // 班级名册导入 + studentTemplateUrl: "/api_html/personal/studentTemplateUrl", + // 班级名册导出 + exportStudent: "/api_html/personal/exportStudent", + // 学生测练统计 + studentExamReport: "/api_html/personal/studentExamReport", + // 查询最新的授课端应用版本 + pLatestVersion: "/api_html/personal/latestVersion", + // 载指定版本授课端 + pGetAppDownloadUrl: "/api_html/personal/getAppDownloadUrl", } diff --git a/src/assets/images/img404/bg404.jpg b/src/assets/images/img404/bg404.jpg new file mode 100644 index 0000000..95e4bde Binary files /dev/null and b/src/assets/images/img404/bg404.jpg differ diff --git a/src/assets/images/img404/i404.png b/src/assets/images/img404/i404.png new file mode 100644 index 0000000..52a430a Binary files /dev/null and b/src/assets/images/img404/i404.png differ diff --git a/src/assets/images/img404/sign.png b/src/assets/images/img404/sign.png new file mode 100644 index 0000000..cb8333b Binary files /dev/null and b/src/assets/images/img404/sign.png differ diff --git a/src/assets/img404/bg404.jpg b/src/assets/img404/bg404.jpg deleted file mode 100644 index 95e4bde..0000000 Binary files a/src/assets/img404/bg404.jpg and /dev/null differ diff --git a/src/assets/img404/i404.png b/src/assets/img404/i404.png deleted file mode 100644 index 52a430a..0000000 Binary files a/src/assets/img404/i404.png and /dev/null differ diff --git a/src/assets/img404/sign.png b/src/assets/img404/sign.png deleted file mode 100644 index cb8333b..0000000 Binary files a/src/assets/img404/sign.png and /dev/null differ diff --git a/src/router/index.js b/src/router/index.js index a3a55e7..30890b8 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,10 +8,14 @@ import HomeMain from "@/views/index/mainIndex" // 不是必须加载的组件使用懒加载 const NotFound = () => import("@/views/page404") -const ExaminationPaper = () => import("@/views/standard/examinationPaper/index") -const ExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add") -const ExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit") -const ExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle") +const ExaminationPaper = () => import("@/views/examinationPaper/index") +const ExaminationPaperAdd = () => import("@/views/examinationPaper/add") +const ExaminationPaperEdit = () => import("@/views/examinationPaper/edit") +const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle") +const Portrait = () => import("@/views/portrait/index") +const PortraitDetail = () => import("@/views/portrait/detail") + + const Ask = () => import("@/views/standard/ask/index") const AskAnalysis = () => import("@/views/standard/ask/analysis") const Test = () => import("@/views/standard/test/index") @@ -29,17 +33,11 @@ const SetUpSchool = () => import("@/views/standard/setUp/school") const SetUpStudent = () => import("@/views/standard/setUp/student") const SetUpTeacher = () => import("@/views/standard/setUp/teacher") -const PersonalExaminationPaper = () => import("@/views/personal/examinationPaper/index") -const PersonalExaminationPaperAdd = () => import("@/views/personal/examinationPaper/add") -const PersonalExaminationPaperEdit = () => import("@/views/personal/examinationPaper/edit") -const PersonalExaminationPaperRecycle = () => import("@/views/personal/examinationPaper/recycle") const PersonalAsk = () => import("@/views/personal/ask/index") const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis") const PersonalTest = () => import("@/views/personal/test/index") const PersonalTestAnalysis = () => import("@/views/personal/test/analysis") const PersonalDataSync = () => import("@/views/personal/dataSync/index") -const PersonalPortrait = () => import("@/views/personal/portrait/index") -const PersonalPortraitDetail = () => import("@/views/personal/portrait/detail") const PersonalSetUpStudent = () => import("@/views/personal/setUp/student") const PersonalDown = () => import("@/views/personal/down/index") const PersonalUserInfo = () => import("@/views/personal/userInfo/index") @@ -371,6 +369,33 @@ let addrouters = [ //测试用，后续后端获取 } ] }, + { + path: "/portrait", + iconCls: "fa fa-users", // 图标样式class + name: "学生画像", + component: Layout, + alone: true, + children: [ + { + path: "/portrait", + iconCls: "fa fa-users", // 图标样式class + name: "", + component: Portrait, + meta: { + keepAlive: true, + }, + children: [] + }, + { + path: "/portraitDetail", + iconCls: "", // 图标样式class + name: "授课端软件", + component: PortraitDetail, + parent: "down", + children: [] + } + ] + }, ] const addroutersPersonal = [ @@ -401,14 +426,14 @@ const addroutersPersonal = [ path: "/examinationPaper", iconCls: "fa fa-file-text", // 图标样式class name: "examinationPaper", - component: PersonalExaminationPaper, + component: ExaminationPaper, children: [] }, { path: "/examinationPaperAdd", iconCls: "", // 图标样式class name: "examinationPaperAdd", - component: PersonalExaminationPaperAdd, + component: ExaminationPaperAdd, parent: "examinationPaper", children: [] }, @@ -416,7 +441,7 @@ const addroutersPersonal = [ path: "/examinationPaperEdit", iconCls: "", // 图标样式class name: "修改答题卡", - component: PersonalExaminationPaperEdit, + component: ExaminationPaperEdit, parent: "examinationPaper", children: [] }, @@ -424,7 +449,7 @@ const addroutersPersonal = [ path: "/examinationPaperRecycle", iconCls: "", // 图标样式class name: "已归档答题卡", - component: PersonalExaminationPaperRecycle, + component: ExaminationPaperRecycle, parent: "examinationPaper", children: [] }, @@ -498,7 +523,7 @@ const addroutersPersonal = [ path: "/portrait", iconCls: "fa fa-users", // 图标样式class name: "", - component: PersonalPortrait, + component: Portrait, meta: { keepAlive: true, }, @@ -508,7 +533,7 @@ const addroutersPersonal = [ path: "/portraitDetail", iconCls: "", // 图标样式class name: "授课端软件", - component: PersonalPortraitDetail, + component: PortraitDetail, parent: "down", children: [] } diff --git a/src/utils/index.js b/src/utils/index.js index 166760c..f76c88b 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -197,7 +197,7 @@ export function b64DecodeUnicode(str) { }) .join("") ); - } catch (e) {} + } catch (e) { } return uni; } @@ -568,7 +568,7 @@ function setSectionName(num) { } return txt; } -function setGradeName(num) { +export function setGradeName(num) { let txt = ""; switch (num) { case 1: @@ -619,6 +619,9 @@ function setGradeName(num) { case 16: txt = "大四"; break; + default: + txt = "未知"; + break; } return txt; } @@ -724,7 +727,7 @@ export function formatGradeNameClass(data) { { value: item.id, label: item.className, - leaf:true + leaf: true }, ], }); @@ -738,7 +741,7 @@ export function formatGradeNameClass(data) { gradeNameArr[gradeIndex].children.push({ value: item.id, label: item.className, - leaf:true + leaf: true }); } }); diff --git a/src/views/admin/clientVersion/components/upLoad.vue b/src/views/admin/clientVersion/components/upLoad.vue index c3e73a1..c15eff1 100644 --- a/src/views/admin/clientVersion/components/upLoad.vue +++ b/src/views/admin/clientVersion/components/upLoad.vue @@ -8,15 +8,15 @@ :action="url" :multiple="false" :data="{ ...query }" - :with-credentials="true" :limit="1" :on-change="change" :on-success="upSuccess" :on-error="upError" + accept=".zip" >
- 选择文件 + 选择zip文件
diff --git a/src/views/admin/clientVersion/components/upLoadImg.vue b/src/views/admin/clientVersion/components/upLoadImg.vue index 250ab1a..e5ef99b 100644 --- a/src/views/admin/clientVersion/components/upLoadImg.vue +++ b/src/views/admin/clientVersion/components/upLoadImg.vue @@ -7,10 +7,10 @@ :action="url" :multiple="false" :data="{ ...query }" - :with-credentials="true" :limit="1" :on-success="upSuccess" :on-error="upError" + accept="image/*" > diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue index 3443838..6c1f3a5 100644 --- a/src/views/admin/clientVersion/index.vue +++ b/src/views/admin/clientVersion/index.vue @@ -75,7 +75,12 @@ - + - + - + - + - + - + - + - + @@ -138,17 +143,18 @@ + + \ No newline at end of file diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue new file mode 100644 index 0000000..ad93eb8 --- /dev/null +++ b/src/views/examinationPaper/edit.vue @@ -0,0 +1,1260 @@ + + + + + \ No newline at end of file diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue new file mode 100644 index 0000000..4fda0a0 --- /dev/null +++ b/src/views/examinationPaper/index.vue @@ -0,0 +1,575 @@ + + + + + \ No newline at end of file diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue new file mode 100644 index 0000000..47f09bb --- /dev/null +++ b/src/views/examinationPaper/recycle.vue @@ -0,0 +1,448 @@ + + + + + \ No newline at end of file diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue index 59bae3a..5f512b0 100644 --- a/src/views/index/mainIndex.vue +++ b/src/views/index/mainIndex.vue @@ -194,7 +194,7 @@ 对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析

-
+

即时测报表

@@ -403,6 +403,7 @@ export default { height: calc(50% - 8px); flex-wrap: wrap; padding: 12px 0 12px 30px; + margin-right:20px; .icon { width: 60px; height: 60px; @@ -419,6 +420,23 @@ export default { margin-right: 0; } } + &.item-child3 { + height: calc(50% - 8px); + flex-wrap: wrap; + padding: 12px 0 12px 30px; + .icon { + width: 60px; + height: 60px; + } + .p1 { + flex: 1; + line-height: 60px; + margin-bottom: 0; + } + .p2 { + width: 100%; + } + } } .item2 { width: calc(50% - 10px); @@ -447,6 +465,7 @@ export default { height: 240px; display: flex; flex-wrap: wrap; + } .item4 { width: calc(50% - 10px); diff --git a/src/views/personal/ask/index.vue b/src/views/personal/ask/index.vue index 44f2cfc..7473f13 100644 --- a/src/views/personal/ask/index.vue +++ b/src/views/personal/ask/index.vue @@ -88,202 +88,209 @@ >

-
- - - - - - - - - - - - - - -
-
- - - - +
+ - + > + + - + + + >{{ scoped.row.classCorrectRate }}% + + - - -
-
- - - - +
+
+ - + fixed + > - + fixed + width="100" + > + + + + + + + + + +
+
+ + + + + + + + + + + - - + +
{ return { - value: item.classId, + value: item.id, label: item.className, }; }); @@ -683,11 +690,10 @@ export default { this.$message.warning("请选择科目"); return; } - const { data, status, info } = await this.$request.pPhaseInteractiveReport( - { + const { data, status, info } = + await this.$request.pPhaseInteractiveReport({ ...query, - } - ); + }); this.loading = false; if (status === 0) { let subjectName = []; diff --git a/src/views/personal/down/index.vue b/src/views/personal/down/index.vue index ea5370f..d96e0ec 100644 --- a/src/views/personal/down/index.vue +++ b/src/views/personal/down/index.vue @@ -8,9 +8,11 @@
-

中天易教授课端 V1.3.4

-

文件大小：35M

-

最近更新：2022-12-03 13:30

+

+ {{ `${info.appName || ""} ${info.versionName || ""}` }} +

+

文件大小：{{ `${info.fileSize}` }}M

+

最近更新：{{ info.modifiedTime }}

立即下载
@@ -22,13 +24,38 @@ export default { data() { return { loading: false, + info: { + id:"", + appName: "", + appImage: "", + versionName: "", + fileSize: "", + modifiedTime: "", + }, }; }, + created() { + this.latestVersion(); + }, methods: { + async latestVersion() { + const { data, status, info } = await this.$request.pLatestVersion(); + if (status == 0) { + this.info = { ...data }; + this.info.fileSize = + (this.info.fileSize && + (this.info.fileSize / 1024 / 1024).toFixed(2)) || + "--"; + } else { + this.$message.error(info); + } + }, async downCard() { if (this.loading == true) return; this.loading = true; - const { data, status, info } = await this.$request.latestClickersApp(); + const { data, status, info } = await this.$request.pGetAppDownloadUrl({ + versionId:this.info.id + }); this.loading = false; if (status == 0) { const a = document.createElement("a"); @@ -51,7 +78,7 @@ export default { } .down-box { - padding:20px 50px; + padding: 20px 50px; display: flex; align-items: center; } diff --git a/src/views/personal/examinationPaper/add.vue b/src/views/personal/examinationPaper/add.vue deleted file mode 100644 index 66aeb88..0000000 --- a/src/views/personal/examinationPaper/add.vue +++ /dev/null @@ -1,2057 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/examinationPaper/edit.vue b/src/views/personal/examinationPaper/edit.vue deleted file mode 100644 index 7dad0c5..0000000 --- a/src/views/personal/examinationPaper/edit.vue +++ /dev/null @@ -1,1199 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/examinationPaper/index.vue b/src/views/personal/examinationPaper/index.vue deleted file mode 100644 index c69618d..0000000 --- a/src/views/personal/examinationPaper/index.vue +++ /dev/null @@ -1,469 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/examinationPaper/recycle.vue b/src/views/personal/examinationPaper/recycle.vue deleted file mode 100644 index a174b3a..0000000 --- a/src/views/personal/examinationPaper/recycle.vue +++ /dev/null @@ -1,418 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/portrait/detail.vue b/src/views/personal/portrait/detail.vue deleted file mode 100644 index fa96804..0000000 --- a/src/views/personal/portrait/detail.vue +++ /dev/null @@ -1,371 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/portrait/index.vue b/src/views/personal/portrait/index.vue deleted file mode 100644 index 71fecef..0000000 --- a/src/views/personal/portrait/index.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue index 0a89616..942d7a1 100644 --- a/src/views/personal/setUp/student.vue +++ b/src/views/personal/setUp/student.vue @@ -450,15 +450,9 @@ export default { let { data, info, status } = await this.$request.studentTemplateUrl(); this.loadingDown = false; if (status == 0) { - // getBlob(data.downloadUrl).then((res) => { - // downloadFile("学生模板", res); - // }); - const a = document.createElement("a"); - a.href = data.downloadUrl; - a.download = data.appName; - document.body.appendChild(a); - a.click(); - a.remove(); + getBlob(data.downloadUrl).then((res) => { + downloadFile("学生模板", res); + }); } else { this.$message.error(info); } diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue index 4916a6c..f0f2c3e 100644 --- a/src/views/personal/test/index.vue +++ b/src/views/personal/test/index.vue @@ -517,6 +517,8 @@ export default { id: obj.studentId, classId: obj.classId, subjectNames: subjectNames.join(","), + studentName:obj.studentName, + studentCode:obj.studentCode, }, }); }, @@ -648,7 +650,7 @@ export default { if (status === 0) { this.classList = data.list.map((item) => { return { - value: item.classId, + value: item.id, label: item.className, }; }); diff --git a/src/views/portrait/detail.vue b/src/views/portrait/detail.vue new file mode 100644 index 0000000..e4def47 --- /dev/null +++ b/src/views/portrait/detail.vue @@ -0,0 +1,408 @@ + + + + + \ No newline at end of file diff --git a/src/views/portrait/index.vue b/src/views/portrait/index.vue new file mode 100644 index 0000000..633e7ac --- /dev/null +++ b/src/views/portrait/index.vue @@ -0,0 +1,339 @@ + + + + + \ No newline at end of file diff --git a/src/views/standard/ask/analysis.vue b/src/views/standard/ask/analysis.vue index 642efb3..feffeea 100644 --- a/src/views/standard/ask/analysis.vue +++ b/src/views/standard/ask/analysis.vue @@ -53,75 +53,85 @@ 反馈时长：{{ setDuration(detail.consumingDuration) }} - - + - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + - + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + +
导出报表 + 打印

@@ -301,7 +338,7 @@ diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue index 650c373..bee7f5c 100644 --- a/src/views/standard/setUp/student.vue +++ b/src/views/standard/setUp/student.vue @@ -347,19 +347,6 @@ export default { this.diaUp = false; this._QueryData(3); }, - async downExcel() { - this.loadingDown = true; - let { data, info, status } = - await this.$request.studentClickerTemplateUrl(); - this.loadingDown = false; - if (status == 0) { - getBlob(data.downloadUrl).then((res) => { - downloadFile("学生答题器绑定模板", res); - }); - } else { - this.$message.error(info); - } - }, async removeStu(obj, index) { const { data, status, info } = await this.$request.delStudent({ studentId: obj.id, @@ -470,6 +457,19 @@ export default { this.$message.error(info); } }, + async downExcel() { + this.loadingDown = true; + let { data, info, status } = + await this.$request.studentClickerTemplateUrl(); + this.loadingDown = false; + if (status == 0) { + getBlob(data.downloadUrl).then((res) => { + downloadFile("学生答题器绑定模板", res); + }); + } else { + this.$message.error(info); + } + }, }, }; diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue index 4d620c9..1802e73 100644 --- a/src/views/standard/setUp/teacher.vue +++ b/src/views/standard/setUp/teacher.vue @@ -5,7 +5,7 @@ 教师管理