From aaedf6771a75a5e3cf96bb14e465b1dd38d2d768 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 15 May 2023 17:43:18 +0800
Subject: [PATCH] fix

---
 src/pages/deviceIntroBeam/index.vue   |  41 ++++---
 src/pages/deviceIntroLinear/index.vue |   8 +-
 src/pages/estate/survey/index.vue     | 155 +++++---------------------
 src/pages/exp/index.vue               |   6 +-
 src/pages/overviewIntro/index.vue     |   4 +-
 5 files changed, 52 insertions(+), 162 deletions(-)

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 @@
     </el-carousel>
 
     <div class="block share">
-      <div class="inner">
-        <h6>{{ modules[1].form.title }}</h6>
-        <p class="en" v-html="modules[1].form.des"></p>
-        <div class="sum">{{ modules[2].form.title }}</div>
-        <div class="flex beamBox">
-          <div class="left">
-            <div class="des" v-html="modules[2].form.des"></div>
-          </div>
-          <img class="pic" :src="modules[2].form.pic" alt="">
+      <h6>{{ modules[1].form.title }}</h6>
+      <p class="en" v-html="modules[1].form.des"></p>
+      <div class="sum">{{ modules[2].form.title }}</div>
+      <div class="flex beamBox">
+        <div class="left">
+          <div class="des" v-html="modules[2].form.des"></div>
         </div>
+        <img class="pic" :src="modules[2].form.pic" alt="">
       </div>
     </div>
 
     <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>
 
@@ -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 @@
           <div class="left">
             <h6>{{ modules[2].form.title }}</h6>
             <div class="line"></div>
-            <div class="text">{{ modules[2].form.des }}</div>
+            <div class="text" v-html="modules[2].form.des"></div>
           </div>
           <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>
@@ -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%;
-  }
 }
 </style>
\ 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 @@
 
     <div class="block station">
       <div class="inner">
-        <h6 class="wow fadeInUp">实验线站</h6>
-        <p class="en wow fadeInUp" data-wow-delay="0.5s">EXPERIMENT STATIONS</p>
+        <h6 class="wow fadeInUp">{{ modules[1].form.title }}</h6>
+        <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">
           <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">
@@ -22,7 +22,7 @@
           </video>
           <img v-else class="pic" :src="modules[1].form.pic" alt="">
         </div>
-        <div class="des">{{ modules[1].form.des }}</div>
+        <div class="des" v-html="modules[1].form.des"></div>
       </div>
     </div>
 
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 @@
       </div>
     </div>
 
-    <div class="ads">
+    <!-- <div class="ads">
       <ul class="list">
         <li>具有高亮度</li>
         <li>超短脉冲</li>
         <li>高相干</li>
         <li>波长连续可调</li>
       </ul>
-    </div>
+    </div> -->
   </div>
 </template>