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

Merge pull request 'dengjie commit : 修改科学研究,学术交流,本科教育和研究生教育的响应式' (#19) from dengjie into master

Browse Source 
Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/19
This commit is contained in:
clay
2022-10-05 08:53:48 +00:00
parent fca20f29c8 2fb853551e
commit 5adb6b2c22
3 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/views/index/components/academy_and_sciences.vue
View File

@@ -90,28 +90,28 @@
</div> </div>
<el-row> <el-row>
<el-col :span="11"> <el-col :span="11">
<div class="academy_content"> <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
<div class="academy_content_icontime"> <div class="academy_content_icontime">
<div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div> <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
<span>2022-10-08</span> <span>2022-10-08</span>
</div> </div>
<div class="academy_content_title"> <div class="academy_content_title">
信息科学与技术学院开展英 信息科学与技术学院开展英
</div> </div>
<div class="academy_content_text"> <div class="academy_content_text">
为加强学院学风建设，提升学生英语能力，2021年10月25日晚，息科学与… 为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
</div> </div>
</div> </div>
<div class="academy_content"> <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
<div class="academy_content_icontime"> <div class="academy_content_icontime">
<div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div> <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
<span>2022-10-08</span> <span>2022-10-08</span>
</div> </div>
<div class="academy_content_title"> <div class="academy_content_title">
信息科学与技术学院开展英 信息科学与技术学院开展英
</div> </div>
<div class="academy_content_text"> <div class="academy_content_text">
为加强学院学风建设，提升学生英语能力，2021年10月25日晚，息科学与… 为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
</div> </div>
</div> </div>
</el-col> </el-col>
@@ -119,22 +119,22 @@
<div class="grid-content"></div> <div class="grid-content"></div>
</el-col> </el-col>
<el-col :span="11"> <el-col :span="11">
<div class="academy_content"> <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
<div class="academy_content_icontime"> <div class="academy_content_icontime">
<div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div> <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
<span>2022-10-08</span> <span>2022-10-08</span>
</div> </div>
<div class="academy_content_title"> <div class="academy_content_title">
信息科学与学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021 信息科学与学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021
</div> </div>
<div class="academy_content_text"> <div class="academy_content_text">
为加强学院学风建设，提学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，20212021年10月25日晚，息科学与… 为加强学院学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021学风建设，提升学生英语能力，2021年10月25日晚，息科学与…
</div> </div>
</div> </div>
<div class="academy_content"> <div class="academy_content" v-bind:style="{backgroundColor:bgColor}">
<div class="academy_content_icontime"> <div class="academy_content_icontime">
<!-- <img :src="src" alt="">--> <!-- <img :src="src" alt="">-->
<div class="img" v-bind:style="{backgroundImage:'url('+bgc+')'}"></div> <div class="img" v-bind:style="{backgroundImage:'url('+iconbgc+')'}"></div>
<span>2022-10-08</span> <span>2022-10-08</span>
</div> </div>
<div class="academy_content_title"> <div class="academy_content_title">
@@ -162,7 +162,8 @@ export default {
name: "academy_and_sciences", name: "academy_and_sciences",
data(){ data(){
return{ return{
bgc:require('../../../assets/index/academy_and_sciences/shijian3.png') bgColor:'rgba(10, 81, 174, 0.89)',
iconbgc:require('../../../assets/index/academy_and_sciences/shijian3.png')
} }
} }
}; };
@@ -193,7 +194,7 @@ export default {
text-align: left; text-align: left;
background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%); background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
padding-left: 1.9rem; padding-left: 1.9rem;
margin-top: 8.1rem; margin-top: 5rem;
margin-bottom: 5rem; margin-bottom: 5rem;
} }
@@ -231,7 +232,7 @@ export default {
display: flex; display: flex;
height: 2.3rem; height: 2.3rem;
margin-top: 3.4rem; margin-top: 3.4rem;
margin-bottom: 2rem; margin-bottom: 3rem;
cursor: pointer; cursor: pointer;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
@@ -255,7 +256,7 @@ export default {
color: #0049AF; color: #0049AF;
} }
padding: 2.5rem 2.3rem; padding: 2.5rem 2.3rem;
background: rgba(10, 81, 174, 0.89); //background: ;
border-radius: 16px; border-radius: 16px;
margin-bottom: 1.9rem; margin-bottom: 1.9rem;
color: #FFFFFF; color: #FFFFFF;

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

