+
平台考试数据统计
-
+
@@ -303,40 +285,63 @@ export default {
diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue
index e2c2c4f..bd9472e 100644
--- a/src/pages/achievement/info/project.vue
+++ b/src/pages/achievement/info/project.vue
@@ -263,8 +263,10 @@ export default {
const res = this.permissions ?
await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) :
await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=${this.pageSize}&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
- this.listData = res.page.records
- this.total = res.page.total
+ // 返回格式有两种
+ const isArr = res.page instanceof Array
+ this.listData = isArr ? res.page : res.page.records
+ this.total = isArr ? res.total : res.page.total
this.avgScore = (+res.avgScore).toFixed(2)
this.examCount = res.examCount
this.peopleNum = res.peopleNum
@@ -339,6 +341,16 @@ export default {
list = res.page.records
}
+ const res = await axios.post(this.api.exportMultipleExperimentalReports, list.map(e => e.reportId), {
+ headers: {
+ token: this.token
+ },
+ responseType: 'blob'
+ })
+ const name = res.headers['content-disposition']
+ util.downloadFileDirect(name ? decodeURI(name) : '成绩报告.xlsx', new Blob([res.data]))
+ this.exporting = false
+ return
list.forEach(async e => {
if (e.reportId) {
try {
diff --git a/src/pages/achievement/list/course.vue b/src/pages/achievement/list/course.vue
index 111da9a..8a1897a 100644
--- a/src/pages/achievement/list/course.vue
+++ b/src/pages/achievement/list/course.vue
@@ -1,67 +1,39 @@
-
+
-
-
+
-
-
+
+
{{ scope.$index + (page - 1) * pageSize + 1 }}
-
+
- 成绩管理
+ 成绩管理
@@ -253,10 +225,11 @@ export default {
\ No newline at end of file
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 8e080a5..65574b5 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -218,9 +218,14 @@ export default {
index++
}
})
- e.lcStudentAnswer.map((n, i) => {
- e.answer += `${i + 1}.${n.userAnswer || '未填写'};`
- })
+ // lcStudentAnswer是后来特意给沙盘项目的且或判分点加的字段，其他系统都没有这个字段，因此如果没有这个字段，则直接显示老的lcRuleRecords
+ if (e.lcStudentAnswer) {
+ e.lcStudentAnswer.map((n, i) => {
+ e.answer += `${i + 1}.${n.userAnswer || '未填写'};`
+ })
+ } else {
+ e.lcStudentAnswer = e.lcRuleRecords
+ }
})
} else { // python系统显示图片（从userScores里取）
list.forEach(e => {
@@ -234,7 +239,7 @@ export default {
this.expData = list
this.loading = false
},
- exportPage () {
+ async exportPage () {
const form = Object.assign(this.form, this.infoData)
const list = JSON.parse(JSON.stringify(this.expData))
list.map((e, i) => {
@@ -387,6 +392,7 @@ samp {
padding: 10px 16px;
font-size: 14px;
color: #333;
+ white-space: pre-wrap;
&.edit {
color: #abb3c6;
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 0a92046..3afcde0 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -1,33 +1,24 @@
-
+
-
+
-
+
@@ -37,55 +28,34 @@
-
+
筛选
-
-
+
-
-
- {{ form.id ? "更新" : "创建" }}
+ {{ form.id ? "更新" : "创建" }}
考核名称
-发布方式
实验时间
-
+
+
实验时长：
-
-
+
-
开始时间:
-
课程
-
-
+
+
-
+
+
-
+
-
+
-
+
{{ permissionsKeys[scope.row.permissions] }}
-
+
{{ scope.row.createUser }}
-
+
- 查看
+ 查看
-
+
@@ -177,46 +120,28 @@
无指定范围
-
实训项目
自定义实验项目
+ 自定义实验项目
-
-
-
-
考核发布
+
-
+
-
+
@@ -225,13 +150,9 @@
@@ -597,16 +518,16 @@ export default {
expNameRepeat: this.expNameRepeat, // 考核名称是否重复
allCheckedNodes: this.allCheckedNodes // 选中的树节点
};
- this.setAss(data);
- this.isToProject = true;
+ this.setAss(data)
+ this.isToProject = true
},
toProject () {
- this.handleCacheData();
- this.$router.push("/project/list?show=1");
+ this.handleCacheData()
+ this.$router.push("/project/list?show=1")
},
showProject (row) {
- this.handleCacheData();
- this.$router.push(`/project/add?projectId=${row.projectId}&show=1`);
+ this.handleCacheData()
+ this.$router.push(`/project/add?projectId=${row.projectId}&show=1&ass=1`)
},
createInv () {
let result = "";
@@ -646,51 +567,60 @@ export default {
\ No newline at end of file
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 27a5604..79c193d 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -1,141 +1,87 @@
班级名称
-
-
+
-
+
{{ tag.organizationName }}
-
+
设置邀请码
- 随机
+ 随机
-
+
-
-
-
- ![]()
+
+
+ ![]()
-
+
{{ form.mall.productName }}
-
+
-
+
- 
适用专业：
-
+ 适用专业：
+
- 适用专业：
- 适用专业：
+
{{ form.goodsRes.professionalName }}
- 
适用场景：
+
适用场景：
+
+ 适用场景：
- 适用场景：
{{ form.mall.applicationScenario }}
- 
匹配课程：
-
+
- 匹配课程：
-
+ 匹配课程：
+
- 匹配课程：
+
{{ form.mall.matchingCourse }}
- 
预计课时：
+
预计课时：
+
+ 预计课时：
- 预计课时：
{{ form.mall.courseHours }}
- 
产品类型：
+
-
-
-
+
+
+
产品类型：
+
+ 产品类型：
产品类型：
{{ form.goodsRes.typeName }}
+
-
-
- {{ tab.name }} +
- {{ + tab.name }}
-
-
+
+
{{ item.name }}
-
-
-
+
+
@@ -145,33 +91,20 @@
+
- 
- 
+
+
- 
- 
- 
+ src="@/assets/img/exts/word.png" alt="">
+
+
+
{{ section.name }}
-
+
-
+
+
-
-
-
+ src="@/assets/img/exts/word.png" alt="">
+
+
+
{{ section.name }}
热门产品推荐
-
-
-
-
-
+ -
+
+
-{{ item.productName }}- - @@ -181,20 +114,11 @@- -++ @@ -334,13 +258,18 @@ export default { window.open('https://www.wjx.top/vm/wFCPCFp.aspx') }, // 跳转实验台 - toStation () { + async toStation () { if (this.isCourse) { // 如果是课程，直接进入实验台 - this.$post(`${this.api.addLearningRecord}?mallId=${this.id}`).then(res => { - this.$router.push('/station/preview?courseId=' + this.form.mall.associatedProduct + '&curriculumName=' + this.form.mall.productName + '&mallId=' + this.id + '&admin=1') - }).catch(res => { }) + await this.$post(`${this.api.addLearningRecord}?mallId=${this.id}`) + this.$router.push('/station/preview?courseId=' + this.form.mall.associatedProduct + '&curriculumName=' + this.form.mall.productName + '&mallId=' + this.id + '&admin=1') } else if (this.withLink) { // 如果没有绑定产品，并且有设置关联链接，则弹框选择链接 - this.linkVisible = true + const links = this.form.mallNonAssociatedLinks + // 链接只有一条，则直接进入 + if (links.length === 1) { + window.open(links[0].url) + } else { + this.linkVisible = true + } } }, // 进入系统 @@ -379,295 +308,350 @@ export default { \ No newline at end of file diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue index d300a07..48a4bdf 100644 --- a/src/pages/project/add/index.vue +++ b/src/pages/project/add/index.vue @@ -193,6 +193,7 @@ export default { return { projectId: this.$route.query.projectId, founder: this.$route.query.founder, + fromAss: this.$route.query.ass, // 从考核新增里点查看项目过来的 systemList: [], mallIds: [], curs: [], @@ -400,7 +401,6 @@ export default { this.setSystemId(this.projectManage.systemId); }).catch(() => { this.projectManage.systemId = this.lastSystemId; - // console.log(this.lastSystemId, "this.lastSystemId"); }); } }, @@ -759,8 +759,7 @@ export default { } }, backPage () { - const { params } = this.$store.state.project - this.$router.push(`/project?${qs.stringify(params.form)}&page=${params.page}`) + this.fromAss ? this.$router.back() : this.$router.push(this.$store.state.achievement.referrer || '/project') }, } }; diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue index cd5dec1..3f81b0a 100644 --- a/src/pages/project/list/index.vue +++ b/src/pages/project/list/index.vue @@ -1,10 +1,7 @@+{{ link.urlName }}： - {{ link.url }} + {{ link.url }}-@@ -209,12 +124,13 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue index add6017..5fc79bf 100644 --- a/src/pages/screen/index.vue +++ b/src/pages/screen/index.vue @@ -1,10 +1,7 @@- + + -筛选
@@ -12,196 +9,114 @@-
-
- + + -
-
- + + -
-
- + + -
-
+ -
-
+
-新增项目 -批量删除 +新增项目 +批量删除 - - + + + {{ scope.$index + (page - 1) * pageSize + 1 }} -- + + {{ founderKeys[scope.row.founder] }} -+ {{ permissionsKeys[scope.row.permissions] }} -- + + {{ stateKeys[scope.row.state] }} -+ - -+ - + + - 查看 -编辑 -删除 -复制 -+ 查看 +编辑 +删除 +复制 +--+ + - -+ - + + -
+
@@ -37,18 +34,15 @@-
+
平台考试数据统计
-
-
- {{ item.name }} +
- + {{ + item.name }}
@@ -68,12 +62,10 @@-- +
+
学生成绩分布分析
@@ -93,12 +85,10 @@-- +
+
月人均在线学习时长情况
@@ -118,17 +108,14 @@-- +
+
平台登录人数
-+-@@ -149,15 +136,8 @@-+@@ -196,18 +175,14 @@-- +
+
学生实验课程考核成绩趋势图
-+-@@ -229,23 +204,18 @@-
+
本月综合学习积极性最高的实验课程
-
-
- +
-
{{ i + 1 }}
{{ item.goodsName }}
-
+
+@@ -267,23 +237,20 @@--
+
热门理论课程排行榜
+--
-
- +
-
{{ i + 1 }}
-
{{ item }}
+{{ item.courseName }}
+ {{ item.viewCount }}
+@@ -301,8 +268,7 @@-
+
学霸排行榜
@@ -318,13 +284,10 @@- -+@@ -354,8 +316,7 @@-
+
活跃度排行榜
@@ -369,13 +330,10 @@- -
-