jialong.yu
/
FE_IASF_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

fix

Browse Source
master
yujialong 1 year ago
parent d1c6ee4e4e
commit 9785648cd2
16 changed files with 1947 additions and 1791 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/breadcrumb/index.vue
  2. 6
      src/i18n/index.js
  3. 2
      src/layouts/footer/index.vue
  4. 4
      src/layouts/header/index.vue
  5. 16
      src/pages/column/index.vue
  6. 45
      src/pages/column/result.vue
  7. 5
      src/pages/deviceIntroBeam/index.vue
  8. 43
      src/pages/deviceIntroLayout/index.vue
  9. 10
      src/pages/deviceIntroLinear/index.vue
  10. 4
      src/pages/estate/orgSetup/index.vue
  11. 5
      src/pages/estate/survey/index.vue
  12. 3
      src/pages/iasf/index.vue
  13. 3
      src/pages/overviewIntro/index.vue
  14. 520
      src/pages/sfel/index.vue
  15. 4
      src/pages/team/index.vue
  16. 4
      src/styles/common.scss

2
src/components/breadcrumb/index.vue
Unescape View File

@ -2,7 +2,7 @@
<!-- 面包屑 --> <!-- 面包屑 -->
<div class="breadcrumb"> <div class="breadcrumb">
<span class="back" <span class="back"
@click="$router.back()">返回&emsp;></span> @click="$router.back()">{{ $t('column.back') }}&emsp;></span>
<span v-if="data[1]">{{ data[1].name }}</span> <span v-if="data[1]">{{ data[1].name }}</span>
</div> </div>
</template> </template>

6
src/i18n/index.js
Unescape View File

@ -67,7 +67,8 @@ export const messages = {
geographicLocation: '地理位置', geographicLocation: '地理位置',
organization: '机构设置', organization: '机构设置',
introduce: '介绍', introduce: '介绍',
ActivityIntroduction: '活动简介' ActivityIntroduction: '活动简介',
back: '返回',
} }
}, },
'en': { 'en': {
@ -137,7 +138,8 @@ export const messages = {
geographicLocation: 'geographic location', geographicLocation: 'geographic location',
organization: 'Organization', organization: 'Organization',
introduce: 'Introduce', introduce: 'Introduce',
ActivityIntroduction: 'Activity Introduction' ActivityIntroduction: 'Activity Introduction',
back: 'Back',
} }
} }
}; };

2
src/layouts/footer/index.vue
Unescape View File

