From 05d1168a85eb4bd510b4468bf73abcc5f209a733 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 2 Aug 2023 10:41:27 +0800
Subject: [PATCH] fix

---
 src/components/editor.js       |   2 +-
 src/const/modules.js           | 137 ++++++++++++++++++----
 src/mixins/page/index.js       |   3 +-
 src/pages/column/page/iasf.vue | 202 +++++++++++++++++----------------
 4 files changed, 225 insertions(+), 119 deletions(-)

diff --git a/src/components/editor.js b/src/components/editor.js
index 8021948..1ae1b7a 100644
--- a/src/components/editor.js
+++ b/src/components/editor.js
@@ -183,7 +183,7 @@ export default {
     './styles/css/editor.css',
   ],
   // content_style: Style,
-  fontsize_formats: '12px 14px 16px 19px 24px 36px 48px 56px 72px',
+  fontsize_formats: '12px 14px 16px 18px 19px 22px 24px 36px 48px 56px 72px',
   font_formats: '苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats;知乎配置=BlinkMacSystemFont, Helvetica Neue, PingFang SC, Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, sans-serif;小米配置=Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif',
   link_list: [
       { title: '预置链接1', value: 'http://www.tinymce.com' },
diff --git a/src/const/modules.js b/src/const/modules.js
index e1850a0..c477a93 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -9166,8 +9166,8 @@ export default {
     },
   ],
   iasf: [
-    {
-      type: 'form',
+		{
+      type: 'introduce',
       forms: [
         {
           type: 'upload',
@@ -9181,22 +9181,20 @@ export default {
           label: '标题',
           required: true
         },
-        {
-          type: 'input',
-          prop: 'des',
-          label: '描述',
-          required: true
-        },
         {
           type: 'link',
           prop: 'link',
           label: '链接'
         },
+        {
+          type: 'textarea',
+          prop: 'des',
+          label: '描述'
+        }
       ],
       form: {
-        pic: 'http://10.10.11.7/images/home/1.png',
-        title: '粤港澳深化合作典范',
-        des: 'IASF的建设邀请大湾区所有创新要素共同参与，以科技合作点亮东方之珠璀璨明天。',
+        pic: '',
+        title: '',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -9207,7 +9205,99 @@ export default {
           otherColumnId: [],
           otherArticleId: '',
           isOpen: 1
+        },
+        des: ''
+      },
+      list: [
+        {
+          pic: 'http://10.10.11.7/images/iasf/banner1.png',
+					title: '粤港澳科技与产业合作典范',
+					des: '——为大湾区打造具有全球影响力的产业科技创新中心贡献关键支撑',
+					link: {
+						linkName: '无',
+						connectionType: 1,
+						columnId: [],
+						articleId: '',
+						linkAddress	: '',
+						site: '',
+						otherColumnId: [],
+						otherArticleId: '',
+						isOpen: 1
+					},
+          isEnable: 1
+        },
+        {
+          pic: 'http://10.10.11.7/images/iasf/banner2.png',
+					title: '聚焦高质量发展首要任务',
+					des: '——抓住新一轮科技革命和产业变革机遇，以大科学装置释放的创新动能驱动引领高质量发展',
+					link: {
+						linkName: '无',
+						connectionType: 1,
+						columnId: [],
+						articleId: '',
+						linkAddress	: '',
+						site: '',
+						otherColumnId: [],
+						otherArticleId: '',
+						isOpen: 1
+					},
+          isEnable: 1
+        },
+        {
+          pic: 'http://10.10.11.7/images/iasf/banner3.png',
+					title: '开放合作共同应对时代挑战',
+					des: '——坚持开放合作的设施建设理念，携手推动科学技术更好造福人类。',
+					link: {
+						linkName: '无',
+						connectionType: 1,
+						columnId: [],
+						articleId: '',
+						linkAddress	: '',
+						site: '',
+						otherColumnId: [],
+						otherArticleId: '',
+						isOpen: 1
+					},
+          isEnable: 1
+        },
+        {
+          pic: 'http://10.10.11.7/images/iasf/banner4.png',
+					title: '敢闯敢试、敢为人先、埋头苦干',
+					des: '——秉承“特区精神”勇攀高峰、勇立潮头，无愧深圳“先行示范”的历史使命',
+					link: {
+						linkName: '无',
+						connectionType: 1,
+						columnId: [],
+						articleId: '',
+						linkAddress	: '',
+						site: '',
+						otherColumnId: [],
+						otherArticleId: '',
+						isOpen: 1
+					},
+          isEnable: 1
+        },
+      ]
+    },
+
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'des',
+          label: '描述'
         }
+      ],
+      form: {
+        title: '综合粒子设施',
+        des: '将微观粒子作为认知微观世界的利器',
       }
     },
     {
@@ -9238,7 +9328,7 @@ export default {
       ],
       form: {
         pic: 'http://10.10.11.7/images/home/2.png',
-        title: 'Shenzhen Innovation Lightsource Facility',
+        title: '深圳产业光源',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -9250,7 +9340,7 @@ export default {
           otherArticleId: '',
           isOpen: 1
         },
-        des: 'The Shenzhen synchrotron radiation facility has a fourth-generation diffraction-limited storage ring with an electron energy of 3 GeV at a low emittance of 50-150 pm·rad, and it provides photons with broad range energy from 4 meV to 160 keV.'
+        des: '首台聚焦高新技术产业发展需要的第四代中能同步辐射光源'
       }
     },
     {
@@ -9281,7 +9371,7 @@ export default {
       ],
       form: {
         pic: 'http://10.10.11.7/images/home/3.png',
-        title: 'Shenzhen Soft X-ray Superconducting Free-electron Laser Facility ',
+        title: '深圳自由电子激光',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -9293,7 +9383,7 @@ export default {
           otherArticleId: '',
           isOpen: 1
         },
-        des: 'Shenzhen XFEL consists of a 2.5 GeV CW superconducting linear accelerator and four initial undulator lines, aiming at generating X-Rays between 40 eV and 1 keV at rates up to 1MHz.'
+        des: '世界最亮的软X射线光源装置'
       }
     },
     {
@@ -9305,9 +9395,15 @@ export default {
           label: '标题',
           required: true
         },
+        {
+          type: 'input',
+          prop: 'des',
+          label: '描述'
+        }
       ],
       form: {
         title: '新闻动态',
+        des: '支撑大湾区综合性国家科学中心建设的公益性科研事业单位',
       }
     },
     {
@@ -9421,11 +9517,11 @@ export default {
         {
           type: 'input',
           prop: 'subTitle',
-          label: '标题',
-          required: true
+          label: '小标题',
+          required: false
         },
         {
-          type: 'input',
+          type: 'editor',
           prop: 'des',
           label: '描述',
           required: true
@@ -9439,8 +9535,9 @@ export default {
       form: {
         pic: 'http://10.10.11.7/images/estate/9.png',
         title: '大湾区科技之光由你点亮！',
-        subTitle: 'The light of science and technology in the Greater Bay Area is lit by you!',
-        des: '以宏伟事业吸引人才、以发展空间留住人才，以优厚待遇保障人才。',
+        subTitle: '',
+        des: `<p>大科学装置建设在即，部分专业岗位面向优秀人才长期开放。在IASF，我们不仅提供一片</p>
+				<p>大展才能的宏伟热土，更能提供广阔的事业发展空间和具有国际竞争力的和待遇保障。</p>`,
         link: {
           linkName: '无',
           connectionType: 1,
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index 3010332..3d4c7da 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -73,7 +73,8 @@ export default {
           const list = JSON.parse(str)
 
           list.map((e, i) => {
-						if (this.modules[i].forms) e.forms = this.modules[i].forms
+						if (this.modules[i].forms) e.forms = this.modules[i].forms // forms即数据结构，直接用本地配置文件里的，方便随时更改结构
+						if (this.modules[i].forms && this.modules[i].forms.length !== e.forms.length) e = this.modules[i]
             if (this.withOriginForm.includes(e.type) && !e.originForm) {
               e.originForm = modules[i].originForm
             }
diff --git a/src/pages/column/page/iasf.vue b/src/pages/column/page/iasf.vue
index 1ebe700..48336f2 100644
--- a/src/pages/column/page/iasf.vue
+++ b/src/pages/column/page/iasf.vue
@@ -15,48 +15,57 @@
 
     <div class="modules">
       <div class="relative">
-        <div class="iasf-banner">
-          <img :src="modules[0].form.pic"
-               alt="" />
-          <div class="texts">
-            <h6>{{ modules[0].form.title }}</h6>
-            <p class="text">{{ modules[0].form.des }}</p>
-          </div>
-        </div>
+        <el-carousel height="500px"
+                     :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+          <template v-for="(item, i) in modules[0].list">
+            <el-carousel-item v-if="item.pic && item.isEnable"
+                              :key="i">
+              <img width="100%"
+                   height="100%"
+                   :src="item.pic"
+                   alt="">
+            </el-carousel-item>
+          </template>
+        </el-carousel>
         <div class="cover"
              @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block">
         <div class="inner">
+          <div class="c-wrap">
+            <h2 class="b-title news-title">{{ modules[1].form.title }}</h2>
+            <p class="intro wow fadeInUp"
+               data-wow-delay="0.5s">{{ modules[1].form.des }}</p>
+            <div class="cover"
+                 @click="toSet(1)">点击更换标题与描述</div>
+          </div>
           <ul class="card">
             <li class="wow fadeInDown"
                 data-wow-delay="0.2s">
               <img class="pic"
-                   :src="modules[1].form.pic"
+                   :src="modules[2].form.pic"
                    alt="">
               <div class="texts">
-                <h6>{{ modules[1].form.title }}</h6>
-                <p class="des">{{ modules[1].form.des }}</p>
-                <img src="@/assets/images/arrow.png"
-                     alt="">
+                <div class="name">SILF</div>
+                <h6>{{ modules[2].form.title }}</h6>
+                <p class="des">{{ modules[2].form.des }}</p>
               </div>
               <div class="cover"
-                   @click="toSet(1)">点击更换图片、标题、概述与链接</div>
+                   @click="toSet(2)">点击更换图片、标题、概述与链接</div>
             </li>
             <li class="wow fadeInDown"
                 data-wow-delay="0.6s">
               <img class="pic"
-                   :src="modules[2].form.pic"
+                   :src="modules[3].form.pic"
                    alt="">
               <div class="texts">
-                <h6>{{ modules[2].form.title }}</h6>
-                <p class="des">{{ modules[2].form.des }}</p>
-                <img src="@/assets/images/arrow.png"
-                     alt="">
+                <div class="name">S³FEL</div>
+                <h6>{{ modules[3].form.title }}</h6>
+                <p class="des">{{ modules[3].form.des }}</p>
               </div>
               <div class="cover"
-                   @click="toSet(2)">点击更换图片、标题、概述与链接</div>
+                   @click="toSet(3)">点击更换图片、标题、概述与链接</div>
             </li>
           </ul>
         </div>
@@ -65,9 +74,11 @@
       <div class="block">
         <div class="inner">
           <div class="c-wrap">
-            <h2 class="b-title news-title">{{ modules[3].form.title }}</h2>
+            <h2 class="b-title news-title">{{ modules[4].form.title }}</h2>
+            <p class="intro wow fadeInUp"
+               data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
             <div class="cover"
-                 @click="toSet(3)">点击更换标题与描述</div>
+                 @click="toSet(4)">点击更换标题与描述</div>
           </div>
           <div class="c-wrap">
             <div class="news-banner">
@@ -122,7 +133,7 @@
               </li>
             </ul>
             <div class="cover"
-                 @click="toSet(4)">关联栏目</div>
+                 @click="toSet(5)">关联栏目</div>
           </div>
 
           <ul class="news-carousel">
@@ -137,7 +148,7 @@
                 <p class="date">2022-07-24</p>
               </div>
               <div class="cover"
-                   @click="toSet(5)">关联栏目</div>
+                   @click="toSet(6)">关联栏目</div>
             </li>
             <li>
               <img class="pic"
@@ -150,7 +161,7 @@
                 <p class="date">2022-07-24</p>
               </div>
               <div class="cover"
-                   @click="toSet(6)">关联栏目</div>
+                   @click="toSet(7)">关联栏目</div>
             </li>
             <li>
               <img class="pic"
@@ -163,7 +174,7 @@
                 <p class="date">2022-07-24</p>
               </div>
               <div class="cover"
-                   @click="toSet(7)">关联栏目</div>
+                   @click="toSet(8)">关联栏目</div>
             </li>
           </ul>
         </div>
@@ -172,11 +183,11 @@
       <div class="block">
         <div class="inner">
           <div class="c-wrap">
-            <h2 class="b-title wow fadeInUp">{{ modules[8].form.title }}</h2>
+            <h2 class="b-title wow fadeInUp">{{ modules[9].form.title }}</h2>
             <p class="intro wow fadeInUp"
-               data-wow-delay="0.5s">{{ modules[8].form.des }}</p>
+               data-wow-delay="0.5s">{{ modules[9].form.des }}</p>
             <div class="cover"
-                 @click="toSet(8)">点击更换标题与描述</div>
+                 @click="toSet(9)">点击更换标题与描述</div>
           </div>
           <ul class="people">
             <li class="wow fadeInDown">
@@ -213,7 +224,7 @@
               </div>
             </li>
             <div class="cover"
-                 @click="toSet(9)">关联栏目</div>
+                 @click="toSet(10)">关联栏目</div>
           </ul>
         </div>
       </div>
@@ -221,25 +232,25 @@
       <div class="block">
         <div class="inner">
           <div class="c-wrap">
-            <h2 class="b-title wow fadeInUp">{{ modules[10].form.title }}</h2>
+            <h2 class="b-title wow fadeInUp">{{ modules[11].form.title }}</h2>
             <p class="intro wow fadeInUp"
-               data-wow-delay="0.5s">{{ modules[10].form.des }}</p>
+               data-wow-delay="0.5s">{{ modules[11].form.des }}</p>
             <div class="cover"
-                 @click="toSet(10)">点击更换标题与描述</div>
+                 @click="toSet(11)">点击更换标题与描述</div>
           </div>
           <div class="talent">
             <div class="left wow fadeInLeft"
                  data-wow-delay="0.5s">
-              <h6>{{ modules[11].form.title }}</h6>
-              <p class="meta">{{ modules[11].form.subTitle }}</p>
+              <h6>{{ modules[12].form.title }}</h6>
+              <p class="meta">{{ modules[12].form.subTitle }}</p>
               <div class="text"
-                   v-html="modules[11].form.des"></div>
+                   v-html="modules[12].form.des"></div>
             </div>
             <img :src="modules[11].form.pic"
                  alt=""
                  class="pic">
             <div class="cover"
-                 @click="toSet(11)">点击更换标题、描述、链接与图片</div>
+                 @click="toSet(12)">点击更换标题、描述、链接与图片</div>
           </div>
         </div>
       </div>
@@ -247,17 +258,17 @@
       <div class="about">
         <div class="inner c-wrap">
           <div class="left">
-            <h6>{{ modules[12].form.title }}</h6>
+            <h6>{{ modules[13].form.title }}</h6>
             <div class="text"
-                 v-html="modules[12].form.des"></div>
+                 v-html="modules[13].form.des"></div>
             <img src="@/assets/images/arrow-white.png"
                  alt="">
           </div>
           <img class="pic"
-               :src="modules[12].form.pic"
+               :src="modules[13].form.pic"
                alt="">
           <div class="cover"
-               @click="toSet(12)">点击更换标题、描述、链接与图片</div>
+               @click="toSet(13)">点击更换标题、描述、链接与图片</div>
         </div>
       </div>
 
@@ -265,21 +276,13 @@
            style="margin-top: 100px">
         <div class="inner">
           <ul class="entry">
-            <li>
-              <img class="icon"
-                   :src="modules[13].form.pic"
-                   alt="">
-              <p class="text">{{ modules[13].form.title }}</p>
-              <div class="cover"
-                   @click="toSet(13)">点击更换图标、标题与链接</div>
-            </li>
             <li>
               <img class="icon"
                    :src="modules[14].form.pic"
                    alt="">
               <p class="text">{{ modules[14].form.title }}</p>
               <div class="cover"
-                   @click="toSet(14)">点击更换图标、标题与链接</div>
+                   @click="toSet(14)">点击更换</div>
             </li>
             <li>
               <img class="icon"
@@ -287,7 +290,7 @@
                    alt="">
               <p class="text">{{ modules[15].form.title }}</p>
               <div class="cover"
-                   @click="toSet(15)">点击更换图标、标题与链接</div>
+                   @click="toSet(15)">点击更换</div>
             </li>
             <li>
               <img class="icon"
@@ -295,7 +298,7 @@
                    alt="">
               <p class="text">{{ modules[16].form.title }}</p>
               <div class="cover"
-                   @click="toSet(16)">点击更换图标、标题与链接</div>
+                   @click="toSet(16)">点击更换</div>
             </li>
             <li>
               <img class="icon"
@@ -303,7 +306,15 @@
                    alt="">
               <p class="text">{{ modules[17].form.title }}</p>
               <div class="cover"
-                   @click="toSet(17)">点击更换图标、标题与链接</div>
+                   @click="toSet(17)">点击更换</div>
+            </li>
+            <li>
+              <img class="icon"
+                   :src="modules[18].form.pic"
+                   alt="">
+              <p class="text">{{ modules[18].form.title }}</p>
+              <div class="cover"
+                   @click="toSet(18)">点击更换</div>
             </li>
           </ul>
         </div>
@@ -316,7 +327,7 @@
             @moduleSubmit="moduleSubmit" />
 
     <ul class="tools">
-      <li v-for="(item, i) in modules[18].list"
+      <li v-for="(item, i) in modules[19].list"
           :key="i">
         <img :src="'http://10.10.11.7/images/iasf/icon' + (i < 4 ? i + 1 : 1) + '.png'"
              alt=""
@@ -324,7 +335,7 @@
         {{ item.title }}
       </li>
       <div class="cover"
-           @click="toSet(18)">点击更换导航</div>
+           @click="toSet(19)">点击更换导航</div>
     </ul>
   </div>
 </template>
@@ -409,9 +420,16 @@ export default {
     li {
         position: relative;
         width: 47%;
+        height: 366px;
         transition: 0.3s;
+        overflow: hidden;
         &:hover {
-            margin-top: -0.9375rem;
+            .project {
+                top: -100%;
+            }
+            .texts {
+                top: 0;
+            }
         }
     }
     .pic {
@@ -419,25 +437,33 @@ export default {
         height: auto;
     }
     .texts {
-        padding-left: 1.375rem;
-        margin-top: 3rem;
-        border-left: 2px solid #dfe4e9;
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+        width: 100%;
+        height: 100%;
+        padding: 0 1rem;
+        color: #fff;
+        background-color: rgba(0, 0, 0, 0.3);
+        transition: 0.3s;
+    }
+    .name {
+        font-size: 2rem;
+        font-family: PingFangSC-Medium, PingFang SC;
     }
     h6 {
-        min-height: 4.5rem;
-        margin-bottom: 1.56rem;
+        margin: 1rem 0;
         line-height: 2rem;
-        font-size: 1.368rem;
-        color: #333;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        text-overflow: ellipsis;
-        overflow: hidden;
+        font-size: 1.6rem;
+        font-family: PingFangSC-Medium, PingFang SC;
+        @include mul-ellipsis(2);
     }
     .des {
-        font-size: 1.024rem;
-        color: #222;
+        font-size: 1.2rem;
         line-height: 30px;
     }
 }
@@ -609,7 +635,7 @@ export default {
     position: relative;
     display: flex;
     color: #fff;
-    background: #1a2844;
+    background: #111c43;
     border-radius: 0px 100px 0px 100px;
     .left {
         width: 50%;
@@ -663,38 +689,20 @@ export default {
 }
 .entry {
     display: flex;
-    flex-wrap: wrap;
+    justify-content: space-between;
+    padding: 50px 10%;
+    background-color: #091733;
+    margin-bottom: 100px;
     li {
         position: relative;
         display: inline-flex;
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        height: 220px;
-        margin: 0 20px 20px 0;
         text-align: center;
-        &:first-child {
-            width: calc((100% - 20px) / 2);
-            background-color: rgba(201, 102, 2, 0.83);
-        }
-        &:nth-child(2) {
-            width: calc((100% - 20px) / 2);
-            margin-right: 0;
-            background: #4fbc72;
-        }
-        &:nth-child(3) {
-            width: calc((100% - 40px) / 3);
-            background-color: rgba(237, 196, 95, 0.93);
-        }
-        &:nth-child(4) {
-            width: calc((100% - 40px) / 3);
-            background-color: rgba(8, 156, 218, 0.73);
-        }
-        &:nth-child(5) {
-            width: calc((100% - 40px) / 3);
-            margin-right: 0;
-            background: #2172e3;
-        }
+    }
+    img {
+        max-width: 100px;
     }
     .text {
         margin-top: 15px;
@@ -733,7 +741,7 @@ export default {
         font-size: 1rem;
         color: #0084ff;
         line-height: 56px;
-        background-color: rgba(255, 255, 255, 0.94);
+        background-color: rgba(19, 18, 19, 0.94);
         cursor: pointer;
         &.active {
             width: 192px;