From e0ecd72fb89b4b8c32d06ba40e30447de7b49044 Mon Sep 17 00:00:00 2001
From: wangchenguang <728837162@qq.com>
Date: Mon, 24 Apr 2023 20:28:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/about/index.vue             | 16 ++++++++-----
 src/pages/application/index.vue       | 22 ++++++++++++++----
 src/pages/article/index.vue           |  2 +-
 src/pages/careers/index.vue           |  6 ++---
 src/pages/column/index.vue            | 33 ++++++++++++++++++---------
 src/pages/deviceIntroBeam/index.vue   |  8 +++----
 src/pages/deviceIntroLinear/index.vue |  6 ++---
 src/pages/estate/index/index.vue      |  2 +-
 src/pages/home/index.vue              |  5 ++--
 src/pages/news/index.vue              | 19 +++++++++++----
 src/pages/newsPress/index.vue         |  2 +-
 src/pages/newsProcurement/index.vue   |  2 +-
 src/pages/research/index.vue          |  2 +-
 13 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index 19d0c12..8c5a0fe 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -193,18 +193,20 @@ export default {
 @import "../../styles/page/page.scss";
 .banner-item {
   .banner-name {
-    font-size: 1.6rem;
+    font-size: 2.16rem;
   }
 }
 .block  {
   padding: 3.85rem 0;
   .inner {
     .wow  {
-      font-size: 1.721rem;
+      font-size: 1.921rem;
     }
     .texts {
       padding: 4.1rem 2.85rem 1.5rem;
       .left {
+        width: 58%;
+        margin-right: 2.8rem;
         h2 {
           font-size: 1.721rem;
         }
@@ -216,12 +218,13 @@ export default {
         }
       }
       .bg {
-        width: 28rem;
+        width: 38%;
         height: 25.3rem;
       }
     }
     .b-title {
       margin-bottom: 2.5rem;
+      font-size: 2.8rem;
     }
     .intro  {
       margin-bottom: 4rem;
@@ -337,7 +340,7 @@ export default {
     font-size: 2.056rem;
   }
   .des {
-    margin: 1rem 0;
+    margin: 2rem 0;
     font-size: 1.1424rem;
   }
 }
@@ -365,6 +368,7 @@ export default {
   h6 {
     margin: 1rem 0;
     font-size: 2.28rem;
+    font-weight: 600;
   }
   .sub {
     font-size: 1.1424rem;
@@ -469,14 +473,14 @@ export default {
   }
   .num {
     margin-bottom: 10px;
-    font-size: 3.424rem;
+    font-size: 2.7rem;
     font-weight: 800;
     font-family: toppan;
     color: #035CE1;
     line-height: 2.45rem;
   }
   .text {
-    font-size: 1.368rem;
+    font-size: 1.08rem;
   }
 }
 
diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue
index 6771da2..76a27de 100644
--- a/src/pages/application/index.vue
+++ b/src/pages/application/index.vue
@@ -17,7 +17,7 @@
         <div class="texts wow fadeInDown" data-wow-delay="0.5s">
           <div class="left">
             <h2>{{ modules[1].form.subTitle }}</h2>
-            <div class="line"></div>
+            <!-- <div class="line"></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)">
           </div>
@@ -157,14 +157,21 @@ export default {
   .texts {
     display: flex;
     justify-content: space-between;
-    padding: 2.7rem 2.56rem 1.35rem;
+    padding: 2.7rem 2.56rem 2.7rem;
     margin-top: 20px;
     background-color: #fff;
     border-radius: 100px 0px 0px 0px;
     transition: .3s;
+    position: relative;
     &:hover {
       transform: scale(1.05);
     }
+    // .line {
+    //   padding: 2.7rem 0;
+    // }
+    .des {
+      margin:  2.7rem 0;
+    }
   }
   .left {
     width: 50%;
@@ -176,9 +183,11 @@ export default {
     line-height: 31px;
   }
   .bg {
-    margin: -122px 0 0 0;
-    width: 50%;
+    width: 32.88rem;
     height: auto;
+    position: absolute;
+    right: -1rem;
+    bottom: 2.9rem;
   }
 }
 .app-inner {
@@ -302,6 +311,11 @@ export default {
   h6 {
     font-size: 1.1rem;
     color: #0648A8;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-overflow: ellipsis;
+    overflow: hidden;
   }
   .des {
     margin: 14px 0;
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index 20e2339..c8a9526 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -245,7 +245,7 @@ export default {
   .right {
     width: 20%;
     /deep/ .el-tree-node__label{
-      font-size: .88rem;
+      font-size: .78rem;
     }
   }
   .column {
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index 11b16ae..a2b9b1d 100644
--- a/src/pages/careers/index.vue
+++ b/src/pages/careers/index.vue
@@ -171,7 +171,6 @@ export default {
     flex-direction: column;
     flex: 1;
     height: 23.67rem;
-    margin-right: 14px;
     color: #fff;
     &:hover {
       .arrow {
@@ -216,8 +215,7 @@ export default {
   position: relative;
   li {
     position: relative;
-    height: 20.25rem;
-    padding: 4.5rem 3.15rem 1.35rem 2.565rem;
+    padding: 4.5rem 3.15rem 4.5rem 2.565rem;
     margin-bottom: 100px;
     background-color: #fff;
     transition: .3s;
@@ -269,7 +267,7 @@ export default {
     display: flex;
     align-items: center;
     width: 100%;
-    height: 29.43rem;
+    height: auto;
     margin-bottom: 40px;
     color: #fff;
     &:hover .left {
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 25ce13b..51088d3 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -29,9 +29,10 @@
             </div>
             <div class="search">
               <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="" />
-              </i>
+              </i> -->
             </div>
           </div>
           <div v-if="info.listStyleId === 12" class="forms">
@@ -52,9 +53,9 @@
             </div>
             <div class="search">
               <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="" />
-              </i>
+              </i> -->
             </div>
           </div>
           <!-- 会议活动：筛选+会议活动列表 -->
@@ -79,7 +80,8 @@
           <div class="contents">
             <template v-if="!isFilter && showNav && columns.length && !columns.find(i=>i.children.length) && info.listStyleId !==55">
              </template>
-
+             <template v-if="!columns.find(i=>i.children.length) && info.listStyleId ===55">
+             </template>
             <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"
               icon-class="el-icon-arrow-down" @node-click="(item) => columnClick(item, 1)">
@@ -651,9 +653,16 @@ export default {
 <style lang="scss" scoped>
 .wrap {
   .banner {
-   
+    height: 24rem;
+    position: relative;
     img {
-      height: 14rem;
+      height: 24rem;
+    }
+    .texts {
+      position: absolute;
+      bottom: 87px;
+      top: auto;
+      left: 213px;
     }
   }
 }
@@ -883,6 +892,7 @@ export default {
 
   .articles {
     .readDetail {
+      padding: 1.3rem 1.5rem;
       justify-content: flex-start;
       align-items: flex-start;
       .leftBox {
@@ -891,13 +901,14 @@ export default {
         }
       }
       .texts {
+        padding-left: 1.5rem;
         .titleDes {
-          margin-bottom: 1.248rem;
+          margin-bottom: 1.3rem;
           font-size: 1.2rem;
-          margin-top: .6rem;
+          margin-top: 0;
         }
         .des {
-          margin-top: 1rem;
+          margin-top: 1.3rem;
         }
       }
       .titleDes {
@@ -909,7 +920,7 @@ export default {
         margin-top: .8rem;
       }
       .readDetailBtn {
-        margin-top: 1rem;
+        margin-top: 1.3rem;
       }
       .texts {
         flex-grow: 1;
diff --git a/src/pages/deviceIntroBeam/index.vue b/src/pages/deviceIntroBeam/index.vue
index eb81101..767919c 100644
--- a/src/pages/deviceIntroBeam/index.vue
+++ b/src/pages/deviceIntroBeam/index.vue
@@ -84,10 +84,10 @@ export default {
   }
   .imgText {
     position: absolute;  
-    right: 4rem;
-    bottom: 3.25rem;
+    right: 2rem;
+    bottom: 2.25rem;
     display: flex;
-    font-size: 1.125rem;
+    font-size: .9rem;
     font-weight: 400;
     .readio {
       width: 7px;
@@ -149,7 +149,7 @@ export default {
 .intro {
   display: flex;
   align-items: center;
-  width: 77.5%;
+  width: 80%;
   height: 19.65rem;
   margin-bottom: 67px;
   .pic {
diff --git a/src/pages/deviceIntroLinear/index.vue b/src/pages/deviceIntroLinear/index.vue
index 5231ed8..dfe7b12 100644
--- a/src/pages/deviceIntroLinear/index.vue
+++ b/src/pages/deviceIntroLinear/index.vue
@@ -121,10 +121,10 @@ export default {
     position: relative;
     .imgText {
     position: absolute;  
-    right: 3rem;
-    bottom: 5.25rem;
+    right: 0rem;
+    bottom: 4.25rem;
     display: flex;
-    font-size: 1.125rem;
+    font-size: .9rem;
     color: #FFFFFF;
     font-weight: 400;
     .readio {
diff --git a/src/pages/estate/index/index.vue b/src/pages/estate/index/index.vue
index b55bf6e..d0fb9ee 100644
--- a/src/pages/estate/index/index.vue
+++ b/src/pages/estate/index/index.vue
@@ -55,7 +55,7 @@
             {{ modules[3].form.title }}
             <span class="sub">{{ modules[3].form.subTitle }}</span>
           </h5>
-          <span class="more" @click="toAll(modules[4].form)">MORE</span>
+          <!-- <span class="more" @click="toAll(modules[4].form)">MORE</span> -->
         </div>
         <div class="shows">
           <div class="left wow fadeInLeft" data-wow-delay="0.5s">
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index e9b2a82..0ba0cee 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -177,12 +177,12 @@ export default {
 @import url(../../plugins/wow/animate.css);
 @import "../../styles/page/page.scss";
 .carousel{
-  height: 76.93rem;
+  height: 100vh;
   img{
     height: 100%;
   }
   /deep/.el-carousel__container{
-    height: 76.93rem;
+    height: 100vh;
   }
 }
 .block {
@@ -348,6 +348,7 @@ export default {
   .text {
     font-size: 1.08rem;
     margin-top: 1rem;
+    line-height: 1.8rem;
   }
 }
 .about {
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 47b7495..8efe4e1 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -311,7 +311,7 @@ export default {
 }
 .banner-item {
   .banner-name {
-    font-size: 1.6rem;
+    font-size: 2.16rem;
   }
 }
 .block  {
@@ -530,6 +530,7 @@ export default {
       width: 100%;
       font-size: .88rem;
       color: #fff;
+      padding: 0 1rem;
       line-height: 48px;
       text-align: center;
       @include ellipsis;
@@ -538,12 +539,12 @@ export default {
     }
   }
   .card-list {
-    padding: 1.7rem 1.3rem;
+    padding: 1.5rem 1.3rem;
     background-color: #fff;
     li {
       display: inline-flex;
       align-items: center;
-      margin-bottom: 1.9rem;
+      margin-bottom: .9rem;
       transition: .3s;
       &:hover {
         transform: scale(1.05);
@@ -553,7 +554,7 @@ export default {
       }
     }
     .pic {
-      width: 11.25rem;
+      width: 8.25rem;
       height: auto;
       margin-right: 1.75rem;
     }
@@ -565,6 +566,11 @@ export default {
       margin-bottom: 10px;
       font-size: 1rem;
       color: #272727;
+      display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    text-overflow: ellipsis;
+    overflow: hidden;
     }
     .des {
       font-size: .7rem;
@@ -657,6 +663,11 @@ export default {
       margin-bottom: 0.5714rem;
       font-size: 1.1428rem;
       color: #333;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 1;
+      text-overflow: ellipsis;
+      overflow: hidden;
     }
     .text {
       display: flex;
diff --git a/src/pages/newsPress/index.vue b/src/pages/newsPress/index.vue
index 885d390..ddba4fa 100644
--- a/src/pages/newsPress/index.vue
+++ b/src/pages/newsPress/index.vue
@@ -113,7 +113,7 @@ export default {
 }
 .banner-item {
   .banner-name {
-    font-size: 1.6rem;
+    font-size: 2.16rem;
   }
 }
 .block  {
diff --git a/src/pages/newsProcurement/index.vue b/src/pages/newsProcurement/index.vue
index f3c88f6..848cc90 100644
--- a/src/pages/newsProcurement/index.vue
+++ b/src/pages/newsProcurement/index.vue
@@ -113,7 +113,7 @@ export default {
 }
 .banner-item {
   .banner-name {
-    font-size: 1.6rem;
+    font-size: 2.16rem;
   }
 }
 .block  {
diff --git a/src/pages/research/index.vue b/src/pages/research/index.vue
index 6c736ea..e4062b1 100644
--- a/src/pages/research/index.vue
+++ b/src/pages/research/index.vue
@@ -107,7 +107,7 @@ export default {
 }
 .banner-item {
   .banner-name {
-    font-size: 1.6rem;
+    font-size: 2.16rem;
   }
 }
 .block  {