diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index ab4a1d2..d692b72 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -73,6 +73,13 @@ color: inherit; } +@media (max-width: 757px){ + .el-message-box{ + width: 300px !important; + margin: 100px auto !important; /* 水平居中 */ + } +} + .el-message-box__status + .el-message-box__message{ word-break: break-word; } diff --git a/ruoyi-ui/src/views/votepage.vue b/ruoyi-ui/src/views/votepage.vue index ab5a39b..c808f38 100644 --- a/ruoyi-ui/src/views/votepage.vue +++ b/ruoyi-ui/src/views/votepage.vue @@ -154,12 +154,18 @@ export default { let pyA = 0 if(this.vote.khitemTypeid===2 || this.vote.khitemTypeid===3){ this.voteList.forEach(item => { - voteEmpList.push({ - id: item.id, - bkhdxName: item.bkhdxName, - score: item.score, - }) + if(!(item.score===null||item.score===undefined)){ + voteEmpList.push({ + id: item.id, + bkhdxName: item.bkhdxName, + score: item.score, + }) + }else { + flag = false; + bkhdxName += item.bkhdxName+',' + } }) + bkhdxName=bkhdxName.slice(0, -1); } if(this.vote.khitemTypeid===1){ this.voteList.forEach(item => { @@ -184,7 +190,6 @@ export default { }); bkhdxName=bkhdxName.slice(0, -1); } - if(this.vote.umax && pyA>this.vote.umax){ flag = false; this.$alert(`评优数量不能超过评优最大值!`, `提示`, {