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

fix

Browse Source
master
yujialong 2 years ago
parent 7555343f25
commit aaedf6771a
5 changed files with 52 additions and 162 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. 41
      src/pages/deviceIntroBeam/index.vue
  2. 8
      src/pages/deviceIntroLinear/index.vue
  3. 155
      src/pages/estate/survey/index.vue
  4. 6
      src/pages/exp/index.vue
  5. 4
      src/pages/overviewIntro/index.vue

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

@ -12,21 +12,20 @@
</el-carousel> </el-carousel>
<div class="block share"> <div class="block share">
<div class="inner"> <h6>{{ modules[1].form.title }}</h6>
<h6>{{ modules[1].form.title }}</h6> <p class="en" v-html="modules[1].form.des"></p>
<p class="en" v-html="modules[1].form.des"></p> <div class="sum">{{ modules[2].form.title }}</div>
<div class="sum">{{ modules[2].form.title }}</div> <div class="flex beamBox">
<div class="flex beamBox"> <div class="left">
<div class="left"> <div class="des" v-html="modules[2].form.des"></div>
<div class="des" v-html="modules[2].form.des"></div>
</div>
<img class="pic" :src="modules[2].form.pic" alt="">
</div> </div>
<img class="pic" :src="modules[2].form.pic" alt="">
</div> </div>
</div> </div>
<div class="intro"> <div class="intro">
<img class="pic" src="http://10.10.11.7/images/device/2.png" alt=""> <!-- <img class="pic" src="http://10.10.11.7/images/device/2.png" alt=""> -->
<img class="pic" src="@/assets/images/2.png" alt="">
<div class="des" v-html="modules[3].form.des"></div> <div class="des" v-html="modules[3].form.des"></div>
</div> </div>
@ -111,9 +110,6 @@ export default {
} }
.beamBox { .beamBox {
position: relative; position: relative;
.left{
flex-grow: 1;
}
.imgText { .imgText {
position: absolute; position: absolute;
right: 2rem; right: 2rem;
@ -133,13 +129,15 @@ export default {
} }
.share { .share {
position: relative; position: relative;
.inner { width: 80%;
width: 1200px; padding-left: 12%;
.beamBox {
align-items: center;
} }
.left { .left {
// width: 34.1875rem; min-width: 468px;
flex-grow: 1; width: 468px;
margin-right: 4.125rem; margin-right: 66px;
} }
h6 { h6 {
position: relative; position: relative;
@ -172,8 +170,7 @@ export default {
overflow: visible; overflow: visible;
} }
.pic { .pic {
width: 30.5rem; width: calc(100% - 536px);
height: auto;
margin-top: 10px; margin-top: 10px;
border-top-left-radius: 20px; border-top-left-radius: 20px;
} }
@ -183,9 +180,11 @@ export default {
align-items: center; align-items: center;
width: 80%; width: 80%;
height: 19.65rem; height: 19.65rem;
padding-left: 12%;
margin-bottom: 67px; margin-bottom: 67px;
background-color: #05607d;
.pic { .pic {
width: 60%; width: 468px;
height: 100%; height: 100%;
} }
.des { .des {

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

@ -19,10 +19,9 @@
<div class="left"> <div class="left">
<h6>{{ modules[2].form.title }}</h6> <h6>{{ modules[2].form.title }}</h6>
<div class="line"></div> <div class="line"></div>
<div class="text">{{ modules[2].form.des }}</div> <div class="text" v-html="modules[2].form.des"></div>
</div> </div>
<img class="bg" src="http://10.10.11.7/images/device/10.png" alt="" /> <img class="bg" src="http://10.10.11.7/images/device/10.png" alt="" />
<div class="imgText"><div class="readio"></div>S³FEL电子枪光电效应示意图</div>
</div> </div>
</div> </div>
</div> </div>
@ -185,7 +184,7 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #ffffff; color: #ffffff;
line-height: 44px; line-height: 1.6;
} }
.bg { .bg {
@ -199,16 +198,13 @@ export default {
.inner { .inner {
display: flex; display: flex;
} }
.left { .left {
width: 30%; width: 30%;
} }
.right { .right {
width: 68%; width: 68%;
margin-left: 2%; margin-left: 2%;
} }
h5 { h5 {
margin-bottom: .93rem; margin-bottom: .93rem;
font-size: .88rem; font-size: .88rem;

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

@ -76,7 +76,7 @@ export default {
.survey { .survey {
width: 1294px; width: 1294px;
min-height: 500px; min-height: 500px;
padding: 80px 86px 29px 32%; padding: 80px 86px 29px 597px;
margin: 0 auto 200px; margin: 0 auto 200px;
background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat; background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat;
border-radius: 160px; border-radius: 160px;
@ -103,7 +103,19 @@ export default {
.lg-bg { .lg-bg {
width: 40%; width: 40%;
} }
@media (max-width: 1200px) { @media (max-width: 1300px) {
.wrap {
.single-banner {
.banner-img {
height: 35rem;
}
.texts {
top: 20rem;
left: 9rem;
}
}
}
.tabs { .tabs {
overflow: hidden;; overflow: hidden;;
overflow-x: auto; overflow-x: auto;
@ -114,41 +126,17 @@ export default {
white-space: normal; white-space: normal;
} }
} }
.tab-content{
padding: 20px 0;
.org{
width: 100%;
padding:15px;
flex-direction: column;
.left{
width: 100%;
}
}
}
}
@media (max-width: 320px) {
.wrap {
.single-banner {
.banner-img {
height: 13rem;
}
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content { .tab-content {
.survey { padding: 20px 0;
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
}
} }
.lg-bg { .lg-bg {
width: 100%; width: 100%;
} }
.survey {
width: 100%;
padding: 80px 86px 29px 47%;
margin-bottom: 2rem;
}
} }
@media (min-width: 320px) and (max-width: 375px) { @media (min-width: 320px) and (max-width: 375px) {
.wrap { .wrap {
@ -156,23 +144,8 @@ export default {
.banner-img { .banner-img {
height: 13rem; height: 13rem;
} }
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
} }
} }
.lg-bg {
width: 100%;
}
} }
@media (min-width: 375px) and (max-width: 480px) { @media (min-width: 375px) and (max-width: 480px) {
.wrap { .wrap {
@ -180,22 +153,13 @@ export default {
.banner-img { .banner-img {
height: 15rem; height: 15rem;
} }
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
} }
} }
.lg-bg { }
width: 100%; @media (max-width: 480px) {
.survey {
padding: 30px;
background: none;
} }
} }
@media (min-width: 480px) and (max-width: 640px) { @media (min-width: 480px) and (max-width: 640px) {
@ -204,23 +168,8 @@ export default {
.banner-img { .banner-img {
height: 18rem; height: 18rem;
} }
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
} }
} }
.lg-bg {
width: 100%;
}
} }
@media (min-width: 640px) and (max-width: 768px) { @media (min-width: 640px) and (max-width: 768px) {
.wrap { .wrap {
@ -228,23 +177,8 @@ export default {
.banner-img { .banner-img {
height: 20rem; height: 20rem;
} }
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
} }
} }
.lg-bg {
width: 100%;
}
} }
@media (min-width: 768px) and (max-width: 980px) { @media (min-width: 768px) and (max-width: 980px) {
.wrap { .wrap {
@ -252,46 +186,7 @@ export default {
.banner-img { .banner-img {
height: 25rem; height: 25rem;
} }
.texts {
top: 6rem;
left: 5rem;
}
}
}
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
}
}
.lg-bg {
width: 100%;
}
}
@media (min-width: 980px) and (max-width: 1200px) {
.wrap {
.single-banner {
.banner-img {
height: 35rem;
}
.texts {
top: 20rem;
left: 9rem;
}
} }
} }
.tab-content {
.survey {
padding: 1.25rem;
width: 100%;
margin-bottom: 2rem;
}
}
.lg-bg {
width: 100%;
}
} }
</style> </style>

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

@ -13,8 +13,8 @@
<div class="block station"> <div class="block station">
<div class="inner"> <div class="inner">
<h6 class="wow fadeInUp">实验线站</h6> <h6 class="wow fadeInUp">{{ modules[1].form.title }}</h6>
<p class="en wow fadeInUp" data-wow-delay="0.5s">EXPERIMENT STATIONS</p> <p class="en wow fadeInUp" data-wow-delay="0.5s">{{ modules[1].form.subTitle }}</p>
<div v-if="modules[1].form.pic" class="text-center"> <div v-if="modules[1].form.pic" class="text-center">
<video v-if="Util.isVideo(modules[1].form.mediaType)" class="pic" ref="video" autoplay controls loop> <video v-if="Util.isVideo(modules[1].form.mediaType)" class="pic" ref="video" autoplay controls loop>
<source :src="modules[1].form.pic" type="video/mp4"> <source :src="modules[1].form.pic" type="video/mp4">
@ -22,7 +22,7 @@
</video> </video>
<img v-else class="pic" :src="modules[1].form.pic" alt=""> <img v-else class="pic" :src="modules[1].form.pic" alt="">
</div> </div>
<div class="des">{{ modules[1].form.des }}</div> <div class="des" v-html="modules[1].form.des"></div>
</div> </div>
</div> </div>

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

@ -33,14 +33,14 @@
</div> </div>
</div> </div>
<div class="ads"> <!-- <div class="ads">
<ul class="list"> <ul class="list">
<li>具有高亮度</li> <li>具有高亮度</li>
<li>超短脉冲</li> <li>超短脉冲</li>
<li>高相干</li> <li>高相干</li>
<li>波长连续可调</li> <li>波长连续可调</li>
</ul> </ul>
</div> </div> -->
</div> </div>
</template> </template>

Write Preview
Loading…
Cancel
Save