From ca7ec9e12d8ecadc24a80dc687ff27b80b092680 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 26 Apr 2023 18:18:48 +0800
Subject: [PATCH] fix

---
 src/const/modules.js                         | 54 ++++++++++++++++++++
 src/pages/column/page/overviewDevHistory.vue | 49 ++++++++++--------
 src/pages/column/page/overviewIntro.vue      |  5 +-
 src/pages/column/page/sfel.vue               |  4 +-
 src/pages/column/page/userSharing.vue        |  6 +--
 5 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/src/const/modules.js b/src/const/modules.js
index c6e7e06..70112e3 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -4023,6 +4023,18 @@ export default {
     {
       type: 'form',
       forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题',
+          required: false
+        },
         {
           type: 'textarea',
           prop: 'des',
@@ -4030,6 +4042,8 @@ export default {
         }
       ],
       form: {
+        title: '用户共享',
+        subTitle: '高效运行、分类开放',
         des: `S³FEL是由深圳市政府投资建设的新一代自由电子激光大科学装置，将成为世界上顶级的先进光源大科学装置，是支撑深圳社会主义先行示范区和大湾区综合性国家科学中心建设的大型公共科技创新平台，对提升我国的科技影响力、集聚顶尖科技人才、推动科技创新具有非常重要的意义。 S³FEL以“高效运行、分类开放”为共享理念，向全世界科技界实行开放共享，促进信息、材料、能源、生物化学等多个基础科学领域的极速发展。`
       }
     },
@@ -5000,6 +5014,26 @@ export default {
         }
       }
     },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'textarea',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        title: '发展历程',
