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
yujialong 3 years ago
parent c68ea76132
commit d8a72c9563
4 changed files with 87 additions and 138 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. 26
      src/pages/achievement/list/index.vue
  2. 139
      src/pages/project/add/index.vue
  3. 8
      src/pages/student/list/index.vue
  4. 4
      src/setting.js

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

@ -76,7 +76,7 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="auth('成绩管理')" type="text" @click="entry(scope.row)">成绩管理</el-button> <el-button v-if="auth('成绩管理')" type="text" @click="entry(scope.row)">成绩管理</el-button>
<el-button v-if="auth('删除')" type="text" @click="handleDelete(scope.row)" :disabled="!scope.row.isDel">删除</el-button> <el-button v-if="auth('删除')" type="text" :disabled="scope.row.isDel" @click="handleDelete(scope.row)" >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -217,7 +217,7 @@ export default {
this.getData(); this.getData();
}, },
disabledSelection(row, index) { // 禁用勾选 disabledSelection(row, index) { // 禁用勾选
if (row.isDel === 0) return false; if (row.isDel === 1) return false;
return true; return true;
}, },
entry(row) { // 成绩管理 entry(row) { // 成绩管理
@ -234,7 +234,13 @@ export default {
this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", { this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
this.$post(`${this.api.deleteReportById}?ids=${row.assessmentId}&projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`).then(res => { let url = "";
if (this.projectPermissions === 0) {
url = `${this.api.deleteReportById}?ids=&projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`;
} else {
url = `${this.api.deleteReportById}?ids=${row.assessmentId}&projectIds=${row.projectId}&projectPermissions=${this.projectPermissions}`;
}
this.$get(url).then(res => {
util.successMsg("删除成功"); util.successMsg("删除成功");
this.getData(); this.getData();
}).catch(res => { }).catch(res => {
@ -247,11 +253,17 @@ export default {
this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", { this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
let url = "";
let ids = []; let ids = [];
let projectIds = this.multipleSelection.map(item => { ids = this.multipleSelection.map(item => item.assessmentId);
return item.projectId; let projectIds = [];
}); projectIds = this.multipleSelection.map(item => item.projectId);
this.$post(`${this.api.deleteReportById}?ids=${ids.toString()}&projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`).then(res => { if (this.projectPermissions === 0) {
url = `${this.api.deleteReportById}?ids=&projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`
} else {
url = `${this.api.deleteReportById}?ids=${ids.toString()}&projectIds=${projectIds.toString()}&projectPermissions=${this.projectPermissions}`
}
this.$get(url).then(res => {
this.multipleSelection = []; this.multipleSelection = [];
this.$refs.table.clearSelection(); this.$refs.table.clearSelection();
util.successMsg("删除成功"); util.successMsg("删除成功");

139
src/pages/project/add/index.vue
Unescape View File

@ -115,8 +115,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="score" label="分数" align="center"> <el-table-column prop="score" label="分数" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<!--type="number"--> <!--type="number" @blur="updateProjectJudgment"-->
<el-input :disabled="isDetail" v-model.trim="scope.row.score" @blur="updateProjectJudgment" @input="scoreChange(scope.row, scope.$index,$event)"></el-input> <el-input :disabled="isDetail" v-model.trim="scope.row.score" @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -398,6 +398,19 @@ export default {
} }
this.setSystemId(this.projectManage.systemId); this.setSystemId(this.projectManage.systemId);
this.projectManage.state = state; this.projectManage.state = state;
let { systemId } = this.projectManage;
if (this.projectId) {
if (systemId == 2 || systemId == 3) {
console.log("系统id：", systemId);
} else {
// 更新
this.updateProjectJudgment();
}
} else {
if (systemId == 2 || systemId == 3) {
console.log("系统id：", systemId);
} else {
// 添加
let tempArr = this.projectJudgmentData.map(i => { let tempArr = this.projectJudgmentData.map(i => {
let obj = { let obj = {
projectId: this.projectId ? this.projectId : "", projectId: this.projectId ? this.projectId : "",
@ -412,20 +425,6 @@ export default {
projectManage: this.projectManage, projectManage: this.projectManage,
projectJudgmentList: tempArr projectJudgmentList: tempArr
}; };
let { systemId } = this.projectManage;
if (this.projectId) {
if (systemId == 2 || systemId == 3) {
console.log("系统id：", systemId);
} else {
// 更新
this.updateProject(params);
}
} else {
if (systemId == 2 || systemId == 3) {
console.log("系统id：", systemId);
} else {
// 添加
this.addProject(params); this.addProject(params);
} }
} }
@ -464,7 +463,7 @@ export default {
item.score = res.data[index]; item.score = res.data[index];
return item; return item;
}); });
this.updateProjectJudgment(); // this.updateProjectJudgment();
} }
}); });
} }
@ -486,11 +485,7 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.projectId) {
this.deleteProjectJudgment([this.projectJudgmentData[index].id]);
} else {
this.projectJudgmentData.splice(index, 1); this.projectJudgmentData.splice(index, 1);
}
}).catch(() => { }).catch(() => {
}); });
}, },
@ -502,18 +497,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
// this.projectJudgmentData.splice(index, 1);
if (this.projectId) {// 编辑项目的时候
let param = this.selectedProjectJudgment.map(e => e.id);
this.deleteProjectJudgment(param);// 调删除接口
} else {
let list = this.projectJudgmentData; let list = this.projectJudgmentData;
let result = []; let result = [];
list.map(i => { list.map(i => {
this.selectedProjectJudgment.find(j => j.judgmentId === i.judgmentId) || result.push(i); this.selectedProjectJudgment.find(j => j.judgmentId === i.judgmentId) || result.push(i);
}); });
this.projectJudgmentData = result; this.projectJudgmentData = result;
}
}).catch(() => { }).catch(() => {
}); });
} else { } else {
@ -587,10 +576,6 @@ export default {
if (this.selectedJudgment.length) { if (this.selectedJudgment.length) {
// console.log(this.selectedJudgment, "queren"); // console.log(this.selectedJudgment, "queren");
this.dialogVisible = false; this.dialogVisible = false;
if (this.projectId) { // 编辑的时候，新增调接口
this.addProjectJudgment();
} else {
// 新增时，假添加
let tempArr = this.selectedJudgment.map(i => { let tempArr = this.selectedJudgment.map(i => {
i.score = 0; i.score = 0;
return i; return i;
@ -602,7 +587,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.projectJudgementTable.clearSelection(); this.$refs.projectJudgementTable.clearSelection();
}); });
}
} else { } else {
util.warningMsg("请选择判分点"); util.warningMsg("请选择判分点");
} }
@ -662,48 +646,22 @@ export default {
// 指定父元素下可被拖拽的子元素 // 指定父元素下可被拖拽的子元素
draggable: ".draggable .el-table__row", draggable: ".draggable .el-table__row",
onEnd({ newIndex, oldIndex }) { onEnd({ newIndex, oldIndex }) {
let newItem = _this.projectJudgmentData[newIndex]; _this.projectJudgmentData.splice(newIndex, 0, _this.projectJudgmentData.splice(oldIndex, 1)[0]);
_this.projectJudgmentData[newIndex] = _this.projectJudgmentData[oldIndex]; let newArray = _this.projectJudgmentData.slice(0);
_this.projectJudgmentData[oldIndex] = newItem; _this.projectJudgmentData = [];
// 循环，重新赋值排序赋值 _this.$nextTick(function () {
_this.projectJudgmentData.forEach((e, i) => { newArray.forEach((e, i) => {
_this.$set(e, "sort", i + 1);// 不更新 _this.$set(e, "sort", i + 1);// 不更新
_this.$set(e, "name", e.name + "?"); _this.$set(e, "name", e.name + "?");
_this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案 _this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案
}); });
// 调修改接口，更新列表 _this.projectJudgmentData = newArray;
if (_this.projectId) {// 如果是编辑项目，则调编辑接口
_this.updateProjectJudgment();
}
}
}); });
},
// 添加判分点中间表
addProjectJudgment() {
let param = this.selectedJudgment.map((e, i) => {
let obj = {
judgmentId: e.judgmentId,
projectId: this.projectId || "",
score: 0,
sort: i + 1
};
return obj;
});
// console.log(param, "param", this.projectId);
this.$post(this.api.addProjectJudgment, param).then(res => {
// 重新调接口
// console.log("添加成功", res);
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新
this.listAgain();
} }
}).catch(err => {
console.log(err);
}); });
}, },
// 修改判分点中间表 // 修改判分点中间表
updateProjectJudgment() { async updateProjectJudgment() {
// 直接传data回去
let param = this.projectJudgmentData.map((e, i) => { let param = this.projectJudgmentData.map((e, i) => {
let obj = { let obj = {
judgmentId: e.judgmentId, judgmentId: e.judgmentId,
@ -714,46 +672,25 @@ export default {
}; };
return obj; return obj;
}); });
this.$post(this.api.updateProjectJudgment, param).then(res => { await this.$post(this.api.updateProjectJudgment, param).then(res => {
// 重新调接口 let tempArr = this.projectJudgmentData.map(i => {
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 let obj = {
this.listAgain(); projectId: this.projectId ? this.projectId : "",
} judgmentId: i.judgmentId,
}).catch(err => { score: i.score,
console.log(err); sort: i.sort
};
return obj;
}); });
}, let params = {
// 批量删除判分点中间表 projectManage: this.projectManage,
deleteProjectJudgment(values) { projectJudgmentList: tempArr
if (values && values.length > 0) { };
this.$post(this.api.deleteProjectJudgment + "?projectJudgmentIds=" + `${values}`).then(res => { this.updateProject(params);
// 重新调接口
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新
this.listAgain();
}
}).catch(err => { }).catch(err => {
console.log(err);
}); });
} }
},
// 重新调接口,专门赋值列表
listAgain() {
this.listLoading = true
let scrollTop = this.$refs.main.scrollTop
this.projectJudgmentData = []
this.$refs.main.scrollTop = scrollTop
this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
let { projectManage, projectJudgmentVos } = res;
projectJudgmentVos.map((e,i)=>{
this.$set(e,'sort',i+1)// 不更新
this.$set(e,'name',e.name+"?")
this.$set(e,'name',e.name.slice(0,e.name.length-1)) // 不更新的解决方案
});
this.projectJudgmentData = projectJudgmentVos;
this.listLoading = false
}).catch(()=>{
this.listLoading = false
})
}
} }
}; };
</script> </script>

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

