diff --git a/ruoyi-ui/src/views/votepage.vue b/ruoyi-ui/src/views/votepage.vue index c808f38..5838468 100644 --- a/ruoyi-ui/src/views/votepage.vue +++ b/ruoyi-ui/src/views/votepage.vue @@ -4,6 +4,7 @@
{{ vote.voteTitle }}
时间:{{ vote.sTime }} - {{ vote.eTime }}
评优最大值为 {{ vote.umax }}
+
评分最大值为 {{ vote.maxNum }}
{{ vote.vDescription }}
@@ -15,7 +16,7 @@
参与评分 {{ item.voteNum!==null?item.voteNum: ''}} 人
均值:{{ item.avgScore!==null?item.avgScore: '' }}
- +
@@ -153,19 +154,29 @@ export default { let bkhdxName = ''; let pyA = 0 if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){ - this.voteList.forEach(item => { - if(!(item.score===null||item.score===undefined)){ - voteEmpList.push({ - id: item.id, - bkhdxName: item.bkhdxName, - score: item.score, + + let VoteList = this.voteList; + for (let i = 0; i < VoteList.length; i++) { + if(VoteList[i].score===null||VoteList[i].score===undefined){ + flag = false; + this.$alert(`【${ VoteList[i].bkhdxName }】未评分,请去评分!`, `提示`, { + type: 'Danger' }) - }else { + break; + }else if(VoteList[i].score > this.vote.maxNum){ flag = false; - bkhdxName += item.bkhdxName+',' + this.$alert(`【${ VoteList[i].bkhdxName }】评分值不能超过评分最大值${this.vote.maxNum},请重新去评分!`, `提示`, { + type: 'Danger' + }) + break; + }else { + voteEmpList.push({ + id: VoteList[i].id, + bkhdxName: VoteList[i].bkhdxName, + score: VoteList[i].score, + }) } - }) - bkhdxName=bkhdxName.slice(0, -1); + } } if(this.vote.khitemTypeid===1){ this.voteList.forEach(item => {