diff --git a/src/pages/deviceIntroBeam/index.vue b/src/pages/deviceIntroBeam/index.vue index 1f5a056..9595a26 100644 --- a/src/pages/deviceIntroBeam/index.vue +++ b/src/pages/deviceIntroBeam/index.vue @@ -12,21 +12,20 @@
-
-
{{ modules[1].form.title }}
-

-
{{ modules[2].form.title }}
-
-
-
-
- +
{{ modules[1].form.title }}
+

+
{{ modules[2].form.title }}
+
+
+
+
- + +
@@ -111,9 +110,6 @@ export default { } .beamBox { position: relative; - .left{ - flex-grow: 1; - } .imgText { position: absolute; right: 2rem; @@ -133,13 +129,15 @@ export default { } .share { position: relative; - .inner { - width: 1200px; + width: 80%; + padding-left: 12%; + .beamBox { + align-items: center; } .left { - // width: 34.1875rem; - flex-grow: 1; - margin-right: 4.125rem; + min-width: 468px; + width: 468px; + margin-right: 66px; } h6 { position: relative; @@ -172,8 +170,7 @@ export default { overflow: visible; } .pic { - width: 30.5rem; - height: auto; + width: calc(100% - 536px); margin-top: 10px; border-top-left-radius: 20px; } @@ -183,9 +180,11 @@ export default { align-items: center; width: 80%; height: 19.65rem; + padding-left: 12%; margin-bottom: 67px; + background-color: #05607d; .pic { - width: 60%; + width: 468px; height: 100%; } .des { diff --git a/src/pages/deviceIntroLinear/index.vue b/src/pages/deviceIntroLinear/index.vue index 488ad39..e9fd1e5 100644 --- a/src/pages/deviceIntroLinear/index.vue +++ b/src/pages/deviceIntroLinear/index.vue @@ -19,10 +19,9 @@
{{ modules[2].form.title }}
-
{{ modules[2].form.des }}
+
-
S³FEL电子枪光电效应示意图
@@ -185,7 +184,7 @@ export default { font-family: PingFangSC-Regular, PingFang SC; font-weight: 400; color: #ffffff; - line-height: 44px; + line-height: 1.6; } .bg { @@ -199,16 +198,13 @@ export default { .inner { display: flex; } - .left { width: 30%; } - .right { width: 68%; margin-left: 2%; } - h5 { margin-bottom: .93rem; font-size: .88rem; diff --git a/src/pages/estate/survey/index.vue b/src/pages/estate/survey/index.vue index 4854a32..061b909 100644 --- a/src/pages/estate/survey/index.vue +++ b/src/pages/estate/survey/index.vue @@ -76,7 +76,7 @@ export default { .survey { width: 1294px; min-height: 500px; - padding: 80px 86px 29px 32%; + padding: 80px 86px 29px 597px; margin: 0 auto 200px; background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat; border-radius: 160px; @@ -103,7 +103,19 @@ export default { .lg-bg { width: 40%; } -@media (max-width: 1200px) { +@media (max-width: 1300px) { + .wrap { + .single-banner { + .banner-img { + height: 35rem; + } + .texts { + top: 20rem; + left: 9rem; + + } + } + } .tabs { overflow: hidden;; overflow-x: auto; @@ -114,41 +126,17 @@ export default { 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 { - .survey { - padding: 1.25rem; - width: 100%; - margin-bottom: 2rem; - } + padding: 20px 0; } .lg-bg { width: 100%; } + .survey { + width: 100%; + padding: 80px 86px 29px 47%; + margin-bottom: 2rem; + } } @media (min-width: 320px) and (max-width: 375px) { .wrap { @@ -156,23 +144,8 @@ export default { .banner-img { 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) { .wrap { @@ -180,22 +153,13 @@ export default { .banner-img { 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) { @@ -204,23 +168,8 @@ export default { .banner-img { 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) { .wrap { @@ -228,23 +177,8 @@ export default { .banner-img { 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) { .wrap { @@ -252,46 +186,7 @@ export default { .banner-img { 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%; - } } \ No newline at end of file diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue index 455c269..88cb78d 100644 --- a/src/pages/exp/index.vue +++ b/src/pages/exp/index.vue @@ -13,8 +13,8 @@
-
实验线站
-

EXPERIMENT STATIONS

+
{{ modules[1].form.title }}
+

{{ modules[1].form.subTitle }}

-
{{ modules[1].form.des }}
+
diff --git a/src/pages/overviewIntro/index.vue b/src/pages/overviewIntro/index.vue index 115b5d3..f8cf0c7 100644 --- a/src/pages/overviewIntro/index.vue +++ b/src/pages/overviewIntro/index.vue @@ -33,14 +33,14 @@ -
+