diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 7633569..ad54316 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1606,15 +1606,6 @@ export default { }, - /** v1.5 */ - // 教师/个人版查询答题卡列表的分享数量 - paperShareCount(data) { - return service({ - url: setUpUrls.paperShareCount, - method: "POST", - data - }); - }, // 教师/个人版导入备题组卷Word文档 paperWordUpload(data) { return service({ diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index d53d1d4..cf7c8d4 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -420,8 +420,6 @@ export default { /** v1.5 */ - // 教师/个人版查询答题卡列表的分享数量 - paperShareCount: "/api_html/common/paper/paperShareCount", // 教师/个人版导入备题组卷Word文档 paperWordUpload: "/api_html/common/paper/upload", // 删除随堂问报表 diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue new file mode 100644 index 0000000..6f00e44 --- /dev/null +++ b/src/components/exportDia.vue @@ -0,0 +1,88 @@ + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 51b1cce..d98dc26 100755 --- a/src/main.js +++ b/src/main.js @@ -28,7 +28,7 @@ Vue.use(permission) NProgress.inc(0.2) NProgress.configure({ easing: "ease", speed: 500, showSpinner: false }) -import "@/mock/index.js" +// import "@/mock/index.js" Array.prototype.remove = function (val) { var index = this.indexOf(val); diff --git a/src/mock/index.js b/src/mock/index.js index 0dd0bf0..4c2dbda 100644 --- a/src/mock/index.js +++ b/src/mock/index.js @@ -1,11 +1,240 @@ import Mock from "mockjs" Mock.mock( - "/api_html/common/paper/paperShareCount", { + "/api_html/teaching/paperList", { info: "success", status: 0, data: { - myCount: 24, - grade: 30 + myCount: 5, + gradeCount: 8, + archivedTotal: 6, + total: 30, + list: [ + { + "sectionName": "小学", + "gradeName": "三年级", + "id": 107, + "tenantId": 9, + "regionId": 0, + "schoolId": 34, + "classId": 696, + "thirdId": "", + "section": 1, + "grade": 3, + "subjectName": "语文", + "title": "X102_语文_课时 4", + "startTime": "2023-04-18 17:43:50", + "endTime": "2023-04-18 17:47:06", + "calculateStatus": 1, + "duration": 196, + "status": 0, + "consumingDuration": 3140, + "classPersonNum": 11, + "answeredNum": 1, + "unansweredNum": 20, + "questionNum": 1, + "answerNum": 1, + "totalAnswersNum": 1, + "totalCorrectAnswersNum": 1, + "participationRate": 9.09, + "classCorrectRate": 9.09, + "answerCorrectRate": 100, + "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}", + "passedNum": 1, + "passedRate": 9.09, + "excellenNum": 1, + "excellenRate": 9.09, + "goodNum": 0, + "goodRate": 0, + "passNum": 0, + "passRate": 0, + "failedNum": 0, + "failedRate": 0, + "latestCalculateTime": "2023-04-19 14:08:35", + "createdTime": "2023-04-19 14:08:35", + "modifiedTime": "2023-04-19 14:08:35", + "deleteFlag": 0 + }, + { + "sectionName": "小学", + "gradeName": "二年级", + "id": 106, + "tenantId": 9, + "regionId": 0, + "schoolId": 34, + "classId": 696, + "thirdId": "", + "section": 1, + "grade": 2, + "subjectName": "语文", + "title": "X102_语文_课时 2", + "startTime": "2023-04-18 15:58:27", + "endTime": "2023-04-18 16:01:28", + "calculateStatus": 1, + "duration": 182, + "status": 0, + "consumingDuration": 2640, + "classPersonNum": 11, + "answeredNum": 1, + "unansweredNum": 18, + "questionNum": 1, + "answerNum": 1, + "totalAnswersNum": 1, + "totalCorrectAnswersNum": 1, + "participationRate": 9.09, + "classCorrectRate": 9.09, + "answerCorrectRate": 100, + "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}", + "passedNum": 1, + "passedRate": 9.09, + "excellenNum": 1, + "excellenRate": 9.09, + "goodNum": 0, + "goodRate": 0, + "passNum": 0, + "passRate": 0, + "failedNum": 0, + "failedRate": 0, + "latestCalculateTime": "2023-04-18 16:01:29", + "createdTime": "2023-04-18 16:01:28", + "modifiedTime": "2023-04-18 16:01:29", + "deleteFlag": 0 + }, + { + "sectionName": "小学", + "gradeName": "二年级", + "id": 105, + "tenantId": 9, + "regionId": 0, + "schoolId": 34, + "classId": 696, + "thirdId": "", + "section": 1, + "grade": 2, + "subjectName": "语文", + "title": "X102_语文_课时 1", + "startTime": "2023-04-18 15:16:11", + "endTime": "2023-04-18 15:21:37", + "calculateStatus": 1, + "duration": 326, + "status": 0, + "consumingDuration": 76880, + "classPersonNum": 11, + "answeredNum": 3, + "unansweredNum": 16, + "questionNum": 1, + "answerNum": 1, + "totalAnswersNum": 3, + "totalCorrectAnswersNum": 2, + "participationRate": 27.27, + "classCorrectRate": 18.18, + "answerCorrectRate": 66.67, + "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}", + "passedNum": 2, + "passedRate": 18.18, + "excellenNum": 2, + "excellenRate": 18.18, + "goodNum": 0, + "goodRate": 0, + "passNum": 0, + "passRate": 0, + "failedNum": 1, + "failedRate": 9.09, + "latestCalculateTime": "2023-04-18 15:58:23", + "createdTime": "2023-04-18 15:58:23", + "modifiedTime": "2023-04-18 15:58:23", + "deleteFlag": 0 + }, + { + "sectionName": "小学", + "gradeName": "二年级", + "id": 103, + "tenantId": 9, + "regionId": 0, + "schoolId": 34, + "classId": 696, + "thirdId": "", + "section": 1, + "grade": 2, + "subjectName": "语文", + "title": "X102_语文_课时 1", + "startTime": "2023-04-18 14:20:16", + "endTime": "2023-04-18 14:57:09", + "calculateStatus": 1, + "duration": 2213, + "status": 0, + "consumingDuration": 229820, + "classPersonNum": 9, + "answeredNum": 1, + "unansweredNum": 16, + "questionNum": 4, + "answerNum": 4, + "totalAnswersNum": 4, + "totalCorrectAnswersNum": 4, + "participationRate": 11.11, + "classCorrectRate": 11.11, + "answerCorrectRate": 100, + "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}", + "passedNum": 1, + "passedRate": 11.11, + "excellenNum": 1, + "excellenRate": 11.11, + "goodNum": 0, + "goodRate": 0, + "passNum": 0, + "passRate": 0, + "failedNum": 0, + "failedRate": 0, + "latestCalculateTime": "2023-04-18 15:02:33", + "createdTime": "2023-04-18 15:02:32", + "modifiedTime": "2023-04-18 15:02:33", + "deleteFlag": 0 + }, + { + "sectionName": "小学", + "gradeName": "一年级", + "id": 102, + "tenantId": 9, + "regionId": 0, + "schoolId": 34, + "classId": 696, + "thirdId": "", + "section": 1, + "grade": 1, + "subjectName": "语文", + "title": "X102_语文_课时 1", + "startTime": "2023-04-18 11:09:20", + "endTime": "2023-04-18 13:59:30", + "calculateStatus": 1, + "duration": 10210, + "status": 0, + "consumingDuration": 12380, + "classPersonNum": 9, + "answeredNum": 1, + "unansweredNum": 16, + "questionNum": 2, + "answerNum": 2, + "totalAnswersNum": 2, + "totalCorrectAnswersNum": 1, + "participationRate": 11.11, + "classCorrectRate": 5.56, + "answerCorrectRate": 50, + "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}", + "passedNum": 0, + "passedRate": 0, + "excellenNum": 0, + "excellenRate": 0, + "goodNum": 0, + "goodRate": 0, + "passNum": 0, + "passRate": 0, + "failedNum": 1, + "failedRate": 11.11, + "latestCalculateTime": "2023-04-18 13:59:36", + "createdTime": "2023-04-18 13:59:35", + "modifiedTime": "2023-04-18 13:59:36", + "deleteFlag": 0 + } + ] } } ) @@ -682,8 +911,8 @@ Mock.mock( "participationCount": '5', "classRank": '1', "score": '100', - "participationRate":'88', - "correctRate":'90', + "participationRate": '88', + "correctRate": '90', }, { "subjectName": "英语", @@ -691,8 +920,8 @@ Mock.mock( "participationCount": '5', "classRank": '2', "score": '100', - "participationRate":'70', - "correctRate":'76', + "participationRate": '70', + "correctRate": '76', }, { "subjectName": "语文", @@ -700,8 +929,8 @@ Mock.mock( "participationCount": '5', "classRank": '2', "score": '100', - "participationRate":'99', - "correctRate":'100', + "participationRate": '99', + "correctRate": '100', }, ] }], diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index dd2bc86..f8508a9 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -35,39 +35,7 @@ icon="el-icon-printer">打印

