|
|
|
|
@ -1,5 +1,5 @@ |
|
|
|
|
<template> |
|
|
|
|
<div ref="main" class="main"> |
|
|
|
|
<div> |
|
|
|
|
<el-form :disabled="isDetail"> |
|
|
|
|
<el-card shadow="hover" class="m-b-20"> |
|
|
|
|
<div class="flex-between"> |
|
|
|
|
@ -30,7 +30,7 @@ |
|
|
|
|
<el-select :disabled="isDetail" v-model="projectManage.systemId" placeholder="请选择" @change="systemChange"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in systemList" |
|
|
|
|
:key="item.value" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.label" |
|
|
|
|
:value="item.id" |
|
|
|
|
></el-option> |
|
|
|
|
@ -83,7 +83,7 @@ |
|
|
|
|
</div> |
|
|
|
|
<el-button :disabled="isDetail" type="primary" icon="el-icon-plus" round @click="handleQueryJudgment" style="margin-bottom: 10px">判分点</el-button> |
|
|
|
|
<el-button :disabled="isDetail" type="primary" icon="el-icon-delete" round @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除</el-button> |
|
|
|
|
<div class="draggable" style="padding: 20px"> |
|
|
|
|
<div class="draggable"> |
|
|
|
|
<el-table |
|
|
|
|
ref="projectJudgementTable" |
|
|
|
|
:data="projectJudgmentData" |
|
|
|
|
@ -92,7 +92,6 @@ |
|
|
|
|
header-align="center" |
|
|
|
|
@selection-change="handleSelectionProjectJudgment" |
|
|
|
|
row-key="judgmentId" |
|
|
|
|
v-loading="listLoading" |
|
|
|
|
> |
|
|
|
|
<el-table-column type="selection" width="55" align="center"></el-table-column> |
|
|
|
|
<el-table-column prop="sort" label="序号" width="80" align="center"> |
|
|
|
|
@ -184,17 +183,16 @@ import Setting from "@/setting"; |
|
|
|
|
import util from "@/libs/util"; |
|
|
|
|
import { mapState, mapActions } from "vuex"; |
|
|
|
|
import quill from "@/components/quill"; |
|
|
|
|
import Sortable from 'sortablejs'; |
|
|
|
|
import Sortable from "sortablejs"; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
quill |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
host: Setting.apiBaseURL, |
|
|
|
|
isHh: Setting.isHh, |
|
|
|
|
projectId: this.$route.query.projectId, |
|
|
|
|
systemList: Setting.systemList, |
|
|
|
|
systemList: [], |
|
|
|
|
token: btoa(util.local.get(Setting.tokenKey)), |
|
|
|
|
isDetail: Boolean(this.$route.query.show), |
|
|
|
|
|
|
|
|
|
@ -226,8 +224,7 @@ export default { |
|
|
|
|
|
|
|
|
|
searchTimer: null, |
|
|
|
|
isToPoint: false, // 判断是否是跳转到判分点系统 |
|
|
|
|
visibleLoading:false,// 加载弹框 |
|
|
|
|
listLoading:false,// 列表加载 |
|
|
|
|
visibleLoading: false// 加载弹框 |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
@ -247,16 +244,17 @@ export default { |
|
|
|
|
// util.warningMsg(res.message); |
|
|
|
|
util.errorMsg("分配的数值已超过100"); |
|
|
|
|
} |
|
|
|
|
console.log("chuli"); |
|
|
|
|
return score; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
watch: { |
|
|
|
|
// projectJudgmentData: { |
|
|
|
|
// handler(newValue) { |
|
|
|
|
// console.log("newValue：", newValue); |
|
|
|
|
// }, |
|
|
|
|
// deep: true |
|
|
|
|
// }, |
|
|
|
|
projectJudgmentData: { |
|
|
|
|
handler(newValue) { |
|
|
|
|
console.log("newValue：", newValue); |
|
|
|
|
}, |
|
|
|
|
deep: true |
|
|
|
|
}, |
|
|
|
|
judgementpointsquery(n) { |
|
|
|
|
clearTimeout(this.searchTimer); |
|
|
|
|
this.searchTimer = setTimeout(() => { |
|
|
|
|
@ -265,7 +263,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
created() { |
|
|
|
|
// console.log(this.projectManage.systemId, "this.projectManage.systemId", this.lastSystemId); |
|
|
|
|
this.getSystemData(); |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
if (this.$route.query.projectId) { |
|
|
|
|
@ -278,7 +276,7 @@ export default { |
|
|
|
|
this.projectManage = projectManage; |
|
|
|
|
this.projectJudgmentData = projectJudgmentData; |
|
|
|
|
} |
|
|
|
|
this.rowDrop() |
|
|
|
|
this.rowDrop(); |
|
|
|
|
}, |
|
|
|
|
beforeDestroy() { |
|
|
|
|
if (!this.isToPoint) { |
|
|
|
|
@ -301,6 +299,11 @@ export default { |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
getSystemData() { |
|
|
|
|
this.$get(this.api.getSystemIdBySchool).then(res => { |
|
|
|
|
this.systemList = res.data; |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getInfoData() { // 获取详情数据 |
|
|
|
|
this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => { |
|
|
|
|
if (res.status === 200) { |
|
|
|
|
@ -308,8 +311,8 @@ export default { |
|
|
|
|
this.projectManage = projectManage; |
|
|
|
|
this.projectJudgmentData = projectJudgmentVos; |
|
|
|
|
this.projectJudgmentData.forEach((e, i) => { |
|
|
|
|
e.sort = i+1 |
|
|
|
|
}) |
|
|
|
|
e.sort = i + 1; |
|
|
|
|
}); |
|
|
|
|
} else { |
|
|
|
|
util.warningMsg(res.message); |
|
|
|
|
} |
|
|
|
|
@ -341,7 +344,7 @@ export default { |
|
|
|
|
this.setSystemId(this.projectManage.systemId); |
|
|
|
|
}).catch(() => { |
|
|
|
|
this.projectManage.systemId = this.lastSystemId; |
|
|
|
|
console.log(this.lastSystemId, "this.lastSystemId"); |
|
|
|
|
// console.log(this.lastSystemId, "this.lastSystemId"); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
@ -459,7 +462,7 @@ export default { |
|
|
|
|
item.score = res.data[index]; |
|
|
|
|
return item; |
|
|
|
|
}); |
|
|
|
|
this.updateProjectJudgment() |
|
|
|
|
this.updateProjectJudgment(); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
@ -482,7 +485,7 @@ export default { |
|
|
|
|
type: "warning" |
|
|
|
|
}).then(() => { |
|
|
|
|
if (this.projectId) { |
|
|
|
|
this.deleteProjectJudgment([this.projectJudgmentData[index].id]) |
|
|
|
|
this.deleteProjectJudgment([this.projectJudgmentData[index].id]); |
|
|
|
|
} else { |
|
|
|
|
this.projectJudgmentData.splice(index, 1); |
|
|
|
|
} |
|
|
|
|
@ -499,8 +502,8 @@ export default { |
|
|
|
|
}).then(() => { |
|
|
|
|
// this.projectJudgmentData.splice(index, 1); |
|
|
|
|
if (this.projectId) {// 编辑项目的时候 |
|
|
|
|
let param = this.selectedProjectJudgment.map(e=>e.id) |
|
|
|
|
this.deleteProjectJudgment(param)// 调删除接口 |
|
|
|
|
let param = this.selectedProjectJudgment.map(e => e.id); |
|
|
|
|
this.deleteProjectJudgment(param);// 调删除接口 |
|
|
|
|
} else { |
|
|
|
|
let list = this.projectJudgmentData; |
|
|
|
|
let result = []; |
|
|
|
|
@ -540,7 +543,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
getProcessClassData(params) { // 获取流程类判分点列表数据 |
|
|
|
|
this.visibleLoading = true |
|
|
|
|
this.visibleLoading = true; |
|
|
|
|
this.$post(`${this.api.getLcJudgmentPoint}`, params).then(res => { |
|
|
|
|
if (res.status === 200) { |
|
|
|
|
let list = res.message.records; |
|
|
|
|
@ -549,7 +552,7 @@ export default { |
|
|
|
|
i.judgmentId = i.lcId; |
|
|
|
|
this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i); |
|
|
|
|
}); |
|
|
|
|
this.visibleLoading = false |
|
|
|
|
this.visibleLoading = false; |
|
|
|
|
this.judgementData = result; |
|
|
|
|
} |
|
|
|
|
}).catch(err => { |
|
|
|
|
@ -557,7 +560,7 @@ export default { |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
getProgrammingClassData(params) { // 获取编程类判分点列表数据 |
|
|
|
|
this.visibleLoading = true |
|
|
|
|
this.visibleLoading = true; |
|
|
|
|
this.$post(this.api.getBcJudgmentPoint, params).then(res => { |
|
|
|
|
if (res.status === 200) { |
|
|
|
|
let list = res.message.records; |
|
|
|
|
@ -566,12 +569,11 @@ export default { |
|
|
|
|
i.judgmentId = i.bcId; |
|
|
|
|
this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i); |
|
|
|
|
}); |
|
|
|
|
this.visibleLoading = false |
|
|
|
|
this.visibleLoading = false; |
|
|
|
|
this.judgementData = result; |
|
|
|
|
console.log(res,'res') |
|
|
|
|
console.log(this.projectJudgmentData,'projectJudgmentData') |
|
|
|
|
// console.log(res, "res"); |
|
|
|
|
// console.log(this.projectJudgmentData, "projectJudgmentData"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}).catch(err => { |
|
|
|
|
console.log(err); |
|
|
|
|
}); |
|
|
|
|
@ -581,10 +583,10 @@ export default { |
|
|
|
|
}, |
|
|
|
|
addJudgment() { // 确认选择判分点 |
|
|
|
|
if (this.selectedJudgment.length) { |
|
|
|
|
console.log(this.selectedJudgment,'queren') |
|
|
|
|
// console.log(this.selectedJudgment, "queren"); |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
if (this.projectId) { // 编辑的时候，新增调接口 |
|
|
|
|
this.addProjectJudgment() |
|
|
|
|
this.addProjectJudgment(); |
|
|
|
|
} else { |
|
|
|
|
// 新增时，假添加 |
|
|
|
|
let tempArr = this.selectedJudgment.map(i => { |
|
|
|
|
@ -593,8 +595,8 @@ export default { |
|
|
|
|
}); |
|
|
|
|
this.projectJudgmentData = this.projectJudgmentData.concat(tempArr); |
|
|
|
|
this.projectJudgmentData.map((e, i) => { |
|
|
|
|
e.sort = i+1 |
|
|
|
|
}) |
|
|
|
|
e.sort = i + 1; |
|
|
|
|
}); |
|
|
|
|
this.$nextTick(() => { |
|
|
|
|
this.$refs.projectJudgementTable.clearSelection(); |
|
|
|
|
}); |
|
|
|
|
@ -609,42 +611,42 @@ export default { |
|
|
|
|
}, |
|
|
|
|
toJudgePoint(type, row) { // 进入判分点系统 |
|
|
|
|
this.handleCacheData(); |
|
|
|
|
// let host = this.host; |
|
|
|
|
let host = "http://192.168.31.154:8087/"; // 本地 |
|
|
|
|
let jumpPath = Setting.jumpPath; |
|
|
|
|
// let jumpPath = "http://192.168.31.154:8087/"; // 本地 |
|
|
|
|
let { systemId } = this.projectManage; |
|
|
|
|
let href = ""; |
|
|
|
|
if (type === "view") { |
|
|
|
|
// 查看 |
|
|
|
|
if (systemId == 2) { |
|
|
|
|
href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; |
|
|
|
|
console.log(systemId); |
|
|
|
|
} else if (systemId == 3) { |
|
|
|
|
href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; |
|
|
|
|
console.log(systemId); |
|
|
|
|
} else if (systemId == 11) { |
|
|
|
|
// 交易类判分点（银行综合系统） |
|
|
|
|
href = `${host}jdTrials/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
href = `${jumpPath}#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
} else { |
|
|
|
|
// 编程类判分点（python子系统） |
|
|
|
|
href = `${host}jdTrials/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
href = `${jumpPath}#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
} |
|
|
|
|
} else if (type === "edit") { |
|
|
|
|
// 自定义（老师端隐藏此功能） |
|
|
|
|
if (systemId == 2) { |
|
|
|
|
href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; |
|
|
|
|
console.log(systemId); |
|
|
|
|
} else if (systemId == 3) { |
|
|
|
|
href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; |
|
|
|
|
console.log(systemId); |
|
|
|
|
} else if (systemId == 11) { |
|
|
|
|
// 交易类判分点（银行综合系统） |
|
|
|
|
href = `${host}jdTrials/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
href = `${jumpPath}#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
} else { |
|
|
|
|
// 编程类判分点（python子系统） |
|
|
|
|
href = `${host}jdTrials/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
href = `${jumpPath}#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
} |
|
|
|
|
} else if (type === "home") { |
|
|
|
|
if (systemId == 2 || systemId == 3) { |
|
|
|
|
href = `${host}jdTrials/#/list`; |
|
|
|
|
console.log(systemId); |
|
|
|
|
} else { |
|
|
|
|
// 进入判分点系统首页（老师端隐藏此功能） |
|
|
|
|
href = `${host}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
href = `${jumpPath}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
location.href = href; |
|
|
|
|
@ -652,26 +654,24 @@ export default { |
|
|
|
|
// 行拖拽 |
|
|
|
|
rowDrop() { |
|
|
|
|
// 此时找到的元素是要拖拽元素的父容器 |
|
|
|
|
const tbody = document.querySelector('.draggable .el-table__body-wrapper tbody'); |
|
|
|
|
const tbody = document.querySelector(".draggable .el-table__body-wrapper tbody"); |
|
|
|
|
const _this = this; |
|
|
|
|
Sortable.create(tbody, { |
|
|
|
|
// 指定父元素下可被拖拽的子元素 |
|
|
|
|
draggable: ".draggable .el-table__row", |
|
|
|
|
onEnd({ newIndex, oldIndex }) { |
|
|
|
|
let newItem = _this.projectJudgmentData[newIndex] |
|
|
|
|
_this.projectJudgmentData[newIndex] = _this.projectJudgmentData[oldIndex] |
|
|
|
|
_this.projectJudgmentData[oldIndex] = newItem |
|
|
|
|
let newItem = _this.projectJudgmentData[newIndex]; |
|
|
|
|
_this.projectJudgmentData[newIndex] = _this.projectJudgmentData[oldIndex]; |
|
|
|
|
_this.projectJudgmentData[oldIndex] = newItem; |
|
|
|
|
// 循环，重新赋值排序赋值 |
|
|
|
|
_this.projectJudgmentData.forEach((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)) // 不更新的解决方案 |
|
|
|
|
}) |
|
|
|
|
// console.log('处理',_this.projectJudgmentData) |
|
|
|
|
_this.$set(e, "sort", i + 1);// 不更新 |
|
|
|
|
_this.$set(e, "name", e.name + "?"); |
|
|
|
|
_this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案 |
|
|
|
|
}); |
|
|
|
|
// 调修改接口，更新列表 |
|
|
|
|
if (_this.projectId) {// 如果是编辑项目，则调编辑接口 |
|
|
|
|
console.log('调接口') |
|
|
|
|
_this.updateProjectJudgment() |
|
|
|
|
_this.updateProjectJudgment(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
@ -681,18 +681,18 @@ export default { |
|
|
|
|
let param = this.selectedJudgment.map((e, i) => { |
|
|
|
|
let obj = { |
|
|
|
|
judgmentId: e.judgmentId, |
|
|
|
|
projectId:this.projectId||'', |
|
|
|
|
projectId: this.projectId || "", |
|
|
|
|
score: 0, |
|
|
|
|
sort: i + 1 |
|
|
|
|
} |
|
|
|
|
return obj |
|
|
|
|
}) |
|
|
|
|
console.log(param,'param',this.projectId,) |
|
|
|
|
}; |
|
|
|
|
return obj; |
|
|
|
|
}); |
|
|
|
|
// console.log(param, "param", this.projectId); |
|
|
|
|
this.$post(this.api.addProjectJudgment, param).then(res => { |
|
|
|
|
// 重新调接口 |
|
|
|
|
console.log('添加成功',res) |
|
|
|
|
// console.log("添加成功", res); |
|
|
|
|
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 |
|
|
|
|
this.listAgain() |
|
|
|
|
this.listAgain(); |
|
|
|
|
} |
|
|
|
|
}).catch(err => { |
|
|
|
|
console.log(err); |
|
|
|
|
@ -705,18 +705,17 @@ export default { |
|
|
|
|
let param = this.projectJudgmentData.map((e, i) => { |
|
|
|
|
let obj = { |
|
|
|
|
judgmentId: e.judgmentId, |
|
|
|
|
projectId:this.projectId||'', |
|
|
|
|
projectId: this.projectId || "", |
|
|
|
|
score: e.score, |
|
|
|
|
sort: i + 1, |
|
|
|
|
id: e.id |
|
|
|
|
} |
|
|
|
|
return obj |
|
|
|
|
}) |
|
|
|
|
}; |
|
|
|
|
return obj; |
|
|
|
|
}); |
|
|
|
|
this.$post(this.api.updateProjectJudgment, param).then(res => { |
|
|
|
|
|
|
|
|
|
// 重新调接口 |
|
|
|
|
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 |
|
|
|
|
this.listAgain() |
|
|
|
|
this.listAgain(); |
|
|
|
|
} |
|
|
|
|
}).catch(err => { |
|
|
|
|
console.log(err); |
|
|
|
|
@ -726,36 +725,23 @@ export default { |
|
|
|
|
deleteProjectJudgment(values) { |
|
|
|
|
if (values && values.length > 0) { |
|
|
|
|
this.$post(this.api.deleteProjectJudgment + "?projectJudgmentIds=" + `${values}`).then(res => { |
|
|
|
|
|
|
|
|
|
// 重新调接口 |
|
|
|
|
if (this.projectId) { // 有项目id，调接口，没有项目id，手动更新 |
|
|
|
|
this.listAgain() |
|
|
|
|
this.listAgain(); |
|
|
|
|
} |
|
|
|
|
}).catch(err => { |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
}).catch(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 |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
this.projectJudgmentData.map((e, i) => { |
|
|
|
|
e.sort = i + 1; |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
@ -768,8 +754,4 @@ export default { |
|
|
|
|
padding: 0; |
|
|
|
|
border-bottom: 0; |
|
|
|
|
} |
|
|
|
|
.main{ |
|
|
|
|
overflow: auto; |
|
|
|
|
height: calc(100vh - 152px ); |
|
|
|
|
} |
|
|
|
|
</style> |
e
3 years ago