odjbin/sist_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '邓洁 commit : 修改新闻中心,本科教育,研究生教育和党群工作细节样式' (#23) from dengjie into master

Browse Source 
Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/23
This commit is contained in:
clay
2022-10-05 12:01:23 +00:00
parent d726e30c65 2861dcbd9c
commit 3f01cc15bf
3 changed files with 109 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
src/views/index/components/news_center.vue
View File

@@ -1,93 +1,92 @@
<script src="../../../utils/sist.js"></script>
<template>
<div class="news_center">
<div class="headline">
<div class="title">
<!-- {{ $t("message.news_ceter") }}-->
新闻中心
<span class="vertica_line"></span>
<div class="news_center_english">
<span class="">NEWS</span>
<span class="">CENTER</span>
</div>
</div>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/news_center/gd_icon.png" alt="">
</div>
<div class="headline">
<div class="title">
<!-- {{ $t("message.news_ceter") }}-->
新闻中心
<span class="vertica_line"></span>
<div class="news_center_english">
<span class="">NEWS</span>
<span class="">CENTER</span>
</div>
</div>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/news_center/gd_icon.png" alt="">
</div>
</div>
<!--轮播图下的新闻-->
<div class="news" >
<el-row>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</div>
<div class="news">
<el-row>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</div>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
<div class="vline"></div>
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</el-col>
</el-row>
</div>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text" style="border-right: 1px solid #CCCCCC;">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="news_context">
<div class="news_context_img">
<img src="../../../assets/index/news_center/t4.png" alt="">
</div>
<div class="news_context_text">
<div class="news_context_text-title">信息引领，勇于拼搏—信息搏…</div>
<div class="news_context_text-content">为促进学生学业发展学生学业学生学业学生学业、给予2021年转专业同学有针对性的帮助，信息科学与技术学院于10月26日开展…
</div>
<div class="news_context_time">
<div class="icon"><img src="../../../assets/index/news_center/shijian.png" alt=""></div>
<span class="time">2022-10-2</span>
</div>
<div class="vline"></div>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
</template>
@@ -152,44 +151,49 @@ export default {
<style scoped lang="scss">
@media screen and (max-width: 1200px) {
.news {
width: 100rem!important;
width: 100rem !important;
}
.headline{
width: 100rem!important;
.headline {
width: 100rem !important;
}
}
@media screen and (max-width: 1050px) {
.news {
width: 90rem!important;
width: 90rem !important;
}
.headline{
width: 90rem!important;
.headline {
width: 90rem !important;
}
}
@media screen and (max-width: 960px) {
.news {
width: 80rem!important;
width: 80rem !important;
}
.headline{
width: 80rem!important;
.headline {
width: 80rem !important;
}
}
@media screen and (max-width: 960px) {
.news {
width: 80rem!important;
width: 80rem !important;
}
.headline{
width: 80rem!important;
.headline {
width: 80rem !important;
}
}
@media screen and (max-width: 768px) {
.news {
width: 70rem!important;
width: 70rem !important;
}
.headline{
width: 70rem!important;
.headline {
width: 70rem !important;
}
}
.news_center {
background-image: url("../../../assets/index/news_center/sy_bj3.png");
background-size: cover;
@@ -203,6 +207,7 @@ export default {
justify-content: space-between;
width: 115.4rem;
margin: 0 auto;
.title {
display: flex;
width: 24rem;
@@ -265,7 +270,7 @@ export default {
}
.news {
margin: 4rem auto 0 auto;
margin: 4rem auto 0 auto;
width: 115.4rem;
//height: 60.4%;
background-color: #fff;
@@ -283,7 +288,6 @@ export default {
}
.news_context_img {
height: 42.8%;
width: 100%;
overflow: hidden;
@@ -298,13 +302,10 @@ export default {
}
}
//.news_context_text-title:last-child{
// border-right: 1px solid red;
//}
.news_context_text {
padding: 2rem 2rem 2rem 2rem;
//padding-right: 2rem;
margin: 2rem 0 2rem 2rem;
padding-right: 2rem;
//border-right: 1px solid #CCCCCC;
.news_context_text-title {
&:hover {
@@ -369,5 +370,4 @@ export default {
}
</style>

7
src/views/index/components/slideshow_card.vue
View File

@@ -180,12 +180,13 @@ export default {
.card_title {
width: 90%;
font-size: 2rem;
font-size: 1.7rem;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #1C1C1C;
text-align: left;
//width: 36rem;
//padding: 1rem 0;
margin: 0 auto;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
@@ -303,11 +304,11 @@ export default {
li {
width: 22rem !important;
height: 22rem !important;
height: 23rem !important;
.card_title {
font-size: 1.6rem;
margin: 1rem 1rem;
margin: 0.6rem 1rem;
display: -webkit-box; //作为弹性伸缩盒子模型显示。
-webkit-box-orient: vertical; //设置伸缩盒子的子元素排列方式--从上到下垂直排列
-webkit-line-clamp: 2; //显示的行

4
src/views/index/components/undergraduate_and_graduate.vue
View File

@@ -108,7 +108,6 @@
</el-row>
</el-col>
</el-row>
</div>
</template>
@@ -161,6 +160,7 @@ export default {
//height: 33.8rem;
margin-top: 8.1rem;
margin-bottom: 5rem;
border-radius: 36px;
}
.headline {
@@ -214,7 +214,7 @@ export default {
color: #0D52B3;
}
width: 81%;
width: 83%;
//height: 23px;
font-size: 1.6rem;
font-weight: 500;