dev_2022-05-11
e 3 years ago
parent fe1e2aff7e
commit 38b8109aa8
  1. 2
      src/pages/achievement/ass/index.vue
  2. 12
      src/pages/achievement/show/index.vue
  3. 4
      src/pages/achievement/teach/index.vue
  4. 4
      src/pages/achievement/vir/index.vue
  5. 2
      src/pages/assessment/list/index.vue
  6. 2
      src/pages/system/list/staff.vue

@ -56,8 +56,6 @@
{{ experimentalName }} {{ experimentalName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="className" prop="class" label="班级" align="center">
</el-table-column>
<el-table-column prop="userName" label="学生姓名" align="center"></el-table-column> <el-table-column prop="userName" label="学生姓名" align="center"></el-table-column>
<el-table-column prop="workNumber" label="学号" align="center"></el-table-column> <el-table-column prop="workNumber" label="学号" align="center"></el-table-column>
<el-table-column prop="score" label="分数" align="center"></el-table-column> <el-table-column prop="score" label="分数" align="center"></el-table-column>

@ -173,7 +173,6 @@ export default {
let expData = res.userScores; let expData = res.userScores;
let form = this.form; let form = this.form;
let score = form.score; let score = form.score;
if (expData) { if (expData) {
if (score) { if (score) {
expData.map(n => { expData.map(n => {
@ -187,16 +186,16 @@ export default {
this.expData = expData; this.expData = expData;
} }
this.infoData.push({ this.infoData.push({
workNumber: form.workNumber, workNumber: form.workNumber,
experimentalClassName: form.experimentalClassName, experimentalClassName: form.experimentalClassName,
instructor: form.instructor, instructor: form.teacherName,
period: form.period, period: form.period,
laboratory: form.laboratory, laboratory: form.laboratory,
submitTime: form.submitTime, submitTime: form.submitTime,
score: form.score, score: form.score,
userName: form.userName userName: form.userName,
className:form.className,
}); });
}).catch(res => { }).catch(res => {
}); });
@ -230,12 +229,13 @@ export default {
this.infoData.push({ this.infoData.push({
workNumber: form.workNumber, workNumber: form.workNumber,
experimentalClassName: form.experimentalClassName, experimentalClassName: form.experimentalClassName,
instructor: form.instructor, instructor: form.teacherName,
period: form.period, period: form.period,
laboratory: form.laboratory, laboratory: form.laboratory,
submitTime: form.submitTime, submitTime: form.submitTime,
score: form.score, score: form.score,
userName: form.userName userName: form.userName,
className:form.className,
}); });
}).catch(res => { }).catch(res => {
}); });

@ -163,7 +163,7 @@ export default {
}, },
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
}).catch(res => {}) }).catch(res => {})
} else { } else {
axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=`,{ axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=`,{
@ -172,7 +172,7 @@ export default {
}, },
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data]))
}).catch(res => {}) }).catch(res => {})
} }
}, },

@ -133,7 +133,7 @@ export default {
}, },
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
}).catch(res => {}) }).catch(res => {})
// location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`; // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`;
} else { } else {
@ -143,7 +143,7 @@ export default {
}, },
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data]))
}).catch(res => {}) }).catch(res => {})
// location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`; // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`;
} }

@ -99,7 +99,7 @@
<el-table-column label="操作" align="center" width="170"> <el-table-column label="操作" align="center" width="170">
<template slot-scope="scope" v-if="scope.row.show"> <template slot-scope="scope" v-if="scope.row.show">
<template v-if="scope.row.status == 0"> <template v-if="scope.row.status == 0">
<el-button v-if="auth('启动')" type="text" @click="start(scope.row)">启动</el-button> <el-button v-if="scope.row.type == 1" type="text" @click="start(scope.row)">启动</el-button>
<el-button v-if="auth('修改')" type="text" @click="edit(scope.row)">修改</el-button> <el-button v-if="auth('修改')" type="text" @click="edit(scope.row)">修改</el-button>
</template> </template>
<template v-else-if="scope.row.status == 1"> <template v-else-if="scope.row.status == 1">

@ -471,7 +471,7 @@ export default {
} }
}, },
roleRemove(value) { // roleRemove(value) { //
let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleId === value); let index = this.teacherForm.roleAndDeptList.findIndex(i => i.roleName === value);
if (index !== -1) { if (index !== -1) {
this.teacherForm.roleAndDeptList.splice(index, 1); this.teacherForm.roleAndDeptList.splice(index, 1);
} }

Loading…
Cancel
Save