|  | @@ -9,26 +9,45 @@
 | 
	
		
			
				|  |  |      <div v-if="Object.keys(reportInfo).length > 0">
 | 
	
		
			
				|  |  |        <p>点评:</p>
 | 
	
		
			
				|  |  |        <div class="mt10 mb10">
 | 
	
		
			
				|  |  | -        <p>1,学校现在所开设的六种科目,<span :class="isCanSignFlag.allowSelect ? 'f-primary': 'f-red'">{{
 | 
	
		
			
				|  |  | +        <p>1,学校现在所开设的六种科目,<span :class="isCanSignFlag.allowSelect ? 'f-primary': 'f-red'">{{
 | 
	
		
			
				|  |  |              isCanSignFlag.groupName
 | 
	
		
			
				|  |  |            }}</span>
 | 
	
		
			
				|  |  |            您
 | 
	
		
			
				|  |  |            <span :class="isCanSignFlag.allowSelect ? 'f-primary': 'f-red'">
 | 
	
		
			
				|  |  |            {{ isCanSignFlag.allowSelect ? '符合' : '不符合' }}
 | 
	
		
			
				|  |  | -          </span>条件,现有
 | 
	
		
			
				|  |  | +          </span>条件,现有
 | 
	
		
			
				|  |  |            <span class="f-primary">
 | 
	
		
			
				|  |  |              {{ canSign.map(item => item.groupName).join(',') }}
 | 
	
		
			
				|  |  |            </span>您可以报名
 | 
	
		
			
				|  |  |          </p>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |        <div class="mb10">
 | 
	
		
			
				|  |  | -        <p>2,专业符合情况:</p>
 | 
	
		
			
				|  |  | +        <p>2,专业符合情况:</p>
 | 
	
		
			
				|  |  | +        <div class="mb5" v-for="item in canSign">
 | 
	
		
			
				|  |  | +          <span class="f-primary mr5"> {{item.groupName}}:</span>
 | 
	
		
			
				|  |  | +          <div style="display: inline" v-if="item.colleges.length > 0">
 | 
	
		
			
				|  |  | +            <span class="mr5" v-for="college in item.colleges">{{`${college.major}(${college.college})`}},</span>
 | 
	
		
			
				|  |  | +             符合您的专业要求;
 | 
	
		
			
				|  |  | +          </div>
 | 
	
		
			
				|  |  | +          <p style="display: inline" class="f-red" v-else>您的自选专业没有符合该组合的</p>
 | 
	
		
			
				|  |  | +        </div>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |        <div class="mb10">
 | 
	
		
			
				|  |  | -        <p>3,三科成绩情况:</p>
 | 
	
		
			
				|  |  | +        <p>3,三科成绩情况:</p>
 | 
	
		
			
				|  |  | +        <div v-for="(item,index) in canSign">
 | 
	
		
			
				|  |  | +          <span>{{item.groupName}} : </span>成绩{{item.scoreSumGroup}} <span class="f-primary" v-if="index == 0"> *成绩最优</span>
 | 
	
		
			
				|  |  | +        </div>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |        <div class="mb10">
 | 
	
		
			
				|  |  | -        <p>4,三科录取分析:</p>
 | 
	
		
			
				|  |  | +        <p class="mb10">4,三科录取分析:</p>
 | 
	
		
			
				|  |  | +        <div v-for="(item,index) in canSign" class="mb10">
 | 
	
		
			
				|  |  | +          <p>{{item.groupName}} : 成绩{{item.scoreSumGroup}}<span class="f-primary" v-if="index == 0"> (补录成绩最优组合)</span> </p>
 | 
	
		
			
				|  |  | +          <p>在补录学生{{countNumber}}人中该组合成绩最优学生有{{item.bestInIndicator}}人,该组合计划人数为{{item.groupIndicator}}
 | 
	
		
			
				|  |  | +            您在该<span v-if="index == 0">最优</span>组合中排名{{ item.rankInBest }},您可以被该组合录取。您的成绩符合该组合。<span v-if="item.colleges.length == 0">(自选专业不符合)</span>
 | 
	
		
			
				|  |  | +            <span v-if="index == 0">按照成绩优先原则,系统推荐您报该组合。</span>
 | 
	
		
			
				|  |  | +            <span v-else>您如果不填写系统推荐您的最优组合,您也可以报该组合。</span>
 | 
	
		
			
				|  |  | +          </p>
 | 
	
		
			
				|  |  | +        </div>
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |      </div>
 | 
	
		
			
				|  |  |      <span slot="footer" class="dialog-footer">
 | 
	
	
		
			
				|  | @@ -49,6 +68,11 @@ export default {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    computed: {
 | 
	
		
			
				|  |  | +    countNumber(){
 | 
	
		
			
				|  |  | +      return this.canSign.reduce((prev,cur)=>{
 | 
	
		
			
				|  |  | +         return prev + cur.groupIndicator
 | 
	
		
			
				|  |  | +      },0)
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      isCanSignFlag() {
 | 
	
		
			
				|  |  |        // 传入的组合是否能报名
 | 
	
		
			
				|  |  |        if (!this.reportInfo.length) return {}
 | 
	
	
		
			
				|  | @@ -62,7 +86,7 @@ export default {
 | 
	
		
			
				|  |  |        if (!this.reportInfo.length) return []
 | 
	
		
			
				|  |  |        return this.reportInfo.filter(item => {
 | 
	
		
			
				|  |  |          return item.allowSelect
 | 
	
		
			
				|  |  | -      })
 | 
	
		
			
				|  |  | +      }).sort((prev,next )=> prev.scoreSumGroup <  next.scoreSumGroup ?  1 : -1 )
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    data() {
 |