@@ -174,6 +174,22 @@ export default {
width: 80rem!important; width: 80rem!important;
} }
} }
@media screen and (max-width: 960px) {
.news {
width: 80rem!important;
}
.headline{
width: 80rem!important;
}
}
@media screen and (max-width: 768px) {
.news {
width: 70rem!important;
}
.headline{
width: 70rem!important;
}
}
.news_center { .news_center {
background-image: url("../../../assets/index/news_center/sy_bj3.png"); background-image: url("../../../assets/index/news_center/sy_bj3.png");
background-size: cover; background-size: cover;
@@ -251,7 +267,7 @@ export default {
.news { .news {
margin: 4rem auto 0 auto; margin: 4rem auto 0 auto;
width: 115.4rem; width: 115.4rem;
height: 60.4%; //height: 60.4%;
background-color: #fff; background-color: #fff;
//margin-top: 4rem; //margin-top: 4rem;
@@ -260,7 +276,7 @@ export default {
cursor: pointer; cursor: pointer;
//width: 28rem; //width: 28rem;
width: 100%; width: 100%;
height: 36.9rem; //height: 36.9rem;
&:hover { &:hover {
box-shadow: 0 0 0.7rem 0 rgba(18, 69, 155, 0.59); box-shadow: 0 0 0.7rem 0 rgba(18, 69, 155, 0.59);
@@ -287,8 +303,8 @@ export default {
//} //}
.news_context_text { .news_context_text {
margin: 4rem 0 4rem 2rem; padding: 2rem 2rem 2rem 2rem;
padding-right: 2rem; //padding-right: 2rem;
//border-right: 1px solid #CCCCCC; //border-right: 1px solid #CCCCCC;
.news_context_text-title { .news_context_text-title {
&:hover { &:hover {

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

@@ -1,7 +1,7 @@
<template> <template>
<div class="undergraduate_and_graduate"> <div class="undergraduate_and_graduate">
<el-row type="flex" justify="center"> <el-row type="flex" justify="center">
<el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14" > <el-col :xs="22" :sm="22" :md="20" :lg="16" :xl="14">
<el-row class="undergraduate_and_graduate_bgc"> <el-row class="undergraduate_and_graduate_bgc">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12"> <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
<div class="undergraduate headline"> <div class="undergraduate headline">
@@ -119,6 +119,18 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@media screen and (max-width: 768px) {
.undergraduate {
border-radius: 36px 36px 0 0 !important;
}
.graduate {
border-radius: 36px 36px 0 0 !important;
}
.more {
justify-content: center!important;
}
}
.undergraduate_and_graduate { .undergraduate_and_graduate {
background-image: url("../../../assets/index/announcements/sy_bj3.png"); background-image: url("../../../assets/index/announcements/sy_bj3.png");
background-size: cover; background-size: cover;
@@ -130,6 +142,7 @@ export default {
background-color: #fff; background-color: #fff;
//height: 33.8rem; //height: 33.8rem;
margin-top: 8.1rem; margin-top: 8.1rem;
margin-bottom: 5rem;
} }
.headline { .headline {
@@ -152,11 +165,14 @@ export default {
letter-spacing: .1rem; letter-spacing: .1rem;
} }
} }
.vline { .vline {
border-right: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC;
} }
.undergraduate { .undergraduate {
border-radius: 36px 0 0 0; border-radius: 36px 0 0 0;
&_content { &_content {
display: flex; display: flex;
margin-bottom: 1.5rem; margin-bottom: 1.5rem;
@@ -200,6 +216,8 @@ export default {
margin-top: 3.1rem; margin-top: 3.1rem;
margin-left: 2.1rem; margin-left: 2.1rem;
cursor: pointer; cursor: pointer;
margin-bottom: 3rem;
.more_text { .more_text {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 500; font-weight: 500;