实验平均分
@@ -133,11 +133,7 @@
prop="experimentalName"
label="考核名称"
min-width="250"
- align="center">
-
- {{ experimentalName }}
-
-
+ align="center">
- {{ scope.row.timeSum }}min
+ {{ scope.row.timeSum + (scope.row.reportId ? 'min' : '') }}
+
+
+ {{ scope.row.reportId ? '已参加' : '未参加' }}
+
+
- 查看成绩报告
- 删除
+
+ 查看成绩报告
+ 删除
+
@@ -292,6 +299,7 @@ export default {
page: 1,
pageSize: 10,
total: 0,
+ examCount: 0,
peopleNum: 0, // 总人数
avgScore: 0, // 平均分
maxScore: 0,
@@ -359,16 +367,16 @@ export default {
const res = this.permissions ?
await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) :
await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
- this.listDataAll = res.page.records
+ this.listData = res.page.records
this.total = res.page.total
this.avgScore = (+res.avgScore).toFixed(2)
+ this.examCount = res.examCount
this.peopleNum = res.peopleNum
this.maxScore = res.maxScore
this.minScore = res.minScore
this.errorAnalysis = res.errorAnalysis || {}
this.max = res.highestErrorRate || {}
this.min = res.minimumErrorRate || {}
- this.handlePage()
this.getChart()
this.errorChart()
},
@@ -402,7 +410,7 @@ export default {
: `${this.api.exportPracticeInfo}?projectId=${this.id}&mallId=${this.mallId}`
// 有勾选，就带上勾选的id
if (this.multipleSelection.length) {
- const ids = this.multipleSelection.map(e => e.reportId)
+ const ids = this.multipleSelection.map(e => this.permissions ? e.testStatusId : e.reportId)
url += `&ids=${ids.toString()}`
}
axios.get(url, {
@@ -415,9 +423,17 @@ export default {
}).catch(res => { })
},
// 导出实验报告
- exportReport () {
+ async exportReport () {
// 没选择数据，则导出全部
- const list = this.multipleSelection.length ? this.multipleSelection : this.listDataAll
+ let list = this.multipleSelection
+ if (!this.multipleSelection.length) {
+ // 考核和练习调不同接口
+ const res = this.permissions ?
+ await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) :
+ await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
+ list = res.page.records
+ }
+
list.forEach(async e => {
const { report, userScores } = await this.$get(`${this.api.reportDetail}?reportId=${e.reportId}`)
userScores.map((e, i) => {
@@ -473,7 +489,7 @@ export default {
},
handleCurrentChange (val) { // 切换分页
this.page = val;
- this.handlePage();
+ this.getData();
},
handleSelectionActivationChange (val) { // 多选
@@ -481,7 +497,7 @@ export default {
},
handleCurrentActivationChange (val) { // 切换分页
this.pageActivation = val;
- this.handlePage();
+ this.getData();
},
// 导出(有勾选：就导勾选中的；没有勾选：就导全部)
@@ -515,7 +531,6 @@ export default {
list.map(n => {
yData[n.score]++
})
- console.log(333, xData, yData)
let myChart = echarts.init(document.getElementById("chart"));
myChart.setOption({
title: { text: "实验分数分布图" },
diff --git a/src/pages/achievement/list/course.vue b/src/pages/achievement/list/course.vue
index dc86753..8317940 100644
--- a/src/pages/achievement/list/course.vue
+++ b/src/pages/achievement/list/course.vue
@@ -3,7 +3,7 @@
筛选
@@ -49,10 +55,10 @@
label="课程"
align="center"
min-width="200">
-
+ min-width="130"> -->
-
+ min-width="100"> -->
@@ -98,7 +104,7 @@ export default {
projectPermissions: this.$route.query.per ? +this.$route.query.per : 0,
mallIds: [],
curs: [],
- keyword: "",
+ keyword: this.$route.query.keyword || '',
searchTimer: null,
startingtime: "",
endTime: "",
@@ -127,7 +133,7 @@ export default {
}
],
date: "",
- page: +this.$route.query.page || 1,
+ page: this.$route.query.page ? +this.$route.query.page : 1,
pageSize: 10,
total: 0,
loadIns: null
@@ -156,6 +162,13 @@ export default {
keyword: function (val) {
clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => {
+ this.$router.push({
+ path: 'list',
+ query: {
+ ...this.$route.query,
+ keyword: val
+ }
+ })
this.initData();
}, 500);
}
diff --git a/src/pages/achievement/list/project.vue b/src/pages/achievement/list/project.vue
index 10758ed..ac386e9 100644
--- a/src/pages/achievement/list/project.vue
+++ b/src/pages/achievement/list/project.vue
@@ -170,7 +170,7 @@ export default {
projectPermissions: this.$route.query.per ? +this.$route.query.per : 0,
mallIds: [],
curs: [],
- keyword: "",
+ keyword: this.$route.query.keyword || '',
searchTimer: null,
startingtime: "",
endTime: "",
@@ -199,7 +199,7 @@ export default {
}
],
date: "",
- page: +this.$route.query.page || 1,
+ page: this.$route.query.page ? +this.$route.query.page : 1,
pageSize: 10,
total: 0,
loadIns: null
@@ -228,6 +228,13 @@ export default {
keyword: function (val) {
clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => {
+ this.$router.push({
+ path: 'list',
+ query: {
+ ...this.$route.query,
+ keyword: val
+ }
+ })
this.initData();
}, 500);
}
@@ -246,7 +253,7 @@ export default {
const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
this.curs = data
this.mallId = this.mallId || data[0].mallId
- this.initData();
+ this.getData();
},
// 课程选择回调
curChange (id) {
@@ -294,7 +301,6 @@ export default {
list = res.page.records
this.total = res.page.total
}
- console.log(33, per)
list.map(e => {
// isAdmin表示这个项目是不是内置的项目，如果为1 表示内置的项目，删除的前提条件就是这个项目删除了isdel=1以及courseDel=1 同时课程管理也移除了这个项目才能删除， 所以要系统内置的项目要满足这三个条件(1.为内置 2.中台删除了、3、课程里面也移除了)才能删除。是isAdmin为0就说明不是内置项目，为当前用户自己创建的项目，所以条件就是isDel为1直接删
e.canDel = per ?
@@ -353,7 +359,7 @@ export default {
},
// 进入实验记录
entry (row) {
- this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.mallId}`)
+ this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.mallId}&classId=${row.classId}`)
},
handleDelete (row) { // 删除
this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index eeb0554..baab042 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -772,6 +772,7 @@ export default {
sort: 0,
isShelves: 0,
hotTag: 1,
+ purchaseStatus: 1
})
if (cousrseRes) {
const courseList = cousrseRes.page.records
diff --git a/src/setting.js b/src/setting.js
index c0b1bc6..2543736 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -15,8 +15,11 @@ let bankPath = `${location.origin}/banksystem` // 银行系统地址
let sandPath = `${location.origin}/sandbox` // 沙盘地址
let jumpPath = `${location.origin}/judgmentPoint`
let host = `${location.origin}/`
-let uploadURL = `${location.origin}/`
-let title = (isHh || isCH) ? '教师管理端' : '职站服务端管理系统'
+// let host = `https://izhixinyun.com/`
+// let uploadURL = `${location.origin}/`
+let uploadURL = `https://izhixinyun.com/`
+// let title = (isHh || isCH) ? '教师管理端' : '职站服务端管理系统'
+let title = '教师管理端'
if (isPro) {
bankPath = `https://www.huorantech.cn/banksystem`
@@ -30,8 +33,7 @@ if (isPro) {
uploadURL = `http://121.37.12.51/`
host = "http://121.37.12.51/"; // 中台测试服
// host = 'https://www.occupationlab.com/' // 正式服
- host = "http://192.168.31.217:9000/"; // 榕
- // host = 'http://192.168.31.51:9000/'; // 赓
+ host = "http://192.168.31.217:9000/";
} else if (isSq) {
zcPath = `10.20.100.204:8883`
}