@ -123,7 +123,7 @@ export default {
data () { data () {
return { return {
isIasf: false, isIasf: false,
showDefaultPath: ['/home', '/iasf'], // 展示默认页脚的页面 showDefaultPath: ['/home', '/iasf', '/estate/index'], // 展示默认页脚的页面
showContactPath: ['/news', '/sfel', '/talent', '/about', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面 showContactPath: ['/news', '/sfel', '/talent', '/about', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面
columns: [], columns: [],
modules: [] modules: []

4
src/layouts/header/index.vue
Unescape View File

@ -35,7 +35,7 @@
<img class="search" <img class="search"
:src="require('@/assets/images/oa' + (isHome ? '-white' : '') + '.png')" :src="require('@/assets/images/oa' + (isHome ? '-white' : '') + '.png')"
alt="" alt=""
@click.stop="toMail"> @click.stop="toOa">
</template> </template>
<template v-if="Util.isEn(site)"> <template v-if="Util.isEn(site)">
<img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')" <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')"
@ -205,7 +205,7 @@ export default {
}, },
// oa点击 // oa点击
toOa () { toOa () {
window.open('http://oa.iasf.ac.cn/sys/portal/page.jsp') window.open('http://oa.iasf.ac.cn/login.jsp')
}, },
// 切换语言 // 切换语言
toggleLang () { toggleLang () {

16
src/pages/column/index.vue
Unescape View File

@ -208,6 +208,7 @@
<el-pagination background <el-pagination background
@current-change="currentChange" @current-change="currentChange"
:current-page="page" :current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next" layout="total, prev, pager, next"
:total="total"></el-pagination> :total="total"></el-pagination>
</div> </div>
@ -284,6 +285,7 @@
<el-pagination background <el-pagination background
@current-change="currentChange" @current-change="currentChange"
:current-page="page" :current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next" layout="total, prev, pager, next"
:total="total"></el-pagination> :total="total"></el-pagination>
</div> </div>
@ -364,6 +366,7 @@
<el-pagination background <el-pagination background
@current-change="currentChange" @current-change="currentChange"
:current-page="page" :current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next" layout="total, prev, pager, next"
:total="total"></el-pagination> :total="total"></el-pagination>
</div> </div>
@ -498,11 +501,12 @@ export default {
.then(({ data }) => { .then(({ data }) => {
this.columnClick(data); this.columnClick(data);
if (data.typeId !== 3) this.loaded = true; // 非长页，才展示页面 if (data.typeId !== 3) this.loaded = true; // 非长页，才展示页面
this.info = data; this.info = data
this.showNav = this.showNavIds.includes(data.listStyleId); this.pageSize = data.pageSize || 10
this.handlePublication(); this.showNav = this.showNavIds.includes(data.listStyleId)
this.getLeftColumn(); this.handlePublication()
this.getClassification(); this.getLeftColumn()
this.getClassification()
}) })
.catch((res) => { }); .catch((res) => { });
}, },
@ -724,7 +728,7 @@ export default {
siteId: this.site, siteId: this.site,
columnIds, columnIds,
pageNum: this.page, pageNum: this.page,
pageSize: this.info.pageSize || 10, pageSize: this.pageSize,
labelName, labelName,
...this.form ...this.form
}) })

45
src/pages/column/result.vue
Unescape View File

@ -3,21 +3,29 @@
<div class="articles"> <div class="articles">
<div class="top"> <div class="top">
<div class="search"> <div class="search">
<input ref="search" type="text" :placeholder="$t('column.titlePlaceholder')" v-model="title"> <input ref="search"
type="text"
:placeholder="$t('column.titlePlaceholder')"
v-model="title">
<i class="el-icon-search icon"></i> <i class="el-icon-search icon"></i>
</div> </div>
<p class="result">包含 “{{ title }}” 的搜索结果</p> <p class="result">包含 “{{ title }}” 的搜索结果</p>
</div> </div>
<ul v-if="articles.length" class="list"> <ul v-if="articles.length"
<li v-for="(item, i) in articles" :key="i"> class="list">
<li v-for="(item, i) in articles"
:key="i">
<h6 @click="toArtice(item)">{{ item.title }}</h6> <h6 @click="toArtice(item)">{{ item.title }}</h6>
<div class="des" v-html="item.mainBody"></div> <div class="des"
v-html="item.mainBody"></div>
<Breadcrumb :data.sync="item.routes" /> <Breadcrumb :data.sync="item.routes" />
</li> </li>
</ul> </ul>
<div v-else class="none"> <div v-else
<img src="@/assets/images/none.png" alt=""> class="none">
<img src="@/assets/images/none.png"
alt="">
<p class="text">没有找到您搜索的内容，您可尝试搜索其他关键词。</p> <p class="text">没有找到您搜索的内容，您可尝试搜索其他关键词。</p>
</div> </div>
</div> </div>
@ -90,12 +98,11 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap { .wrap {
background: url(../../assets/images/result-bg1.png) no-repeat, background: url(../../assets/images/result-bg1.png) no-repeat, url(../../assets/images/result-bg2.png) bottom right/auto no-repeat;
url(../../assets/images/result-bg2.png) bottom right/auto no-repeat;
background-color: #fff; background-color: #fff;
} }
.articles { .articles {
width: 100%; width: 70%;
padding-top: 47px; padding-top: 47px;
margin: 0 auto; margin: 0 auto;
} }
@ -121,7 +128,7 @@ export default {
color: #333; color: #333;
border: 0; border: 0;
outline: none; outline: none;
background: #F7F7F7; background: #f7f7f7;
} }
.icon { .icon {
position: absolute; position: absolute;
@ -140,7 +147,7 @@ export default {
h6 { h6 {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 22px; font-size: 22px;
color: #1583FF; color: #1583ff;
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
@ -163,9 +170,19 @@ export default {
color: #333; color: #333;
} }
} }
@media (min-width: 280px) and (max-width: 750px) { @media (max-width: 1100px) {
.top {
flex-direction: column;
align-items: flex-start;
}
.search {
margin-bottom: 10px;
}
}
@media (max-width: 750px) {
.articles { .articles {
width: 100%; width: 90%;
.top { .top {
flex-direction: column; flex-direction: column;
.search { .search {
@ -176,7 +193,7 @@ export default {
.none { .none {
margin-top: 50px; margin-top: 50px;
.text { .text {
font-size: .5rem; font-size: 0.5rem;
} }
} }
} }

5
src/pages/deviceIntroBeam/index.vue
Unescape View File

@ -43,7 +43,8 @@
</div> </div>
<div class="unit"> <div class="unit">
<h6>{{ modules[4].form.title }}</h6> <div class="title"
v-html="modules[4].form.title"></div>
<img class="pic" <img class="pic"
:src="modules[4].form.pic" :src="modules[4].form.pic"
alt=""> alt="">
@ -218,7 +219,7 @@ export default {
width: 986px; width: 986px;
padding-bottom: 60px; padding-bottom: 60px;
margin: 0 auto; margin: 0 auto;
h6 { .title {
padding-left: 0.93rem; padding-left: 0.93rem;
margin-bottom: 0.93rem; margin-bottom: 0.93rem;
font-size: 0.88rem; font-size: 0.88rem;

43
src/pages/deviceIntroLayout/index.vue
Unescape View File

@ -22,11 +22,9 @@
<p class="en">{{ modules[1].form.subTitle }}</p> <p class="en">{{ modules[1].form.subTitle }}</p>
<div class="card" <div class="card"
v-html="modules[1].form.des"></div> v-html="modules[1].form.des"></div>
<div class="flex textBox"> <div class="texts">
<div class="left">
<div class="des" <div class="des"
v-html="modules[2].form.des"></div> v-html="modules[2].form.des"></div>
</div>
<img class="pic" <img class="pic"
:src="modules[2].form.pic" :src="modules[2].form.pic"
alt=""> alt="">
@ -44,7 +42,8 @@
</div> </div>
<div class="unit"> <div class="unit">
<h6>{{ modules[4].form.title }}</h6> <div class="title"
v-html="modules[4].form.title"></div>
<img class="pic" <img class="pic"
:src="modules[4].form.pic" :src="modules[4].form.pic"
alt=""> alt="">
@ -125,28 +124,19 @@ export default {
.inner { .inner {
width: 100%; width: 100%;
max-width: 1323px; max-width: 1323px;
.textBox { }
.texts {
position: absolute; position: absolute;
width: 85%; width: 85%;
right: 0; right: 0;
top: 26rem; top: 26rem;
.left { display: flex;
flex-grow: 1;
}
}
h6 {
font-weight: bold;
}
}
.left {
width: 34.187rem;
margin-right: 4.125rem;
} }
h6 { h6 {
position: relative; position: relative;
font-size: 1.76rem; font-size: 1.76rem;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: bold;
color: #333333; color: #333333;
} }
.en { .en {
@ -171,11 +161,12 @@ export default {
background: url(http://10.10.11.7/images/device/5.png) 0 0 /100% 100% no-repeat; background: url(http://10.10.11.7/images/device/5.png) 0 0 /100% 100% no-repeat;
} }
.des { .des {
margin-top: 25px; flex-grow: 1;
font-size: 0.98rem; margin: 25px 4rem 0 0;
font-size: 1rem;
-webkit-line-clamp: inherit; -webkit-line-clamp: inherit;
color: #333; color: #333;
line-height: 37px; line-height: 2;
overflow: visible; overflow: visible;
} }
.pic { .pic {
@ -209,7 +200,7 @@ export default {
width: 986px; width: 986px;
padding-bottom: 60px; padding-bottom: 60px;
margin: 0 auto; margin: 0 auto;
h6 { .title {
padding-left: 0.93rem; padding-left: 0.93rem;
margin-bottom: 0.93rem; margin-bottom: 0.93rem;
font-size: 0.88rem; font-size: 0.88rem;
@ -228,20 +219,18 @@ export default {
.inner { .inner {
max-width: none; max-width: none;
width: 95%; width: 95%;
.textBox { .texts {
position: static; position: static;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: flex-end; align-items: flex-end;
margin-left: 15%; margin-left: 15%;
.left {
width: 100%;
.des { .des {
width: 100%;
-webkit-line-clamp: 100; -webkit-line-clamp: 100;
} }
} }
} }
}
.pic { .pic {
width: 50%; width: 50%;
margin-top: 20px; margin-top: 20px;
@ -277,11 +266,11 @@ export default {
@media (max-width: 640px) { @media (max-width: 640px) {
.share { .share {
.inner { .inner {
.textBox { .texts {
margin: 0 auto; margin: 0 auto;
} }
} }
.left { .des {
margin-right: 0; margin-right: 0;
} }
} }

10
src/pages/deviceIntroLinear/index.vue
Unescape View File

@ -40,12 +40,14 @@
<div class="block intro"> <div class="block intro">
<div class="inner"> <div class="inner">
<div class="left"> <div class="left">
<h5>{{ modules[3].form.title }}</h5> <div class="title1"
v-html="modules[3].form.title"></div>
<img :src="modules[3].form.pic" <img :src="modules[3].form.pic"
alt="" /> alt="" />
</div> </div>
<div class="right"> <div class="right">
<h6>{{ modules[4].form.title }}</h6> <div class="title2"
v-html="modules[4].form.title"></div>
<img :src="modules[4].form.pic" <img :src="modules[4].form.pic"
alt="" /> alt="" />
</div> </div>
@ -218,7 +220,7 @@ export default {
width: 68%; width: 68%;
margin-left: 2%; margin-left: 2%;
} }
h5 { .title1 {
margin-bottom: 0.93rem; margin-bottom: 0.93rem;
font-size: 0.88rem; font-size: 0.88rem;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
@ -226,7 +228,7 @@ export default {
color: #2a2a2a; color: #2a2a2a;
} }
h6 { .title2 {
padding-left: 0.93rem; padding-left: 0.93rem;
margin-bottom: 0.93rem; margin-bottom: 0.93rem;
font-size: 0.88rem; font-size: 0.88rem;

4
src/pages/estate/orgSetup/index.vue
Unescape View File

@ -22,8 +22,8 @@
<div class="org"> <div class="org">
<div class="left"> <div class="left">
<h6>{{ modules[1].form.title }}</h6> <h6>{{ modules[1].form.title }}</h6>
<p class="text" <div class="text"
v-html="modules[1].form.des"></p> v-html="modules[1].form.des"></div>
</div> </div>
<img class="pic" <img class="pic"
src="http://10.10.11.7/images/overviewSetup/1.png" src="http://10.10.11.7/images/overviewSetup/1.png"

5
src/pages/estate/survey/index.vue
Unescape View File

@ -26,8 +26,8 @@
src="http://10.10.11.7/images/overviewIntro/2.png" src="http://10.10.11.7/images/overviewIntro/2.png"
alt=""> alt="">
</h6> </h6>
<p class="text" <div class="text"
v-html="modules[1].form.des"></p> v-html="modules[1].form.des"></div>
</div> </div>
<div class="lg-bg"> <div class="lg-bg">
<img width="100%" <img width="100%"
@ -89,6 +89,7 @@ export default {
font-size: 1rem; font-size: 1rem;
color: #020202; color: #020202;
line-height: 2rem; line-height: 2rem;
// @include mul-ellipsis(10);
} }
} }
.lg-bg { .lg-bg {

3
src/pages/iasf/index.vue
Unescape View File

@ -430,6 +430,9 @@ export default {
position: absolute; position: absolute;
bottom: 20%; bottom: 20%;
left: 120px; left: 120px;
display: flex;
flex-direction: column;
align-items: flex-start;
h6, h6,
.text { .text {
padding: 20px 15px; padding: 20px 15px;

3
src/pages/overviewIntro/index.vue
Unescape View File

@ -92,6 +92,7 @@ export default {
padding-top: 3.85rem; padding-top: 3.85rem;
.intro { .intro {
display: flex; display: flex;
align-items: center;
margin-bottom: 5.5rem; margin-bottom: 5.5rem;
.pic { .pic {
width: 40%; width: 40%;
@ -112,7 +113,7 @@ export default {
} }
.text { .text {
margin-top: 2rem; margin-top: 2rem;
font-size: 0.99rem; font-size: 1rem;
color: #020202; color: #020202;
line-height: 2; line-height: 2;
} }

520
src/pages/sfel/index.vue
View File

File diff suppressed because it is too large Load Diff

4
src/pages/team/index.vue
Unescape View File

@ -12,7 +12,8 @@
<div class="content"> <div class="content">
<div class="left"> <div class="left">
<ul class="list"> <ul class="list">
<li v-for="(item, i) in modules[1].list" <template v-for="(item, i) in modules[1].list">
<li v-if="item.isEnable"
:key="i" :key="i"
:class="{'cursor-pointer': isLink(item.link.linkName)}" :class="{'cursor-pointer': isLink(item.link.linkName)}"
@click="openLink(item)"> @click="openLink(item)">
@ -26,6 +27,7 @@
v-html="item.des"></div> v-html="item.des"></div>
</div> </div>
</li> </li>
</template>
</ul> </ul>
</div> </div>

4
src/styles/common.scss
Unescape View File

@ -5,6 +5,10 @@
font-family: PingFang; font-family: PingFang;
src: url('font/PingFang-Regular.otf'); src: url('font/PingFang-Regular.otf');
} }
@font-face {
font-family: PingFang SC;
src: url('font/PingFang-Regular.otf');
}
@font-face { @font-face {
font-family: PingFangSC-Medium; font-family: PingFangSC-Medium;
src: url('font/PingFangSC-Medium.otf'); src: url('font/PingFangSC-Medium.otf');

Write Preview
Loading…
Cancel
Save