${v.seriesName}
` + html += `${v.marker} ${v.name}：${v.value}${that.tooltipFormatter?'%':''}` + return html + }, }, legend: { show: true, diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue index 8468471..30bb64c 100644 --- a/src/components/exportDia.vue +++ b/src/components/exportDia.vue @@ -92,7 +92,7 @@ export default { return item.studentId }) } - this.$emit('exportData', studentIds) + this.$emit('exportData', this.downType==1?null:studentIds) }, cancel() { if (this.exportType == 2) { diff --git a/src/router/index.js b/src/router/index.js index 51ed0fb..340ac50 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ import HomeMain from "@/views/index/mainIndex" const NotFound = () => import("@/views/page404") const ExaminationPaper = () => import("@/views/examinationPaper/index") const ExaminationPaperAdd = () => import("@/views/examinationPaper/add") -const ExaminationPaperAddAsk = () => import("@/views/examinationPaper/addAsk") +const ExaminationPaperAddQs = () => import("@/views/examinationPaper/addQs") const ExaminationPaperEdit = () => import("@/views/examinationPaper/edit") const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle") const ExaminationPaperArchiving = () => import("@/views/examinationPaper/archiving") @@ -169,10 +169,10 @@ let addrouters = [ children: [] }, { - path: "/examinationPaperAddAsk", + path: "/examinationPaperAddQs", iconCls: "", // 图标样式class - name: "examinationPaperAddAsk", - component: ExaminationPaperAddAsk, + name: "examinationPaperAddQs", + component: ExaminationPaperAddQs, parent: "examinationPaper", children: [] }, @@ -810,10 +810,10 @@ const addroutersPersonal = [ children: [] }, { - path: "/examinationPaperAddAsk", + path: "/examinationPaperAddQs", iconCls: "", - name: "examinationPaperAddAsk", - component: ExaminationPaperAddAsk, + name: "examinationPaperAddQs", + component: ExaminationPaperAddQs, parent: "examinationPaper", children: [] }, diff --git a/src/store/index.js b/src/store/index.js index bb2260c..6dc062e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -26,6 +26,7 @@ const store = new Vuex.Store({ : [], //动态路由 tokenSources: new Map(), //正在请求接口（切换取消请求） classes: localStorage.getItem("classes") || "", //班主任选择班级查询报表（用于教学班学生筛选） + refreshTestList: false, //重新计分刷新列表 }, mutations: { setToken(state, token) { @@ -75,6 +76,9 @@ const store = new Vuex.Store({ setClasses(state, data) { state.classes = data; localStorage.setItem("classes", data); + }, + setRefreshTestList(state, data) { + state.refreshTestList = data; } }, actions: { @@ -206,6 +210,7 @@ const store = new Vuex.Store({ uniquerouter: (state) => state.layoutStore.uniquerouter, tabnavBox: (state) => state.layoutStore.tabnavBox, rightNav: (state) => state.layoutStore.rightNav, + refreshTestList: (state) => state.refreshTestList, }, modules: { layoutStore, diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index d18fac6..e9c87ce 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -103,7 +103,7 @@ export default { this.id = JSON.parse(this.$route.query.id) this.status = this.$route.query.status ? this.$route.query.status : 0; this._QueryData(); - this._QueryDataQuestionRank(); + this.types != 1 ?this._QueryDataQuestionRank():''; this.types != 3 ? this.periodDetail() : ''; }, methods: { @@ -209,13 +209,7 @@ export default { }); this.loading = false; if (status === 0) { - if (this.type == 2) { - this.tableData = data?.list || [] - } else { - this.tableData = data?.list.sort((a, b) => { - return a.questionIndex - b.questionIndex; - }); - } + this.tableData = data?.list || [] this.total = data.count; } else { this.$message.error(info); @@ -224,22 +218,13 @@ export default { async _QueryDataQuestionRank() { let queryData; let query = {}; - if (this.types == 1) { - if (this.role == "ROLE_PERSONAL") { - queryData = this.$request.pPeriodStudentReport - } else { - queryData = this.$request.periodStudentReport - } - query.type = this.type - 1 - query.periodId = this.id[0] - } else { + query.periodIds = this.id if (this.types == 2) { queryData = this.$request.phaseAnswerReport } else if (this.types == 3) { queryData = this.$request.cTPhaseAnswerReport } - } if (this.types != 1) { query.classId = this.classId } @@ -249,6 +234,7 @@ export default { ...query, }); this.loading = false; + console.log(data) if (status === 0) { this.exportStudent = data?.list && [...data?.list] || [] } else { @@ -268,16 +254,21 @@ export default { this.exportLoading = true; let studentIds = arr let query = {}; - if (studentIds.length > 0) { - query.studentIds = studentIds - } else { - query.studentIds = [] + if(studentIds != null){ + if (studentIds.length > 0) { + query.studentIds = studentIds + } else { + query.studentIds = [] + } } let exportPeriodReport = "" - if (this.id.length == 1) { + if (this.types == 1) { query.periodId = this.id[0] - exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPeriodReport - } else { + exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPeriodReport : this.$request.exportPeriodReport + } else if(this.types == 2){ + query.periodIds = this.id + exportPeriodReport = this.role == "ROLE_PERSONAL" ?this.$request.pExportPhaseAnswerReport:this.$request.exportPhaseAnswerReport + }else{ query.periodIds = this.id exportPeriodReport = this.$request.cTExportPhaseAnswerReport } @@ -287,6 +278,7 @@ export default { }); this.exportLoading = false; if (data) { + this.cancel() let blob = new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", }); diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue index 31b83e6..bcb1647 100644 --- a/src/views/basic/ask/components/answerQustion.vue +++ b/src/views/basic/ask/components/answerQustion.vue @@ -1,22 +1,68 @@