From e8382c1d0533f1e3ec013cfb5e8ccffbd7179659 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 2 Jan 2024 18:38:58 +0800
Subject: [PATCH] fix

---
 src/components/breadcrumb/index.vue   | 51 +++++++++++---
 src/layouts/footer/index.vue          | 65 +-----------------
 src/pages/about/index.vue             |  3 +-
 src/pages/article/activity.vue        |  1 +
 src/pages/article/index.vue           |  3 +-
 src/pages/careers/index.vue           |  1 +
 src/pages/column/index.vue            | 18 ++---
 src/pages/deviceIntroBeam/index.vue   | 32 +++++----
 src/pages/deviceIntroLayout/index.vue | 30 ++-------
 src/pages/iasf/index.vue              | 95 +++++++++++++++++++--------
 src/pages/org/index.vue               |  4 +-
 src/pages/overview/index.vue          |  4 +-
 src/pages/overviewIntro/index.vue     |  8 +--
 src/pages/overviewSetup/index.vue     |  4 +-
 src/pages/research/index.vue          |  1 +
 src/pages/scientific/index.vue        |  1 -
 src/styles/page/page.scss             |  3 +
 17 files changed, 155 insertions(+), 169 deletions(-)

diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index 01b4650..50fce1f 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -1,9 +1,19 @@
 <template>
   <!-- 面包屑 -->
   <div class="breadcrumb">
-    <span class="back"
-          @click="$router.back()">{{ $t('column.back') }}&emsp;></span>
-    <span v-if="data[1]">{{ data[1].name }}</span>
+    <el-breadcrumb separator=">">
+      <template v-for="(item, i) in data">
+        <el-breadcrumb-item v-if="i != data.length - 1"
+                            :key="i"
+                            :to="{ path: item.path || '/column', query: item.query }">
+          {{ item.name | i18nName($i18n)}}
+        </el-breadcrumb-item>
+        <el-breadcrumb-item v-else
+                            :key="i">
+          {{ item.name }}
+        </el-breadcrumb-item>
+      </template>
+    </el-breadcrumb>
   </div>
 </template>
 