+        des: 'DEVELOPMENT HISTORY'
+      }
+    },
     {
       type: 'history',
       historyForm: {
@@ -5118,6 +5152,26 @@ export default {
         S³FEL汇聚并培养信息、生命、材料、能源等学科领域的国际水平科技领军人才，集聚世界前沿和原创性科学技术及产业研发，将推动一批高水平大学和科研机构的科技人才队伍建设及相关学科的高质量发展，营造粤港澳大湾区人才高地，并助力粤港澳大湾区国际科技创新中心的建设。此外， S³FEL作为重要的科普教育基地，是展示我国科技实力、提高全民族科学素质和民族自信的重要宣传窗口。S³FEL主体建筑将成为深圳市地标式建筑，促进提升深圳市的城市形象和国际化知名度。`
       }
     },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'editor',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        title: 'henzhen Superconducting Soft X-Ray Fre Electron Laser',
+        des: `探索认知微观世界和物质结构的”高速摄像机”`
+      }
+    },
   ],
   'estate/index': [
     {
diff --git a/src/pages/column/page/overviewDevHistory.vue b/src/pages/column/page/overviewDevHistory.vue
index c119422..ca716f7 100644
--- a/src/pages/column/page/overviewDevHistory.vue
+++ b/src/pages/column/page/overviewDevHistory.vue
@@ -28,32 +28,37 @@
       </ul>
 
       <div class="block history">
-        <div class="inner c-wrap">
-          <h2 class="wow fadeInLeft">发展历程</h2>
-          <p class="en">DEVELOPMENT HISTORY</p>
-
-          <div v-if="modules[1].list.length" class="event">
-            <ul class="time">
-              <template v-for="(item, i) in modules[1].list">
-                <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}">{{ item.title }}</li>
-              </template>
-            </ul>
-            <div class="right">
-              <h6 class="year">{{ modules[1].list[curYear].title }}</h6>
-              <ul class="list">
-                <template v-for="(e, j) in modules[1].list[curYear].list">
-                  <li v-if="e.isEnable" :key="j">
-                    <div class="texts">
-                      <p class="date">{{ e.title }}</p>
-                      <p class="text">{{ e.des }}</p>
-                    </div>
-                    <img v-if="e.pic" :src="e.pic" alt="" class="pic">
-                  </li>
+        <div class="inner">
+          <div class="c-wrap">
+            <h2 class="wow fadeInLeft">{{ modules[1].form.title }}</h2>
+            <p class="en">{{ modules[1].form.des }}</p>
+            <div class="cover" @click="toSet(1)">点击更换标题与描述</div>
+          </div>
+          
+          <div class="c-wrap">
+            <div v-if="modules[2].list.length" class="event">
+              <ul class="time">
+                <template v-for="(item, i) in modules[2].list">
+                  <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}">{{ item.title }}</li>
                 </template>
               </ul>
+              <div class="right">
+                <h6 class="year">{{ modules[2].list[curYear].title }}</h6>
+                <ul class="list">
+                  <template v-for="(e, j) in modules[2].list[curYear].list">
+                    <li v-if="e.isEnable" :key="j">
+                      <div class="texts">
+                        <p class="date">{{ e.title }}</p>
+                        <p class="text">{{ e.des }}</p>
+                      </div>
+                      <img v-if="e.pic" :src="e.pic" alt="" class="pic">
+                    </li>
+                  </template>
+                </ul>
+              </div>
             </div>
+            <div class="cover" style="min-height: 300px;" @click="toSet(2)">点击配置历程</div>
           </div>
-          <div class="cover" style="min-height: 300px;" @click="toSet(1)">点击配置历程</div>
         </div>
       </div>
     </div>
diff --git a/src/pages/column/page/overviewIntro.vue b/src/pages/column/page/overviewIntro.vue
index ddb8592..4fc2d95 100644
--- a/src/pages/column/page/overviewIntro.vue
+++ b/src/pages/column/page/overviewIntro.vue
@@ -42,9 +42,10 @@
         <div class="intro-bg">
           <div class="mask"></div>
           <div class="texts">
-            <h6>henzhen Superconducting Soft X-Ray Fre Electron Laser</h6>
-            <div class="des">探索认知微观世界和物质结构的”高速摄像机”</div>
+            <h6>{{ modules[2].form.title }}</h6>
+            <div class="des" v-html="modules[2].form.des"></div>
           </div>
+          <div class="cover" @click="toSet(2)">点击更换标题与描述</div>
         </div>
       </div>
     </div>
diff --git a/src/pages/column/page/sfel.vue b/src/pages/column/page/sfel.vue
index 6608612..a31a940 100644
--- a/src/pages/column/page/sfel.vue
+++ b/src/pages/column/page/sfel.vue
@@ -33,7 +33,7 @@
             <div class="cover" @click="toSet(1)">点击更换标题与小标题</div>
           </div>
           <div class="c-wrap">
-            <div class="banner">
+            <div class="sfel-banner">
               <img width="100%" height="480" src="http://10.10.11.7/images/about/5.png" alt="">
               <div class="right">
                 <h6>IASF is driven to serve the Science and industry, and solve grand challenges through research and innovation. We are open and creative</h6>
@@ -427,7 +427,7 @@ export default {
 .banner-block {
   background: url(../../../assets/images/sfel/2.png) 0 0/cover no-repeat;
 }
-.banner {
+.sfel-banner {
   display: flex;
   cursor: pointer;
   .pic {
diff --git a/src/pages/column/page/userSharing.vue b/src/pages/column/page/userSharing.vue
index 025f083..cdde56c 100644
--- a/src/pages/column/page/userSharing.vue
+++ b/src/pages/column/page/userSharing.vue
@@ -25,14 +25,14 @@
       <div class="block share">
         <div class="inner c-wrap">
           <div class="left">
-            <h6>用户共享</h6>
+            <h6>{{ modules[1].form.title }}</h6>
             <p class="en">USERS SHARE</p>
-            <div class="des">{{ modules[1].form.des }}</div>
+            <div class="des" v-html="modules[1].form.des"></div>
           </div>
           <div class="cover" @click="toSet(1)">点击更换描述</div>
           <img class="pic" src="@/assets/images/userSharing/1.png" alt="">
           <div class="card">
-            <p class="title">高效运行、分类开放</p>
+            <p class="title">{{ modules[1].form.subTitle }}</p>
             <p class="en-text">EFFICIENT OPERATION, CLASSIFICATION OPEN</p>
           </div>
         </div>