@ -94,7 +94,7 @@
<div class="tool"> <div class="tool">
<ul class="filter"> <ul class="filter">
<li> <li>
<el-input style="width: 250px;" placeholder="请输入学生账号/姓名" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input> <el-input style="width: 250px;" placeholder="请输入学生账号/姓名" prefix-icon="el-icon-search" v-model="keyWord" clearable></el-input>
</li> </li>
</ul> </ul>
<div> <div>
@ -287,7 +287,7 @@ export default {
treeNode: {}, treeNode: {},
treeResolve: [], treeResolve: [],
isDetail: false, isDetail: false,
keyword: "", keyWord: "",
form: { form: {
userName: "", userName: "",
phone: "", phone: "",
@ -366,7 +366,7 @@ export default {
// this.auth(); // this.auth();
}, },
watch: { watch: {
keyword: function(val) { keyWord: function(val) {
clearTimeout(this.searchTimer); clearTimeout(this.searchTimer);
this.searchTimer = setTimeout(() => { this.searchTimer = setTimeout(() => {
if (this.studentType) { if (this.studentType) {
@ -889,7 +889,7 @@ export default {
uploadSure() { uploadSure() {
this.importVisible = false; this.importVisible = false;
this.studentType = 1; this.studentType = 1;
this.keyword = ""; this.keyWord = "";
this.initData(); this.initData();
} }
} }

4
src/setting.js
Unescape View File

@ -41,8 +41,8 @@ if (isHh) {
schoolId = 2105; schoolId = 2105;
} else if (isDev) { } else if (isDev) {
jumpPath = "http://192.168.31.154:8087/"; jumpPath = "http://192.168.31.154:8087/";
host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://39.108.250.202:9000/"; // 中台测试服
// host = "http://192.168.31.151:9000/"; // 榕 host = "http://192.168.31.151:9000/"; // 榕
// host = "http://192.168.31.125:9000/"; // 坤 // host = "http://192.168.31.125:9000/"; // 坤
// host = 'http://192.168.31.137:9000/'; // 赓 // host = 'http://192.168.31.137:9000/'; // 赓
title = "职站服务端管理系统"; title = "职站服务端管理系统";

Write Preview
Loading…
Cancel
Save