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

修复bug

Browse Source
master
wangchenguang 2 years ago
parent 0d8fbc1e3c
commit e0ecd72fb8
13 changed files with 82 additions and 43 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. 16
      src/pages/about/index.vue
  2. 22
      src/pages/application/index.vue
  3. 2
      src/pages/article/index.vue
  4. 6
      src/pages/careers/index.vue
  5. 33
      src/pages/column/index.vue
  6. 8
      src/pages/deviceIntroBeam/index.vue
  7. 6
      src/pages/deviceIntroLinear/index.vue
  8. 2
      src/pages/estate/index/index.vue
  9. 5
      src/pages/home/index.vue
  10. 19
      src/pages/news/index.vue
  11. 2
      src/pages/newsPress/index.vue
  12. 2
      src/pages/newsProcurement/index.vue
  13. 2
      src/pages/research/index.vue

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

@ -193,18 +193,20 @@ export default {
@import "../../styles/page/page.scss"; @import "../../styles/page/page.scss";
.banner-item { .banner-item {
.banner-name { .banner-name {
font-size: 1.6rem; font-size: 2.16rem;
} }
} }
.block { .block {
padding: 3.85rem 0; padding: 3.85rem 0;
.inner { .inner {
.wow { .wow {
font-size: 1.721rem; font-size: 1.921rem;
} }
.texts { .texts {
padding: 4.1rem 2.85rem 1.5rem; padding: 4.1rem 2.85rem 1.5rem;
.left { .left {
width: 58%;
margin-right: 2.8rem;
h2 { h2 {
font-size: 1.721rem; font-size: 1.721rem;
} }
@ -216,12 +218,13 @@ export default {
} }
} }
.bg { .bg {
width: 28rem; width: 38%;
height: 25.3rem; height: 25.3rem;
} }
} }
.b-title { .b-title {
margin-bottom: 2.5rem; margin-bottom: 2.5rem;
font-size: 2.8rem;
} }
.intro { .intro {
margin-bottom: 4rem; margin-bottom: 4rem;
@ -337,7 +340,7 @@ export default {
font-size: 2.056rem; font-size: 2.056rem;
} }
.des { .des {
margin: 1rem 0; margin: 2rem 0;
font-size: 1.1424rem; font-size: 1.1424rem;
} }
} }
@ -365,6 +368,7 @@ export default {
h6 { h6 {
margin: 1rem 0; margin: 1rem 0;
font-size: 2.28rem; font-size: 2.28rem;
font-weight: 600;
} }
.sub { .sub {
font-size: 1.1424rem; font-size: 1.1424rem;
@ -469,14 +473,14 @@ export default {
} }
.num { .num {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 3.424rem; font-size: 2.7rem;
font-weight: 800; font-weight: 800;
font-family: toppan; font-family: toppan;
color: #035CE1; color: #035CE1;
line-height: 2.45rem; line-height: 2.45rem;
} }
.text { .text {
font-size: 1.368rem; font-size: 1.08rem;
} }
} }

22
src/pages/application/index.vue
Unescape View File

@ -17,7 +17,7 @@
<div class="texts wow fadeInDown" data-wow-delay="0.5s"> <div class="texts wow fadeInDown" data-wow-delay="0.5s">
<div class="left"> <div class="left">
<h2>{{ modules[1].form.subTitle }}</h2> <h2>{{ modules[1].form.subTitle }}</h2>
<div class="line"></div> <!-- <div class="line"></div> -->
<div class="des">{{ modules[1].form.des }}</div> <div class="des">{{ modules[1].form.des }}</div>
<img :class="{'arrow': isLink(modules[1].form.link.linkName)}" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[1].form)"> <img :class="{'arrow': isLink(modules[1].form.link.linkName)}" src="@/assets/images/arrow.png" alt="" @click="openLink(modules[1].form)">
</div> </div>
@ -157,14 +157,21 @@ export default {
.texts { .texts {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 2.7rem 2.56rem 1.35rem; padding: 2.7rem 2.56rem 2.7rem;
margin-top: 20px; margin-top: 20px;
background-color: #fff; background-color: #fff;
border-radius: 100px 0px 0px 0px; border-radius: 100px 0px 0px 0px;
transition: .3s; transition: .3s;
position: relative;
&:hover { &:hover {
transform: scale(1.05); transform: scale(1.05);
} }
// .line {
// padding: 2.7rem 0;
// }
.des {
margin: 2.7rem 0;
}
} }
.left { .left {
width: 50%; width: 50%;
@ -176,9 +183,11 @@ export default {
line-height: 31px; line-height: 31px;
} }
.bg { .bg {
margin: -122px 0 0 0; width: 32.88rem;
width: 50%;
height: auto; height: auto;
position: absolute;
right: -1rem;
bottom: 2.9rem;
} }
} }
.app-inner { .app-inner {
@ -302,6 +311,11 @@ export default {
h6 { h6 {
font-size: 1.1rem; font-size: 1.1rem;
color: #0648A8; color: #0648A8;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
text-overflow: ellipsis;
overflow: hidden;
} }
.des { .des {
margin: 14px 0; margin: 14px 0;

2
src/pages/article/index.vue
Unescape View File

@ -245,7 +245,7 @@ export default {
.right { .right {
width: 20%; width: 20%;
/deep/ .el-tree-node__label{ /deep/ .el-tree-node__label{
font-size: .88rem; font-size: .78rem;
} }
} }
.column { .column {

6
src/pages/careers/index.vue
Unescape View File

@ -171,7 +171,6 @@ export default {
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
height: 23.67rem; height: 23.67rem;
margin-right: 14px;
color: #fff; color: #fff;
&:hover { &:hover {
.arrow { .arrow {
@ -216,8 +215,7 @@ export default {
position: relative; position: relative;
li { li {
position: relative; position: relative;
height: 20.25rem; padding: 4.5rem 3.15rem 4.5rem 2.565rem;
padding: 4.5rem 3.15rem 1.35rem 2.565rem;
margin-bottom: 100px; margin-bottom: 100px;
background-color: #fff; background-color: #fff;
transition: .3s; transition: .3s;
@ -269,7 +267,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 29.43rem; height: auto;
margin-bottom: 40px; margin-bottom: 40px;
color: #fff; color: #fff;
&:hover .left { &:hover .left {

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

@ -29,9 +29,10 @@
</div> </div>
<div class="search"> <div class="search">
<input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" /> <input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" />
<i class="icon">
<!-- <i class="icon">
<img src="@/assets/images/search-white.png" alt="" /> <img src="@/assets/images/search-white.png" alt="" />
</i> </i> -->
</div> </div>
</div> </div>
<div v-if="info.listStyleId === 12" class="forms"> <div v-if="info.listStyleId === 12" class="forms">
@ -52,9 +53,9 @@
</div> </div>
<div class="search"> <div class="search">
<input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" /> <input type="text" :placeholder="$t('column.titlePlaceholder')" v-model="form.title" />
<i class="icon"> <!-- <i class="icon">
<img src="@/assets/images/search-white.png" alt="" /> <img src="@/assets/images/search-white.png" alt="" />
</i> </i> -->
</div> </div>
</div> </div>
<!-- 会议活动：筛选+会议活动列表 --> <!-- 会议活动：筛选+会议活动列表 -->
@ -79,7 +80,8 @@
<div class="contents"> <div class="contents">
<template v-if="!isFilter && showNav && columns.length && !columns.find(i=>i.children.length) && info.listStyleId !==55"> <template v-if="!isFilter && showNav && columns.length && !columns.find(i=>i.children.length) && info.listStyleId !==55">
</template> </template>
<template v-if="!columns.find(i=>i.children.length) && info.listStyleId ===55">
</template>
<el-tree v-else class="columns" ref="leftColumn" :data="columns" <el-tree v-else class="columns" ref="leftColumn" :data="columns"
highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id" highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id"
icon-class="el-icon-arrow-down" @node-click="(item) => columnClick(item, 1)"> icon-class="el-icon-arrow-down" @node-click="(item) => columnClick(item, 1)">
@ -651,9 +653,16 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.wrap { .wrap {
.banner { .banner {
height: 24rem;
position: relative;
img { img {
height: 14rem; height: 24rem;
}
.texts {
position: absolute;
bottom: 87px;
top: auto;
left: 213px;
} }
} }
} }
@ -883,6 +892,7 @@ export default {
.articles { .articles {
.readDetail { .readDetail {
padding: 1.3rem 1.5rem;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start; align-items: flex-start;
.leftBox { .leftBox {
@ -891,13 +901,14 @@ export default {
} }
} }
.texts { .texts {
padding-left: 1.5rem;
.titleDes { .titleDes {
margin-bottom: 1.248rem; margin-bottom: 1.3rem;
font-size: 1.2rem; font-size: 1.2rem;
margin-top: .6rem; margin-top: 0;
} }
.des { .des {
margin-top: 1rem; margin-top: 1.3rem;
} }
} }
.titleDes { .titleDes {
@ -909,7 +920,7 @@ export default {
margin-top: .8rem; margin-top: .8rem;
} }
.readDetailBtn { .readDetailBtn {
margin-top: 1rem; margin-top: 1.3rem;
} }
.texts { .texts {
flex-grow: 1; flex-grow: 1;

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

@ -84,10 +84,10 @@ export default {
} }
.imgText { .imgText {
position: absolute; position: absolute;
right: 4rem; right: 2rem;
bottom: 3.25rem; bottom: 2.25rem;
display: flex; display: flex;
font-size: 1.125rem; font-size: .9rem;
font-weight: 400; font-weight: 400;
.readio { .readio {
width: 7px; width: 7px;
@ -149,7 +149,7 @@ export default {
.intro { .intro {
display: flex; display: flex;
align-items: center; align-items: center;
width: 77.5%; width: 80%;
height: 19.65rem; height: 19.65rem;
margin-bottom: 67px; margin-bottom: 67px;
.pic { .pic {

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

@ -121,10 +121,10 @@ export default {
position: relative; position: relative;
.imgText { .imgText {
position: absolute; position: absolute;
right: 3rem; right: 0rem;
bottom: 5.25rem; bottom: 4.25rem;
display: flex; display: flex;
font-size: 1.125rem; font-size: .9rem;
color: #FFFFFF; color: #FFFFFF;
font-weight: 400; font-weight: 400;
.readio { .readio {

2
src/pages/estate/index/index.vue
Unescape View File

@ -55,7 +55,7 @@
{{ modules[3].form.title }} {{ modules[3].form.title }}
<span class="sub">{{ modules[3].form.subTitle }}</span> <span class="sub">{{ modules[3].form.subTitle }}</span>
</h5> </h5>
<span class="more" @click="toAll(modules[4].form)">MORE</span> <!-- <span class="more" @click="toAll(modules[4].form)">MORE</span> -->
</div> </div>
<div class="shows"> <div class="shows">
<div class="left wow fadeInLeft" data-wow-delay="0.5s"> <div class="left wow fadeInLeft" data-wow-delay="0.5s">

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

@ -177,12 +177,12 @@ export default {
@import url(../../plugins/wow/animate.css); @import url(../../plugins/wow/animate.css);
@import "../../styles/page/page.scss"; @import "../../styles/page/page.scss";
.carousel{ .carousel{
height: 76.93rem; height: 100vh;
img{ img{
height: 100%; height: 100%;
} }
/deep/.el-carousel__container{ /deep/.el-carousel__container{
height: 76.93rem; height: 100vh;
} }
} }
.block { .block {
@ -348,6 +348,7 @@ export default {
.text { .text {
font-size: 1.08rem; font-size: 1.08rem;
margin-top: 1rem; margin-top: 1rem;
line-height: 1.8rem;
} }
} }
.about { .about {

19
src/pages/news/index.vue
Unescape View File

@ -311,7 +311,7 @@ export default {
} }
.banner-item { .banner-item {
.banner-name { .banner-name {
font-size: 1.6rem; font-size: 2.16rem;
} }
} }
.block { .block {
@ -530,6 +530,7 @@ export default {
width: 100%; width: 100%;
font-size: .88rem; font-size: .88rem;
color: #fff; color: #fff;
padding: 0 1rem;
line-height: 48px; line-height: 48px;
text-align: center; text-align: center;
@include ellipsis; @include ellipsis;
@ -538,12 +539,12 @@ export default {
} }
} }
.card-list { .card-list {
padding: 1.7rem 1.3rem; padding: 1.5rem 1.3rem;
background-color: #fff; background-color: #fff;
li { li {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
margin-bottom: 1.9rem; margin-bottom: .9rem;
transition: .3s; transition: .3s;
&:hover { &:hover {
transform: scale(1.05); transform: scale(1.05);
@ -553,7 +554,7 @@ export default {
} }
} }
.pic { .pic {
width: 11.25rem; width: 8.25rem;
height: auto; height: auto;
margin-right: 1.75rem; margin-right: 1.75rem;
} }
@ -565,6 +566,11 @@ export default {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 1rem; font-size: 1rem;
color: #272727; color: #272727;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
text-overflow: ellipsis;
overflow: hidden;
} }
.des { .des {
font-size: .7rem; font-size: .7rem;
@ -657,6 +663,11 @@ export default {
margin-bottom: 0.5714rem; margin-bottom: 0.5714rem;
font-size: 1.1428rem; font-size: 1.1428rem;
color: #333; color: #333;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
text-overflow: ellipsis;
overflow: hidden;
} }
.text { .text {
display: flex; display: flex;

2
src/pages/newsPress/index.vue
Unescape View File

@ -113,7 +113,7 @@ export default {
} }
.banner-item { .banner-item {
.banner-name { .banner-name {
font-size: 1.6rem; font-size: 2.16rem;
} }
} }
.block { .block {

2
src/pages/newsProcurement/index.vue
Unescape View File

@ -113,7 +113,7 @@ export default {
} }
.banner-item { .banner-item {
.banner-name { .banner-name {
font-size: 1.6rem; font-size: 2.16rem;
} }
} }
.block { .block {

2
src/pages/research/index.vue
Unescape View File

@ -107,7 +107,7 @@ export default {
} }
.banner-item { .banner-item {
.banner-name { .banner-name {
font-size: 1.6rem; font-size: 2.16rem;
} }
} }
.block { .block {

Write Preview
Loading…
Cancel
Save