clay commit : 解决有三级菜单时跳转出现问题

This commit is contained in:
clay
2022-10-07 20:58:29 +08:00
parent 576ed2a3b8
commit b533dddb3f
9 changed files with 86 additions and 134 deletions

View File

@@ -34,8 +34,8 @@
<div class="academy_content_title">
{{sciencesData[0].title}}
</div>
<div class="academy_content_text" v-html="sciencesData[0].content">
</div>
<div v-if="sciencesData[0].description" class="academy_content_text">{{sciencesData[0].description}}</div>
<div v-if="!sciencesData[0].description" class="academy_content_text" v-html="sciencesData[0].content"></div>
</div>
</el-col>
<el-col :span="2">
@@ -50,8 +50,8 @@
<div class="academy_content_title">
{{sciencesData[1].title}}
</div>
<div class="academy_content_text" v-html="sciencesData[1].content">
</div>
<div v-if="sciencesData[1].description" class="academy_content_text">{{sciencesData[1].description}}</div>
<div v-if="!sciencesData[1].description" class="academy_content_text" v-html="sciencesData[1].content"></div>
</div>
</el-col>
</el-row>
@@ -65,8 +65,8 @@
<div class="academy_content_title">
{{sciencesData[2].title}}
</div>
<div class="academy_content_text" v-html="sciencesData[2].content">
</div>
<div v-if="sciencesData[2].description" class="academy_content_text">{{sciencesData[2].description}}</div>
<div v-if="!sciencesData[2].description" class="academy_content_text" v-html="sciencesData[2].content"></div>
</div>
</el-col>
<el-col :span="2">
@@ -83,8 +83,8 @@
<div class="academy_content_title">
{{sciencesData[3].title}}
</div>
<div class="academy_content_text" v-html="sciencesData[3].content">
</div>
<div v-if="sciencesData[3].description" class="academy_content_text">{{sciencesData[3].description}}</div>
<div v-if="!sciencesData[3].description" class="academy_content_text" v-html="sciencesData[3].content"></div>
</div>
</el-col>
</el-row>
@@ -264,6 +264,7 @@ export default {
color: #0049AF;
.academy_content_text{
color: #575757;
font-size: 1.4rem !important;
}
.img {
@@ -314,7 +315,7 @@ export default {
//width: 139px;
width: 100%;
//height: 38px;
font-size: 1.4rem;
font-size: 1.6rem;
font-weight: bold;
//color: #FFFFFF;
line-height: 1.9rem;

View File

@@ -23,8 +23,8 @@
</div>
<div class="announcements_text_line"></div>
<div class="announcements_text_title">{{item.title}}</div>
<div class="announcements_text_content" v-html="item.content">
</div>
<div v-if="item.description" class="announcements_text_content">{{item.description}}</div>
<div v-if="!item.description" class="announcements_text_content" v-html="item.content"></div>
</div>
</el-col>
</el-row>
@@ -173,7 +173,7 @@ export default {
width: 100%;
height: 3.8rem;
font-size: 1.4rem;
font-size: 1.6rem;
font-weight: bold;
color: #000000;
line-height: 1.9rem;
@@ -189,7 +189,7 @@ export default {
&_content {
width: 100%;
height: 7rem;
font-size: 1rem;
font-size: 1.4rem;
font-weight: 500;
color: #777777;
line-height: 1.8rem;

View File

@@ -21,7 +21,7 @@
<td>
<div class="right one">
<div class="table_tr_left">{{ $t('message.employees') }}</div>
<div class="table_tr_right">{{data.worker}}</div>
<div class="table_tr_right">{{data.worker}}</div>
</div>
</td>
</tr>
@@ -29,7 +29,7 @@
<td>
<div class="right tow">
<div class="table_tr_left">{{ $t('message.number_students') }}</div>
<div class="table_tr_right">{{data.students}}</div>
<div class="table_tr_right">{{data.students}}</div>
</div>
</td>
</tr>
@@ -37,7 +37,7 @@
<td>
<div class="right three">
<div class="table_tr_left">{{ $t('message.graduate_tutor') }}</div>
<div class="table_tr_right">{{data.postgraduateTutor}}</div>
<div class="table_tr_right">{{data.postgraduateTutor}}</div>
</div>
</td>
</tr>
@@ -45,7 +45,7 @@
<td>
<div class="right fourth">
<div class="table_tr_left">{{ $t('message.research_team') }}</div>
<div class="table_tr_right">{{data.scientificTeam}}</div>
<div class="table_tr_right">{{data.scientificTeam}}</div>
</div>
</td>
</tr>
@@ -53,7 +53,7 @@
<td>
<div class="right five">
<div class="table_tr_left">{{ $t('message.high_level_talents') }}</div>
<div class="table_tr_right">{{data.highLevelTalents}}</div>
<div class="table_tr_right">{{data.highLevelTalents}}</div>
</div>
</td>
</tr>
@@ -61,7 +61,7 @@
<td>
<div class="right six">
<div class="table_tr_left">{{ $t('message.major_projects') }}</div>
<div class="table_tr_right">{{data.majorProjects}}</div>
<div class="table_tr_right">{{data.majorProjects}}</div>
</div>
</td>
</tr>

View File

@@ -19,15 +19,15 @@
<!--轮播图下的新闻-->
<div class="news">
<el-row>
<el-col :span="6" v-for="(item,index) in newsData" :key="index">
<el-col :span="6" v-for="(item,index) in newsData" :key="index" :class="'border_right-' + (index + 1)">
<div class="news_context" @click="getArticle(item)">
<div class="news_context_img">
<img v-if="item.imgurl" :src="item.imgurl" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text" >
<div class="news_context_text-title">{{ item.title }}</div>
<div class="news_context_text-content" v-html="item.content">
</div>
<div v-if="item.description" class="news_context_text-content">{{item.description}}</div>
<div v-if="!item.description" class="news_context_text-content" v-html="item.content"></div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">{{ getDateTime(item.publishTime) }}</span>
@@ -222,6 +222,15 @@ export default {
}
}
.border_right-4{
.news_context{
.news_context_text{
border-right: none!important;
}
}
}
.news {
margin: 4rem auto 0 auto;
width: 115.4rem;
@@ -260,7 +269,7 @@ export default {
.news_context_text {
margin: 2rem 0 2rem 2rem;
padding-right: 2rem;
//border-right: 1px solid #CCCCCC;
border-right: 1px solid #CCCCCC;
.news_context_text-title {
&:hover {
color: #0040A4;