- -
-
-

是否将学生表现折线图一起导出

- - 不导出 - 导出 - -
-
-

选择要导出的学生

- - 导出全部 - 导出制定学生 - -
-
- -
- 导出前十 - 确 定 - 取 消 -
- + @@ -96,11 +64,9 @@ export default { size: 20, total: 0, status: 0, - diaDown: false, - downType: 1, - exportType: 1, + //导出相关 + diaShow: false, exportStudent: [], - multipleSelection: [], }; }, created() { @@ -216,7 +182,7 @@ export default { } } if (this.types == 1) { - query.type = this.type + query.type = this.type - 1 } this.loading = true; let { data, info, status } = await queryData({ @@ -265,7 +231,7 @@ export default { let query = {}; if (this.types == 1) { - query.type = this.type + query.type = this.type - 1 } this.loading = true; let { data, info, status } = await queryData({ @@ -282,38 +248,17 @@ export default { } }, - + //导出 openDown() { - this.diaDown = true; - this.downType = 1 + this.diaShow = true; }, cancel() { - if (this.exportType == 2) { - this.exportType = 1 - } else { - this.diaDown = false; - } + this.diaShow = false; }, - changeDownType() { - this.exportType = 1 - }, - handleSelectionChange(val) { - this.multipleSelection = val - }, - //导出 - async exportData(length) { + async exportData(arr) { if (this.exportLoading == true) return; this.exportLoading = true; - let studentIds = [] - if (length) { - studentIds = this.exportStudent.slice(0, 10).map(item => { - return item.studentId - }) - } else { - studentIds = this.multipleSelection.map(item => { - return item.studentId - }) - } + let studentIds = arr let query = {}; if (studentIds.length == this.exportStudent.length) { query.studentIds = [] diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue index 9e2792f..4695ec2 100644 --- a/src/views/basic/ask/components/answerQustion.vue +++ b/src/views/basic/ask/components/answerQustion.vue @@ -147,22 +147,24 @@ export default { }, methods: { setDuration(times) { - let m = parseInt(times / 1000 / 60); - let s = parseInt((times / 1000) % 60); - let ms = times; - let aTime; - if (times == 0) { - aTime = `0`; - } else { - if (m == 0 && s == 0) { - aTime = `${ms}毫秒`; - } else if (m == 0 && s != 0) { - aTime = `${s}秒`; - } else if (m != 0 && s != 0) { - aTime = `${m}分${s}秒`; + if (times) { + let m = parseInt(times / 1000 / 60); + let s = parseInt((times / 1000) % 60); + let ms = times; + let aTime; + if (times == 0) { + aTime = `0`; + } else { + if (m == 0 && s == 0) { + aTime = `${ms}毫秒`; + } else if (m == 0 && s != 0) { + aTime = `${s}秒`; + } else if (m != 0 && s != 0) { + aTime = `${m}分${s}秒`; + } } + return aTime; } - return aTime; }, } }; diff --git a/src/views/basic/ask/components/interact.vue b/src/views/basic/ask/components/interact.vue index 09ba7d9..40a8a30 100644 --- a/src/views/basic/ask/components/interact.vue +++ b/src/views/basic/ask/components/interact.vue @@ -39,26 +39,25 @@ export default { resultData: function () { let resultData = [] if (this.tableData.length) { - if (this.types == "3") { - let subjectName = []; - resultData = data?.list.map((item) => { - let params = {}; - item.dataList.map((items, index) => { - if (!subjectName.includes(items.subjectName)) { - subjectName.push(items.subjectName); - } - params["interactionsNum" + items.subjectName] = - items.interactionsNum; - params["interactionsCorrectNum" + items.subjectName] = - items.interactionsCorrectNum; - }); - return { - ...item, - ...params, - }; + + let subjectName = []; + resultData = this.tableData?.map((item) => { + let params = {}; + item.dataList?.map((items, index) => { + if (!subjectName.includes(items.subjectName)) { + subjectName.push(items.subjectName); + } + params["interactionsNum" + items.subjectName] = + items.interactionsNum; + params["interactionsCorrectNum" + items.subjectName] = + items.interactionsCorrectNum; }); - this.phaseInter = [...subjectName]; - } + return { + ...item, + ...params, + }; + }); + this.phaseInter = [...subjectName]; } else { resultData = [] this.optionsList = [] diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue index 9b706ff..f346ecd 100644 --- a/src/views/basic/ask/list.vue +++ b/src/views/basic/ask/list.vue @@ -13,14 +13,14 @@
-

+

查看汇总报表

- + @@ -142,6 +142,9 @@ export default { }, //去详情 linkToDetail2() { + if (this.multipleSelection.length == 0) { + this.$message.warning("未选择课时，请选择～") + return } let subjectArr = [] const ids = this.multipleSelection.map(item => { subjectArr.push(item.subject) diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue index 809db77..bf92c07 100644 --- a/src/views/basic/test/analysis.vue +++ b/src/views/basic/test/analysis.vue @@ -2,7 +2,7 @@
@@ -44,8 +44,8 @@ export default { this.ids = this.$route.query.ids && this.$route.query.ids.split() || ""; this.type = this.$route.query.type this.classId = this.$route.query.classId || ""; - this.subjectName = this.$route.query.subjectName || "" this.title = this.$route.query.title || "" + this.subjectName = this.$route.query.subjectName || "" }, methods: { diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue index f1a6adc..80f2f29 100644 --- a/src/views/basic/test/components/multipleSubTest.vue +++ b/src/views/basic/test/components/multipleSubTest.vue @@ -29,7 +29,7 @@
- 导出报表 + 导出报表 打印
@@ -38,6 +38,7 @@
+