diff --git a/public/1.html b/public/1.html deleted file mode 100644 index b4077ff..0000000 --- a/public/1.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - MathML示例 - - - - - -

一、我是题干我是题干我是题干我是题干我是题干我是题干我是题干

-

A. -(12)-1+3tan30°-(3-π)0-83 -

-

B. 2$a$2 - - - - - - - 4 - x - - - 6 - - 5 - ( - x - - - 1 - ) - - - - - - - - x - - - 3 - - - - 2 - - - - - x - - - 2 - - - 6 - - - - - - - - - -

-

- C. y=2x -

- - \ No newline at end of file diff --git a/public/static/试卷模板.docx b/public/static/试卷模板.docx new file mode 100644 index 0000000..6f550a0 --- /dev/null +++ b/public/static/试卷模板.docx diff --git a/src/components/charts/radarChart.vue b/src/components/charts/radarChart.vue index 17594a4..cd593df 100644 --- a/src/components/charts/radarChart.vue +++ b/src/components/charts/radarChart.vue @@ -41,7 +41,9 @@ export default { let marker = param.marker let oHtml = `

${marker}${param.name}

` param.value.map((item, index) => { - oHtml += `

${that.params.indicator[index].name}:${item}

` + if (that.params.indicator[index].name) { + oHtml += `

${that.params.indicator[index].name}:${item}

` + } }) return oHtml } @@ -57,8 +59,8 @@ export default { radar: { indicator: [...that.params.indicator], splitNumber: 5, - center: ['50%', '65%'], - radius: "90%", + center: ['50%', '55%'], + radius: "80%", shape: "polygon", nameGap: 6, axisLine: { diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue index 170ace2..31b83e6 100644 --- a/src/views/basic/ask/components/answerQustion.vue +++ b/src/views/basic/ask/components/answerQustion.vue @@ -174,23 +174,7 @@ export default { return resultData } }, - created() {RadarChart - if (this.types == 3) { - this.chartData = { - indicator: [ - { - name: '', max: 100, - axisLabel: { - show: true, - showMaxLabel: true, - formatter: '{value}%' - }, - }, - ], - seriesData: [] - } - } - }, + created() { }, methods: { setDuration(times) { if (times) { @@ -219,7 +203,8 @@ export default { let participationRate = [] let correctRate = [] let answerCorrectRate = [] - this.xAxis = obj.dataList.map(item => { + let dataList = obj.dataList + this.xAxis = dataList.map(item => { participationRate.push(item.participationRate) correctRate.push(item.correctRate) answerCorrectRate.push(item.answerCorrectRate) @@ -242,8 +227,22 @@ export default { }, openRandarChart(obj) { + this.chartData = { + indicator: [ + { + name: '', max: 100, + axisLabel: { + show: true, + showMaxLabel: true, + formatter: '{value}%' + }, + }, + ], + seriesData: [] + } this.chartTitle = obj.studentName + '-多科-多课时作答表现图' - let subjectList = obj.dataList.map(item => item.subjectName) + let dataList = obj.dataList.slice(1, obj.dataList.length) + let subjectList = dataList.map(item => item.subjectName) subjectList.map((item, index) => { if (index < 1) { this.chartData.indicator[index].name = item @@ -260,13 +259,15 @@ export default { } } } + let participationRate = dataList.map(item => item.participationRate) + let correctRate = dataList.map(item => item.correctRate) this.chartData.seriesData = [ { - value: obj.dataList.map(item => item.participationRate), + value: participationRate, name: '参与度' }, { - value: obj.dataList.map(item => item.correctRate), + value: correctRate, name: '正确率' }, ] diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue index 012e058..58e2e12 100644 --- a/src/views/basic/test/components/multipleSubTest.vue +++ b/src/views/basic/test/components/multipleSubTest.vue @@ -138,7 +138,8 @@ export default { this.chartTitle = obj.studentName + '-多科-多课时作答表现图' let max = 0; - let subjectList = obj.dataList.map(item => { + const dataList = obj.dataList.slice(1, obj.dataList.length) + let subjectList = dataList.map(item => { let score = Number(item.highestScore || item.score) max = score > max ? score : max return item.subjectName @@ -176,15 +177,15 @@ export default { } this.chartData.seriesData = [ { - value: obj.dataList.map(item => item.highestScore), + value: dataList.map(item => item.highestScore), name: '班级最高分' }, { - value: obj.dataList.map(item => item.avgScore), + value: dataList.map(item => item.avgScore), name: '班平均分' }, { - value: obj.dataList.map(item => item.score), + value: dataList.map(item => item.score), name: '本人得分' }, ] diff --git a/src/views/basic/test/components/multipleTest.vue b/src/views/basic/test/components/multipleTest.vue index 70dd7c6..999888a 100644 --- a/src/views/basic/test/components/multipleTest.vue +++ b/src/views/basic/test/components/multipleTest.vue @@ -122,7 +122,8 @@ export default { let score = [] let classRank = [] let avgScore = [] - this.xAxis = obj.examList.map(item => { + const examList = obj.examList.slice(1,obj.examList.length) + this.xAxis = examList.map(item => { score.push(item.score) classRank.push(item.classRank) avgScore.push(item.avgScore) diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue index 1d49cc8..78505e3 100644 --- a/src/views/examinationPaper/index.vue +++ b/src/views/examinationPaper/index.vue @@ -147,6 +147,7 @@