huoran
/
FE_occupationlab_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

修改bug

Browse Source
dev_2022-05-11
e 3 years ago
parent 7cca89d676
commit 12b73e893f
8 changed files with 46 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/index.js
  2. 17
      src/pages/achievement/ass/index.vue
  3. 12
      src/pages/achievement/list/index.vue
  4. 31
      src/pages/achievement/show/index.vue
  5. 5
      src/pages/achievement/vir/index.vue
  6. 11
      src/pages/assessment/add/index.vue
  7. 4
      src/pages/match/manage/matchProgress.vue
  8. 1
      src/pages/student/list/index.vue

1
src/api/index.js
Unescape View File

@ -68,6 +68,7 @@ export default {
getPracticeDetail: `${host}occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情 getPracticeDetail: `${host}occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
myClass: `${host}occupationlab/achievement/myClass`, // 教师端:我的班级 myClass: `${host}occupationlab/achievement/myClass`, // 教师端:我的班级
deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核 deleteReportById: `${host}occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
experimentOverview: `${host}occupationlab/achievement/reportDetail`, // 查看实验报告
// 项目管理 // 项目管理
getSystemIdBySchool: `${host}occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统 getSystemIdBySchool: `${host}occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统

17
src/pages/achievement/ass/index.vue
Unescape View File

@ -4,14 +4,7 @@
<div class="flex-between m-b-10"> <div class="flex-between m-b-10">
<el-page-header @back="goBack" :content="experimentalName"></el-page-header> <el-page-header @back="goBack" :content="experimentalName"></el-page-header>
</div> </div>
<el-form label-width="100px">
<div class="flex-between">
<div></div>
<div>
<el-input placeholder="请输入学校/学生姓名" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
</div>
</div>
</el-form>
</el-card> </el-card>
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover" class="m-b-20">
@ -35,6 +28,14 @@
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover" class="m-b-20">
<div class="flex-between m-b-20"> <div class="flex-between m-b-20">
<el-form label-width="100px">
<div class="flex-between">
<div></div>
<div>
<el-input placeholder="请输入学校/学生姓名" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
</div>
</div>
</el-form>
<div></div> <div></div>
<div> <div>
<el-button type="primary" @click="delAllData">批量删除</el-button> <el-button type="primary" @click="delAllData">批量删除</el-button>

12
src/pages/achievement/list/index.vue
Unescape View File

@ -69,19 +69,19 @@
</template> </template>
</el-table-column> </el-table-column>
<template v-if="projectPermissions == 1"> <template v-if="projectPermissions == 1">
<el-table-column prop="className" label="班级" align="center"></el-table-column> <el-table-column prop="className" label="班级" align="center" min-width="100"></el-table-column>
<el-table-column prop="experimentalName" label="实验名称" align="center"></el-table-column> <el-table-column prop="experimentalName" label="实验名称" align="center" min-width="100"></el-table-column>
</template> </template>
<el-table-column prop="projectName" label="项目名称" align="center" min-width="400"></el-table-column> <el-table-column prop="projectName" label="项目名称" align="center" min-width="400"></el-table-column>
<el-table-column prop="projectPermissions" label="分类" align="center"> <el-table-column prop="projectPermissions" label="分类" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.permissions == 2 ? "竞赛" : projectType.find(n => n.id === scope.row.permissions).name }} {{ scope.row.permissions == 2 ? "竞赛" : projectType.find(n => n.id === scope.row.permissions).name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="experimentalNumber" label="成绩报告数量" align="center"></el-table-column> <el-table-column prop="experimentalNumber" label="成绩报告数量" align="center" min-width="100"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"> <el-table-column prop="createTime" label="创建时间" align="center" min-width="200">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center" min-width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="auth('练习成绩管理') || auth('考核成绩管理')" type="text" @click="entry(scope.row)">成绩管理</el-button> <el-button v-if="auth('练习成绩管理') || auth('考核成绩管理')" type="text" @click="entry(scope.row)">成绩管理</el-button>
<el-button type="text" v-if="scope.row.isDel == 1" @click="handleDelete(scope.row)" >删除</el-button> <el-button type="text" v-if="scope.row.isDel == 1" @click="handleDelete(scope.row)" >删除</el-button>

31
src/pages/achievement/show/index.vue
Unescape View File

@ -21,7 +21,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="workNumber" label="学生学号" align="center"> <el-table-column prop="workNumber" label="学生学号" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="experimentalClassName" label="学生班级" align="center"> <el-table-column prop="className" label="学生班级" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="instructor" label="指导老师" align="center"> <el-table-column prop="instructor" label="指导老师" align="center">
</el-table-column> </el-table-column>
@ -38,7 +38,7 @@
<div class="meta-title-wrap"> <div class="meta-title-wrap">
<p class="meta-title"><img src="@/assets/img/cup.png" alt=""> 实验项目名称</p> <p class="meta-title"><img src="@/assets/img/cup.png" alt=""> 实验项目名称</p>
</div> </div>
<el-input v-model="form.proName" type="textarea" :disabled="true" rows="5"></el-input> <el-input v-model="form.projectName" type="textarea" :disabled="true" rows="5"></el-input>
</div> </div>
<div class="m-b-20"> <div class="m-b-20">
@ -59,19 +59,23 @@
{{ scope.$index + 1 }} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="judgmentPointsName" label="任务名称" align="center"> <el-table-column prop="judgmentName" label="任务名称" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="userAnswer" label="学生答案" align="center"> <el-table-column prop="userAnswer" label="学生答案" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<pre v-html="scope.row.userAnswer" style="white-space: pre-wrap"></pre> <div v-for="(item, index) in scope.row.lcRuleRecords">
<span>{{index+1}}. </span>{{item.userAnswer}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="answer" label="参考答案" align="center"> <el-table-column prop="answer" label="参考答案" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<pre v-html="scope.row.answer" style="white-space: pre-wrap"></pre> <div v-for="(item, index) in scope.row.lcRuleRecords">
<span>{{index+1}}. </span>{{item.ruleAnswer}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="codeScore" label="得分" align="center"> <el-table-column prop="score" label="得分" align="center">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@ -157,9 +161,9 @@ export default {
let data = { let data = {
recordId: this.id recordId: this.id
}; };
this.$get(this.api.queryVirtualReport, data).then(res => { this.$get(this.api.experimentOverview, data).then(res => {
this.form = res.data.report; this.form = res.report;
let expData = res.data.data; let expData = res.userScores;
let form = this.form; let form = this.form;
let score = form.score; let score = form.score;
@ -193,12 +197,13 @@ export default {
let data = { let data = {
studentId: this.studentId, studentId: this.studentId,
projectId: this.projectId, projectId: this.projectId,
recordId: this.id, // recordId: this.id,
reportId: this.reportId reportId: this.reportId
}; };
this.$get(this.api.queryArchievement, data).then(res => { this.$get(this.api.experimentOverview, data).then(res => {
this.form = res.data.report ? res.data.report : {}; console.log(res)
let expData = res.data.data; this.form = res.report ? res.report : {};
let expData = res.userScores;
let form = this.form; let form = this.form;
let score = form.score; let score = form.score;

5
src/pages/achievement/vir/index.vue
Unescape View File

@ -110,10 +110,11 @@ export default {
}); });
}, },
show(row) { show(row) {
console.log(row)
if (this.permissions) { if (this.permissions) {
this.$router.push(`show?id=${row.recordId}&projectId=${this.projectId}&reportId=${row.reportId}`); this.$router.push(`show?id=${row.projectId}&projectId=${this.projectId}&reportId=${row.reportId}`);
} else { } else {
this.$router.push(`show?id=${row.recordId}&type=1`); this.$router.push(`show?id=${row.projectId}&type=1`);
} }
}, },
exportData() { exportData() {

11
src/pages/assessment/add/index.vue
Unescape View File

@ -9,6 +9,7 @@
</div> </div>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="mgr20 m-b-20"> <el-card shadow="hover" class="mgr20 m-b-20">
<div> <div>
<p class="m-b-20">考核名称</p> <p class="m-b-20">考核名称</p>
@ -21,6 +22,7 @@
></el-input> ></el-input>
</div> </div>
</el-card> </el-card>
<el-card shadow="hover" class="m-b-20"> <el-card shadow="hover" class="m-b-20">
<div> <div>
<p class="m-b-20">发布方式</p> <p class="m-b-20">发布方式</p>
@ -147,7 +149,7 @@
<div class="tree-con"> <div class="tree-con">
<student-tree <student-tree
ref="tree" ref="tree"
node-key="nodeKey" node-key="id"
show-checkbox show-checkbox
highlight-current highlight-current
default-expand-all default-expand-all
@ -299,6 +301,7 @@ export default {
}); });
// 缓存全选和半选状态下的所有节点 // 缓存全选和半选状态下的所有节点
this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes]; this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
console.log(this.allCheckedNodes)
}, },
filterNode(value, data) { // 对树节点进行过滤 filterNode(value, data) { // 对树节点进行过滤
if (!value) return true; if (!value) return true;
@ -335,9 +338,9 @@ export default {
}); });
this.$nextTick(() => { this.$nextTick(() => {
// 编辑时，设置默认勾选 // 编辑时，设置默认勾选
if (this.form.stuInfo && this.form.stuInfo.length) { if (this.form.classInfo && this.form.classInfo.length) {
let keys = this.form.stuInfo.map(i => { let keys = this.form.classInfo.map(i => {
return `${i.classId}-${i.stuAccountId}`; return i.id;
}); });
this.defaultCheckedKeys = keys; this.defaultCheckedKeys = keys;
} }

4
src/pages/match/manage/matchProgress.vue
Unescape View File

@ -143,8 +143,8 @@ export default {
status: 0 status: 0
}); });
} }
} },
} },
}; };
</script> </script>

1
src/pages/student/list/index.vue
Unescape View File

@ -858,7 +858,6 @@ export default {
// console.log(this.form.classId); // console.log(this.form.classId);
treeList.forEach(i => { treeList.forEach(i => {
i.disabled = i.level < 3; i.disabled = i.level < 3;
if (i.level === 3) { if (i.level === 3) {
i.leaf = true; i.leaf = true;
// 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked // 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked

Write Preview
Loading…
Cancel
Save