diff --git a/ruoyi-ui/src/api/kaohe/pingce.js b/ruoyi-ui/src/api/kaohe/pingce.js index 8b9459a..2a92621 100644 --- a/ruoyi-ui/src/api/kaohe/pingce.js +++ b/ruoyi-ui/src/api/kaohe/pingce.js @@ -63,7 +63,7 @@ export function addsUser(data) { } -// 新增考核评测 +// 生成考核任务得分接口 export function generateResult(data) { return request({ url: '/kaohe/kh_result/generateResult', @@ -73,7 +73,7 @@ export function generateResult(data) { } -// 新增考核评测 +// 查询考核任务考核项 export function pcItemVotes(data) { return request({ url: '/kaohe/template/pcItemVotes', @@ -81,3 +81,13 @@ export function pcItemVotes(data) { data: data }) } + + +// 考核任务添加/删除被考核对象接口 +export function modifyBkhdx(data) { + return request({ + url: '/kaohe/pingce/modifyBkhdx', + method: 'put', + data: data + }) +} diff --git a/ruoyi-ui/src/api/kaohe/votepage.js b/ruoyi-ui/src/api/kaohe/votepage.js new file mode 100644 index 0000000..891cddd --- /dev/null +++ b/ruoyi-ui/src/api/kaohe/votepage.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询投票选项列表 +export function getVoteEmps(query) { + return request({ + url: '/kaohe/vote_emp/getVoteEmps', + method: 'get', + params: query + }) +} diff --git a/ruoyi-ui/src/views/votepage.vue b/ruoyi-ui/src/views/votepage.vue index a3102a1..ab5f77d 100644 --- a/ruoyi-ui/src/views/votepage.vue +++ b/ruoyi-ui/src/views/votepage.vue @@ -15,7 +15,7 @@ -
+
@@ -31,7 +31,7 @@ -
+
优秀 合格 @@ -99,6 +99,7 @@ import { getVote } from "@/api/kaohe/vote" import { listVote_emp, VoteEmpSubmit } from "@/api/kaohe/vote_emp" import { getEmployee } from "@/api/kaohe/employee"; import { getDept } from "@/api/system/dept" +import { getVoteEmps } from "@/api/kaohe/votepage" import axios from "axios"; export default { @@ -141,7 +142,7 @@ export default { }, /** 查询投票评测列表 */ getList() { - listVote_emp({ + getVoteEmps({ voteId: this.$route.query.id, pageNum: 1, pageSize: 10000000, @@ -174,6 +175,7 @@ export default { }else { voteEmpList.push({ id: VoteList[i].id, + bkhdxId: VoteList[i].bkhdxId, bkhdxName: VoteList[i].bkhdxName, score: VoteList[i].score, }) @@ -184,6 +186,7 @@ export default { this.voteList.forEach(item => { let obj = { id: item.id, + bkhdxId: item.bkhdxId, bkhdxName: item.bkhdxName, optionA: 0, optionB: 0, @@ -218,6 +221,7 @@ export default { }).then(() => { VoteEmpSubmit({ khitemTypeid : this.vote.khitemTypeid, + pingceId : this.vote.pingceId, voteId : this.vote.id, userId : this.$store.state.user.id, userName : this.$store.state.user.name,