From 28ea2d3bebfc657541250575662f463c03759fec Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 15 Nov 2022 11:11:18 +0800
Subject: [PATCH] fix

---
 src/api/index.js                          |  7 +-
 src/components/modules/link.vue           | 26 ++++---
 src/components/modules/module.vue         | 10 ++-
 src/mixins/page/index.js                  |  4 +-
 src/pages/article/add/index.vue           | 27 +++++--
 src/pages/article/list/index.vue          | 16 +++--
 src/pages/column/add/index.vue            | 21 +++++-
 src/pages/column/list/index.vue           | 22 +++---
 src/pages/column/page/about.vue           | 44 ++++++------
 src/pages/column/page/careers.vue         | 87 +++++++++++++++++------
 src/pages/column/page/edu.vue             | 58 ++++++++++++---
 src/pages/column/page/home.vue            | 68 ++++++++++++++----
 src/pages/column/page/news.vue            | 57 ++++++++++++++-
 src/pages/column/page/newsPress.vue       | 24 ++++---
 src/pages/column/page/newsProcurement.vue | 22 +++---
 src/styles/page/page.scss                 |  3 +-
 16 files changed, 367 insertions(+), 129 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 3c2c378..e1dd678 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -38,11 +38,11 @@ export default {
   saveColumn: `iasf/sysColumn/save`,
   updateColumn: `iasf/sysColumn/update`,
   findColumn: `iasf/sysColumn/findById`,
-  deleteColumn: `iasf/sysColumn/delete`,
+  deleteColumn: `iasf/sysColumn/batchDeletion`,
   sameLevelJudgment: `iasf/sysColumn/sameLevelJudgment`,
   sortByColumn: `iasf/sysColumn/sortByColumn`,
   checkIfTheTitleIsRepeat: `iasf/sysContent/checkIfTheTitleIsRepeat`,
-  deleteArticle: `iasf/sysContent/delete`,
+  deleteArticle: `iasf/sysContent/batchDeletion`,
   findArticle: `iasf/sysContent/findById`,
   queryArticle: `iasf/sysContent/pagingQuery`,
   saveArticle: `iasf/sysContent/save`,
@@ -67,4 +67,7 @@ export default {
   queryLabel: `iasf/content/label/queryAllArticleSubjectTags`,
   saveLabel: `iasf/content/label/save`,
   updateLabel: `iasf/content/label/update`,
+  delContentFile: `iasf/content/file/batchDeletion`,
+  saveContentFile: `iasf/content/file/save`,
+  theAttachmentUnderTheQueryColumn: `iasf/content/file/theAttachmentUnderTheQueryColumn`,
 }
\ No newline at end of file
diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue
index 43fb1a8..11193a7 100644
--- a/src/components/modules/link.vue
+++ b/src/components/modules/link.vue
@@ -40,7 +40,7 @@
         </el-form-item>
         <template v-if="data.connectionType === 3">
           <el-form-item prop="site" label="站点选择">
-            <el-select v-model="data.site">
+            <el-select v-model="data.site" @change="getOtherColumn">
               <el-option
                 v-for="item in sites"
                 :key="item.id"
@@ -53,7 +53,7 @@
             <el-cascader
               ref="otherColumn"
               v-model="data.otherColumnId"
-              :options="columns"
+              :options="otherColumns"
               :props="columnProps"
               @change="columnChange"></el-cascader>
           </el-form-item>
@@ -100,6 +100,7 @@ export default {
       site: this.$store.state.content.site,
       sites: [],
       columns: [],
+      otherColumns: [],
       articles: [],
       columnProps: {
         checkStrictly: true,
@@ -119,6 +120,7 @@ export default {
   mounted() {
     this.getList()
     this.getSite()
+    this.getOtherColumn()
   },
   methods: {
     // 栏目列表
@@ -131,19 +133,13 @@ export default {
         isSort: 0
       }).then(({ data }) => {
         this.columns = data
-        if (this.isEdit) {
-          this.getData()
-          this.handleId(data)
-        } else {
-          this.loaded = true
-        }
         this.data.connectionType !== 2 && this.getArticle()
       }).catch(err => {})
     },
     // 给当前栏目加上disabled禁止选中
     handleId(list) {
       list.forEach(e => {
-        if (this.isEdit && e.id == this.id) e.disabled = true 
+        if (e.id == this.id) e.disabled = true 
         e.children.length ? this.handleId(e.children) : delete e.children
       })
     },
@@ -176,6 +172,18 @@ export default {
         this.sites = data.records
       }).catch(e => {})
     },
+    // 获取指定站点的栏目列表
+    getOtherColumn() {
+      this.$post(this.api.listWithTree, {
+        siteId: this.data.site,
+        columnName: '',
+        templateId: '',
+        typeId	: '',
+        isSort: 0
+      }).then(({ data }) => {
+        this.otherColumns = data
+      }).catch(err => {})
+    },
     close() {
       this.$emit('update:visible', false)
     },
diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue
index 2d79ba1..253e965 100644
--- a/src/components/modules/module.vue
+++ b/src/components/modules/module.vue
@@ -116,9 +116,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="栏目标题">
-          <el-radio v-model="data.form.columnTitle" :label="1">默认读取关联栏目</el-radio>
+          <el-radio v-model="data.form.columnTitle" :label="1" @change="columnTitleChange">默认读取关联栏目</el-radio>
           <div class="radio-wrap">
-            <el-radio v-model="data.form.columnTitle" :label="2"></el-radio>
+            <el-radio v-model="data.form.columnTitle" :label="2" @change="columnTitleChange"></el-radio>
             <el-input v-model="data.form.columnTitleCustom" :disabled="data.form.columnTitle == 1" size="small" maxlength="10"></el-input>
           </div>
         </el-form-item>
@@ -240,6 +240,12 @@ export default {
     columnChange(val) {
       this.data.form.columnName = this.$refs.links.getCheckedNodes()[0].label
     },
+    // 栏目标题切换回调
+    columnTitleChange(val) {
+      const { form } = this.data
+      const checked = this.$refs.links.getCheckedNodes()
+      form.columnName = val === 2 ? form.columnTitleCustom : (checked.length ? checked[0].label : '')
+    },
     // 添加行
     addRow() {
       if (this.data.type === 'banner') {
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index 80725a1..176a8ee 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -67,8 +67,8 @@ export default {
     moduleSubmited() {
       this.diaVisible = false
       if (this.curData.type === 'columns') {
-        const form = this.curData.form
-        if (form.columnTitle === 2) form.columnName = form.columnTitleCustom
+        const { form } = this.curData
+        form.columnName = form[form.columnTitle === 2 ? 'columnTitleCustom' : 'columnName']
         this.modules[this.curModule].list[this.curListIndex] = JSON.parse(JSON.stringify(form))
       } else {
         this.modules[this.curModule] = this.curData
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index 8d41562..67d021c 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -54,20 +54,20 @@
         </el-form-item>
       </div>
       <div class="item-line">
-        <el-form-item prop="source" label="编辑">
+        <el-form-item prop="edit" label="编辑">
           <el-input
             placeholder="请输入编辑"
-            v-model.trim="form.source"
+            v-model.trim="form.edit"
             clearable
             maxlength="15"
             class="inline-input"
             @change="nameChange"
           ></el-input>
         </el-form-item>
-        <el-form-item prop="author" label="审核">
+        <el-form-item prop="audit" label="审核">
           <el-input
             placeholder="请输入审核"
-            v-model.trim="form.author"
+            v-model.trim="form.audit"
             clearable
             maxlength="15"
             class="inline-input"
@@ -350,6 +350,8 @@ export default {
             templateStatus: 0,
             articleTemplate: '',
             author: '',
+            edit: '',
+            audit: '',
             bannerImg: '',
             columnId: +this.$route.query.columnId,
             file: '',
@@ -718,7 +720,7 @@ export default {
           })
         })
       },
-      handleRemove(file, fileList) {
+      handleRemove() {
         this.form.file = ''
       },
       uploadSuccessBanner(res) {
@@ -727,7 +729,20 @@ export default {
         this.form.bannerImg = res.url
       },
       uploadSuccessFile(res) {
-        this.form.file = res.url
+        this.$post(this.api.saveContentFile, {
+          contentId: this.form.id,
+          editorId: this.userId,
+          founderId: this.userId,
+          fileFormat: '',
+          fileSize: '',
+          ossFileName: '',
+          id: '',
+          fileName: this.userId,
+          filePath: res.url
+        }).then(res => {
+          
+        }).catch(res => {})
+        // this.form.file = res.url
       },
       // 预览
       preview() {
diff --git a/src/pages/article/list/index.vue b/src/pages/article/list/index.vue
index 4135bf7..11b6c3e 100644
--- a/src/pages/article/list/index.vue
+++ b/src/pages/article/list/index.vue
@@ -245,11 +245,15 @@ export default {
           this.$confirm('确定要删除吗？', '提示', {
             type: 'warning'
           }).then(() => {
-            // this.$del(`${this.api.user}`, list.map(e => e.id)).then(res => {
-            //   this.$refs.table.clearSelection()
-            //   util.successMsg('删除成功')
-            //   this.getStaff()
-            // }).catch(res => {})
+            const data = []
+            list.map(e => {
+              data.push('ids=' + e.id)
+            })
+            this.$post(`${this.api.deleteArticle}?${data.join('&')}`).then(res => {
+              this.$refs.table.clearSelection()
+              util.successMsg("删除成功")
+              this.getData()
+            }).catch(res => {})
           }).catch(() => {})
         } else {
           util.errorMsg('请先选择数据 ！')
@@ -260,7 +264,7 @@ export default {
         this.$confirm("确定要删除吗？", "提示", {
           type: "warning"
         }).then(() => {
-          this.$post(`${this.api.deleteArticle}?id=${row.id}`).then(res => {
+          this.$post(`${this.api.deleteArticle}?ids=${row.id}`).then(res => {
             util.successMsg("删除成功")
             this.getData()
           }).catch(res => {})
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index e9b9f88..4ef596d 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -139,7 +139,7 @@
         </el-form-item>
         <template v-if="form.connectionType === 3">
           <el-form-item prop="siteSelection" label="站点选择">
-            <el-select v-model="form.siteSelection">
+            <el-select v-model="form.siteSelection" @change="getOtherColumn">
               <el-option
                 v-for="item in sites"
                 :key="item.id"
@@ -151,7 +151,7 @@
           <el-form-item label="栏目">
             <el-cascader
               v-model="otherLink"
-              :options="columns"
+              :options="otherColumns"
               :props="columnProps"
               clearable
               @change="getArticle"></el-cascader>
@@ -246,6 +246,7 @@ export default {
           },
           links: [],
           article: '',
+          otherColumns: [],
           otherLink: [],
           otherArticle: '',
           form: {
@@ -362,7 +363,7 @@ export default {
       }
     },
     methods: {
-      // 栏目列表
+      // 获取当前站点的栏目列表
       getList() {
         this.$post(this.api.listWithTree, {
           siteId: this.site.id,
@@ -376,6 +377,7 @@ export default {
             this.getData()
             this.handleId(data)
           } else {
+            this.getOtherColumn()
             this.loaded = true
           }
         }).catch(err => {})
@@ -438,6 +440,7 @@ export default {
           } else {
             this.loaded = true
           }
+          this.getOtherColumn()
         }).catch(err => {})
       },
       // 获取站点列表
@@ -450,6 +453,18 @@ export default {
           this.sites = data.records
         }).catch(e => {})
       },
+      // 获取指定站点的栏目列表
+      getOtherColumn() {
+        this.$post(this.api.listWithTree, {
+          siteId: this.form.siteSelection,
+          columnName: '',
+          templateId: '',
+          typeId	: '',
+          isSort: 0
+        }).then(({ data }) => {
+          this.otherColumns = data
+        }).catch(err => {})
+      },
       // 栏目名称判重
       nameChange(){
         const { columnName, level, id } = this.form
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 7e2c81e..a07a520 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -17,7 +17,7 @@
           </el-dropdown-menu>
         </el-dropdown>
         <el-button v-auth="'/site/list:' + siteName + ':内容管理:栏目管理:新增'" type="primary" @click="add" >新增</el-button>
-        <!-- <el-button v-auth="'/site/list:' + siteName + ':内容管理:栏目管理:删除'" @click="batchDel">删除</el-button> -->
+        <el-button v-auth="'/site/list:' + siteName + ':内容管理:栏目管理:删除'" @click="batchDel">删除</el-button>
         <el-button v-auth="'/site/list:' + siteName + ':内容管理:栏目管理:更改排序'" class="lg" @click="sort">更改排序</el-button>
         <el-button v-auth="'/site/list:' + siteName + ':内容管理:栏目管理:导航样式设置'" class="lg" @click="styleSet">导航样式设置</el-button>
       </div>
@@ -233,7 +233,7 @@ export default {
           columnName: this.keyword,
           templateId: '',
           typeId	: '',
-          isSort: 0
+          isSort: 1
         }).then(({ data }) => {
           this.handleList(data)
           this.list = data
@@ -271,7 +271,7 @@ export default {
         this.$confirm("确定要删除吗？", "提示", {
           type: "warning"
         }).then(() => {
-          this.$post(`${this.api.deleteColumn}?id=${row.id}`).then(res => {
+          this.$post(`${this.api.deleteColumn}?ids=${row.id}`).then(res => {
             util.successMsg("删除成功")
             this.getData()
           }).catch(res => {})
@@ -298,11 +298,15 @@ export default {
           this.$confirm('确定要删除吗？', '提示', {
             type: 'warning'
           }).then(() => {
-            // this.$del(`${this.api.user}`, list.map(e => e.id)).then(res => {
-            //   this.$refs.table.clearSelection()
-            //   util.successMsg('删除成功')
-            //   this.getStaff()
-            // }).catch(res => {})
+            const data = []
+            list.map(e => {
+              data.push('ids=' + e.id)
+            })
+            this.$post(`${this.api.deleteColumn}?${data.join('&')}`).then(res => {
+              this.$refs.table.clearSelection()
+              util.successMsg("删除成功")
+              this.getData()
+            }).catch(res => {})
           }).catch(() => {})
         } else {
           util.errorMsg('请先选择数据 ！')
@@ -334,7 +338,7 @@ export default {
           columnName: '',
           templateId: '',
           typeId	: '',
-          isSort: 0
+          isSort: 1
         }).then(({ data }) => {
           this.sortColumns = data
         }).catch(err => {})
diff --git a/src/pages/column/page/about.vue b/src/pages/column/page/about.vue
index ff5b3e8..888060c 100644
--- a/src/pages/column/page/about.vue
+++ b/src/pages/column/page/about.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/ABOUT</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/ABOUT</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -109,16 +109,16 @@
         </div>
       </div>
 
-      <div class="plan">
-        <div class="inner c-wrap">
+      <div class="plan c-wrap">
+        <div class="inner">
           <img class="pic" :src="modules[14].form.pic" alt="">
           <div class="texts">
             <h6>{{ modules[14].form.title }}</h6>
             <div class="des">{{ modules[14].form.des }}</div>
             <img src="@/assets/images/arrow-white.png" alt="">
           </div>
-          <div class="cover" @click="toSet(14)">点击更换标题、概述与跳转</div>
         </div>
+        <div class="cover" style="height: calc(100% + 60px);" @click="toSet(14)">点击更换标题、概述与跳转</div>
       </div>
 
       <div class="block">
@@ -129,15 +129,17 @@
             <div class="cover" @click="toSet(15)">点击更换标题与描述</div>
           </div>
           <ul class="people">
-            <li v-for="(item, i) in modules[16].list" :key="i">
-              <img class="pic" :src="item.pic" alt="">
-              <div class="texts">
-                <p class="sub">{{ item.subTitle }}</p>
-                <h6>{{ item.title }}</h6>
-                <p class="des">{{ item.des }}</p>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="">
-              </div>
-            </li>
+            <template v-for="(item, i) in modules[16].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="pic" :src="item.pic" alt="">
+                <div class="texts">
+                  <p class="sub">{{ item.subTitle }}</p>
+                  <h6>{{ item.title }}</h6>
+                  <p class="des">{{ item.des }}</p>
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+            </template>
             <div class="cover" @click="toSet(16)">点击更改图片、标题概述与链接</div>
           </ul>
         </div>
@@ -309,7 +311,7 @@ export default {
               label: '链接'
             },
             {
-              type: 'editor',
+              type: 'textarea',
               prop: 'des',
               label: '概述',
               required: true
@@ -328,7 +330,7 @@ export default {
               otherArticleId: '',
               isOpen: 1
             },
-            des: ''
+            des: '2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen…'
           }
         },
         {
@@ -346,7 +348,7 @@ export default {
               label: '链接'
             },
             {
-              type: 'editor',
+              type: 'textarea',
               prop: 'des',
               label: '概述',
               required: true
@@ -365,7 +367,7 @@ export default {
               otherArticleId: '',
               isOpen: 1
             },
-            des: ''
+            des: '2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen…'
           }
         },
         {
@@ -383,7 +385,7 @@ export default {
               label: '链接'
             },
             {
-              type: 'editor',
+              type: 'textarea',
               prop: 'des',
               label: '概述',
               required: true
@@ -402,7 +404,7 @@ export default {
               otherArticleId: '',
               isOpen: 1
             },
-            des: ''
+            des: '2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen…'
           }
         },
         {
@@ -420,7 +422,7 @@ export default {
               label: '链接'
             },
             {
-              type: 'editor',
+              type: 'textarea',
               prop: 'des',
               label: '概述',
               required: true
@@ -439,7 +441,7 @@ export default {
               otherArticleId: '',
               isOpen: 1
             },
-            des: ''
+            des: '2021 is another challenging year for the Institute of Advanced Science Facilities, Shenzhen…'
           }
         },
         {
diff --git a/src/pages/column/page/careers.vue b/src/pages/column/page/careers.vue
index d4d0d6f..49f9bfa 100644
--- a/src/pages/column/page/careers.vue
+++ b/src/pages/column/page/careers.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/CAREERS</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/CAREERS</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -79,29 +79,33 @@
             <div class="cover" @click="toSet(5)">点击更换标题与描述</div>
           </div>
           <ul class="people">
-            <li v-for="(item, i) in modules[6].list" :key="i">
-              <img class="comma" src="@/assets/images/comma.png" alt="">
-              <div class="left">
-                <h6>{{ item.title }}</h6>
-                <div class="des">{{ item.des }}</div>
-              </div>
-              <img class="pic" :src="item.pic" alt="">
-            </li>
-            <div class="cover" @click="toSet(6)">点击更换标题与描述</div>
+            <template v-for="(item, i) in modules[6].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="comma" src="@/assets/images/comma.png" alt="">
+                <div class="left">
+                  <h6>{{ item.title }}</h6>
+                  <div class="des">{{ item.des }}</div>
+                </div>
+                <img class="pic" :src="item.pic" alt="">
+              </li>
+            </template>
+            <div class="cover" style="top: -60px" @click="toSet(6)">点击更换标题与描述</div>
           </ul>
         </div>
       </div>
 
       <ul class="shows">
-        <li v-for="(item, i) in modules[7].list" :key="i">
-          <img class="pic" :src="item.pic" alt="">
-          <div class="left">
-            <h6>{{ item.title }}</h6>
-            <div class="sub">{{ item.subTitle }}</div>
-            <div class="des">{{ item.des }}</div>
-            <img class="arrow" src="@/assets/images/arrow-white.png" alt="">
-          </div>
-        </li>
+        <template v-for="(item, i) in modules[7].list">
+          <li v-if="item.isEnable" :key="i">
+            <div class="left">
+              <h6>{{ item.title }}</h6>
+              <div class="sub">{{ item.subTitle }}</div>
+              <div class="des">{{ item.des }}</div>
+              <img class="arrow" src="@/assets/images/arrow-white.png" alt="">
+            </div>
+            <img class="pic" :src="item.pic" alt="">
+          </li>
+        </template>
         <div class="cover" @click="toSet(7)">点击更换标题与描述</div>
       </ul>
     </div>
@@ -491,6 +495,42 @@ export default {
               },
               des: 'We offer the most competitive package to assure the welfare of our people at IAST.',
               isEnable: 1
+            },
+            {
+              pic: require('@/assets/images/careers/10.png'),
+              title: 'Traineeships',
+              subTitle: 'YOUR FUTURE STARTS HERE',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              des: 'IASF works with research institutions, universities, and others, to provide a pathway for future scientists, engineers, and industry leaders.',
+              isEnable: 1
+            },
+            {
+              pic: require('@/assets/images/careers/11.png'),
+              title: 'Programs',
+              subTitle: 'YOUR INSPIRATION HAS GREAT SUPPORTS',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              des: 'We collect various professional and funding resources to support your dream and ideas, your job is as simple as it looks, go for it!',
+              isEnable: 1
             }
           ]
         },
@@ -628,20 +668,25 @@ export default {
     }
   }
   .left {
+    position: relative;
+    z-index: 1;
     width: 43.3%;
     height: 100%;
     padding: 138px 30px 30px 103px;
     background-color: rgba(54, 54, 54, .65);
   }
   .pic {
-    width: 56.9%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 100%;
     height: 100%;
   }
   h6 {
     font-size: 46px;
   }
   .sub {
-    margin: 20px;
+    margin: 20px 0;
     font-size: 36px;
   }
   .des {
diff --git a/src/pages/column/page/edu.vue b/src/pages/column/page/edu.vue
index 33bdeaf..463a35f 100644
--- a/src/pages/column/page/edu.vue
+++ b/src/pages/column/page/edu.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/EDUCATION & COLLABORATION</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/EDUCATION & COLLABORATION</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -46,15 +46,17 @@
             <div class="cover" @click="toSet(3)">点击更换标题与描述</div>
           </div>
           <ul class="list c-wrap">
-            <li v-for="(item, i) in modules[4].list" :key="i">
-              <img class="pic" :src="item.pic" alt="">
-              <div class="texts">
-                <h6>{{ item.title }}</h6>
-                <p class="sub">{{ item.subTitle }}</p>
-                <div class="des">{{ item.des }}</div>
-              </div>
-            </li>
-            <div class="cover" @click="toSet(4)">点击更改图片、标题概述与链接</div>
+            <template v-for="(item, i) in modules[4].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="pic" :src="item.pic" alt="">
+                <div class="texts">
+                  <h6>{{ item.title }}</h6>
+                  <p class="sub">{{ item.subTitle }}</p>
+                  <div class="des">{{ item.des }}</div>
+                </div>
+              </li>
+            </template>
+            <div class="cover" style="width: calc(100% + 60px);" @click="toSet(4)">点击更改图片、标题概述与链接</div>
           </ul>
         </div>
       </div>
@@ -263,6 +265,42 @@ export default {
               },
               des: 'Innovation centers are distributed in the bay areas, such as the San Francisco Bay area, the New York Bay area, and the Tokyo Bay area …',
               isEnable: 1
+            },
+            {
+              pic: require('@/assets/images/edu/4.png'),
+              title: 'community service',
+              subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              des: 'Innovation centers are distributed in the bay areas, such as the San Francisco Bay area, the New York Bay area, and the Tokyo Bay area …',
+              isEnable: 1
+            },
+            {
+              pic: require('@/assets/images/edu/5.png'),
+              title: 'community service',
+              subTitle: 'IASF is driven to serve the Science and industry, and solve grand challenges.',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              des: 'Innovation centers are distributed in the bay areas, such as the San Francisco Bay area, the New York Bay area, and the Tokyo Bay area …',
+              isEnable: 1
             }
           ]
         },
diff --git a/src/pages/column/page/home.vue b/src/pages/column/page/home.vue
index a257471..2dd54cd 100644
--- a/src/pages/column/page/home.vue
+++ b/src/pages/column/page/home.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/HOME</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/HOME</p>
       <div class="relative">
         <el-carousel height="500px">
           <template v-for="(item, i) in modules[0].list">
@@ -119,14 +119,16 @@
             <div class="cover" @click="toSet(6)">点击更换标题与描述</div>
           </div>
           <ul class="people">
-            <li v-for="(item, i) in modules[7].list" :key="i">
-              <img class="pic" :src="item.pic" alt="">
-              <div class="texts">
-                <h6>{{ item.title }}</h6>
-                <p class="des">{{ item.des }}</p>
-                <img class="arrow" src="@/assets/images/arrow.png" alt="">
-              </div>
-            </li>
+            <template v-for="(item, i) in modules[7].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="pic" :src="item.pic" alt="">
+                <div class="texts">
+                  <h6>{{ item.title }}</h6>
+                  <p class="des">{{ item.des }}</p>
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+            </template>
             <div class="cover" @click="toSet(7)">点击更改图片、标题概述与链接</div>
           </ul>
         </div>
@@ -305,8 +307,8 @@ export default {
             }
           ],
           form: {
-            pic: require('@/assets/images/channel1.png'),
-            title: 'Shenzhen Innovation Lightsource Facility',
+            pic: require('@/assets/images/channel2.png'),
+            title: 'Shenzhen Soft X-ray Superconducting Free-electron Laser Facility ',
             link: {
               linkName: '无',
               connectionType: 1,
@@ -318,7 +320,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: '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.'
           }
         },
         {
@@ -421,8 +423,44 @@ export default {
           },
           list: [
             {
-              pic: require('@/assets/images/channel1.png'),
-              title: 'Shenzhen Innovation Lightsource Facility',
+              pic: require('@/assets/images/careers/6.png'),
+              title: 'SHAO Jiahang, PH.D.',
+              subTitle: '',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              isEnable: 1,
+              des: '“..., The new facility (S3FEL) will provide the brightest soft X-ray laser to both scientific and industrial users worldwide, enabling applications that are beyond imagination, ...”…'
+            },
+            {
+              pic: require('@/assets/images/careers/7.png'),
+              title: 'PENG Ziling, Ph.D.',
+              subTitle: '',
+              link: {
+                linkName: '无',
+                connectionType: 1,
+                columnId: [],
+                articleId: '',
+                linkAddress	: '',
+                site: '',
+                otherColumnId: [],
+                otherArticleId: '',
+                isOpen: 1
+              },
+              isEnable: 1,
+              des: '“..., With so many young, professional, and passionate workmates, I treasure the moments we spent on fruitful discussions, brainstorming, teamworking, and the leisure activities on the Guangming farm just next to our worksite, ...”…'
+            },
+            {
+              pic: require('@/assets/images/careers/8.png'),
+              title: 'CHEN Rikun, M.S.',
               subTitle: '',
               link: {
                 linkName: '无',
@@ -436,7 +474,7 @@ export default {
                 isOpen: 1
               },
               isEnable: 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: '“..., Working is more of a learning process for a young professional. Every day at IASF I try to learn to write properly, communicate effectively, and solve problems. As getting more experience, I feel excited to grow with IASF, ...”.…'
             }
           ]
         },
diff --git a/src/pages/column/page/news.vue b/src/pages/column/page/news.vue
index ba7fe1e..f2c40ad 100644
--- a/src/pages/column/page/news.vue
+++ b/src/pages/column/page/news.vue
@@ -6,8 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/NEWS&EVENTS</p>
+    
     <div class="modules">
-      <p class="page-name mb">页面设置/NEWS&EVENTS</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -161,6 +162,60 @@
                   </p>
                 </div>
               </li>
+              <li>
+                <img class="pic" src="@/assets/images/about/9.png" alt="">
+                <div class="texts">
+                  <h6>Professional technical Free electron laser device</h6>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Jiahang Shao
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Time: 2022.8.13  14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Address: Big conference room on the fourth floor of headquarters
+                  </p>
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="@/assets/images/about/9.png" alt="">
+                <div class="texts">
+                  <h6>Professional technical Free electron laser device</h6>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Jiahang Shao
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Time: 2022.8.13  14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Address: Big conference room on the fourth floor of headquarters
+                  </p>
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="@/assets/images/about/9.png" alt="">
+                <div class="texts">
+                  <h6>Professional technical Free electron laser device</h6>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Jiahang Shao
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Time: 2022.8.13  14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/address.png" alt="">
+                    Address: Big conference room on the fourth floor of headquarters
+                  </p>
+                </div>
+              </li>
             </ul>
             <div class="cover" @click="toSet(5)">关联栏目</div>
           </div>
diff --git a/src/pages/column/page/newsPress.vue b/src/pages/column/page/newsPress.vue
index ba3fe89..d9db726 100644
--- a/src/pages/column/page/newsPress.vue
+++ b/src/pages/column/page/newsPress.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/NEWS&EVENTS-PRESS ROOM</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/NEWS&EVENTS-PRESS ROOM</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -23,17 +23,19 @@
       <div class="block">
         <div class="inner c-wrap">
           <ul class="list">
-            <li v-for="(item, i) in modules[1].list" :key="i">
-              <img class="pic" :src="item.pic" alt="">
-              <div class="texts">
-                <h6>{{ item.title }}</h6>
-                <p class="sub">{{ item.subTitle }}</p>
-                <div class="des">{{ item.des }}</div>
-                <img src="@/assets/images/arrow.png" alt="">
-              </div>
-            </li>
+            <template v-for="(item, i) in modules[1].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="pic" :src="item.pic" alt="">
+                <div class="texts">
+                  <h6>{{ item.title }}</h6>
+                  <p class="sub">{{ item.subTitle }}</p>
+                  <div class="des">{{ item.des }}</div>
+                  <img src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+            </template>
           </ul>
-          <div class="cover" @click="toSet(1)">点击更改图片、标题概述与链接</div>
+          <div class="cover" style="width: calc(100% + 60px);" @click="toSet(1)">点击更改图片、标题概述与链接</div>
         </div>
       </div>
     </div>
diff --git a/src/pages/column/page/newsProcurement.vue b/src/pages/column/page/newsProcurement.vue
index 9db45ae..61103be 100644
--- a/src/pages/column/page/newsProcurement.vue
+++ b/src/pages/column/page/newsProcurement.vue
@@ -6,9 +6,9 @@
       <el-button type="primary" @click="save(1)">发布</el-button>
       <el-button @click="$router.back()">放弃编辑</el-button>
     </div>
+    <p class="page-name mb">页面设置/NEWS&EVENTS-PROCUREMENT</p>
 
     <div class="modules">
-      <p class="page-name mb">页面设置/NEWS&EVENTS-PROCUREMENT</p>
       <div class="relative">
         <el-carousel height="480px">
           <template v-for="(item, i) in modules[0].list">
@@ -23,15 +23,17 @@
       <div class="block">
         <div class="inner c-wrap">
           <ul class="list">
-            <li v-for="(item, i) in modules[1].list" :key="i">
-              <img class="pic" :src="item.pic" alt="">
-              <div class="texts">
-                <h6>{{ item.title }}</h6>
-                <p class="sub">{{ item.subTitle }}</p>
-                <div class="des">{{ item.des }}</div>
-                <img src="@/assets/images/arrow.png" alt="">
-              </div>
-            </li>
+            <template v-for="(item, i) in modules[1].list">
+              <li v-if="item.isEnable" :key="i">
+                <img class="pic" :src="item.pic" alt="">
+                <div class="texts">
+                  <h6>{{ item.title }}</h6>
+                  <p class="sub">{{ item.subTitle }}</p>
+                  <div class="des">{{ item.des }}</div>
+                  <img src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+            </template>
           </ul>
           <div class="cover" @click="toSet(1)">点击更改图片、标题概述与链接</div>
         </div>
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index e198c4a..09cf50b 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -38,7 +38,7 @@
 }
 
 .modules {
-  height: calc(100vh - 160px);
+  height: calc(100vh - 198px);
   overflow: auto;
 }
 .actions {
@@ -58,6 +58,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  font-size: 22px;
   color: #fff;
   background-color: rgba(0, 0, 0, .5);
   cursor: pointer;