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

Merge pull request 'dengjie commit : 修改三级菜单样式' (#33) from dengjie into master

Browse Source 
Reviewed-on: http://git.hchyun.com/feashow/sist_web/pulls/33
This commit is contained in:
clay
2022-10-07 09:12:34 +00:00
parent 8a9679085f e8bcee01d5
commit 549ecbe309
5 changed files with 101 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/test.html
View File

@@ -6,50 +6,10 @@
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"> content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<style> <style>
.sticky header {
position: sticky;
background: linear-gradient(180deg, #0A51AE 0%, rgba(25,84,167,0.9) 56%, rgba(21,82,167,0.7) 69%, rgba(16,80,168,0.4) 85%, rgba(11,81,173,0) 100%);
width: 120rem;
top: 0;
/*font-size: 20px;*/
/*padding: 10px;*/
z-index: 1;
/*margin: 0 auto;*/
display: flex;
justify-content: center;
align-content: center;
}
/*.sticky shadow::before {*/
/* content: '';*/
/* box-shadow: 0 0 10px 1px #333;*/
/* position: fixed;*/
/* width: 100%;*/
/*}*/
/*.sticky shadow::after {*/
/* content: '';*/
/* width: 100%;*/
/* height: 15px;*/
/* background-color: #fff;*/
/* position: absolute;*/
/* top: 0;*/
/*}*/
.sticky main {
height: 1800px;
/*padding-top: 10px;*/
line-height: 200%;
}
</style> </style>
<title>Document</title> <title>Document</title>
</head> </head>
<body> <body>
<div class='sticky'>
<header>LOGO</header>
<!-- <shadow></shadow>-->
<main>很多内容文本</main>
</div>
</body> </body>
</html> </html>

95
src/views/content/index.vue
View File

@@ -16,7 +16,7 @@
<div style="background-color:#F8F8F8 ; padding-bottom: 19rem"> <div style="background-color:#F8F8F8 ; padding-bottom: 19rem">
<!--有三级菜单--> <!--有三级菜单-->
<el-row v-show="showSecond"> <el-row v-show="false">
<el-col v-if="$i18n.locale === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4"> <el-col v-if="$i18n.locale === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4">
<div class="grid-content"></div> <div class="grid-content"></div>
</el-col> </el-col>
@@ -45,7 +45,6 @@
</div> </div>
</el-col> </el-col>
<el-col v-if="$i18n.locale === 'en'" :xs="2" :sm="2" :md="2" :lg="2" :xl="3"> <el-col v-if="$i18n.locale === 'en'" :xs="2" :sm="2" :md="2" :lg="2" :xl="3">
<div class="grid-content"></div> <div class="grid-content"></div>
</el-col> </el-col>
@@ -76,6 +75,82 @@
</el-col> </el-col>
<!--<el-col v-if="$i18n.locale === 'cn'" :xs="20" :sm="20" :md="15" :lg="14" :xl="12">-->
<el-col :xs="20" :sm="20" :md="15" :lg="14" :xl="12">
<el-row>
<el-col>
<div class="tab">
<router-link style="color: #1956BC; font-size: 16px;" to="/home">{{ $t('message.home') }}</router-link>
<span> > </span>
<span>
<!--<router-link to="">-->
<span v-if="$i18n.locale === 'cn'">{{ crumbs.one.title }}</span>
<span v-if="$i18n.locale === 'en'">{{ crumbs.one.englishTitle }}</span>
<!--</router-link>-->
</span>
<span> > </span>
<span>
<span v-if="$i18n.locale === 'cn'">{{ crumbs.two.title }}</span>
<span v-if="$i18n.locale === 'en'">{{ crumbs.two.englishTitle }}</span>
</span>
</div>
</el-col>
</el-row>
<el-row>
<el-col>
<Introduction :introduction="contextData" v-if="type === 1"/>
<List :list="contextData" v-if="type === 2 && listDataType == 0"/>
<SimpleList :list="contextData" v-if="type === 2 && listDataType == 1"/>
<FileList :value="contextData" v-if="type === 4"/>
<DireData :value="contextData" v-if="type === 3 && dreDataType == '1'"/>
<DireDataTow :value="contextData" v-if="type === 3 && dreDataType == '2'"/>
<Details :value="detailsData" v-if="type == null"/>
</el-col>
</el-row>
</el-col>
</el-row>
<el-row v-show="true">
<el-col v-if="$i18n.locale === 'cn'" :xs="2" :sm="2" :md="1.5" :lg="2" :xl="4">
<div class="grid-content"></div>
</el-col>
<el-col v-if="$i18n.locale === 'cn'" v-show="width" :md="6" :lg="6" :xl="4">
<div class="left_bgc">
<div class="right_bgc">
</div>
</div>
</el-col>
<el-col v-if="$i18n.locale === 'en'" :xs="2" :sm="2" :md="2" :lg="2" :xl="3">
<div class="grid-content"></div>
</el-col>
<el-col v-if="$i18n.locale === 'en'" v-show="width" :md="6" :lg="6" :xl="5">
<div class="left_lab english" ref="lab">
<div class="lab">
<div v-for="(nav,index) in navList" class="lab_div">
<div v-if="index === showIndex" class="lab_list lab_select" @click="navClick(nav,index)">
<div class="lab_img">
<img src="@/assets/school_profile/eji_icon_xz.png" alt="">
</div>
<div class="lab_title">
{{ nav.englishTitle }}
</div>
</div>
<div v-if="index !== showIndex" class="lab_list" @click="navClick(nav,index)">
<div class="lab_img">
<img src="@/assets/school_profile/eji_icon_xz.png" alt="">
</div>
<div class="lab_title">
{{ nav.englishTitle }}
</div>
</div>
</div>
</div>
</div>
</el-col>
<!--<el-col v-if="$i18n.locale === 'cn'" :xs="20" :sm="20" :md="15" :lg="14" :xl="12">--> <!--<el-col v-if="$i18n.locale === 'cn'" :xs="20" :sm="20" :md="15" :lg="14" :xl="12">-->
<el-col :xs="20" :sm="20" :md="15" :lg="14" :xl="12"> <el-col :xs="20" :sm="20" :md="15" :lg="14" :xl="12">
<el-row> <el-row>
@@ -562,6 +637,22 @@ export default {
} }
} }
.left_bgc{
width: 13.8rem;
//height: 250px;
background: #1956BC;
border-radius: 0px 0px 13px 0px;
position: relative;
.right_bgc{
width: 119px;
height: 200px;
background: #FFFFFF;
box-shadow: 0px 1px 3px 0px rgba(6,42,102,0.67);
border-radius: 0px 0px 16px 13px;
}
}
.tab { .tab {
margin-left: 1.9rem; margin-left: 1.9rem;
margin-top: 1.5rem; margin-top: 1.5rem;

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

@@ -315,7 +315,7 @@ export default {
width: 100%; width: 100%;
//height: 38px; //height: 38px;
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 500; font-weight: bold;
//color: #FFFFFF; //color: #FFFFFF;
line-height: 1.9rem; line-height: 1.9rem;
letter-spacing: .1rem; letter-spacing: .1rem;

2
src/views/index/components/announcements.vue
View File

@@ -174,7 +174,7 @@ export default {
width: 100%; width: 100%;
height: 3.8rem; height: 3.8rem;
font-size: 1.4rem; font-size: 1.4rem;
font-weight: 500; font-weight: bold;
color: #000000; color: #000000;
line-height: 1.9rem; line-height: 1.9rem;
letter-spacing: .1rem; letter-spacing: .1rem;

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

@@ -238,9 +238,9 @@ export default {
//height: 35.1rem; //height: 35.1rem;
padding-bottom: 2rem; padding-bottom: 2rem;
&: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);
} //}
.news_context_img { .news_context_img {
height: 42.8%; height: 42.8%;
@@ -269,8 +269,8 @@ export default {
width: 100%; width: 100%;
height: 2.1rem; height: 2.1rem;
font-size: 1.5rem; font-size: 1.6rem;
font-weight: 500; font-weight: bold;
color: #262626; color: #262626;
line-height: 2.1rem; line-height: 2.1rem;
overflow: hidden; overflow: hidden;
@@ -281,10 +281,9 @@ export default {
} }
.news_context_text-content { .news_context_text-content {
width: 100%; width: 100%;
height: 5.3rem; height: 5.3rem;
font-size: 1.3rem; font-size: 1.4rem;
font-weight: 500; font-weight: 500;
color: #777777; color: #777777;
line-height: 1.8rem; line-height: 1.8rem;