|  | @@ -28,35 +28,34 @@
 | 
	
		
			
				|  |  |        </div>
 | 
	
		
			
				|  |  |        <div v-if="tabActive == 0">
 | 
	
		
			
				|  |  |          <el-row class="fx-row">
 | 
	
		
			
				|  |  | -          <el-col :span="8"><img src="https://i6.youzy.cn/basiclib/college/images/10003-647784f7.jpg" width="100%"
 | 
	
		
			
				|  |  | -                                 alt=""
 | 
	
		
			
				|  |  | -          ></el-col>
 | 
	
		
			
				|  |  | +          <el-col :span="8">
 | 
	
		
			
				|  |  | +            <img src="https://i6.youzy.cn/basiclib/college/images/10003-647784f7.jpg" width="100%" alt="">
 | 
	
		
			
				|  |  | +          </el-col>
 | 
	
		
			
				|  |  |            <el-col :span="16">
 | 
	
		
			
				|  |  |              <div class="f14 f-666 text-center fx-row">
 | 
	
		
			
				|  |  | -              <el-col :span="24" v-for="item in iconList">
 | 
	
		
			
				|  |  | -                <div v-if="Array.isArray(item.value)">
 | 
	
		
			
				|  |  | -                  <img width="50px" :src="item.img" :alt="item.desc">
 | 
	
		
			
				|  |  | -                  <el-popover
 | 
	
		
			
				|  |  | -                    placement="bottom"
 | 
	
		
			
				|  |  | -                    trigger="hover"
 | 
	
		
			
				|  |  | -                     >
 | 
	
		
			
				|  |  | -                    <div>
 | 
	
		
			
				|  |  | -                    <p v-for="i in item.value">
 | 
	
		
			
				|  |  | -                      {{i.type}}  {{i.number}}个
 | 
	
		
			
				|  |  | -                    </p>
 | 
	
		
			
				|  |  | -                  </div>
 | 
	
		
			
				|  |  | -                    <p class="mt10" slot="reference">
 | 
	
		
			
				|  |  | -                      {{ `${item.value[0].number }/ ${item.value[1].number}` }}
 | 
	
		
			
				|  |  | -                      <i class="el-icon-question"></i>
 | 
	
		
			
				|  |  | -                    </p>
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -                  </el-popover>
 | 
	
		
			
				|  |  | -                </div>
 | 
	
		
			
				|  |  | +              <el-col :span="24" v-for="item in iconList" v-if="Array.isArray(item.value) ? item.value.length : item.value">
 | 
	
		
			
				|  |  | +                  <div v-if="Array.isArray(item.value)">
 | 
	
		
			
				|  |  | +                    <img width="50px" :src="item.img" :alt="item.desc">
 | 
	
		
			
				|  |  | +                    <el-popover
 | 
	
		
			
				|  |  | +                      placement="bottom"
 | 
	
		
			
				|  |  | +                      trigger="hover"
 | 
	
		
			
				|  |  | +                    >
 | 
	
		
			
				|  |  | +                      <div>
 | 
	
		
			
				|  |  | +                        <p v-for="i in item.value">
 | 
	
		
			
				|  |  | +                          {{i.type}}  {{i.number}}个
 | 
	
		
			
				|  |  | +                        </p>
 | 
	
		
			
				|  |  | +                      </div>
 | 
	
		
			
				|  |  | +                      <p class="mt10" slot="reference">
 | 
	
		
			
				|  |  | +                        {{ `${item.value[0] ? item.value[0].number : ''} / ${item.value[1] ? item.value[1].number : ''} ` }}
 | 
	
		
			
				|  |  | +                        <i class="el-icon-question"></i>
 | 
	
		
			
				|  |  | +                      </p>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -                 <div v-else>
 | 
	
		
			
				|  |  | -                  <img width="50px" :src="item.img" :alt="item.desc">
 | 
	
		
			
				|  |  | -                  <p class="mt10">{{ item.value }}</p>
 | 
	
		
			
				|  |  | -                </div>
 | 
	
		
			
				|  |  | +                    </el-popover>
 | 
	
		
			
				|  |  | +                  </div>
 | 
	
		
			
				|  |  | +                  <div v-else>
 | 
	
		
			
				|  |  | +                    <img width="50px" :src="item.img" :alt="item.desc">
 | 
	
		
			
				|  |  | +                    <p class="mt10">{{ item.value }}</p>
 | 
	
		
			
				|  |  | +                  </div>
 | 
	
		
			
				|  |  |                </el-col>
 | 
	
		
			
				|  |  |              </div>
 | 
	
		
			
				|  |  |              <div class="mt10  pl10 f14">
 | 
	
	
		
			
				|  | @@ -90,7 +89,7 @@
 | 
	
		
			
				|  |  |                </template>
 | 
	
		
			
				|  |  |              </mx-table>
 | 
	
		
			
				|  |  |            </div>
 | 
	
		
			
				|  |  | -          <div class="mt20" v-if="Object.keys(subjects).length">
 | 
	
		
			
				|  |  | +          <div class="mt20" v-if="Object.keys(activeSyl).length">
 | 
	
		
			
				|  |  |              <p class="format-tit">双一流学科</p>
 | 
	
		
			
				|  |  |              <el-select v-model="activeSylId" placeholder="placeholder">
 | 
	
		
			
				|  |  |                <el-option
 | 
	
	
		
			
				|  | @@ -278,7 +277,7 @@ export default {
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      activeSyl() {
 | 
	
		
			
				|  |  | -      if (!Object.keys(this.subjects).length) return {}
 | 
	
		
			
				|  |  | +      if (!this.subjects.hasOwnProperty('sylSubjectsGroup')) return {}
 | 
	
		
			
				|  |  |        // const col = this.
 | 
	
		
			
				|  |  |        const row = this.subjects.sylSubjectsGroup.find(item => {
 | 
	
		
			
				|  |  |          return item.id == this.activeSylId
 | 
	
	
		
			
				|  | @@ -338,12 +337,14 @@ export default {
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |            img: 'https://pv4y-pc.youzy.cn/static/img/icon_shijian@2x.8463f33f.png',
 | 
	
		
			
				|  |  |            value: baseInfo.pointsOfShuo,
 | 
	
		
			
				|  |  | -          desc: '硕士点'
 | 
	
		
			
				|  |  | +          desc: '硕士点',
 | 
	
		
			
				|  |  | +          type: 'arr'
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |            img: 'https://pv4y-pc.youzy.cn/static/img/icon_shijian@2x.8463f33f.png',
 | 
	
		
			
				|  |  |            value: baseInfo.pointsOfBo,
 | 
	
		
			
				|  |  | -          desc: '博士点'
 | 
	
		
			
				|  |  | +          desc: '博士点',
 | 
	
		
			
				|  |  | +          type: 'arr'
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        ]
 | 
	
		
			
				|  |  |      }
 |