Procházet zdrojové kódy

修改管理员评分排序逻辑,修改管理员查看项目时出现上一步与下一步的按钮

SanHQin před 1 rokem
rodič
revize
921e17c88f

+ 19 - 6
src/components/pages/disAdmin/score.vue

@@ -816,6 +816,15 @@ export default {
 						    let bScore = b.hasOwnProperty(this.tType==2?'ownScore':'sum') ? this.tType=='2'?b.ownScore:b.sum===0?Number.MAX_VALUE: parseFloat(b.sum) : Number.MAX_VALUE;
 						    return aScore - bScore;
 						})
+
+						// 如果是管理员则再排序一次
+						if(this.tType=='0'){
+							p.sort((a,b)=>{
+								let aScore = a.scoreList.length>=2?-1:a.scoreList.length==1?a.scoreList[0].score:Number.MAX_VALUE;
+								let bScore = b.scoreList.length>=2?-1:a.scoreList.length==1?a.scoreList[0].score:Number.MAX_VALUE;
+								return aScore - bScore;
+							})
+						}
 					}else if(this.scoreFn===2){//降序
 						//降序
 						p.sort((a, b) => {
@@ -823,18 +832,24 @@ export default {
 						    let bScore = b.hasOwnProperty(this.tType==2?'ownScore':'sum') ? this.tType=='2'?b.ownScore:b.sum===0?-1: parseFloat(b.sum) : -1;
 						    return bScore - aScore;
 						});
+						// 如果是管理员则再排序一次
+						if(this.tType=='0'){
+							p.sort((a,b)=>{
+								let aScore = a.scoreList.length>=2?Number.MAX_VALUE:a.scoreList.length==1?a.scoreList[0].score:-1;
+								let bScore = b.scoreList.length>=2?Number.MAX_VALUE:a.scoreList.length==1?a.scoreList[0].score:-1;
+								return bScore - aScore;
+							})
+						}
 					}
 
+					
+
 					sessionStorage.setItem("allScoreList",JSON.stringify(p.map(i=>i.id)))
 
 					const start = (this.page - 1) * 10;
           const end = start + 10;
           let result = p.slice(start, end);
 
-					console.log("==============================")
-					console.log(result)
-					console.log("++++++++++++++++++++++++++++++")
-
 					result.forEach(i=>{
 						let typeName = i.typename;
 						if(typeName=="活动类" || typeName =="学科类")return;
@@ -843,11 +858,9 @@ export default {
 						// console.log(typeName.indexOf("理科类"))
 						if(typeName.indexOf("活动类")!=-1){
 							replaceValue = typeName.replace("活动类","")
-							console.log(replaceValue.split('/'))
 							typeName = `活动类:${replaceValue.split('/').filter(f=>f!=='').join('/')}`
 						}else if(typeName.indexOf("学科类")!=-1){
 							replaceValue = typeName.replace("学科类","")
-							console.log(replaceValue.split('/'))
 							typeName = `学科类:${replaceValue.split('/').filter(f=>f!=='').join('/')}`
 						}
 						i.typename = typeName;

+ 6 - 1
src/components/pages/race/eventCenter/anliDetail.vue

@@ -146,7 +146,7 @@
         	  <div>平台案例填写</div>
         	</div>
 				</div>
-				<div class=navBoxBtn v-if="psDialog && isNavTop >= 300 && ['0','2'].includes(tType)">
+				<div :class="['navBoxBtn',psDialog?'':'noPsDialog']" v-if="psDialog || isNavTop >= 300 && ['0','2'].includes(tType)">
 
 					<div @click="upperOne()" class="clickBtn">上一个</div>
 
@@ -4430,6 +4430,7 @@ body {
   margin: 0 auto;
   height: 50px;
   border-radius: 5px;
+	position:relative;
 }
 .navBoxHeader{
 	display:flex;
@@ -4445,6 +4446,10 @@ body {
 	justify-content:center;
 	align-items:center;
 }
+.noPsDialog{
+	position:absolute;
+	right:50px;
+}
 
 .clickBtn{
 	width: 70px;