@@ -18,18 +28,39 @@ export default {
   methods: {
 
   },
+  filters: {
+    i18nName (name, type) {
+      switch (name) {
+        case '专利':
+          return type.t('column.patent')
+        case '专著':
+          return type.t('column.monograph')
+        case '论文':
+          return type.t('column.paper')
+        case '科学研究':
+          return type.t('column.scientificResearch')
+
+        default:
+          return name
+      }
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
 .breadcrumb {
     margin: 4px 0 16px;
-    span {
-        color: #0b1d30;
-    }
-    .back {
-        margin-right: 12px;
-        color: $main-color;
-        cursor: pointer;
+    /deep/.el-breadcrumb__item {
+        .is-link,
+        .el-breadcrumb__separator {
+            font-weight: 400;
+            color: $main-color;
+        }
+        &:last-child {
+            .is-link {
+                color: #0b1d30;
+            }
+        }
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index ba5766b..1624dc1 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -1,48 +1,7 @@
 <template>
   <div>
     <div v-if="showDefaultPath.includes($route.path)"
-         :class="['footer', {iasf: isIasf}]">
-      <template v-if="isIasf">
-        <div class="mask"></div>
-        <ul v-if="isIasf"
-            class="entry">
-          <li :class="{'cursor-pointer': isLink(modules[13].form.link.linkName)}"
-              @click="openLink(modules[14].form)">
-            <img class="icon"
-                 :src="modules[14].form.pic"
-                 alt="">
-            <p class="text">{{ modules[14].form.title }}</p>
-          </li>
-          <li :class="{'cursor-pointer': isLink(modules[14].form.link.linkName)}"
-              @click="openLink(modules[15].form)">
-            <img class="icon"
-                 :src="modules[15].form.pic"
-                 alt="">
-            <p class="text">{{ modules[15].form.title }}</p>
-          </li>
-          <li :class="{'cursor-pointer': isLink(modules[15].form.link.linkName)}"
-              @click="openLink(modules[16].form)">
-            <img class="icon"
-                 :src="modules[16].form.pic"
-                 alt="">
-            <p class="text">{{ modules[16].form.title }}</p>
-          </li>
-          <li :class="{'cursor-pointer': isLink(modules[16].form.link.linkName)}"
-              @click="openLink(modules[17].form)">
-            <img class="icon"
-                 :src="modules[17].form.pic"
-                 alt="">
-            <p class="text">{{ modules[17].form.title }}</p>
-          </li>
-          <li :class="{'cursor-pointer': isLink(modules[17].form.link.linkName)}"
-              @click="openLink(modules[18].form)">
-            <img class="icon"
-                 :src="modules[18].form.pic"
-                 alt="">
-            <p class="text">{{ modules[18].form.title }}</p>
-          </li>
-        </ul>
-      </template>
+         class="footer">
       <div class="relative">
         <div class="info">
           <div class="leftBox">
@@ -313,28 +272,6 @@ export default {
         }
     }
 }
-.entry {
-    position: relative;
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 100px;
-    li {
-        display: inline-flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        text-align: center;
-    }
-    img {
-        max-width: 100px;
-    }
-    .text {
-        margin-top: 15px;
-        font-size: 1rem;
-        font-family: PingFangSC-Medium, PingFang SC;
-        color: #fff;
-    }
-}
 .contact {
     position: relative;
     padding: 0 0 73px 0;
diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue
index 8b69807..d0526a6 100644
--- a/src/pages/about/index.vue
+++ b/src/pages/about/index.vue
@@ -454,8 +454,7 @@ export default {
 }
 .list-block {
     .inner {
-        width: 80%;
-        padding: 5.625rem 0;
+        padding: 5rem 0;
         background-color: #fff;
     }
 }
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index 4e4e3bf..8173f45 100644
--- a/src/pages/article/activity.vue
+++ b/src/pages/article/activity.vue
@@ -153,6 +153,7 @@ export default {
     font-size: 48px;
     color: #fff;
     background: url(../../assets/images/intro-bg.png) 0 0/100% 100% no-repeat;
+    object-fit: cover;
 }
 .article {
     display: flex;
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index a28daa1..97e12a9 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -115,7 +115,7 @@ export default {
             }
           ]
           // 文章被禁用了就直接返回
-          if (data.isDisable) {
+          if (data.isDisable || !data.isRelease) {
             this.$router.back()
           } else {
             const temId = data.articleTemplate
@@ -202,6 +202,7 @@ export default {
     font-weight: 600;
     color: #fff;
     background: url(../../assets/images/intro-bg.png) 0 0/100% 100% no-repeat;
+    object-fit: cover;
 }
 .article {
     display: flex;
diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue
index ad63f2f..d231040 100644
--- a/src/pages/careers/index.vue
+++ b/src/pages/careers/index.vue
@@ -354,6 +354,7 @@ export default {
         right: 0;
         width: 100%;
         height: 100%;
+        object-fit: cover;
     }
     h6 {
         font-size: 2.07rem;
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 85becbc..927f163 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -888,6 +888,7 @@ export default {
     color: #fff;
     img {
         height: 24rem;
+        object-fit: cover;
     }
     .texts {
         position: absolute;
@@ -922,12 +923,12 @@ export default {
 
 .article {
     display: flex;
-    justify-content: center;
+    justify-content: space-between;
+    width: 1200px;
     margin: 0 auto;
 
     .left {
-        width: 66%;
-        margin-right: 1.4rem;
+        width: 83%;
     }
 
     .article-wrap {
@@ -1246,8 +1247,8 @@ export default {
         padding: 15px;
     }
     .right {
-        width: 14%;
-        min-width: 15rem;
+        width: 17%;
+        padding-left: 20px;
         overflow: hidden;
     }
 
@@ -1288,13 +1289,6 @@ export default {
     }
 
     .article {
-        justify-content: center;
-
-        .left {
-            width: 1136px;
-            margin-right: 36px;
-        }
-
         .forms {
             padding: 30px 0;
         }
diff --git a/src/pages/deviceIntroBeam/index.vue b/src/pages/deviceIntroBeam/index.vue
index 39a08c7..56a6aac 100644
--- a/src/pages/deviceIntroBeam/index.vue
+++ b/src/pages/deviceIntroBeam/index.vue
@@ -17,23 +17,25 @@
     </el-carousel>
 
     <div class="block share">
-      <h6 v-html="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 class="inner">
+        <h6 v-html="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>
-        <img class="pic"
-             :src="modules[2].form.pic"
-             alt="">
       </div>
     </div>
 
     <div class="intro">
-      <div class="intro-inner">
+      <div class="inner intro-inner">
         <img class="pic"
              :src="modules[3].form.pic"
              alt="">
@@ -146,8 +148,6 @@ $banner-height: 21.6rem;
 }
 .share {
     position: relative;
-    width: 80%;
-    padding-left: 14%;
     .beamBox {
         align-items: center;
     }
@@ -192,15 +192,13 @@ $banner-height: 21.6rem;
     }
 }
 .intro {
-    width: 80%;
     height: 19.65rem;
-    padding-left: 14%;
     margin-bottom: 67px;
-    background-color: #2e4984;
     .intro-inner {
         display: flex;
         align-items: center;
         height: 100%;
+        background-color: #2e4984;
     }
     .pic {
         width: 50%;
diff --git a/src/pages/deviceIntroLayout/index.vue b/src/pages/deviceIntroLayout/index.vue
index 6eb8626..468d3ae 100644
--- a/src/pages/deviceIntroLayout/index.vue
+++ b/src/pages/deviceIntroLayout/index.vue
@@ -32,7 +32,7 @@
       </div>
     </div>
 
-    <div class="intro">
+    <div class="inner intro">
       <img class="bg"
            src="http://10.10.11.7/images/device/7.png"
            alt="">
@@ -122,15 +122,7 @@ $banner-height: 21.6rem;
 }
 .share {
     position: relative;
-    .inner {
-        width: 100%;
-        max-width: 1323px;
-    }
     .texts {
-        position: absolute;
-        width: 85%;
-        right: 0;
-        top: 26rem;
         display: flex;
     }
     h6 {
@@ -148,18 +140,15 @@ $banner-height: 21.6rem;
         color: #e3e3e3;
     }
     .card {
-        position: absolute;
-        left: 0;
-        max-width: 1671px;
-        width: 85%;
-        padding: 1.6rem 2.9rem 1.6rem 14%;
-        font-size: 1.06rem;
+        padding: 1.5rem;
+        margin-bottom: 20px;
+        font-size: 1rem;
         font-family: PingFangSC-Medium, PingFang SC;
         border-radius: 0 6rem 0 0;
         font-weight: 500;
         color: #ffffff;
         line-height: 2.375rem;
-        background: url(http://10.10.11.7/images/device/5.png) 0 0 /100% 100% no-repeat;
+        background: url(http://10.10.11.7/images/device/5.png) center center no-repeat;
     }
     .des {
         flex-grow: 1;
@@ -178,15 +167,8 @@ $banner-height: 21.6rem;
 }
 .intro {
     position: relative;
-    height: 42.625rem;
-    margin-bottom: 2.3rem;
-    margin-top: 50rem;
-    width: 85%;
+    margin: 60px auto;
     .bg {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 65%;
         height: 35.73rem;
     }
     .pic {
diff --git a/src/pages/iasf/index.vue b/src/pages/iasf/index.vue
index 0ad0de3..bd8bd66 100644
--- a/src/pages/iasf/index.vue
+++ b/src/pages/iasf/index.vue
@@ -274,7 +274,51 @@
           </div>
         </div>
       </div>
+
+      <div class="block"
+           style="margin-top: 100px">
+        <div class="inner">
+          <ul class="entry">
+            <li :class="{'cursor-pointer': isLink(modules[14].form.link.linkName)}"
+                @click="openLink(modules[14].form)">
+              <img class="icon"
+                   :src="modules[14].form.pic"
+                   alt="">
+              <p class="text">{{ modules[14].form.title }}</p>
+            </li>
+            <li :class="{'cursor-pointer': isLink(modules[15].form.link.linkName)}"
+                @click="openLink(modules[15].form)">
+              <img class="icon"
+                   :src="modules[15].form.pic"
+                   alt="">
+              <p class="text">{{ modules[15].form.title }}</p>
+            </li>
+            <li :class="{'cursor-pointer': isLink(modules[16].form.link.linkName)}"
+                @click="openLink(modules[16].form)">
+              <img class="icon"
+                   :src="modules[16].form.pic"
+                   alt="">
+              <p class="text">{{ modules[16].form.title }}</p>
+            </li>
+            <li :class="{'cursor-pointer': isLink(modules[17].form.link.linkName)}"
+                @click="openLink(modules[17].form)">
+              <img class="icon"
+                   :src="modules[17].form.pic"
+                   alt="">
+              <p class="text">{{ modules[17].form.title }}</p>
+            </li>
+            <li :class="{'cursor-pointer': isLink(modules[18].form.link.linkName)}"
+                @click="openLink(modules[18].form)">
+              <img class="icon"
+                   :src="modules[18].form.pic"
+                   alt="">
+              <p class="text">{{ modules[18].form.title }}</p>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
+
     <ul class="tools">
       <template v-for="(item, i) in modules[19].list">
         <li v-if="item.isEnable"
@@ -550,11 +594,11 @@ $bannerMh: 800px;
     z-index: 2;
     position: relative;
     top: $bannerHeight;
-    padding: 6rem 0 229px;
+    padding: 6rem 0 30px;
     background-color: #fff;
     transition: all 0.7s cubic-bezier(0.5, 0, 0.2, 1) 0s;
     &.active {
-        top: 106px;
+        top: 0;
     }
 }
 .block {
@@ -1033,6 +1077,28 @@ $bannerMh: 800px;
         height: 558px;
     }
 }
+
+.entry {
+    position: relative;
+    display: flex;
+    justify-content: space-between;
+    li {
+        display: inline-flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        text-align: center;
+    }
+    img {
+        max-width: 100px;
+    }
+    .text {
+        margin-top: 15px;
+        font-size: 1rem;
+        font-family: PingFangSC-Medium, PingFang SC;
+        color: #48525e;
+    }
+}
 .tools {
     z-index: 10;
     position: fixed;
@@ -1094,29 +1160,4 @@ $bannerMh: 800px;
         margin-right: 10px;
     }
 }
-@media (max-width: 1440px) {
-    .carousel {
-        .texts {
-            top: 30%;
-            bottom: auto;
-        }
-    }
-}
-@media (max-width: 980px) {
-    .carousel {
-        height: 500px;
-        min-height: 0;
-        img {
-            height: 500px;
-            min-height: 0;
-        }
-        /deep/.el-carousel__container {
-            height: 500px;
-            min-height: 0;
-        }
-    }
-    .block-wrap {
-        top: 500px;
-    }
-}
 </style>
\ No newline at end of file
diff --git a/src/pages/org/index.vue b/src/pages/org/index.vue
index 91c5f23..93e1b80 100644
--- a/src/pages/org/index.vue
+++ b/src/pages/org/index.vue
@@ -75,7 +75,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    width: 1294px;
+    width: 1200px;
     padding: 9px 86px 29px 116px;
     margin: 0 auto 50px;
     background: #fcfcfc;
@@ -101,7 +101,7 @@ export default {
     }
 }
 .lg-bg {
-    width: 50%;
+    width: 1200px;
     margin: 0 auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/overview/index.vue b/src/pages/overview/index.vue
index 8a7e416..b775492 100644
--- a/src/pages/overview/index.vue
+++ b/src/pages/overview/index.vue
@@ -119,7 +119,7 @@
           v-html="modules[8].form.title"></h2>
       <p class="intro wow fadeInUp"
          data-wow-delay="0.5s">{{ modules[8].form.des }}</p>
-      <div class="scan-inner">
+      <div class="inner scan-inner">
         <div class="left">
           <template v-for="(item, i) in modules[9].list">
             <div v-if="item.isEnable"
@@ -345,8 +345,6 @@ export default {
 .scan {
     .scan-inner {
         display: flex;
-        justify-content: flex-end;
-        padding-left: 19%;
     }
     .left {
         width: 45%;
diff --git a/src/pages/overviewIntro/index.vue b/src/pages/overviewIntro/index.vue
index 931a461..366e32c 100644
--- a/src/pages/overviewIntro/index.vue
+++ b/src/pages/overviewIntro/index.vue
@@ -19,7 +19,7 @@
     </ul>
 
     <div class="tab-content">
-      <div class="intro">
+      <div class="inner intro">
         <img class="pic"
              :src="modules[1].form.pic"
              alt="">
@@ -95,11 +95,11 @@ export default {
         align-items: center;
         margin-bottom: 5.5rem;
         .pic {
-            width: 40%;
-            margin-right: 2.5rem;
+            width: 49%;
+            margin-right: 2%;
         }
         .right {
-            width: 40%;
+            width: 49%;
         }
         h6 {
             position: relative;
diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue
index 331e04a..971e9ac 100644
--- a/src/pages/overviewSetup/index.vue
+++ b/src/pages/overviewSetup/index.vue
@@ -75,7 +75,7 @@ export default {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    width: 1294px;
+    width: 1200px;
     padding: 9px 86px 29px 116px;
     margin: 0 auto 50px;
     background: #fcfcfc;
@@ -101,7 +101,7 @@ export default {
     }
 }
 .lg-bg {
-    width: 50%;
+    width: 1200px;
     margin: 0 auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/research/index.vue b/src/pages/research/index.vue
index 6deaebe..3c28c23 100644
--- a/src/pages/research/index.vue
+++ b/src/pages/research/index.vue
@@ -188,6 +188,7 @@ export default {
     .pic {
         width: 100%;
         height: 32.65rem;
+        object-fit: cover;
     }
     .icon {
         transition: 0.3s;
diff --git a/src/pages/scientific/index.vue b/src/pages/scientific/index.vue
index cbefb72..724d997 100644
--- a/src/pages/scientific/index.vue
+++ b/src/pages/scientific/index.vue
@@ -270,7 +270,6 @@ export default {
     height: 643px;
     text-align: center;
     background: url(../../assets/images/about-bg.png) no-repeat center center;
-    background-size: 100% 100%;
     .texts {
         padding: 2.375rem 3.75rem;
         color: #fff;
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index 6cfc756..c174486 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -40,6 +40,7 @@
     padding: 123px 0 0 243px;
     font-size: 2rem;
     color: #fff;
+    object-fit: cover;
 }
 .banner-item {
     position: relative;
@@ -48,6 +49,7 @@
     img {
         width: 100%;
         height: 100%;
+        object-fit: cover;
     }
     .banner-name {
         position: absolute;
@@ -67,6 +69,7 @@
     .banner-img {
         width: 100%;
         height: 24rem;
+        object-fit: cover;
     }
     .texts {
         position: absolute;