From 53a419fe966855e880e40ed4286ad0b670889490 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 19 Sep 2023 11:11:10 +0800
Subject: [PATCH] fix

---
 src/layouts/footer/index.vue     |  1 -
 src/pages/column/index.vue       |  9 +++++----
 src/pages/estate/index/index.vue |  4 ++--
 src/pages/iasf/index.vue         | 17 ++++++++---------
 src/pages/lightSources/index.vue |  4 ++--
 src/pages/org/index.vue          |  9 +++++----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 02bf7e9..282763e 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -161,7 +161,6 @@ export default {
         typeId: '',
         isSort: 1
       }).then(({ data }) => {
-
         this.columns = data.slice(0, 5)
       }).catch(err => { })
     },
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 0f3f1bb..0673451 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -410,7 +410,9 @@
             </div>
           </div>
         </div>
-        <div class="right">
+        <!-- 选择了“列表样式”，不用显示右侧部分 -->
+        <div v-if="info.listStyleId !== 73"
+             class="right">
           <p class="l-title">{{ $t('column.hot') }}</p>
           <ul class="list">
             <li v-for="(item, i) in hots"
@@ -467,7 +469,7 @@ export default {
       sameStyle: 1,
       allColumnId: [],
       showNav: false,
-      showNavIds: [10, 11, 12, 16, 55, 68], // 显示侧导航的模板id
+      showNavIds: [10, 11, 12, 16, 55, 68, 73], // 显示侧导航的模板id
       isFilter: false,
       page: 1,
       pageSize: 10,
@@ -774,9 +776,8 @@ export default {
           })
           this.articles = articles
           this.total = +data.total;
-          // 如果栏目那勾选了“只有一篇文章时，以详情方式展示”，并且只有一篇文章，则直接展示详情
           // this.total == 1 && this.info.showWithDetails && this.$router.push(`/article?articleId=${this.articles[0].id}&id=${this.articles[0].columnId}`)
-          if (this.total == 1) {
+          if (this.total) {
             this.$post(`${this.api.findArticle}?id=${articles[0].id}`).then(async ({ data }) => {
               this.article = data
               console.log("🚀 ~ file: index.vue:778 ~ .then ~ this.article:", this.article)
diff --git a/src/pages/estate/index/index.vue b/src/pages/estate/index/index.vue
index a83114e..71e5ee1 100644
--- a/src/pages/estate/index/index.vue
+++ b/src/pages/estate/index/index.vue
@@ -332,11 +332,11 @@ export default {
 @import url(../../../plugins/wow/animate.css);
 @import '../../../styles/page/page.scss';
 /deep/ .el-carousel {
-    height: 991px;
+    height: 100vh;
     .el-carousel__container,
     .el-carousel__item,
     img {
-        height: 100%;
+        height: 100vh;
     }
 }
 .title {
diff --git a/src/pages/iasf/index.vue b/src/pages/iasf/index.vue
index 1a3baaa..43c7108 100644
--- a/src/pages/iasf/index.vue
+++ b/src/pages/iasf/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="wrap">
     <el-carousel class="carousel"
-                 :style="{height}"
                  :interval="6000"
                  :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
                  :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
@@ -422,10 +421,10 @@ export default {
 .carousel {
     height: 100vh;
     img {
-        height: 100%;
+        height: 100vh;
     }
     /deep/.el-carousel__container {
-        height: 100%;
+        height: 100vh;
     }
     .texts {
         position: absolute;
@@ -466,8 +465,7 @@ export default {
     }
 }
 .inner {
-    width: 1444px;
-    // min-width: 70%;
+    width: 1200px;
 }
 .card {
     display: flex;
@@ -476,7 +474,7 @@ export default {
     li {
         position: relative;
         width: calc((100% - 64px) / 2);
-        height: 488px;
+        height: 402px;
         transition: 0.3s;
         overflow: hidden;
         &:hover {
@@ -517,7 +515,7 @@ export default {
         align-items: center;
         width: 100%;
         height: 100%;
-        padding: 0 128px;
+        padding: 0 60px;
         text-align: center;
         color: #fff;
         background-color: rgba(0, 0, 0, 0.3);
@@ -849,6 +847,7 @@ export default {
     }
     .text {
         font-size: 1rem;
+        text-align: justify;
         line-height: 1.6;
         color: #333;
     }
@@ -918,8 +917,8 @@ export default {
         position: absolute;
         top: -60px;
         right: 0;
-        width: 744px;
-        height: 657px;
+        width: 632px;
+        height: 558px;
     }
 }
 .tools {
diff --git a/src/pages/lightSources/index.vue b/src/pages/lightSources/index.vue
index eaa10d6..63fc657 100644
--- a/src/pages/lightSources/index.vue
+++ b/src/pages/lightSources/index.vue
@@ -42,7 +42,7 @@
                 <th>地点</th>
                 <th>能量（GeV）</th>
                 <th>储存环周长(m)</th>
-                <th>光束线/条</th>
+                <th>光束线</th>
                 <th>代际</th>
                 <th>发射度(nm.rad)</th>
                 <th>状态</th>
@@ -84,7 +84,7 @@
                 <th>波长范围/nm</th>
                 <th>重复频率/Hz</th>
                 <th>设施长度/m</th>
-                <th>实验站/个</th>
+                <th>实验站</th>
                 <th>状态</th>
                 <th>建成时间</th>
               </tr>
diff --git a/src/pages/org/index.vue b/src/pages/org/index.vue
index da7dfb4..17a1d25 100644
--- a/src/pages/org/index.vue
+++ b/src/pages/org/index.vue
@@ -20,9 +20,10 @@
            alt="">
     </div>
     <div class="lg-bg">
-      <img width="100%"
-           :src="modules[2].form.pic"
-           alt="">
+      <el-image style="width: 100%;"
+                :src="modules[2].form.pic"
+                :preview-src-list="[modules[2].form.pic]">
+      </el-image>
     </div>
   </div>
 </template>
@@ -100,7 +101,7 @@ export default {
     }
 }
 .lg-bg {
-    width: 65%;
+    width: 50%;
     margin: 0 auto;
 }
 @media (max-width: 1300px) {