From fffb3a824ce79fb9a1f7a75a943cb2a9c0e63dc8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 16 May 2023 14:10:41 +0800
Subject: [PATCH] fix

---
 src/const/modules.js                          |  24 +-
 src/pages/column/page/deviceIntroBeam.vue     | 224 ++++++++++--------
 src/pages/column/page/deviceIntroLinear.vue   |   2 +-
 src/pages/column/page/estate/survey/index.vue |   2 +-
 src/pages/column/page/exp.vue                 |   6 +-
 src/plugins/requests/index.js                 |   2 +-
 6 files changed, 155 insertions(+), 105 deletions(-)

diff --git a/src/const/modules.js b/src/const/modules.js
index a2ab283..36509e0 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -4218,6 +4218,17 @@ export default {
     {
       type: 'form',
       forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题'
+        },
         {
           type: 'media',
           prop: 'pic',
@@ -4225,12 +4236,14 @@ export default {
           required: true
         },
         {
-          type: 'textarea',
+          type: 'editor',
           prop: 'des',
           label: '描述'
         }
       ],
       form: {
+        title: '实验线站',
+        subTitle: 'EXPERIMENT STATIONS',
         pic: 'http://10.10.11.7/images/exp/2.png',
         des: `       科学实验站是S³FEL面向国家重大需求、聚焦科学前沿和引领地区产业发展的关键，旨在重点探究量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的关键技术和科学难题。S³FEL的供光具有超高时间分辨（40飞秒）、超高重复频率（最高百万赫兹）和超高亮度（电子束能量达2.5 Gev）的特点。
 
@@ -4959,7 +4972,7 @@ export default {
           required: true
         },
         {
-          type: 'textarea',
+          type: 'editor',
           prop: 'des',
           label: '描述'
         }
@@ -5260,6 +5273,12 @@ export default {
     {
       type: 'form',
       forms: [
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
         {
           type: 'editor',
           prop: 'des',
@@ -5267,6 +5286,7 @@ export default {
         },
       ],
       form: {
+        pic: 'http://10.10.11.7/images/device/2.png',
         des: `波荡器是S³FEL光束线的关键部件，由一系列N极和S极交替排列的磁铁阵列构成，是一种能够产生空间周期性分布磁场的电磁装置。被超导直线加速器加速的高能电子束经过波荡器时，将扭摆状波荡前行。通过合理选择电子束和波荡器的参数，可使电子束在每个波动周期内与波荡器发出的同步辐射相互干涉，以获得超高亮度、强相干、高重频的X射线自由电子激光。`,
       }
     },
diff --git a/src/pages/column/page/deviceIntroBeam.vue b/src/pages/column/page/deviceIntroBeam.vue
index e26778b..0cd1513 100644
--- a/src/pages/column/page/deviceIntroBeam.vue
+++ b/src/pages/column/page/deviceIntroBeam.vue
@@ -3,59 +3,85 @@
     <div class="actions">
       <p class="page-name">页面设置/装置介绍</p>
       <div>
-        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button type="primary"
+                   @click="preview">预览</el-button>
         <el-button @click="save(0)">保存为草稿</el-button>
-        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button type="primary"
+                   @click="save(1)">发布</el-button>
         <el-button @click="back">放弃编辑</el-button>
       </div>
     </div>
 
     <div class="modules">
       <div class="relative">
-        <el-carousel height="480px" :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+        <el-carousel height="480px"
+                     :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 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 class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block share">
         <div class="inner">
           <div class="c-wrap">
             <h6>{{ modules[1].form.title }}</h6>
-            <p class="en" v-html="modules[1].form.des"></p>
-            <div class="cover" @click="toSet(1)">点击更改标题与描述</div>
+            <p class="en"
+               v-html="modules[1].form.des"></p>
+            <div class="cover"
+                 @click="toSet(1)">点击更改标题与描述</div>
           </div>
           <div class="c-wrap">
             <div class="sum">{{ modules[2].form.title }}</div>
             <div class="flex">
               <div class="left">
-                <div class="des" v-html="modules[2].form.des"></div>
+                <div class="des"
+                     v-html="modules[2].form.des"></div>
               </div>
-              <img class="pic" :src="modules[2].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[2].form.pic"
+                   alt="">
             </div>
-            <div class="cover" @click="toSet(2)">点击更改标题、描述与图片</div>
+            <div class="cover"
+                 @click="toSet(2)">点击更改标题、描述与图片</div>
           </div>
         </div>
       </div>
 
       <div class="intro">
-        <img class="pic" src="http://10.10.11.7/images/device/2.png" alt="">
-        <div class="des" v-html="modules[3].form.des"></div>
-        <div class="cover" @click="toSet(3)">点击更改描述</div>
+        <div class="intro-inner c-wrap">
+          <img class="pic"
+               :src="modules[3].form.pic"
+               alt="">
+          <div class="des"
+               v-html="modules[3].form.des"></div>
+          <div class="cover"
+               @click="toSet(3)">点击更改描述</div>
+        </div>
       </div>
 
       <div class="unit">
         <h6>{{ modules[4].form.title }}</h6>
-        <img class="pic" :src="modules[4].form.pic" alt="">
-        <div class="cover" @click="toSet(4)">点击更改标题与图片</div>
+        <img class="pic"
+             :src="modules[4].form.pic"
+             alt="">
+        <div class="cover"
+             @click="toSet(4)">点击更改标题与图片</div>
       </div>
     </div>
 
-    <Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
+    <Module ref="module"
+            :data.sync="curData"
+            :visible.sync="diaVisible"
+            @moduleSubmit="moduleSubmit" />
   </div>
 </template>
 
@@ -64,12 +90,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.deviceIntroBeam
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -89,98 +115,102 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .wrap {
-  background: url(http://10.10.11.7/images/device/4.png) (100% 1363px)/auto no-repeat;
+    background: url(http://10.10.11.7/images/device/4.png) (100% 1363px) / auto no-repeat;
 }
 .banner {
-  background: url(http://10.10.11.7/images/device/13.png) 0 0/100% 100% no-repeat;
+    background: url(http://10.10.11.7/images/device/13.png) 0 0/100% 100% no-repeat;
 }
 .share {
-  position: relative;
-  .inner {
-    width: 1323px;
-  }
-  .left {
-    width: 547px;
-    margin-right: 66px;
-  }
-  h6 {
     position: relative;
-    font-size: 48px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #333333;
-  }
-  .en {
-    margin-top: -35px;
-    font-size: 48px;
-    font-family: PingFangSC-Light, PingFang SC;
-    font-weight: 300;
-    color: #E3E3E3;
-  }
-  .sum {
-    margin-top: 60px;
-    font-size: 28px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #333333;
-    line-height: 44px;
-  }
-  .des {
-    margin-top: 25px;
-    font-size: 18px;
-    color: #333;
-    line-height: 37px;
-    overflow: visible;
-  }
-  .pic {
-    width: 710px;
-    height: 509px;
-    margin-top: -30px;
-    border-top-left-radius: 20px;
-  }
+    .inner {
+        width: 1323px;
+    }
+    .left {
+        width: 547px;
+        margin-right: 66px;
+    }
+    h6 {
+        position: relative;
+        font-size: 48px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333333;
+    }
+    .en {
+        margin-top: -35px;
+        font-size: 48px;
+        font-family: PingFangSC-Light, PingFang SC;
+        font-weight: 300;
+        color: #e3e3e3;
+    }
+    .sum {
+        margin-top: 60px;
+        font-size: 28px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333333;
+        line-height: 44px;
+    }
+    .des {
+        margin-top: 25px;
+        font-size: 18px;
+        color: #333;
+        line-height: 37px;
+        overflow: visible;
+    }
+    .pic {
+        width: 710px;
+        height: 509px;
+        margin-top: -30px;
+        border-top-left-radius: 20px;
+    }
 }
 .intro {
-  position: relative;
-  display: flex;
-  align-items: center;
-  max-width: 1490px;
-  width: 90%;
-  height: 393px;
-  margin-bottom: 67px;
-  .pic {
-    width: 60%;
-    height: 100%;
-  }
-  .des {
-    height: 100%;
-    padding: 57px 60px 20px 60px;
-    font-size: 22px;
-    color: #fff;
-    line-height: 40px;
-    background: #2E4984;
-  }
+    width: 80%;
+    height: 19.65rem;
+    padding-left: 14%;
+    margin-bottom: 67px;
+    background-color: #2e4984;
+    .intro-inner {
+        display: flex;
+        align-items: center;
+        height: 100%;
+    }
+    .pic {
+        width: 50%;
+        height: 100%;
+    }
+    .des {
+        width: 50%;
+        height: 19.65rem;
+        padding: 2.85rem 3rem 1rem 3rem;
+        font-size: 0.96rem;
+        color: #fff;
+        line-height: 2rem;
+        -webkit-line-clamp: 7;
+    }
 }
 .unit {
-  position: relative;
-  width: 986px;
-  padding-bottom: 60px;
-  margin: 0 auto;
-  h6 {
-    padding-left: 15px;
-    margin-bottom: 15px;
-    font-size: 20px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #2A2A2A;
-    border-left: 4px solid #1583FF;
-  }
+    position: relative;
+    width: 986px;
+    padding-bottom: 60px;
+    margin: 0 auto;
+    h6 {
+        padding-left: 15px;
+        margin-bottom: 15px;
+        font-size: 20px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #2a2a2a;
+        border-left: 4px solid #1583ff;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/deviceIntroLinear.vue b/src/pages/column/page/deviceIntroLinear.vue
index 0d1ff18..981456a 100644
--- a/src/pages/column/page/deviceIntroLinear.vue
+++ b/src/pages/column/page/deviceIntroLinear.vue
@@ -33,7 +33,7 @@
             <div class="left c-wrap">
               <h6>{{ modules[2].form.title }}</h6>
               <div class="line"></div>
-              <div class="des">{{ modules[2].form.des }}</div>
+              <div class="des" v-html="modules[2].form.des"></div>
               <div class="cover" @click="toSet(2)">点击更改标题与概述</div>
             </div>
             <img class="bg" src="http://10.10.11.7/images/device/10.png" alt="">
diff --git a/src/pages/column/page/estate/survey/index.vue b/src/pages/column/page/estate/survey/index.vue
index 94fc8d1..28e647a 100644
--- a/src/pages/column/page/estate/survey/index.vue
+++ b/src/pages/column/page/estate/survey/index.vue
@@ -113,7 +113,7 @@ export default {
 .survey {
   width: 1294px;
   min-height: 500px;
-  padding: 80px 86px 29px 37%;
+  padding: 80px 86px 29px 597px;
   margin: 0 auto 200px;
   background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat;
   border-radius: 160px;
diff --git a/src/pages/column/page/exp.vue b/src/pages/column/page/exp.vue
index eeee882..032c09e 100644
--- a/src/pages/column/page/exp.vue
+++ b/src/pages/column/page/exp.vue
@@ -24,8 +24,8 @@
 
       <div class="block station">
         <div class="inner c-wrap">
-          <h6>实验线站</h6>
-          <p class="en">EXPERIMENT STATIONS</p>
+          <h6>{{ modules[1].form.title }}</h6>
+          <p class="en">{{ modules[1].form.subTitle }}</p>
           <template v-if="modules[1].form.pic">
             <video v-if="Util.isVideo(modules[1].form.mediaType)" class="pic" ref="video" autoplay controls loop>
               <source :src="modules[1].form.pic" type="video/mp4">
@@ -33,7 +33,7 @@
             </video>
             <img v-else class="pic" :src="modules[1].form.pic" alt="">
           </template>
-          <div class="des">{{ modules[1].form.des }}</div>
+          <div class="des" v-html="modules[1].form.des"></div>
           <div class="cover" @click="toSet(1)">点击更改图片与概述</div>
         </div>
       </div>
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index ea67895..a40d432 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -5,7 +5,7 @@ import store from '@/store'
 
 const service = axios.create({
   baseURL: Setting.apiBaseURL,
-  timeout: 10000000
+  timeout: 1000 * 60 * 60 * 6
 });
 // post请求头
 service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'