diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 17b39bf..cdee1cb 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1615,15 +1615,6 @@ export default {
});
},
-
- // 教师/个人版导入备题组卷Word文档
- paperWordUpload(data) {
- return service({
- url: setUpUrls.paperWordUpload,
- method: "POST",
- data
- });
- },
// 删除随堂问报表
deletePaperReport(data) {
return service({
@@ -1632,6 +1623,7 @@ export default {
data
});
},
+
//删除基站
deleteStation(data) {
return service({
@@ -1657,6 +1649,15 @@ export default {
responseType: 'arraybuffer',
});
},
+ // 教学班模版下载
+ tClassAndStudentTemplate(data) {
+ return service({
+ url: setUpUrls.tClassAndStudentTemplate,
+ method: "POST",
+ data,
+ responseType: 'arraybuffer',
+ });
+ },
//教学班班级名册导出
exportTClassAndStudent(data) {
return service({
@@ -1715,4 +1716,6 @@ export default {
data
});
},
+
+
};
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index aeeadff..f8e5d88 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -417,4 +417,15 @@ export default {
exportExamMultiReport: "/api_html/teaching/exportExamMultiReport",
//查询即时测多班默认等级列表
defaultLevels: "/api_html/teaching/defaultLevels",
+ //教学班模版下载
+ tClassAndStudentTemplate: "/api_html/school/manager/tClassAndStudentTemplate",
+ //教学班导出
+ exportTClassAndStudent: "/api_html/school/manager/exportTClassAndStudent",
+ //删除随堂问报表
+ deletePaperReport: "/api_html/teaching/deletePaperReport",
+ //获取即时测报表学生名单和题目列表
+ listStudentsAndQuestions: "/api_html/teaching/listStudentsAndQuestions",
+ //提交即时测报表分数
+ submitScore: "/api_html/teaching/submitScore",
+
}
diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue
index cc42c99..15bdb53 100644
--- a/src/components/charts/lineChart.vue
+++ b/src/components/charts/lineChart.vue
@@ -43,7 +43,7 @@ export default {
confine: true,
formatter(v) {
let html = `
${v.seriesName}
`
- html += `${v.marker} ${v.name}:${v.value}${that.tooltipFormatter?'%':''}`
+ html += `${v.marker} ${v.name}:${Number(v.value)}${that.tooltipFormatter?'%':''}`
return html
},
},
diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index 7cd5b47..3761ff0 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -8,6 +8,7 @@ export default {
props: {
id: String,
params: Array,
+ tooltipFormatter:false
},
watch: {
params: {
@@ -38,7 +39,7 @@ export default {
trigger: "item",
confine: true,
formatter(v) {
- return `${v.marker} ${v.name}:${v.value}`
+ return `${v.marker} ${v.name}:${v.value}${that.tooltipFormatter?'%':''}`
},
},
legend: {
diff --git a/src/components/charts/radarChart.vue b/src/components/charts/radarChart.vue
index cd593df..9619b05 100644
--- a/src/components/charts/radarChart.vue
+++ b/src/components/charts/radarChart.vue
@@ -8,6 +8,7 @@ export default {
props: {
id: String,
params: Object,
+ tooltipFormatter:false
},
watch: {
params: {
@@ -42,7 +43,7 @@ export default {
let oHtml = `${marker}${param.name}
`
param.value.map((item, index) => {
if (that.params.indicator[index].name) {
- oHtml += `${that.params.indicator[index].name}:${item}
`
+ oHtml += `${that.params.indicator[index].name}:${Number(item)}${that.tooltipFormatter?'%':''}
`
}
})
return oHtml
diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue
index 30bb64c..c774a4e 100644
--- a/src/components/exportDia.vue
+++ b/src/components/exportDia.vue
@@ -1,10 +1,15 @@
-
+
-
是否将学生表现折线图一起导出
+
是否将学生表现{{ type }}一起导出
不导出
导出
@@ -20,27 +25,57 @@
选择学生
-
+
-
+
{{
- scoped.row.classRank || scoped.row.rank }}
- {{ scoped.row.examList && scoped.row.examList[0].classRank }}
+ scoped.row.classRank || scoped.row.rank
+ }}
+ {{
+ scoped.row.examList && scoped.row.examList[0].classRank
+ }}
-
- {{
- scoped.row.correctRate || scoped.row.scoringRate }}%
- {{ scoped.row.examList && scoped.row.examList[0].score }}
-
+
+ {{ scoped.row.correctRate }}%
+
+ {{ scoped.row.scoringRate }}%
+
+ {{
+ scoped.row.examList && scoped.row.examList[0].score
+ }}
+
@@ -49,64 +84,67 @@
export default {
name: "exportDia",
props: {
+ type: {
+ type: String,
+ default: "折线图",
+ },
diaShow: Boolean,
exportStudent: Array,
lastLabel: {
type: String,
- default: '总正确率'
- }
+ default: "总正确率",
+ },
},
data() {
return {
downType: 1,
exportType: 1,
multipleSelection: [],
- }
+ };
},
watch: {
diaShow: {
handler: function (nVal) {
if (nVal) {
- this.downType = 1
+ this.downType = 1;
}
},
- immediate: true
- }
-
+ immediate: true,
+ },
},
methods: {
changeDownType() {
- this.exportType = 1
+ this.exportType = 1;
},
handleSelectionChange(val) {
- this.multipleSelection = val
+ this.multipleSelection = val;
},
exportData(length) {
- let studentIds = []
+ let studentIds = [];
if (length) {
- studentIds = this.exportStudent.slice(0, 10).map(item => {
- return item.studentId
- })
+ studentIds = this.exportStudent.slice(0, 10).map((item) => {
+ return item.studentId;
+ });
} else {
- studentIds = this.multipleSelection.map(item => {
- return item.studentId
- })
+ studentIds = this.multipleSelection.map((item) => {
+ return item.studentId;
+ });
}
- this.$emit('exportData', this.downType==1?null:studentIds)
+ this.$emit("exportData", this.downType == 1 ? null : studentIds);
},
cancel() {
if (this.exportType == 2) {
- this.exportType = 1
+ this.exportType = 1;
} else {
- this.$emit('cancel')
+ this.$emit("cancel");
}
},
closeDia() {
- this.$emit('cancel')
- this.exportType = 1
- }
- }
-}
+ this.$emit("cancel");
+ this.exportType = 1;
+ },
+ },
+};
\ No newline at end of file
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 04e8234..1c31043 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -5,23 +5,59 @@
备题组卷
-
-
+
+
- 备题
- 组卷
+ 备题
+ 组卷
-
- 导入课件
-
-
- 添加试卷
+
+ 导入课件
+
+
+ 添加试卷
导入试卷
手动创建
@@ -31,20 +67,60 @@
@@ -54,10 +130,16 @@
- 我自编的 ({{ totalCount.my
- }})
- 年级共享的 ({{ totalCount.share
- }})
+ 我自编的 ({{ totalCount.my }})
+ 年级共享的 ({{ totalCount.share }})
-
+
-
-
+
+
- 修改分享范围
+ 修改分享范围
复制
- 放入回收站
+ 放入回收站
-
+
-
-
+
@@ -134,16 +267,33 @@
取 消
-
-
+
+
-
第一步:导出菁优网试卷,
-
+
+ 第一步:导出菁优网试卷,
+
-
+
导出选项示例。
+ 或者
+ 下载模板 。
第二步:上传完成编辑好的试卷。
@@ -158,7 +308,7 @@