diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index b77bf89..7131654 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -112,7 +112,7 @@ export default { return { role: "", loading: false, - classId: "", + classIds: [], className: "", subjectNames: "", id: [], @@ -136,7 +136,7 @@ export default { this.types = Number(this.$route.query.types); // this.className = this.$route.query.className; const queryData = JSON.parse(this.$route.query.params); - this.classId = this.$route.query.classId; + this.classIds = this.$route.query.classIds; console.log(this.$route.query); this.subjectNames = this.$route.query.subjectNames.split(","); if (this.types == 1) { @@ -279,13 +279,13 @@ export default { query.type = this.type - 1; } else { query.periodIds = this.id; + query.classIds = this.classIds; if (this.types == 3) { query.subjectNames = this.subjectNames; } } this.loading = true; let { data, info, status } = await queryData({ - classId: this.classId, ...query, }); this.loading = false; @@ -307,7 +307,7 @@ export default { queryData = this.$request.cTPhaseAnswerReport; } if (this.types != 1) { - query.classId = this.classId; + query.classIds = this.classIds; } this.loading = true; let { data, info, status } = await queryData({ @@ -351,16 +351,17 @@ export default { : this.$request.exportPeriodReport; } else if (this.types == 2) { query.periodIds = this.id; + query.classIds = this.classIds; exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPhaseAnswerReport; } else { query.periodIds = this.id; + query.classIds = this.classIds; exportPeriodReport = this.$request.cTExportPhaseAnswerReport; } const data = await exportPeriodReport({ - classId: this.classId, ...query, }); this.exportLoading = false; diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue index 4ae69f8..23f30e3 100644 --- a/src/views/basic/ask/list.vue +++ b/src/views/basic/ask/list.vue @@ -38,11 +38,14 @@ > @@ -267,7 +270,7 @@ export default { return; } let subjectArr = []; - let classId = ""; + let classIds = []; let multipleData = []; let multipleSelectionData = []; Object.keys(this.multipleSelectionObj).map((keys) => { @@ -279,10 +282,11 @@ export default { if (this.multipleSelection.includes(item.id)) { subjectArr.push(item.subjectName); multipleData.push(item); - classId = item.classId; + classIds.push(item.classId); } }); subjectArr = [...new Set(subjectArr)]; + classIds = [...new Set(classIds)]; if (this.multipleSelection.length == 1) { this.$router.push({ path: "/askAnalysis", @@ -290,6 +294,7 @@ export default { id: JSON.stringify(this.multipleSelection), types: 1, subjectNames: subjectArr[0], + classIds: classIds, params: this.$route.query.params, }, }); @@ -306,7 +311,8 @@ export default { : 3, subjectNames: subjectArr.join(","), params: this.$route.query.params, - classId: classId, + // classId: classId, + classIds: classIds, }, }); } diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue index f0749a4..977497d 100644 --- a/src/views/basic/test/analysis.vue +++ b/src/views/basic/test/analysis.vue @@ -17,7 +17,7 @@ v-if="type == 1" :role="role" :id="id" - :classId="classId" + :classIds="classIds" :subjectName="subjectName" :title="title" :score="score" @@ -27,14 +27,14 @@ v-else-if="type == 2" :role="role" :ids="ids" - :classId="classId" + :classIds="classIds" :subjectName="subjectName" /> - + {{ scoped.row.studentName }} + { - return item.value; - }); - subjectNames?.shift(); - } - //去学生画像 - this.$router.push({ - path: "/portraitDetail", - query: { - id: obj.studentId, - classId: this.query.classId, - subjectNames: subjectNames.join(","), - studentName: obj.studentName, - studentCode: obj.studentCode, - startDay: this.query.startDay, - endDay: this.query.endDay, - date: this.date, - }, - }); - }, //查看折线图 openChart(obj) { this.studentName = obj.studentName; @@ -212,7 +174,7 @@ export default { ? this.$request.pPhaseExamReport : this.$request.phaseExamReport; const { data, status, info } = await phaseExamReport({ - classId: this.classId, + classIds: this.classIds, examIds: this.ids, subjectName: this.subjectName, }); @@ -277,7 +239,7 @@ export default { ? this.$request.pExportPhaseExamReport : this.$request.exportPhaseExamReport; const data = await exportPhaseExamReport({ - classId: this.classId, + classIds: this.classIds, examIds: this.ids, ...query, }); diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue index c3eb6f6..d5aeb95 100644 --- a/src/views/basic/test/components/test.vue +++ b/src/views/basic/test/components/test.vue @@ -518,7 +518,7 @@ export default { role: "", id: "", title: String, - classId: String, + classIds: Array, subjectName: String, examType: String, score: { @@ -666,7 +666,7 @@ export default { } this.loadingTange = true; let { data, status, info } = await this.$request.setLowRange({ - classId: this.classId, + classId: this.classIds[0], subjectName: this.subjectName, ...this.lowRange, }); diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue index 520f9d5..145c19a 100644 --- a/src/views/basic/test/list.vue +++ b/src/views/basic/test/list.vue @@ -327,7 +327,7 @@ export default { return; } let subjectArr = []; - let classIds = ""; + let classIds = []; let multipleData = []; let multipleSelectionData = []; Object.keys(this.multipleSelectionObj).map((keys) => { @@ -339,10 +339,11 @@ export default { if (this.multipleSelection.includes(item.id)) { subjectArr.push(item.subjectName); multipleData.push(item); - classIds = item.classId; + classIds.push(item.classId); } }); subjectArr = [...new Set(subjectArr)]; + classIds = [...new Set(classIds)]; console.log(subjectArr); if (this.multipleSelection.length == 1) { this.$router.push({ @@ -353,7 +354,7 @@ export default { score: multipleData[0].examPaperScore || 0, type: 1, subjectName: subjectArr.join(), - classId: classIds, + classIds: classIds, params: this.$route.query.params, }, }); @@ -363,7 +364,7 @@ export default { path: "/testAnalysis", query: { ids: this.multipleSelection.join(), - classId: classIds, + classIds: classIds, type: subjectArr.length == 1 ? 2 : 3, subjectName: subjectArr.join(), params: this.$route.query.params, @@ -390,19 +391,20 @@ export default { // 班主任教学班不能与行政班汇总 checkboxDisabled(obj) { if (obj.examStartTime) { - if (this.role == "ROLE_BANZHUREN") { - let classId = - (this.multipleSelectionObj[1] && - this.multipleSelectionObj[1][0]?.classId) || - ""; - if (classId) { - return obj.classId == classId ? false : true; - } else { - return false; - } - } else { - return false; - } + // if (this.role == "ROLE_BANZHUREN") { + // let classId = + // (this.multipleSelectionObj[1] && + // this.multipleSelectionObj[1][0]?.classId) || + // ""; + // if (classId) { + // return obj.classId == classId ? false : true; + // } else { + // return false; + // } + // } else { + // return false; + // } + return false; } else { return true; } diff --git a/vue.config.js b/vue.config.js index b4b81e6..4cd1bb7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -22,8 +22,9 @@ module.exports = { }, proxy: { "/": { - target:"http://121.40.127.171", // target:"http://ezquiz.sunvotecloud.cn", + // target:"http://121.40.127.171", + target:"http://192.168.3.221:8080", changeOrigin: true, ws:true, },