Merge pull request 'dengjie commit : 科学研究,学术交流,本科教育和研究生教育样式' (#10) from dengjie into master

Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/10
This commit is contained in:
clay
2022-10-04 13:53:42 +00:00
17 changed files with 593 additions and 65 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 919 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 307 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 549 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 923 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 933 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@@ -1,15 +1,315 @@
<template> <template>
<div> <div class="academy_and_sciences">
科学 学术 <el-row>
</div> <el-col :span="5">
<div class="grid-content"></div>
</el-col>
<el-col :span="14">
<el-row>
<el-col :span="12">
<div class="sciences_title">
科学研究
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
剑桥大学博士后李鹤博士后李鹤博士 士学术学学报
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
复旦大学蒋轶教授学术报告
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
徐加鹏博士学术报告-通信受士后李鹤博限随机系.受限
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
剑桥大学博士后李鹤博士后李鹤博士 士学术学学报
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
复旦大学蒋轶教授学术报告
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="sciences_content">
<div class="sciences_content_time">
10-03
</div>
<div class="sciences_content_text">
徐加鹏博士学术报告-通信受士后李鹤博限随机系.受限
</div>
</div>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
</div>
</el-col>
<el-col :span="12">
<div class="academy_title">
学术交流
</div>
<el-row>
<el-col :span="11">
<div class="academy_content">
<div class="academy_content_icontime">
<div class="img"></div>
<span>2022-10-08</span>
</div>
<div class="academy_content_title">
信息科学与技术学院开展英
</div>
<div class="academy_content_text">
为加强学院学风建设提升学生英语能力2021年10月25日晚息科学与
</div>
</div>
<div class="academy_content">
<div class="academy_content_icontime">
<div class="img"></div>
<span>2022-10-08</span>
</div>
<div class="academy_content_title">
信息科学与技术学院开展英
</div>
<div class="academy_content_text">
为加强学院学风建设提升学生英语能力2021年10月25日晚息科学与
</div>
</div>
</el-col>
<el-col :span="2">
<div class="grid-content"></div>
</el-col>
<el-col :span="11">
<div class="academy_content">
<div class="academy_content_icontime">
<div class="img"></div>
<span>2022-10-08</span>
</div>
<div class="academy_content_title">
信息科学与技术学院开展英
</div>
<div class="academy_content_text">
为加强学院学风建设提升学生英语能力2021年10月25日晚息科学与
</div>
</div>
<div class="academy_content">
<div class="academy_content_icontime">
<div class="img"></div>
<span>2022-10-08</span>
</div>
<div class="academy_content_title">
信息科学与技术学院开展英
</div>
<div class="academy_content_text">
为加强学院学风建设提升学生英语能力2021年10月25日晚息科学与
</div>
</div>
</el-col>
</el-row>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/academy_and_sciences/gangduobai1.png" alt="">
</div>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
</template> </template>
<script> <script>
export default { export default {
name: "academy_and_sciences" name: "academy_and_sciences"
} };
</script> </script>
<style scoped> <style scoped lang="scss">
/deep/ .el-col-2 {
width: 8%;
}
.academy_and_sciences {
background-image: url("../../../assets/index/academy_and_sciences/bj.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
height: 68.3rem;
.sciences_title, .academy_title {
display: flex;
width: 18rem;
height: 5.9rem;
line-height: 5.9rem;
border-radius: 1.3rem 0 0 1.3rem;
font-size: 3rem;
font-weight: 500;
letter-spacing: .1rem;
color: #FFFFFF;
text-align: left;
background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
padding-left: 1.9rem;
margin-top: 8.1rem;
margin-bottom: 5rem;
}
.sciences_content {
display: flex;
margin-bottom: 1.6rem;
&_time {
//width: 38px;
//height: 18px;
font-size: 1.3rem;
font-weight: 500;
color: #FFFFFF;
line-height: 2.3rem;
margin-right: 1.4rem;
}
&_text {
width: 81%;
//height: 23px;
font-size: 1.6rem;
font-weight: 500;
color: #FFFFFF;
line-height: 2.3rem;
}
}
.more {
width: 100%;
display: flex;
height: 2.3rem;
margin-top: 3.4rem;
.more_text {
font-size: 1.6rem;
font-weight: 500;
color: #FFFFFF;
letter-spacing: .2rem;
}
img {
width: 2.9rem;
height: 1.4rem;
margin-left: 0.8rem;
margin-top: .5rem;
}
}
.academy_content {
&:hover {
box-shadow: 0 8px 11px 0 rgba(0, 73, 174, 0.5);
background: #FFFFFF;
&_icontime{
.img {
background-image: url('../../../assets/index/academy_and_sciences/shijian2.png');
}
span {
color: #0049AF;
}
}
&_title{
color: #0049AF;
}
&_text {
color: #575757;
}
}
padding: 2.5rem 2.3rem;
background: rgba(10, 81, 174, 0.89);
border-radius: 16px;
margin-bottom: 1.9rem;
&_icontime {
display: flex;
margin-bottom: 1.1rem;
.img {
background-image: url('../../../assets/index/academy_and_sciences/shijian3.png');
background-size: 1.5rem;
width: 1.5rem;
height: 1.5rem;
margin-right: .9rem;
}
span {
//width: 79px;
//height: 18px;
font-size: 1.3rem;
font-weight: 500;
color: #FFFFFF;
line-height: 1.85rem;
}
}
&_title {
//width: 139px;
width: 100%;
//height: 38px;
font-size: 1.4rem;
font-weight: 500;
color: #FFFFFF;
line-height: 1.9rem;
letter-spacing: .1rem;
margin-bottom: .6rem;
}
&_text {
//width: 139px;
width: 100%;
//height: 41px;
font-size: 1rem;
font-weight: 500;
color: #FFFFFF;
line-height: 1.4rem;
letter-spacing: .1rem;
}
}
}
</style> </style>

View File

@@ -24,7 +24,10 @@
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-row justify="space-between"> <el-row justify="space-between">
<el-col :span="7"> <el-col :span="1">
<div class="grid-content"></div>
</el-col>
<el-col :span="6">
<div class="announcements_text"> <div class="announcements_text">
<div class="announcements_text_line_time"> <div class="announcements_text_line_time">
<div class="announcements_text_line_time_btime">27</div> <div class="announcements_text_line_time_btime">27</div>
@@ -40,7 +43,7 @@
<el-col :span="1"> <el-col :span="1">
<div class="grid-content"></div> <div class="grid-content"></div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="6">
<div class="announcements_text"> <div class="announcements_text">
<div class="announcements_text_line_time"> <div class="announcements_text_line_time">
<div class="announcements_text_line_time_btime">27</div> <div class="announcements_text_line_time_btime">27</div>
@@ -56,7 +59,7 @@
<el-col :span="1"> <el-col :span="1">
<div class="grid-content"></div> <div class="grid-content"></div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="6">
<div class="announcements_text"> <div class="announcements_text">
<div class="announcements_text_line_time"> <div class="announcements_text_line_time">
<div class="announcements_text_line_time_btime">27</div> <div class="announcements_text_line_time_btime">27</div>
@@ -69,6 +72,9 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="1">
<div class="grid-content"></div>
</el-col>
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
@@ -96,7 +102,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
/deep/ .el-col-1 { /deep/ .el-col-1 {
width: 6.25%; width: 6%;
} }
.announcements { .announcements {

View File

@@ -185,10 +185,10 @@ export default {
.title { .title {
display: flex; display: flex;
width: 25.9rem; width: 24rem;
height: 5.9rem; height: 5.9rem;
line-height: 5.9rem; line-height: 5.9rem;
border-radius: 2rem; border-radius: 1.3rem 0 0 1.3rem;
font-size: 3rem; font-size: 3rem;
font-weight: 500; font-weight: 500;
letter-spacing: .1rem; letter-spacing: .1rem;

View File

@@ -1,13 +1,220 @@
<template> <template>
<div class="undergraduate_and_graduate">
<el-row>
<el-col :span="5">
<div class="grid-content"></div>
</el-col>
<el-col :span="14">
<el-row class="undergraduate_and_graduate_bgc">
<el-col :span="12">
<div class="undergraduate headline">
<img src="../../../assets/index/undergraduate_and_graduate/benka.png" alt=""/>
<span>本科教育</span>
</div>
<div class="vline">
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/news_center/gd_icon.png" alt="">
</div>
</div>
</el-col>
<el-col :span="12">
<div class="graduate headline">
<img src="../../../assets/index/undergraduate_and_graduate/boshimaobeifen.png" alt=""/>
<span>研究生教育</span>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="undergraduate_content">
<div class="undergraduate_content_time">
10-03
</div>
<div class="undergraduate_content_text">
徐加鹏博士学术报告-通信受限随机系.受限通信受限随系
</div>
</div>
<div class="more">
<span class="more_text">更多</span>
<img src="../../../assets/index/news_center/gd_icon.png" alt="">
</div>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
</template> </template>
<script> <script>
export default { export default {
name: "undergraduate_and_graduate" name: "undergraduate_and_graduate"
} };
</script> </script>
<style scoped> <style scoped lang="scss">
.undergraduate_and_graduate {
background-image: url("../../../assets/index/announcements/sy_bj3.png");
background-size: cover;
background-repeat: no-repeat;
width: 100%;
height: 54.2rem;
&_bgc {
background-color: #fff;
height: 33.8rem;
margin-top: 8.1rem;
}
.headline {
display: flex;
background: #004AAF;
height: 5.6rem;
margin-bottom: 3.1rem;
img {
margin: 1.2rem 1.5rem 1.2rem 4.4rem;
}
span {
//width: 129px;
//height: 44px;
font-size: 3.1rem;
font-weight: 500;
color: #FFFFFF;
line-height: 4.4rem;
letter-spacing: .1rem;
}
}
.vline {
border-right: 1px solid #CCCCCC;
}
.undergraduate {
border-radius: 36px 0 0 0;
&_content {
display: flex;
margin-bottom: 1.5rem;
&_time {
//width: 38px;
//height: 18px;
font-size: 1.3rem;
font-weight: 500;
color: #0D52B3;
line-height: 1.8rem;
margin-right: 1.5rem;
margin-left: 2.1rem;
}
&_text {
&:hover {
color: #0D52B3;
}
width: 81%;
//height: 23px;
font-size: 1.6rem;
font-weight: 500;
color: #000000;
line-height: 2.3rem;
}
}
}
.more {
width: 100%;
display: flex;
height: 2.3rem;
margin-top: 3.1rem;
margin-left: 2.1rem;
.more_text {
font-size: 1.6rem;
font-weight: 500;
color: #8B8B8B;
letter-spacing: .2rem;
}
img {
width: 2.9rem;
height: 1.4rem;
margin-left: 0.8rem;
margin-top: .5rem;
}
}
.graduate {
border-radius: 0 36px 0 0;
}
}
</style> </style>

View File

@@ -6,47 +6,59 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col > <el-col>
<NewsCenter/> <NewsCenter/>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
<Announcements/> <Announcements/>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row>--> <el-row>
<!-- <el-col>--> <el-col>
<!-- <ResearchTrends/>--> <AcademyAndSciences/>
<!-- </el-col>--> </el-col>
<!-- </el-row>--> </el-row>
<!-- <el-row v-if="$i18n.locale === 'cn'">--> <el-row>
<!-- <el-col>--> <el-col>
<!-- <PartyBuildingActivities/>--> <UndergraduateAndGraduate/>
<!-- </el-col>--> </el-col>
<!-- </el-row>--> </el-row>
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col>--> <!-- <el-col>-->
<!-- <TeachingStudent/>--> <!-- <ResearchTrends/>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row v-show="width>=1100">--> <!-- <el-row v-if="$i18n.locale === 'cn'">-->
<!-- <el-col>--> <!-- <el-col>-->
<!-- <Bottom/>--> <!-- <PartyBuildingActivities/>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col>-->
<!-- <TeachingStudent/>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row v-show="width>=1100">-->
<!-- <el-col>-->
<!-- <Bottom/>-->
<!-- </el-col>-->
<!-- </el-row>-->
</div> </div>
</template> </template>
<script> <script>
import NewsCenter from './components/news_center' import NewsCenter from "./components/news_center";
import Carousel from './components/carousel' import Carousel from "./components/carousel";
import Announcements from "./components/announcements"; import Announcements from "./components/announcements";
import PartyBuildingActivities from './components/party_building_activities.vue' import AcademyAndSciences from "@/views/index/components/academy_and_sciences";
import ResearchTrends from './components/scientific_research_trends.vue' import PartyBuildingActivities from "./components/party_building_activities.vue";
import SlideshowCard from './components/slideshow_card.vue' import UndergraduateAndGraduate from "@/views/index/components/undergraduate_and_graduate";
import TeachingStudent from './components/teaching_student.vue' import ResearchTrends from "./components/scientific_research_trends.vue";
import Bottom from './components/bottom.vue' import SlideshowCard from "./components/slideshow_card.vue";
import TeachingStudent from "./components/teaching_student.vue";
import Bottom from "./components/bottom.vue";
import {getConfig} from "@/api"; import {getConfig} from "@/api";
import {setAppLanguage, setLanguage} from "@/utils/sist"; import {setAppLanguage, setLanguage} from "@/utils/sist";
@@ -54,6 +66,8 @@ import {setAppLanguage, setLanguage} from "@/utils/sist";
export default { export default {
name: "index", name: "index",
components: { components: {
UndergraduateAndGraduate,
AcademyAndSciences,
Announcements, Announcements,
NewsCenter, NewsCenter,
PartyBuildingActivities, PartyBuildingActivities,
@@ -66,44 +80,44 @@ export default {
data() { data() {
return { return {
width: document.documentElement.clientWidth, width: document.documentElement.clientWidth,
imageUrl:null, imageUrl: null,
iftop: false, iftop: false,
timer : true, timer: true
} };
}, },
beforeDestroy() { //及时释放 beforeDestroy() { //及时释放
window.removeEventListener('scroll', this.handleScroll) window.removeEventListener("scroll", this.handleScroll);
}, },
created() { created() {
setLanguage(this) setLanguage(this);
getConfig("sist_bg").then(res=>{ getConfig("sist_bg").then(res => {
this.imageUrl = res.data this.imageUrl = res.data;
}) });
}, },
mounted() { mounted() {
window.addEventListener('scroll', this.handleScroll) window.addEventListener("scroll", this.handleScroll);
const that = this const that = this;
window.onresize = () => { window.onresize = () => {
return (() => { return (() => {
//这里写要操作的函数 //这里写要操作的函数
window.screenWidth = document.body.clientWidth window.screenWidth = document.body.clientWidth;
that.width = window.screenWidth>992 that.width = window.screenWidth > 992;
})() })();
} };
}, },
methods: { methods: {
handleScroll() { handleScroll() {
this.iftop = window.pageYOffset > 400 this.iftop = window.pageYOffset > 400;
this.$emit("input", window.pageYOffset) this.$emit("input", window.pageYOffset);
}, },
backTop() { backTop() {
window.scrollTo({top: 0, behavior: 'smooth',}) window.scrollTo({top: 0, behavior: "smooth"});
} }
} }
} };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@@ -124,7 +138,8 @@ export default {
position: absolute; position: absolute;
margin-left: -1.7vw; margin-left: -1.7vw;
cursor: pointer; cursor: pointer;
img{
img {
width: 100%; width: 100%;
} }
} }