diff --git a/src/assets/images/page/contactUs.png b/src/assets/images/page/contactUs.png
new file mode 100644
index 0000000..0f44f2d
Binary files /dev/null and b/src/assets/images/page/contactUs.png differ
diff --git a/src/assets/images/page/lightSources.png b/src/assets/images/page/lightSources.png
new file mode 100644
index 0000000..36f67de
Binary files /dev/null and b/src/assets/images/page/lightSources.png differ
diff --git a/src/assets/images/page/speech.png b/src/assets/images/page/speech.png
new file mode 100644
index 0000000..77d073f
Binary files /dev/null and b/src/assets/images/page/speech.png differ
diff --git a/src/assets/images/page/talentCentre.png b/src/assets/images/page/talentCentre.png
new file mode 100644
index 0000000..4eb33c2
Binary files /dev/null and b/src/assets/images/page/talentCentre.png differ
diff --git a/src/assets/images/style/68.png b/src/assets/images/style/68.png
new file mode 100644
index 0000000..3c42d8a
Binary files /dev/null and b/src/assets/images/style/68.png differ
diff --git a/src/assets/images/style/69.png b/src/assets/images/style/69.png
new file mode 100644
index 0000000..97c8c65
Binary files /dev/null and b/src/assets/images/style/69.png differ
diff --git a/src/components/modules/history.vue b/src/components/modules/history.vue
index 6283a4a..9bd9a00 100644
--- a/src/components/modules/history.vue
+++ b/src/components/modules/history.vue
@@ -1,51 +1,88 @@
 <template>
   <!-- sfel-概况-发展历程 or 产业光源-概况-大事记 -->
   <div>
-    <el-dialog title="编辑内容" :visible.sync="visible" width="70%" custom-class="module" :close-on-click-modal="false" :before-close="close">
-      <el-table class="module-table" :data="list" header-align="center" row-key="id">
-        <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-        <el-table-column label="图片" min-width="140" align="center">
+    <el-dialog title="编辑内容"
+               :visible.sync="visible"
+               width="70%"
+               custom-class="module"
+               :close-on-click-modal="false"
+               :before-close="close">
+      <el-table class="module-table"
+                :data="list"
+                header-align="center"
+                row-key="id">
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column label="图片"
+                         min-width="140"
+                         align="center">
           <template slot-scope="scope">
-            <img v-if="scope.row.pic" :src="scope.row.pic" class="upload-pic">
-            <div class="upload-none" v-else>
+            <img v-if="scope.row.pic"
+                 :src="scope.row.pic"
+                 class="upload-pic">
+            <div class="upload-none"
+                 v-else>
               <i class="el-icon-picture-outline"></i>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="title" label="标题" min-width="140" align="center"></el-table-column>
-        <el-table-column label="链接" min-width="140" align="center">
+        <el-table-column prop="title"
+                         label="标题"
+                         min-width="140"
+                         align="center"></el-table-column>
+        <el-table-column label="链接"
+                         min-width="140"
+                         align="center">
           <template slot-scope="scope">
             <div class="link-wrap">
               <span>{{ scope.row.link.linkName }}</span>
-              <el-button v-if="data.type === 'banner'" class="set-link" type="primary" size="mini" @click="toLink(scope.row, scope.$index)">设置链接</el-button>
+              <el-button v-if="data.type === 'banner'"
+                         class="set-link"
+                         type="primary"
+                         size="mini"
+                         @click="toLink(scope.row, scope.$index)">设置链接</el-button>
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="des" label="描述" min-width="240" align="center"></el-table-column>
-        <el-table-column label="操作" width="100" align="center">
+        <el-table-column prop="des"
+                         label="描述"
+                         min-width="240"
+                         align="center"></el-table-column>
+        <el-table-column label="操作"
+                         width="100"
+                         align="center">
           <template slot-scope="scope">
             <div class="flex a-center">
-              <el-switch
-                v-model="scope.row.isEnable"
-                :active-value="1"
-                :inactive-value="0">
+              <el-switch v-model="scope.row.isEnable"
+                         :active-value="1"
+                         :inactive-value="0">
               </el-switch>
-              <i class="el-icon-edit-outline del" @click="editHistory(scope.row, scope.$index)"></i>
-              <i class="el-icon-delete del" @click="delRow(data.list, scope.$index)"></i>
+              <i class="el-icon-edit-outline del"
+                 @click="editHistory(scope.row, scope.$index)"></i>
+              <i class="el-icon-delete del"
+                 @click="delRow(data.list, scope.$index)"></i>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <div class="plus">
-        <i class="el-icon-circle-plus-outline" @click="editHistory(data.originForm, -1)"></i>
+      <div v-if="!data.disableAdd"
+           class="plus">
+        <i class="el-icon-circle-plus-outline"
+           @click="editHistory(data.originForm, -1)"></i>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="$emit('update:visible', false)">取消</el-button>
-        <el-button type="primary" @click="historySubmit">确定</el-button>
+        <el-button type="primary"
+                   @click="historySubmit">确定</el-button>
       </span>
     </el-dialog>
-    
-    <Content :data.sync="data" :visible.sync="contentVisible" @contentSubmit="contentSubmit" />
+
+    <Content :data.sync="data"
+             :visible.sync="contentVisible"
+             @contentSubmit="contentSubmit" />
   </div>
 </template>
 
@@ -58,7 +95,7 @@ export default {
   components: {
     Content
   },
-  data() {
+  data () {
     return {
       rules: {},
       linkVisible: false,
@@ -74,25 +111,25 @@ export default {
       curData: {},
     };
   },
-  mounted() {
-    
+  mounted () {
+
   },
   methods: {
     // 添加行
-    addRow() {
+    addRow () {
       this.editHistory(this.data.originForm, -1)
     },
     // 编辑内容
-    editHistory(row, i = 0) {
+    editHistory (row, i = 0) {
       this.data.form = JSON.parse(JSON.stringify(row))
       this.curModule = i
       this.contentVisible = true
     },
-    close() {
+    close () {
       this.$emit('update:visible', false)
     },
     // 模块设置提交
-    contentSubmit() {
+    contentSubmit () {
       this.contentVisible = false
       const { form } = this.data
       if (this.curModule === -1) {
@@ -106,7 +143,7 @@ export default {
       this.data.form = JSON.parse(JSON.stringify(this.data.originForm))
     },
     // 模块设置提交
-    historySubmit() {
+    historySubmit () {
       this.$emit('historySubmit')
     },
   }
@@ -114,11 +151,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .radio-wrap {
-  display: flex;
-  align-items: center;
-  .el-input {
-    width: 200px;
-    margin-left: -40px;
-  }
+    display: flex;
+    align-items: center;
+    .el-input {
+        width: 200px;
+        margin-left: -40px;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/const/column.js b/src/const/column.js
index 78efca3..3fcefb8 100644
--- a/src/const/column.js
+++ b/src/const/column.js
@@ -72,4 +72,4 @@ export default {
       name: '实用外观'
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/const/modules.js b/src/const/modules.js
index 6405a64..5eb8cd9 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -6538,48 +6538,160 @@ export default {
         《深圳综合粒子设施研究院理事会章程》《深圳综合粒子设施研究院章程》于2020年6月4日研究院第一届理事会第一次会议通过。`
       }
     },
+		
     {
-      type: 'label',
-      forms: [
-        {
-          type: 'input',
-          prop: 'title',
-          label: '标题',
-          required: true
-        },
-      ],
-      form: {
+      type: 'history',
+      historyForm: {
         title: '',
+        isEnable: 1,
+        list: []
       },
       list: [
-        {
-          title: '理事会',
-        },
-        {
-          title: '研究院党委',
-        },
-        {
-          title: '院长办公会议',
-        },
-        {
-          title: '职工代表大会',
-        },
-        {
-          title: '科技委员会',
-        },
-        {
-          title: '用户委员会',
-        },
-        {
-          title: '产业促进委员会',
-        },
-        {
-          title: '学术委员会',
-        },
-      ]
-    },
-    {
-      type: 'form',
+				{
+					title: '理事会',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+				{
+					title: '研究院党委',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+				{
+					title: '院长办公室',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+				{
+					title: '科技委员会',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+				{
+					title: '用户委员会',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+				{
+					title: '产业促进委员会',
+					list: [
+						{
+							pic: 'http://10.10.11.7/images/governance/8.png',
+							title: '产业促进委员会',
+							des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
+
+							产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`,
+							link: {
+								linkName: '无',
+								connectionType: 1,
+								columnId: [],
+								articleId: '',
+								linkAddress	: '',
+								site: '',
+								otherColumnId: [],
+								otherArticleId: '',
+								isOpen: 1
+							},
+							isEnable: 1
+						}
+					]
+				},
+			],
       forms: [
         {
           type: 'upload',
@@ -6594,18 +6706,18 @@ export default {
           required: true
         },
         {
-          type: 'editor',
+          type: 'textarea',
           prop: 'des',
           label: '描述'
         }
       ],
       form: {
-        pic: 'http://10.10.11.7/images/governance/8.png',
-        title: '产业促进委员会',
-        des: `       产业促进委员会对理事会负责，是贯彻战略性新兴产业发展需求牵引导向，强化设施服务深圳和大湾区高新技术产业发展，加强“从0 到1”原创科技成果持续供给产业，强化科技服务经济的专门机构。
-
-        产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态，挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术；对研究院设施的产业需求、建设方案和性能指标进行咨询建议，参与编制设施中产业板块线站机时分配方案；收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见，为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考；负责对定期举办产业用户培训进行指导，积极引导高新技术企业与研究院深度合作，促进设施服务产业经济发展。`
-      }
+        pic: '',
+        title: '',
+        des: ``,
+        isEnable: 1
+      },
+			disableAdd: true // 禁止添加里面的list
     },
   ],
   org: [
@@ -7282,6 +7394,12 @@ export default {
           label: '标题',
           required: true
         },
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
         {
           type: 'link',
           prop: 'link',
@@ -7295,6 +7413,7 @@ export default {
       ],
       form: {
         title: '使命',
+        pic: 'http://10.10.11.7/images/mission/2.png',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -7323,6 +7442,12 @@ export default {
           label: '标题',
           required: true
         },
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
         {
           type: 'link',
           prop: 'link',
@@ -7336,6 +7461,7 @@ export default {
       ],
       form: {
         title: '愿景',
+        pic: 'http://10.10.11.7/images/mission/3.png',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -7516,9 +7642,9 @@ export default {
           label: '描述'
         }
       ],
-      form: {
-        pic: 'http://10.10.11.7/images/home/2.png',
-        title: '深圳产业光源',
+			form: {
+        pic: 'http://10.10.11.7/images/home/3.png',
+        title: '深圳自由电子激光 ',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -7530,7 +7656,7 @@ export default {
           otherArticleId: '',
           isOpen: 1
         },
-        des: `围绕国家重大战略需求，以战略性新兴产业发展需求为牵引、以核心关键技术攻关为导向，建设一台中能、高亮度、小发射度的高性能同步辐射产业光源，提升前沿基础和产业技术的原始创新能力，服务高新技术产业发展，支撑粤港澳大湾区综合性国家科学中心和社会主义先行示范区的经济社会发展和产业技术创新。`
+        des: `以前沿科学技术发展和核心产业需求为导向，助力解决国家重大发展需求，并特别专注于推动半导体光刻、量子材料、能源科学、生物医药、燃烧科学、大气环境、星际科学、原子分子物理等前沿科学和应用产业的持续创新发展，实现深圳战略性新兴产业技术瓶颈及其相关根源性科学问题的重大突破。`
       }
     },
     {
@@ -7560,8 +7686,8 @@ export default {
         }
       ],
       form: {
-        pic: 'http://10.10.11.7/images/home/3.png',
-        title: '深圳自由电子激光 ',
+        pic: 'http://10.10.11.7/images/home/2.png',
+        title: '深圳产业光源',
         link: {
           linkName: '无',
           connectionType: 1,
@@ -7573,37 +7699,7 @@ export default {
           otherArticleId: '',
           isOpen: 1
         },
-        des: `以前沿科学技术发展和核心产业需求为导向，助力解决国家重大发展需求，并特别专注于推动半导体光刻、量子材料、能源科学、生物医药、燃烧科学、大气环境、星际科学、原子分子物理等前沿科学和应用产业的持续创新发展，实现深圳战略性新兴产业技术瓶颈及其相关根源性科学问题的重大突破。`
-      }
-    },
-    {
-      type: 'form',
-      forms: [
-        {
-          type: 'input',
-          prop: 'title',
-          label: '标题',
-          required: true
-        },
-        {
-          type: 'textarea',
-          prop: 'subTitle',
-          label: '小标题'
-        },
-      ],
-      form: {
-        title: '工程进展',
-        subTitle: 'PRROJECT PROGRESS',
-      }
-    },
-    {
-      type: 'column',
-      form: {
-        site: '',
-        column: '',
-        articleNum: '',
-        columnTitle: 1,
-        columnTitleCustom: ''
+        des: `围绕国家重大战略需求，以战略性新兴产业发展需求为牵引、以核心关键技术攻关为导向，建设一台中能、高亮度、小发射度的高性能同步辐射产业光源，提升前沿基础和产业技术的原始创新能力，服务高新技术产业发展，支撑粤港澳大湾区综合性国家科学中心和社会主义先行示范区的经济社会发展和产业技术创新。`
       }
     },
     {
@@ -8220,6 +8316,41 @@ export default {
           isOpen: 1
         }
       }
+    },
+		{
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'address',
+          label: '地址',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'phone',
+          label: '电话',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'email',
+          label: '邮箱',
+          required: false
+        },
+      ],
+      form: {
+        title: 'Contact us',
+        address: '深圳市光明区新湖街道圳园路268号3号楼3—6层',
+        phone: '0755-21096000',
+        email: 'gad@mail.iasf.ac.cn',
+      }
     },
     {
       type: 'form',
@@ -8235,5 +8366,314 @@ export default {
         pic: 'http://10.10.11.7/images/contactUs/2.png',
       }
     },
+    {
+      type: 'customList',
+      forms: [
+        {
+          type: 'input',
+          prop: 'dep',
+          label: '部门',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'contacts',
+          label: '联系人',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'phone',
+          label: '电话',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'email',
+          label: '邮箱',
+          required: false
+        },
+      ],
+      form: {
+        dep: '',
+        dep: '',
+        phone: '',
+        email: '',
+        isEnable: 1
+      },
+      list: [
+        {
+          dep: '',
+        dep: '',
+        phone: '',
+        email: '',
+          isEnable: 1
+        }
+      ]
+    },
+  ],
+  lightSources: [
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
+      ],
+      form: {
+        pic: 'http://10.10.11.7/images/lightSources/1.png',
+        title: '科学普及',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'textarea',
+          prop: 'des',
+          label: '描述'
+        },
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
+      ],
+      form: {
+        title: '标题',
+        des: `支撑大湾区综合性国家科学中心建设的公益性科研事业单位`,
+        pic: 'http://10.10.11.7/images/lightSources/2.png',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      type: 'customList',
+      forms: [
+        {
+          type: 'input',
+          prop: 'name',
+          label: '光源名称',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'country',
+          label: '国家',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'gev',
+          label: '电子束能量（GeV）',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'storage',
+          label: '储存环周长',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'stations',
+          label: '实验站数量',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'intergenerational',
+          label: '代际',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'time',
+          label: '建成/改造时间',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'emittance',
+          label: '发射度(nm.rad)',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'status',
+          label: '状态',
+          required: false
+        },
+      ],
+      form: {
+        name: '',
+        country: '',
+        gev: '',
+        storage: '',
+        stations: '',
+        intergenerational: '',
+        time: '',
+        emittance: '',
+        status: '',
+      },
+      list: [
+        {
+          name: '',
+					country: '',
+					gev: '',
+					storage: '',
+					stations: '',
+					intergenerational: '',
+					time: '',
+					emittance: '',
+					status: '',
+        }
+      ]
+    },
+    {
+      type: 'customList',
+      forms: [
+        {
+          type: 'input',
+          prop: 'name',
+          label: '光源名称',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'country',
+          label: '国家',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'address',
+          label: '地点',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'accelerator',
+          label: '加速器技术',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'gev',
+          label: '能量/GeV',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'wavelength',
+          label: '波长范围/nm',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'repetitive',
+          label: '重复频率/Hz Repetition rate',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'facility',
+          label: '设施长度/m Overall length',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'stations',
+          label: '线站数量',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'status',
+          label: '状态',
+          required: false
+        },
+        {
+          type: 'input',
+          prop: 'time',
+          label: '出光时间',
+          required: false
+        },
+      ],
+      form: {
+        name: '',
+        country: '',
+        address: '',
+        accelerator: '',
+        gev: '',
+        wavelength: '',
+        repetitive: '',
+        facility: '',
+        stations: '',
+        status: '',
+        time: '',
+      },
+      list: [
+        {
+          name: '',
+					country: '',
+					address: '',
+					accelerator: '',
+					gev: '',
+					wavelength: '',
+					repetitive: '',
+					facility: '',
+					stations: '',
+					status: '',
+					time: '',
+        }
+      ]
+    },
   ],
 }
\ No newline at end of file
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index 20486fe..cff9d51 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -1,458 +1,494 @@
 <template>
   <div class="page">
     <p class="page-name mb">文章详情</p>
-    <el-form :model="form" :rules="rules" class="input-form model" label-width="140px">
-      <el-form-item v-if="!isPublication" class="lg" prop="articleTemplate" label="独立文章模板">
-        <el-popover
-          placement="top-start"
-          trigger="hover"
-          content="默认使用栏目中设置的文章样式，如果需要为该篇文章指定专门的模板样式，可以设置此项">
-          <img slot="reference" class="info" src="@/assets/images/ques.png" alt="">
+    <el-form :model="form"
+             :rules="rules"
+             class="input-form model"
+             label-width="140px">
+      <el-form-item v-if="!isPublication"
+                    class="lg"
+                    prop="articleTemplate"
+                    label="独立文章模板">
+        <el-popover placement="top-start"
+                    trigger="hover"
+                    content="默认使用栏目中设置的文章样式，如果需要为该篇文章指定专门的模板样式，可以设置此项">
+          <img slot="reference"
+               class="info"
+               src="@/assets/images/ques.png"
+               alt="">
         </el-popover>
         <div style="width: 940px;text-align: right;">
-          <el-switch
-            v-model="form.templateStatus"
-            :active-value="1"
-            :inactive-value="0">
+          <el-switch v-model="form.templateStatus"
+                     :active-value="1"
+                     :inactive-value="0">
           </el-switch>
         </div>
-        <ul v-if="form.templateStatus" class="styles">
+        <ul v-if="form.templateStatus"
+            class="styles">
           <template v-for="(item, i) in detailStyle">
-            <li v-if="item.id !== column.detailStyle" :key="i" @click="styleChange(item.id)">
+            <li v-if="item.id !== column.detailStyle"
+                :key="i"
+                @click="styleChange(item.id)">
               <div class="review">
-                <img :class="{'is-link': item.id == 24}" :src="require('@/assets/images/style/' + item.id + '.png')" alt="">
+                <img :class="{'is-link': item.id == 24}"
+                     :src="require('@/assets/images/style/' + item.id + '.png')"
+                     alt="">
               </div>
-              <el-radio v-model="form.articleTemplate" :label="item.id">{{ item.style }}</el-radio>
+              <el-radio v-model="form.articleTemplate"
+                        :label="item.id">{{ item.style }}</el-radio>
             </li>
           </template>
         </ul>
       </el-form-item>
-      <el-form-item prop="title" label="标题">
-        <el-input
-          id="articleTitle"
-          style="width: 940px"
-          placeholder="请输入标题"
-          v-model="form.title"
-          clearable
-          maxlength="100"
-          @change="nameChange"
-        ></el-input>
+      <el-form-item prop="title"
+                    label="标题">
+        <el-input id="articleTitle"
+                  style="width: 940px"
+                  placeholder="请输入标题"
+                  v-model="form.title"
+                  clearable
+                  maxlength="100"
+                  @change="nameChange"></el-input>
       </el-form-item>
       <div class="item-line">
-        <el-form-item prop="columnId" label="所属栏目">
-          <el-cascader
-            ref="column"
-            v-model="form.columnId"
-            :options="columns"
-            :props="columnProps"
-            @change="columnChange"></el-cascader>
+        <el-form-item prop="columnId"
+                      label="所属栏目">
+          <el-cascader ref="column"
+                       v-model="form.columnId"
+                       :options="columns"
+                       :props="columnProps"
+                       @change="columnChange"></el-cascader>
         </el-form-item>
-        <el-form-item prop="releaseTime" label="发布日期">
-          <el-date-picker
-            v-model="form.releaseTime"
-            type="date"
-            placeholder="选择日期"
-            format="yyyy-MM-dd"
-            :clearable="false"
-            value-format="yyyy-MM-dd">
+        <el-form-item prop="releaseTime"
+                      label="发布日期">
+          <el-date-picker v-model="form.releaseTime"
+                          type="date"
+                          placeholder="选择日期"
+                          format="yyyy-MM-dd"
+                          :clearable="false"
+                          value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
       </div>
       <!-- 专利 -->
       <template v-if="isPatent">
         <div class="item-line">
-          <el-form-item prop="patentClassId" label="专利类别">
-            <el-select v-model="form.patentClassId" clearable>
+          <el-form-item prop="patentClassId"
+                        label="专利类别">
+            <el-select v-model="form.patentClassId"
+                       clearable>
               <template v-for="item in patentClasses">
-                <el-option
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                <el-option :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
                 </el-option>
               </template>
             </el-select>
           </el-form-item>
-          <el-form-item prop="applicationNumber" label="申请号">
-            <el-input
-              placeholder="请输入申请号"
-              v-model.trim="form.applicationNumber"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="applicationNumber"
+                        label="申请号">
+            <el-input placeholder="请输入申请号"
+                      v-model.trim="form.applicationNumber"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
         </div>
         <div class="item-line">
-          <el-form-item prop="applicationDate" label="申请日期">
-            <el-date-picker
-              v-model="form.applicationDate"
-              type="date"
-              placeholder="选择日期"
-              format="yyyy-MM-dd"
-              :clearable="false"
-              value-format="yyyy-MM-dd">
+          <el-form-item prop="applicationDate"
+                        label="申请日期">
+            <el-date-picker v-model="form.applicationDate"
+                            type="date"
+                            placeholder="选择日期"
+                            format="yyyy-MM-dd"
+                            :clearable="false"
+                            value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
-          <el-form-item prop="dateOfAuthorization" label="授权日期">
-            <el-date-picker
-              v-model="form.dateOfAuthorization"
-              type="date"
-              placeholder="选择日期"
-              format="yyyy-MM-dd"
-              :clearable="false"
-              value-format="yyyy-MM-dd">
+          <el-form-item prop="dateOfAuthorization"
+                        label="授权日期">
+            <el-date-picker v-model="form.dateOfAuthorization"
+                            type="date"
+                            placeholder="选择日期"
+                            format="yyyy-MM-dd"
+                            :clearable="false"
+                            value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
         </div>
-        <el-form-item prop="inventor" label="发明人">
-          <el-input
-            style="width: 940px"
-            type="textarea"
-            v-model="form.inventor"
-            :rows="3"
-          ></el-input>
+        <el-form-item prop="inventor"
+                      label="发明人">
+          <el-input style="width: 940px"
+                    type="textarea"
+                    v-model="form.inventor"
+                    :rows="3"></el-input>
         </el-form-item>
       </template>
       <!-- 专著 -->
       <template v-if="isMonograph">
         <div class="item-line">
-          <el-form-item prop="publishingHouse" label="出版社">
-            <el-input
-              placeholder="请输入出版社"
-              v-model.trim="form.publishingHouse"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="publishingHouse"
+                        label="出版社">
+            <el-input placeholder="请输入出版社"
+                      v-model.trim="form.publishingHouse"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
-          <el-form-item prop="writersAndEditors" label="编写人员">
-            <el-input
-              placeholder="请输入编写人员"
-              v-model.trim="form.writersAndEditors"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="writersAndEditors"
+                        label="编写人员">
+            <el-input placeholder="请输入编写人员"
+                      v-model.trim="form.writersAndEditors"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
         </div>
         <div class="item-line">
-          <el-form-item prop="publicationYear" label="出版时间">
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.publicationYear"
-              type="year"
-              placeholder="请选择出版时间"
-              format="yyyy"
-              value-format="yyyy">
+          <el-form-item prop="publicationYear"
+                        label="出版时间">
+            <el-date-picker style="width: 300px"
+                            v-model="form.publicationYear"
+                            type="year"
+                            placeholder="请选择出版时间"
+                            format="yyyy"
+                            value-format="yyyy">
             </el-date-picker>
           </el-form-item>
         </div>
       </template>
       <!-- 期刊详情 or 论文 -->
-      <template v-if="form.articleTemplate === 26 || isThesis">
+      <template v-if="isJournal || isThesis">
         <div class="item-line">
-          <el-form-item v-if="!isThesis" prop="doi" label="DOI">
-            <el-input
-              placeholder="请输入DOI"
-              v-model.trim="form.doi"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item v-if="!isThesis"
+                        prop="doi"
+                        label="DOI">
+            <el-input placeholder="请输入DOI"
+                      v-model.trim="form.doi"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
-          <el-form-item prop="publicationYear" :label="isThesis ? '发表年度' : '出版年份'">
-            <el-date-picker
-              style="width: 300px"
-              v-model="form.publicationYear"
-              type="year"
-              :placeholder="'请选择' + (isThesis ? '发表年度' : '出版年份')"
-              format="yyyy"
-              value-format="yyyy">
+          <el-form-item prop="publicationYear"
+                        :label="isThesis ? '发表年度' : '出版年份'">
+            <el-date-picker style="width: 300px"
+                            v-model="form.publicationYear"
+                            type="year"
+                            :placeholder="'请选择' + (isThesis ? '发表年度' : '出版年份')"
+                            format="yyyy"
+                            value-format="yyyy">
             </el-date-picker>
           </el-form-item>
         </div>
         <div class="item-line">
-          <el-form-item prop="periodicalName" :label="isThesis ? '期刊名称' : '刊物名称'">
-            <el-input
-              :placeholder="'请输入' + (isThesis ? '期刊名称' : '刊物名称')"
-              v-model="form.periodicalName"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="periodicalName"
+                        :label="isThesis ? '期刊名称' : '刊物名称'">
+            <el-input :placeholder="'请输入' + (isThesis ? '期刊名称' : '刊物名称')"
+                      v-model="form.periodicalName"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
           <div style="display: inline-flex;">
-            <el-form-item prop="reel" label="卷" style="margin-right: 0;">
-              <el-input
-                placeholder="请输入"
-                v-model="form.reel"
-                clearable
-                maxlength="50"
-                style="width: 110px"
-              ></el-input>
+            <el-form-item prop="reel"
+                          label="卷"
+                          style="margin-right: 0;">
+              <el-input placeholder="请输入"
+                        v-model="form.reel"
+                        clearable
+                        maxlength="50"
+                        style="width: 110px"></el-input>
             </el-form-item>
-            <el-form-item prop="documentNumber" label="文献号" label-width="80px">
-              <el-input
-                placeholder="请输入"
-                v-model="form.documentNumber"
-                clearable
-                maxlength="50"
-                style="width: 110px"
-              ></el-input>
+            <el-form-item prop="documentNumber"
+                          label="文献号"
+                          label-width="80px">
+              <el-input placeholder="请输入"
+                        v-model="form.documentNumber"
+                        clearable
+                        maxlength="50"
+                        style="width: 110px"></el-input>
             </el-form-item>
           </div>
         </div>
-        <el-form-item prop="author" label="作者">
-          <el-input
-            style="width: 940px"
-            type="textarea"
-            v-model="form.author"
-            :rows="3"
-          ></el-input>
+        <el-form-item prop="author"
+                      label="作者">
+          <el-input style="width: 940px"
+                    type="textarea"
+                    v-model="form.author"
+                    :rows="3"></el-input>
         </el-form-item>
       </template>
-      <el-form-item v-if="isPublication" prop="mainBody" label="正文">
-        <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
+      <el-form-item v-if="isPublication"
+                    prop="mainBody"
+                    label="正文">
+        <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                v-model="form.mainBody"
+                :init="editorConfig" />
       </el-form-item>
-      <div v-else-if="!isPublication" class="item-line">
-        <el-form-item prop="source" label="来源">
-          <el-input
-            placeholder="请输入来源"
-            v-model.trim="form.source"
-            clearable
-            maxlength="50"
-            class="inline-input"
-          ></el-input>
+      <div v-else-if="!isPublication"
+           class="item-line">
+        <el-form-item prop="source"
+                      label="来源">
+          <el-input placeholder="请输入来源"
+                    v-model.trim="form.source"
+                    clearable
+                    maxlength="50"
+                    class="inline-input"></el-input>
         </el-form-item>
-        <el-form-item v-if="form.articleTemplate === 25" prop="time" label="起止时间">
-          <el-date-picker
-            style="width: 300px"
-            v-model="form.time"
-            type="datetimerange"
-            range-separator="~"
-            :clearable="false"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期">
+        <el-form-item v-if="form.articleTemplate === 25"
+                      prop="time"
+                      label="起止时间">
+          <el-date-picker style="width: 300px"
+                          v-model="form.time"
+                          type="datetimerange"
+                          range-separator="~"
+                          :clearable="false"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-else prop="author" label="作者">
-          <el-input
-            placeholder="请输入作者"
-            v-model.trim="form.author"
-            clearable
-            maxlength="200"
-            class="inline-input"
-          ></el-input>
+        <el-form-item v-else-if="!isJournal"
+                      prop="author"
+                      label="作者">
+          <el-input placeholder="请输入作者"
+                    v-model.trim="form.author"
+                    clearable
+                    maxlength="200"
+                    class="inline-input"></el-input>
         </el-form-item>
       </div>
       <template v-if="!isPublication">
-        <div v-if="form.articleTemplate === 25" class="item-line">
-          <el-form-item prop="lectureSeries" label="演讲系列">
-            <el-input
-              placeholder="请输入演讲系列"
-              v-model.trim="form.lectureSeries"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+        <div v-if="form.articleTemplate === 25"
+             class="item-line">
+          <el-form-item prop="lectureSeries"
+                        label="演讲系列">
+            <el-input placeholder="请输入演讲系列"
+                      v-model.trim="form.lectureSeries"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
-          <el-form-item prop="onlineLocation" label="线上地点">
-            <el-input
-              placeholder="请输入线上地点"
-              v-model.trim="form.onlineLocation"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="onlineLocation"
+                        label="线上地点">
+            <el-input placeholder="请输入线上地点"
+                      v-model.trim="form.onlineLocation"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
         </div>
-        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23" class="item-line">
-          <el-form-item prop="edit" label="编辑">
-            <el-input
-              placeholder="请输入编辑"
-              v-model.trim="form.edit"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+             class="item-line">
+          <el-form-item prop="edit"
+                        label="编辑">
+            <el-input placeholder="请输入编辑"
+                      v-model.trim="form.edit"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
-          <el-form-item prop="audit" label="审核">
-            <el-input
-              placeholder="请输入审核"
-              v-model.trim="form.audit"
-              clearable
-              maxlength="50"
-              class="inline-input"
-            ></el-input>
+          <el-form-item prop="audit"
+                        label="审核">
+            <el-input placeholder="请输入审核"
+                      v-model.trim="form.audit"
+                      clearable
+                      maxlength="50"
+                      class="inline-input"></el-input>
           </el-form-item>
         </div>
         <template v-if="form.articleTemplate === 25">
           <div class="item-line">
-            <el-form-item prop="classificationId" label="所属分类">
-              <el-select style="width: 234px;" v-model="getModelData" clearable>
-              <!-- <el-select style="width: 234px;" v-model="form.classificationId" :value="classificationName.find(i=>i.id === form.classificationId ? form.classificationId : '')" clearable> -->
+            <el-form-item prop="classificationId"
+                          label="所属分类">
+              <el-select style="width: 234px;"
+                         v-model="getModelData"
+                         clearable>
+                <!-- <el-select style="width: 234px;" v-model="form.classificationId" :value="classificationName.find(i=>i.id === form.classificationId ? form.classificationId : '')" clearable> -->
                 <template v-for="item in classifications">
-                  <el-option
-                    v-if="item.classificationName"
-                    :key="item.id"
-                    :label="item.classificationName"
-                    :value="item.id"
-                    >
+                  <el-option v-if="item.classificationName"
+                             :key="item.id"
+                             :label="item.classificationName"
+                             :value="item.id">
                   </el-option>
                 </template>
               </el-select>
-              <el-button class="set-btn" type="primary" @click="setClass">设置</el-button>
+              <el-button class="set-btn"
+                         type="primary"
+                         @click="setClass">设置</el-button>
             </el-form-item>
-            <el-form-item prop="offlineLocation" label="线下地点">
-              <el-input
-                placeholder="请输入线下地点"
-                v-model="form.offlineLocation"
-                clearable
-                maxlength="100"
-              ></el-input>
+            <el-form-item prop="offlineLocation"
+                          label="线下地点">
+              <el-input placeholder="请输入线下地点"
+                        v-model="form.offlineLocation"
+                        clearable
+                        maxlength="100"></el-input>
             </el-form-item>
           </div>
-          <el-form-item prop="keynoteSpeaker" label="主讲人">
-            <el-input
-              style="width: 940px"
-              placeholder="请输入主讲人"
-              v-model="form.keynoteSpeaker"
-              clearable
-              maxlength="100"
-            ></el-input>
+          <el-form-item prop="keynoteSpeaker"
+                        label="主讲人">
+            <el-input style="width: 940px"
+                      placeholder="请输入主讲人"
+                      v-model="form.keynoteSpeaker"
+                      clearable
+                      maxlength="100"></el-input>
           </el-form-item>
-          <el-form-item prop="eventProfile" label="活动简介">
-            <el-input
-              style="width: 940px"
-              placeholder="请输入活动简介"
-              v-model="form.eventProfile"
-              type="textarea"
-              clearable
-            ></el-input>
+          <el-form-item prop="eventProfile"
+                        label="活动简介">
+            <el-input style="width: 940px"
+                      placeholder="请输入活动简介"
+                      v-model="form.eventProfile"
+                      type="textarea"
+                      clearable></el-input>
           </el-form-item>
         </template>
-        
-        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23" class="item-line">
-          <el-form-item prop="source" label="所属分类">
-            <el-select style="width: 234px;" v-model="getModelData" clearable>
+
+        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+             class="item-line">
+          <el-form-item prop="source"
+                        label="所属分类">
+            <el-select style="width: 234px;"
+                       v-model="getModelData"
+                       clearable>
               <template v-for="item in classifications">
-                <el-option
-                  v-if="item.id"
-                  :key="item.id"
-                  :label="item.classificationName"
-                  :value="item.id">
+                <el-option v-if="item.id"
+                           :key="item.id"
+                           :label="item.classificationName"
+                           :value="item.id">
                 </el-option>
               </template>
             </el-select>
-            <el-button class="set-btn" type="primary" @click="setClass">设置</el-button>
+            <el-button class="set-btn"
+                       type="primary"
+                       @click="setClass">设置</el-button>
           </el-form-item>
-          <el-form-item prop="author" label="主题标签">
-            <el-select style="width: 234px;" v-model="form.lableId" multiple >
+          <el-form-item prop="author"
+                        label="主题标签">
+            <el-select style="width: 234px;"
+                       v-model="form.lableId"
+                       multiple>
               <template v-for="item in labels">
-                <el-option
-                  v-if="item.id"
-                  :key="item.id"
-                  :label="item.labelName"
-                  :value="item.id">
+                <el-option v-if="item.id"
+                           :key="item.id"
+                           :label="item.labelName"
+                           :value="item.id">
                 </el-option>
               </template>
             </el-select>
-            <el-button class="set-btn" type="primary" @click="setLabel">设置</el-button>
+            <el-button class="set-btn"
+                       type="primary"
+                       @click="setLabel">设置</el-button>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23" prop="summary" label="摘要">
-          <el-input
-            style="width: 940px"
-            type="textarea"
-            v-model.trim="form.summary"
-            :rows="3"
-            clearable
-          ></el-input>
+        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+                      prop="summary"
+                      label="摘要">
+          <el-input style="width: 940px"
+                    type="textarea"
+                    v-model.trim="form.summary"
+                    :rows="3"
+                    clearable></el-input>
         </el-form-item>
-        <el-form-item prop="titleImg" :label="form.articleTemplate === 25 ? '标题图' : '封面图'">
-          <el-upload
-            class="avatar-uploader"
-            accept=".jpg,.png,.jpeg,.gif"
-            :on-change="file => changeFile(file, 0)"
-            :show-file-list="false"
-            :action="this.api.upload"
-            :auto-upload="false"
-          >
-            <img v-if="form.titleImg" :src="form.titleImg" class="avatar">
-            <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/images/plus.png" alt="">
+        <el-form-item prop="titleImg"
+                      :label="form.articleTemplate === 25 ? '标题图' : '封面图'">
+          <el-upload class="avatar-uploader"
+                     accept=".jpg,.png,.jpeg,.gif"
+                     :on-change="file => changeFile(file, 0)"
+                     :show-file-list="false"
+                     :action="this.api.upload"
+                     :auto-upload="false">
+            <img v-if="form.titleImg"
+                 :src="form.titleImg"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <img class="plus"
+                   src="@/assets/images/plus.png"
+                   alt="">
               <p>点击上传</p>
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 25" prop="bannerImg" label="Banner图(选填)" style="flex: 1;">
-          <el-upload
-            class="avatar-uploader avatar-uploader-lg"
-            accept=".jpg,.png,.jpeg,.gif"
-            :on-change="file => changeFile(file, 1)"
-            :show-file-list="false"
-            :action="this.api.upload"
-            :auto-upload="false"
-          >
-            <img v-if="form.bannerImg" :src="form.bannerImg" class="avatar-lg">
-            <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/images/plus.png" alt="">
+        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 25"
+                      prop="bannerImg"
+                      label="Banner图(选填)"
+                      style="flex: 1;">
+          <el-upload class="avatar-uploader avatar-uploader-lg"
+                     accept=".jpg,.png,.jpeg,.gif"
+                     :on-change="file => changeFile(file, 1)"
+                     :show-file-list="false"
+                     :action="this.api.upload"
+                     :auto-upload="false">
+            <img v-if="form.bannerImg"
+                 :src="form.bannerImg"
+                 class="avatar-lg">
+            <div class="uploader-default"
+                 v-else>
+              <img class="plus"
+                   src="@/assets/images/plus.png"
+                   alt="">
               <p>点击上传</p>
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || form.articleTemplate === 25" prop="mainBody" label="正文">
-          <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
+        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || form.articleTemplate === 25"
+                      prop="mainBody"
+                      label="正文">
+          <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                  v-model="form.mainBody"
+                  :init="editorConfig" />
         </el-form-item>
-        <template v-if="form.articleTemplate === 26">
-          <el-form-item prop="publicationTypeId" label="出版物类型">
-            <el-select style="width: 234px;" v-model="form.publicationTypeId">
+        <template v-if="isJournal">
+          <el-form-item prop="publicationTypeId"
+                        label="出版物类型">
+            <el-select style="width: 234px;"
+                       v-model="form.publicationTypeId">
               <template v-for="item in publicationTypes">
-                <el-option
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
+                <el-option :key="item.id"
+                           :label="item.name"
+                           :value="item.id">
                 </el-option>
               </template>
             </el-select>
           </el-form-item>
-          <el-form-item prop="quote" label="引用">
-            <el-input
-              style="width: 940px"
-              type="textarea"
-              v-model="form.quote"
-              :rows="3"
-            ></el-input>
+          <el-form-item prop="quote"
+                        label="引用">
+            <el-input style="width: 940px"
+                      type="textarea"
+                      v-model="form.quote"
+                      :rows="3"></el-input>
           </el-form-item>
-          <el-form-item prop="articleKeyWord" label="关键字">
-            <el-input
-              style="width: 940px"
-              v-model="form.articleKeyWord"
-            ></el-input>
+          <el-form-item prop="articleKeyWord"
+                        label="关键字">
+            <el-input style="width: 940px"
+                      v-model="form.articleKeyWord"></el-input>
           </el-form-item>
-          <el-form-item prop="mainBody" label="摘要">
-            <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
+          <el-form-item prop="mainBody"
+                        label="摘要">
+            <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                    v-model="form.mainBody"
+                    :init="editorConfig" />
           </el-form-item>
         </template>
-        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || form.articleTemplate === 25" prop="file" label="文件上传">
-          <el-upload
-            :before-upload="fileBeforeUpload"
-            :on-remove="handleRemove"
-            :on-success="uploadSuccessFile"
-            :action="this.api.upload"
-            :file-list="form.fileList"
-            :headers="headers"
-            :data="{
+        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || form.articleTemplate === 25"
+                      prop="file"
+                      label="文件上传">
+          <el-upload :before-upload="fileBeforeUpload"
+                     :on-remove="handleRemove"
+                     :on-success="uploadSuccessFile"
+                     :action="this.api.upload"
+                     :file-list="form.fileList"
+                     :headers="headers"
+                     :data="{
               quote: form.title,
               site: site.siteName,
               uploader: userName
-            }"
-          >
+            }">
             <el-button>上传</el-button>
           </el-upload>
         </el-form-item>
         <template v-if="form.articleTemplate === 24">
-          <el-form-item prop="connectionType" label="连接类型">
+          <el-form-item prop="connectionType"
+                        label="连接类型">
             <el-radio-group v-model="form.connectionType">
               <el-radio :label="1">站内链接</el-radio>
               <el-radio :label="2">站外链接</el-radio>
@@ -461,112 +497,139 @@
           </el-form-item>
           <template v-if="form.connectionType === 1">
             <el-form-item label="站内链接">
-              <el-cascader
-                v-model="links"
-                :options="columns"
-                :props="columnProps"
-                clearable
-                @change="getArticle"></el-cascader>
+              <el-cascader v-model="links"
+                           :options="columns"
+                           :props="columnProps"
+                           clearable
+                           @change="getArticle"></el-cascader>
             </el-form-item>
             <el-form-item label="文章">
-              <el-select v-model="article" clearable>
-                <el-option
-                  v-for="item in articles"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id">
+              <el-select v-model="article"
+                         clearable>
+                <el-option v-for="item in articles"
+                           :key="item.id"
+                           :label="item.title"
+                           :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </template>
-          <el-form-item v-show="form.connectionType === 2" prop="linkAddress" label="站外链接">
-            <el-input
-              placeholder="请输入站外链接"
-              v-model.trim="form.linkAddress"
-              clearable
-            ></el-input>
+          <el-form-item v-show="form.connectionType === 2"
+                        prop="linkAddress"
+                        label="站外链接">
+            <el-input placeholder="请输入站外链接"
+                      v-model.trim="form.linkAddress"
+                      clearable></el-input>
           </el-form-item>
           <template v-if="form.connectionType === 3">
-            <el-form-item prop="siteSelection" label="站点选择">
-              <el-select v-model="form.siteSelection" @change="getOtherColumn">
-                <el-option
-                  v-for="item in sites"
-                  :key="item.id"
-                  :label="item.siteName"
-                  :value="item.id">
+            <el-form-item prop="siteSelection"
+                          label="站点选择">
+              <el-select v-model="form.siteSelection"
+                         @change="getOtherColumn">
+                <el-option v-for="item in sites"
+                           :key="item.id"
+                           :label="item.siteName"
+                           :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="栏目">
-              <el-cascader
-                v-model="otherLink"
-                :options="otherColumns"
-                :props="columnProps"
-                clearable
-                @change="getArticle"></el-cascader>
+              <el-cascader v-model="otherLink"
+                           :options="otherColumns"
+                           :props="columnProps"
+                           clearable
+                           @change="getArticle"></el-cascader>
             </el-form-item>
             <el-form-item label="文章">
-              <el-select v-model="otherArticle" clearable>
-                <el-option
-                  v-for="item in otherArticles"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id">
+              <el-select v-model="otherArticle"
+                         clearable>
+                <el-option v-for="item in otherArticles"
+                           :key="item.id"
+                           :label="item.title"
+                           :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
           </template>
-          <el-form-item prop="isOpen" label="新窗口打开">
-            <el-switch
-              v-model="form.isOpen"
-              :active-value="1"
-              :inactive-value="0">
+          <el-form-item prop="isOpen"
+                        label="新窗口打开">
+            <el-switch v-model="form.isOpen"
+                       :active-value="1"
+                       :inactive-value="0">
             </el-switch>
           </el-form-item>
         </template>
       </template>
     </el-form>
     <div class="btns">
-      <el-button type="primary" @click="submit(1)">发布</el-button>
-      <el-button v-if="$route.query.id" @click="preview">预览</el-button>
+      <el-button type="primary"
+                 @click="submit(1)">发布</el-button>
+      <el-button v-if="$route.query.id"
+                 @click="preview">预览</el-button>
       <el-button @click="submit(0)">保存草稿</el-button>
       <el-button @click="back">取消</el-button>
     </div>
     <!-- 剪裁组件弹窗 -->
-    <el-dialog title="图片裁剪" append-to-body :visible.sync="cropperModel" width="1100px" :close-on-click-modal="false">
-      <Cropper
-        ref="cropper"
-        :img-file.sync="file"
-        :is-upload="isUpload"
-        :fixed="true"
-        :fixedNumber.sync="fixedNumber"
-        @upload="customUpload" />
+    <el-dialog title="图片裁剪"
+               append-to-body
+               :visible.sync="cropperModel"
+               width="1100px"
+               :close-on-click-modal="false">
+      <Cropper ref="cropper"
+               :img-file.sync="file"
+               :is-upload="isUpload"
+               :fixed="true"
+               :fixedNumber.sync="fixedNumber"
+               @upload="customUpload" />
     </el-dialog>
-    
-    <el-dialog title="所属分类设置" :visible.sync="classVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeClass">
+
+    <el-dialog title="所属分类设置"
+               :visible.sync="classVisible"
+               width="500px"
+               :close-on-click-modal="false"
+               class="manage-dia"
+               :before-close="closeClass">
       <div class="plus">
-        <i class="el-icon-circle-plus-outline" @click="addClass"></i>
+        <i class="el-icon-circle-plus-outline"
+           @click="addClass"></i>
       </div>
-      <el-table :data="classifications" ref="table" header-align="center" row-key="id">
-        <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-        <el-table-column prop="classificationName" label="分类名称" align="center" min-width="130">
+      <el-table :data="classifications"
+                ref="table"
+                header-align="center"
+                row-key="id">
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="classificationName"
+                         label="分类名称"
+                         align="center"
+                         min-width="130">
           <template slot-scope="scope">
-            <el-input
-              v-if="scope.row.edit"
-              placeholder="请输入分类名称"
-              v-model="scope.row.classificationName"
-              clearable
-              maxlength="30"
-            ></el-input>
+            <el-input v-if="scope.row.edit"
+                      placeholder="请输入分类名称"
+                      v-model="scope.row.classificationName"
+                      clearable
+                      maxlength="30"></el-input>
             <span v-else>{{ scope.row.classificationName }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="updateTime1" label="是否引用" align="center" min-width="60">否</el-table-column>
-        <el-table-column label="操作" align="center" min-width="60">
+        <el-table-column prop="updateTime1"
+                         label="是否引用"
+                         align="center"
+                         min-width="60">否</el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         min-width="60">
           <template slot-scope="scope">
-            <i v-if="scope.row.edit" class="el-icon-check edit" @click="submitClass(scope.row)"></i>
-            <i v-else class="el-icon-edit edit" @click="editClass(scope.row)"></i>
-            <i class="el-icon-delete del" @click="delClass(scope.row, scope.$index)"></i>
+            <i v-if="scope.row.edit"
+               class="el-icon-check edit"
+               @click="submitClass(scope.row)"></i>
+            <i v-else
+               class="el-icon-edit edit"
+               @click="editClass(scope.row)"></i>
+            <i class="el-icon-delete del"
+               @click="delClass(scope.row, scope.$index)"></i>
           </template>
         </el-table-column>
       </el-table>
@@ -574,31 +637,54 @@
         <el-button @click="closeClass">返回</el-button>
       </span>
     </el-dialog>
-    
-    <el-dialog title="主题标签设置" :visible.sync="labelVisible" width="500px" :close-on-click-modal="false" class="manage-dia" :before-close="closeLabel">
+
+    <el-dialog title="主题标签设置"
+               :visible.sync="labelVisible"
+               width="500px"
+               :close-on-click-modal="false"
+               class="manage-dia"
+               :before-close="closeLabel">
       <div class="plus">
-        <i class="el-icon-circle-plus-outline" @click="addLabel"></i>
+        <i class="el-icon-circle-plus-outline"
+           @click="addLabel"></i>
       </div>
-      <el-table :data="labels" ref="table" header-align="center" row-key="id">
-        <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-        <el-table-column prop="labelName" label="主题名称" align="center" min-width="130">
+      <el-table :data="labels"
+                ref="table"
+                header-align="center"
+                row-key="id">
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="labelName"
+                         label="主题名称"
+                         align="center"
+                         min-width="130">
           <template slot-scope="scope">
-            <el-input
-              v-if="scope.row.edit"
-              placeholder="请输入主题名称"
-              v-model="scope.row.labelName"
-              clearable
-              maxlength="30"
-            ></el-input>
+            <el-input v-if="scope.row.edit"
+                      placeholder="请输入主题名称"
+                      v-model="scope.row.labelName"
+                      clearable
+                      maxlength="30"></el-input>
             <span v-else>{{ scope.row.labelName }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="updateTime1" label="是否引用" align="center" min-width="60">否</el-table-column>
-        <el-table-column label="操作" align="center" min-width="60">
+        <el-table-column prop="updateTime1"
+                         label="是否引用"
+                         align="center"
+                         min-width="60">否</el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         min-width="60">
           <template slot-scope="scope">
-            <i v-if="scope.row.edit" class="el-icon-check edit" @click="submitLabel(scope.row)"></i>
-            <i v-else class="el-icon-edit edit" @click="editLabel(scope.row)"></i>
-            <i class="el-icon-delete del" @click="delLabel(scope.row, scope.$index)"></i>
+            <i v-if="scope.row.edit"
+               class="el-icon-check edit"
+               @click="submitLabel(scope.row)"></i>
+            <i v-else
+               class="el-icon-edit edit"
+               @click="editLabel(scope.row)"></i>
+            <i class="el-icon-delete del"
+               @click="delLabel(scope.row, scope.$index)"></i>
           </template>
         </el-table-column>
       </el-table>
@@ -618,854 +704,858 @@ import Cropper from '@/components/img-upload/Cropper'
 import Axios from 'axios'
 import ColumnConst from '@/const/column'
 export default {
-    data() {
-        return {
-          site: this.$store.state.content.site,
-          userId: this.$store.state.user.userId,
-          publicationTypes: ColumnConst.publicationTypes,
-          patentClasses: ColumnConst.patentClasses,
-          headers: {
-            token: Util.local.get(Setting.tokenKey)
-          },
-          nameRepeat: false,
-          sites: [],
-          detailStyle: [],
-          columns: [],
-          articles: [],
-          otherArticles: [],
-          columnProps: {
-            checkStrictly: true,
-            value: 'id',
-            label: 'columnName'
-          },
-          links: [],
-          article: '',
-          otherColumns: [],
-          otherLink: [],
-          otherArticle: '',
-          form: {
-            siteId: this.$store.state.content.site.id,
-            id: this.$route.query.id || '',
-            founderId: this.$store.state.user.userId,
-            editorId: this.$store.state.user.userId,
-            templateStatus: 0,
-            articleTemplate: '',
-            doi: '',
-            quote: '',
-            articleKeyWord: '',
-            publicationTypeId: '',
-            publicationYear: '',
-            periodicalName: '',
-            reel: '',
-            documentNumber: '',
-            activityEndTime: '',
-            activityStartTime: '',
-            time: '',
-            lectureSeries: '',
-            onlineLocation: '',
-            offlineLocation: '',
-            keynoteSpeaker: '',
-            eventProfile: '',
-            author: '',
-            edit: '',
-            audit: '',
-            bannerImg: '',
-            lableId: [],
-            classificationId: '',
-            columnId: +this.$route.query.columnId,
-            file: '',
-            isRelease: 0,
-            mainBody: '',
-            releaseTime: new Date(),
-            source: '',
-            summary	: '',
-            title: '',
-            titleImg: '',
-            connectionType	: 1,
-            linkAddress: '',
-            siteSelection: '',
-            fileList: [],
-            isOpen: 1,
-            patentClassId: '',
-            patentName: '',
-            writersAndEditors: '',
-            inventor: '',
-            famousWorks: '',
-            applicationNumber: '',
-            applicationDate: '',
-            dateOfAuthorization: '',
-            publishingHouse: ''
-          },
-          rules: {
-            title: [
-              { required: true, message: '请输入标题', trigger: 'blur' }
-            ],
-            columnId: [
-              { required: true, message: '请选择所属栏目', trigger: 'change' }
-            ],
-            time: [
-              { required: true, message: '请选择起始时间', trigger: 'change' }
-            ],
-            classificationId: [
-              { required: false, message: '请选择所属分类', trigger: 'change' }
-            ],
-            keynoteSpeaker: [
-              { required: true, message: '请输入主讲人', trigger: 'blur' }
-            ],
-            eventProfile: [
-              { required: true, message: '请输入活动简介', trigger: 'blur' }
-            ],
-            releaseTime: [
-              { required: true, message: '请选择发布日期', trigger: 'change' }
-            ],
-            publicationYear: [
-              { required: true, message: '请选择出版年份', trigger: 'change' }
-            ],
-            titleImg: [
-              { required: true, message: '请上传封面图', trigger: 'change' }
-            ],
-            mainBody: [
-              { required: true, message: '请输入正文', trigger: 'blur' }
-            ],
-            connectionType: [
-              { required: true, message: '请选择连接类型', trigger: 'blur' }
-            ],
-          },
-          columnInfo: {},
-          editorConfig,
-          submiting: false, // 新增编辑防抖标识
-          pass: false,
-          uploading: 0,
-          updateTime: 0,
-          cropperModel: false,
-          isUpload: false,
-          fixedNumber: [1.76, 1],
-          file: {}, // 当前被选择的图片文件
-          isBanner: 0,
-          classifications: [],
-          classVisible: false,
-          labels: [],
-          labelVisible: false,
-          originalName: '',
-          originColumnId: ''
-        };
-    },
-    computed: {
-      ...mapState('user', [
-        'userName'
-      ]),
-      ...mapState('content', [
-        'column'
-      ]),
-      // 栏目的栏目模板是出版物
-      isPublication() {
-        return this.columnInfo.templateId === 11
-      },
-      // 论文
-      isThesis() {
-        return this.columnInfo.listStyleId === 46
+  data () {
+    return {
+      site: this.$store.state.content.site,
+      userId: this.$store.state.user.userId,
+      publicationTypes: ColumnConst.publicationTypes,
+      patentClasses: ColumnConst.patentClasses,
+      headers: {
+        token: Util.local.get(Setting.tokenKey)
       },
-      // 专利
-      isPatent() {
-        return this.columnInfo.listStyleId === 44
+      nameRepeat: false,
+      sites: [],
+      detailStyle: [],
+      columns: [],
+      articles: [],
+      otherArticles: [],
+      columnProps: {
+        checkStrictly: true,
+        value: 'id',
+        label: 'columnName'
       },
-      // 专著
-      isMonograph() {
-        return this.columnInfo.listStyleId === 45
+      links: [],
+      article: '',
+      otherColumns: [],
+      otherLink: [],
+      otherArticle: '',
+      form: {
+        siteId: this.$store.state.content.site.id,
+        id: this.$route.query.id || '',
+        founderId: this.$store.state.user.userId,
+        editorId: this.$store.state.user.userId,
+        templateStatus: 0,
+        articleTemplate: '',
+        doi: '',
+        quote: '',
+        articleKeyWord: '',
+        publicationTypeId: '',
+        publicationYear: '',
+        periodicalName: '',
+        reel: '',
+        documentNumber: '',
+        activityEndTime: '',
+        activityStartTime: '',
+        time: '',
+        lectureSeries: '',
+        onlineLocation: '',
+        offlineLocation: '',
+        keynoteSpeaker: '',
+        eventProfile: '',
+        author: '',
+        edit: '',
+        audit: '',
+        bannerImg: '',
+        lableId: [],
+        classificationId: '',
+        columnId: +this.$route.query.columnId,
+        file: '',
+        isRelease: 0,
+        mainBody: '',
+        releaseTime: new Date(),
+        source: '',
+        summary: '',
+        title: '',
+        titleImg: '',
+        connectionType: 1,
+        linkAddress: '',
+        siteSelection: '',
+        fileList: [],
+        isOpen: 1,
+        patentClassId: '',
+        patentName: '',
+        writersAndEditors: '',
+        inventor: '',
+        famousWorks: '',
+        applicationNumber: '',
+        applicationDate: '',
+        dateOfAuthorization: '',
+        publishingHouse: ''
       },
-      getModelData: {
-        get() {
-          const data = this.classifications.find(item=> item.id ===  this.form.classificationId)
-          return data ? data.id : ''
-        },
-        set(newVal) {
-          this.form.classificationId = newVal
-        }
+      rules: {
+        title: [
+          { required: true, message: '请输入标题', trigger: 'blur' }
+        ],
+        columnId: [
+          { required: true, message: '请选择所属栏目', trigger: 'change' }
+        ],
+        time: [
+          { required: true, message: '请选择起始时间', trigger: 'change' }
+        ],
+        classificationId: [
+          { required: false, message: '请选择所属分类', trigger: 'change' }
+        ],
+        keynoteSpeaker: [
+          { required: true, message: '请输入主讲人', trigger: 'blur' }
+        ],
+        eventProfile: [
+          { required: true, message: '请输入活动简介', trigger: 'blur' }
+        ],
+        releaseTime: [
+          { required: true, message: '请选择发布日期', trigger: 'change' }
+        ],
+        publicationYear: [
+          { required: true, message: '请选择出版年份', trigger: 'change' }
+        ],
+        titleImg: [
+          { required: true, message: '请上传封面图', trigger: 'change' }
+        ],
+        mainBody: [
+          { required: true, message: '请输入正文', trigger: 'blur' }
+        ],
+        connectionType: [
+          { required: true, message: '请选择连接类型', trigger: 'blur' }
+        ],
       },
+      columnInfo: {},
+      editorConfig,
+      submiting: false, // 新增编辑防抖标识
+      pass: false,
+      uploading: 0,
+      updateTime: 0,
+      cropperModel: false,
+      isUpload: false,
+      fixedNumber: [1.76, 1],
+      file: {}, // 当前被选择的图片文件
+      isBanner: 0,
+      classifications: [],
+      classVisible: false,
+      labels: [],
+      labelVisible: false,
+      originalName: '',
+      originColumnId: ''
+    };
+  },
+  computed: {
+    ...mapState('user', [
+      'userName'
+    ]),
+    ...mapState('content', [
+      'column'
+    ]),
+    // 栏目的栏目模板是出版物
+    isPublication () {
+      return this.columnInfo.templateId === 11
     },
-    components: {
-      Editor,
-      Cropper
+    // 论文
+    isThesis () {
+      return this.columnInfo.listStyleId === 46
     },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-      form: {
-        handler(val){
-          this.updateTime++
-        },
-        deep:true
+    // 专利
+    isPatent () {
+      return this.columnInfo.listStyleId === 44
+    },
+    // 专著
+    isMonograph () {
+      return this.columnInfo.listStyleId === 45
+    },
+    // 期刊详情
+    isJournal () {
+      return this.form.articleTemplate === 26
+    },
+    getModelData: {
+      get () {
+        const data = this.classifications.find(item => item.id === this.form.classificationId)
+        return data ? data.id : ''
+      },
+      set (newVal) {
+        this.form.classificationId = newVal
       }
     },
-    // 页面离开的时候如果没有保存则提示
-    beforeRouteLeave(to, from, next) {
-      if (this.submiting) {
-        next()
-      } else if (!this.pass) {
-        // 更改了信息才需要提示
-        if (this.updateTime > 1) {
-          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.submit(this.form.isRelease, next)
-          }).catch(() => {
-            next()
-          })
-        } else {
+  },
+  components: {
+    Editor,
+    Cropper
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler (val) {
+        this.updateTime++
+      },
+      deep: true
+    }
+  },
+  // 页面离开的时候如果没有保存则提示
+  beforeRouteLeave (to, from, next) {
+    if (this.submiting) {
+      next()
+    } else if (!this.pass) {
+      // 更改了信息才需要提示
+      if (this.updateTime > 1) {
+        this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.submit(this.form.isRelease, next)
+        }).catch(() => {
           next()
-        }
+        })
       } else {
         next()
       }
-    },
-    mounted() {
-      this.$store.commit('user/setCrumbs', [
-        {
-          name: '站点管理',
-          route: '/site'
-        },
-        {
-          name: '内容管理'
-        },
-        {
-          name: '文章管理',
-          route: '/article'
-        },
-        {
-          name: this.$route.query.columnName,
-          route: '/article'
-        },
-        {
-          name: this.$route.query.id ? '编辑' : '新增'
-        }
-      ])
-      this.getList()
-      this.getSite()
-      this.getLabel()
-      this.getTemplate()
-    },
-    methods: {
-      // 获取栏目
-      getList() {
-        this.$post(this.api.listWithTree, {
-          siteId: this.site.id,
-          columnName: '',
-          templateId: '',
-          typeId	: '',
-          isSort: 1
-        }).then(({ data }) => {
-          this.columns = data
-          let { columnId } = this.$route.query
-          // 如果是新增文章，则要默认选中栏目，因为从外面带进来的是单个id，要取到父id来选中到里面的层级
-          if (columnId && data.length) {
-            columnId = +columnId
-            let ids = []
-            // 递归获取完整id
-            const getId = (list, parentId) => {
-              for (const i in list) {
-                const e = list[i]
-                if (e.id === columnId) {
-                  ids = [...parentId, list[i].id]
-                  break
-                } else {
-                  getId(e.children, [...parentId, e.id])
-                }
-              }
-            }
-            getId(data, [])
-            if (!ids.length) ids = [data[0].id] // 如果因为切换站点而没有匹配的栏目id，则取第一个栏目
-            this.form.columnId = ids
-          }
-          this.form.id ? this.getData() : this.getColumn()
-        }).catch(err => {})
+    } else {
+      next()
+    }
+  },
+  mounted () {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
       },
-      // 文章列表
-      getArticle() {
-        // 站内链接/其他站点链接
-        const inner = this.form.connectionType === 1
-        const id = inner ? this.links[this.links.length - 1] : this.otherLink[this.otherLink.length - 1]
-        this[inner ? 'article' : 'otherArticle'] = ''
-        this.$post(this.api.queryArticle, {
-          siteId: inner ? this.site.id : this.form.siteSelection,
-          columnIds: [id],
-          pageNum: 1,
-          pageSize: 1000,
-          title: '',
-          isDisable: 0
-        }).then(({ data }) => {
-          this[inner ? 'articles' : 'otherArticles'] = data.records.filter(e => e.isRelease) // 只显示已发布的文章
-        }).catch(err => {})
+      {
+        name: '内容管理'
       },
-      // 获取文章详情
-      getData() {
-        this.$post(`${this.api.findArticle}?id=${this.form.id}`).then(({ data }) => {
-          data.lableId = data.lableId ? data.lableId.split(',').map(e => +e) : []
-          if (data.activityStartTime && data.activityEndTime) data.time = [data.activityStartTime, data.activityEndTime]
-          // 文件上传回显
-          if (data.fileList) {
-            data.fileList.map(e => {
-              e.name = e.fileName
-            })
-          }
-          // 链接回显
-          if (data.articleTemplate === 24 && data.connectionType !== 2 && data.linkAddress) {
-            const columnArticle = data.linkAddress.split('-')
-            const column = columnArticle[0].split(',').map(e => +e)
-
-            const article = columnArticle[1] || '' // 获取文章id（文章id是附在linkAddress最后面的-后面的数字）
-            const { connectionType } = data
-            // 获取文章
-            this.$post(this.api.queryArticle, {
-              siteId: connectionType === 1 ? this.site.id : data.siteSelection,
-              columnIds: [column[column.length - 1]], // 截取走最后面的文章id，最后一个id就是栏目id
-              pageNum: 1,
-              pageSize: 1000,
-              title: '',
-              isDisable: 0
-            }).then(res => {
-              this[connectionType === 1 ? 'articles' : 'otherArticles'] = res.data.records
-              // 站内链接/其他站点链接
-              if (connectionType === 1) {
-                this.links = column
-                this.form.linkAddress = ''
-                if (article) this.article = +article
-              } else if (connectionType === 3) {
-                this.otherLink = column
-                this.form.linkAddress = ''
-                if (article) this.otherArticle = +article
-              }
-            }).catch(err => {})
-          }
-          this.originalName = data.title
-          this.originColumnId = data.columnId
-          let lableData = []
-          data.lableId.forEach(item => {
-            this.labels.forEach(options=> {
-              if (item ==options.id) {
-                lableData.push(item)
-              }
-            })
-          })
-          data.lableId = lableData
-          this.form = data
-          data.siteSelection && this.getOtherColumn()
-          this.getColumn()
-        }).catch(err => {})
+      {
+        name: '文章管理',
+        route: '/article'
       },
-      // 获取栏目详情
-      getColumn() {
-        this.$post(`${this.api.findColumn}?id=${this.$route.query.columnId}`).then(({ data }) => {
-          this.columnInfo = data
-          const { form } = this
-          // 如果独立文章模板未启用，并且该栏目的类型为常规/子级优先，则把栏目所选的详情样式赋值到文章模板；如果栏目类型为长页或者链接，则文章模板默认为文章（23）
-          if (!form.templateStatus) {
-            form.articleTemplate = (data.typeId === 1 || data.typeId === 4) ? data.detailStyleId : 23
-          }
-          this.handleRules()
-          this.getClassification()
-          this.$nextTick(() => {
-            this.updateTime = 0
-          })
-        }).catch(err => {})
+      {
+        name: this.$route.query.columnName,
+        route: '/article'
       },
-      // 处理表单验证
-      handleRules() {
-        const { articleTemplate } = this.form
-        // 会议活动
-        if (articleTemplate === 25) {
-          this.rules.titleImg[0].required  = false
-        } else {
-          this.rules.titleImg[0].required  = true
+      {
+        name: this.$route.query.id ? '编辑' : '新增'
+      }
+    ])
+    this.getList()
+    this.getSite()
+    this.getLabel()
+    this.getTemplate()
+  },
+  methods: {
+    // 获取栏目
+    getList () {
+      this.$post(this.api.listWithTree, {
+        siteId: this.site.id,
+        columnName: '',
+        templateId: '',
+        typeId: '',
+        isSort: 1
+      }).then(({ data }) => {
+        this.columns = data
+        let { columnId } = this.$route.query
+        // 如果是新增文章，则要默认选中栏目，因为从外面带进来的是单个id，要取到父id来选中到里面的层级
+        if (columnId && data.length) {
+          columnId = +columnId
+          let ids = []
+          // 递归获取完整id
+          const getId = (list, parentId) => {
+            for (const i in list) {
+              const e = list[i]
+              if (e.id === columnId) {
+                ids = [...parentId, list[i].id]
+                break
+              } else {
+                getId(e.children, [...parentId, e.id])
+              }
+            }
+          }
+          getId(data, [])
+          if (!ids.length) ids = [data[0].id] // 如果因为切换站点而没有匹配的栏目id，则取第一个栏目
+          this.form.columnId = ids
         }
-        if (this.columnInfo.templateId === 11) {
-          this.rules.mainBody[0].required  = false
+        this.form.id ? this.getData() : this.getColumn()
+      }).catch(err => { })
+    },
+    // 文章列表
+    getArticle () {
+      // 站内链接/其他站点链接
+      const inner = this.form.connectionType === 1
+      const id = inner ? this.links[this.links.length - 1] : this.otherLink[this.otherLink.length - 1]
+      this[inner ? 'article' : 'otherArticle'] = ''
+      this.$post(this.api.queryArticle, {
+        siteId: inner ? this.site.id : this.form.siteSelection,
+        columnIds: [id],
+        pageNum: 1,
+        pageSize: 1000,
+        title: '',
+        isDisable: 0
+      }).then(({ data }) => {
+        this[inner ? 'articles' : 'otherArticles'] = data.records.filter(e => e.isRelease) // 只显示已发布的文章
+      }).catch(err => { })
+    },
+    // 获取文章详情
+    getData () {
+      this.$post(`${this.api.findArticle}?id=${this.form.id}`).then(({ data }) => {
+        data.lableId = data.lableId ? data.lableId.split(',').map(e => +e) : []
+        if (data.activityStartTime && data.activityEndTime) data.time = [data.activityStartTime, data.activityEndTime]
+        // 文件上传回显
+        if (data.fileList) {
+          data.fileList.map(e => {
+            e.name = e.fileName
+          })
         }
-      },
-      // 独立文章模板选择回调
-      styleChange(id) {
-        this.form.articleTemplate = id
-        this.handleRules()
-      },
-      // 所属栏目选择回调
-      columnChange(val) {
-        const checked = this.$refs.column.getCheckedNodes()
-        if (checked && checked.length) {
-          // 所属栏目改变后重新查询所属分类
-          this.columnInfo = checked[checked.length - 1].data
-          this.getClassification()
+        // 链接回显
+        if (data.articleTemplate === 24 && data.connectionType !== 2 && data.linkAddress) {
+          const columnArticle = data.linkAddress.split('-')
+          const column = columnArticle[0].split(',').map(e => +e)
+
+          const article = columnArticle[1] || '' // 获取文章id（文章id是附在linkAddress最后面的-后面的数字）
+          const { connectionType } = data
+          // 获取文章
+          this.$post(this.api.queryArticle, {
+            siteId: connectionType === 1 ? this.site.id : data.siteSelection,
+            columnIds: [column[column.length - 1]], // 截取走最后面的文章id，最后一个id就是栏目id
+            pageNum: 1,
+            pageSize: 1000,
+            title: '',
+            isDisable: 0
+          }).then(res => {
+            this[connectionType === 1 ? 'articles' : 'otherArticles'] = res.data.records
+            // 站内链接/其他站点链接
+            if (connectionType === 1) {
+              this.links = column
+              this.form.linkAddress = ''
+              if (article) this.article = +article
+            } else if (connectionType === 3) {
+              this.otherLink = column
+              this.form.linkAddress = ''
+              if (article) this.otherArticle = +article
+            }
+          }).catch(err => { })
         }
-      },
-      // 每个层级加上父级id的集合
-      getId(list, ids) {
-        list.forEach(e => {
-          e.ids = ids ? [...ids, e.id] : [e.id]
-          e.children.length ? this.getId(e.children, e.ids) : delete e.children
-        })
-      },
-      // 获取站点列表
-      getSite() {
-        this.$post(this.api.site, {
-          page: 1,
-          limit: 1000,
-          siteName: ''
-        }).then(({ data }) => {
-          data.records.splice(data.records.findIndex(e => e.id == this.site.id), 1) // 不显示当前站点
-          this.sites = data.records
-        }).catch(e => {})
-      },
-      // 获取指定站点的栏目列表
-      getOtherColumn(val) {
-        this.$post(this.api.listWithTree, {
-          siteId: this.form.siteSelection,
-          columnName: '',
-          templateId: '',
-          typeId	: '',
-          isSort: 1
-        }).then(({ data }) => {
-          if (val) {
-            this.otherArticles = []
-            this.otherArticle = ''
-            this.otherLink = ''
-          }
-          this.otherColumns = data
-        }).catch(err => {})
-      },
-      // 获取所有模板
-      getTemplate() {
-        this.$post(this.api.individualTemplateDetailsStyle).then(({ data }) => {
-          const result = []
-          data.map(e => {
-            result.find(n => n.style === e.style) || result.push(e)
+        this.originalName = data.title
+        this.originColumnId = data.columnId
+        let lableData = []
+        data.lableId.forEach(item => {
+          this.labels.forEach(options => {
+            if (item == options.id) {
+              lableData.push(item)
+            }
           })
-          this.detailStyle = result
-        }).catch(err => {})
-      },
-      // 获取所属分类
-      getClassification() {
-        this.$post(`${this.api.queryClassif}?siteId=${this.site.id}&templateId=${this.columnInfo.templateId}`).then(({ data }) => {
-          this.classifications = data
-        }).catch(err => {})
-      },
-      // 显示所属分类弹框
-      setClass() {
-        this.classVisible = true
-      },
-      // 新增所属分类
-      addClass() {
-        this.classifications.push({
-          edit: true,
-          id: '',
-          classificationName: ''
         })
-      },
-      // 编辑所属分类
-      editClass(row) {
-        this.$set(row, 'edit', 1)
-      },
-      // 删除所属分类
-      delClass(row, i) {
-        if (row.id) {
-          this.$confirm('确定要删除吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$post(`${this.api.delClassif}?id=${row.id}`).then(res => {
-              Util.successMsg('删除成功')
-              this.getClassification()
-            }).catch(res => {})
-          }).catch(() => {})
-        } else {
-          this.classifications.splice(i, 1)
+        data.lableId = lableData
+        this.form = data
+        data.siteSelection && this.getOtherColumn()
+        this.getColumn()
+      }).catch(err => { })
+    },
+    // 获取栏目详情
+    getColumn () {
+      this.$post(`${this.api.findColumn}?id=${this.$route.query.columnId}`).then(({ data }) => {
+        this.columnInfo = data
+        const { form } = this
+        // 如果独立文章模板未启用，并且该栏目的类型为常规/子级优先，则把栏目所选的详情样式赋值到文章模板；如果栏目类型为长页或者链接，则文章模板默认为文章（23）
+        if (!form.templateStatus) {
+          form.articleTemplate = (data.typeId === 1 || data.typeId === 4) ? data.detailStyleId : 23
         }
-      },
-      // 提交所属分类
-      submitClass(row, showMsg = 1) {
-        if (!row.classificationName) return Util.errorMsg('请输入分类名称')
-        this.$post(`${this.api.checkClassif}?classificationName=${row.classificationName}&siteId=${this.site.id}&classificationId=${row.id}`).then(res => {
-          this.$post(this.api[row.id ? 'updateClassif' : 'saveClassif'], {
-            classificationName: row.classificationName,
-            templateId: this.columnInfo.templateId,
-            id: row.id,
-            siteId: this.site.id,
-            editorId: this.userId,
-            founderId: this.userId
-          }).then(res => {
-            showMsg && Util.successMsg((row.id ? '修改' : '新增') + '成功')
+        this.handleRules()
+        this.getClassification()
+        this.$nextTick(() => {
+          this.updateTime = 0
+        })
+      }).catch(err => { })
+    },
+    // 处理表单验证
+    handleRules () {
+      const { articleTemplate } = this.form
+      // 会议活动
+      if (articleTemplate === 25) {
+        this.rules.titleImg[0].required = false
+      } else {
+        this.rules.titleImg[0].required = true
+      }
+      if (this.columnInfo.templateId === 11) {
+        this.rules.mainBody[0].required = false
+      }
+    },
+    // 独立文章模板选择回调
+    styleChange (id) {
+      this.form.articleTemplate = id
+      this.handleRules()
+    },
+    // 所属栏目选择回调
+    columnChange (val) {
+      const checked = this.$refs.column.getCheckedNodes()
+      if (checked && checked.length) {
+        // 所属栏目改变后重新查询所属分类
+        this.columnInfo = checked[checked.length - 1].data
+        this.getClassification()
+      }
+    },
+    // 每个层级加上父级id的集合
+    getId (list, ids) {
+      list.forEach(e => {
+        e.ids = ids ? [...ids, e.id] : [e.id]
+        e.children.length ? this.getId(e.children, e.ids) : delete e.children
+      })
+    },
+    // 获取站点列表
+    getSite () {
+      this.$post(this.api.site, {
+        page: 1,
+        limit: 1000,
+        siteName: ''
+      }).then(({ data }) => {
+        data.records.splice(data.records.findIndex(e => e.id == this.site.id), 1) // 不显示当前站点
+        this.sites = data.records
+      }).catch(e => { })
+    },
+    // 获取指定站点的栏目列表
+    getOtherColumn (val) {
+      this.$post(this.api.listWithTree, {
+        siteId: this.form.siteSelection,
+        columnName: '',
+        templateId: '',
+        typeId: '',
+        isSort: 1
+      }).then(({ data }) => {
+        if (val) {
+          this.otherArticles = []
+          this.otherArticle = ''
+          this.otherLink = ''
+        }
+        this.otherColumns = data
+      }).catch(err => { })
+    },
+    // 获取所有模板
+    getTemplate () {
+      this.$post(this.api.individualTemplateDetailsStyle).then(({ data }) => {
+        const result = []
+        data.map(e => {
+          result.find(n => n.style === e.style) || result.push(e)
+        })
+        this.detailStyle = result
+      }).catch(err => { })
+    },
+    // 获取所属分类
+    getClassification () {
+      this.$post(`${this.api.queryClassif}?siteId=${this.site.id}&templateId=${this.columnInfo.templateId}`).then(({ data }) => {
+        this.classifications = data
+      }).catch(err => { })
+    },
+    // 显示所属分类弹框
+    setClass () {
+      this.classVisible = true
+    },
+    // 新增所属分类
+    addClass () {
+      this.classifications.push({
+        edit: true,
+        id: '',
+        classificationName: ''
+      })
+    },
+    // 编辑所属分类
+    editClass (row) {
+      this.$set(row, 'edit', 1)
+    },
+    // 删除所属分类
+    delClass (row, i) {
+      if (row.id) {
+        this.$confirm('确定要删除吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.$post(`${this.api.delClassif}?id=${row.id}`).then(res => {
+            Util.successMsg('删除成功')
             this.getClassification()
-          }).catch(res => {})
-        }).catch(res => {})
-      },
-      // 关闭所属分类
-      closeClass() {
-        const list = this.classifications
-        if (list.find(e => e.edit && e.classificationName)) {
-          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            list.map(e => {
-              e.edit && e.classificationName && this.submitClass(e, 0)
-            })
-            this.classVisible = false
-          }).catch(() => {
-            this.classVisible = false
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.classifications.splice(i, 1)
+      }
+    },
+    // 提交所属分类
+    submitClass (row, showMsg = 1) {
+      if (!row.classificationName) return Util.errorMsg('请输入分类名称')
+      this.$post(`${this.api.checkClassif}?classificationName=${row.classificationName}&siteId=${this.site.id}&classificationId=${row.id}`).then(res => {
+        this.$post(this.api[row.id ? 'updateClassif' : 'saveClassif'], {
+          classificationName: row.classificationName,
+          templateId: this.columnInfo.templateId,
+          id: row.id,
+          siteId: this.site.id,
+          editorId: this.userId,
+          founderId: this.userId
+        }).then(res => {
+          showMsg && Util.successMsg((row.id ? '修改' : '新增') + '成功')
+          this.getClassification()
+        }).catch(res => { })
+      }).catch(res => { })
+    },
+    // 关闭所属分类
+    closeClass () {
+      const list = this.classifications
+      if (list.find(e => e.edit && e.classificationName)) {
+        this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          list.map(e => {
+            e.edit && e.classificationName && this.submitClass(e, 0)
           })
-        } else {
           this.classVisible = false
-        }
-      },
-
-      
-      // 获取标签
-      getLabel() {
-        this.$post(`${this.api.queryLabel}?siteId=${this.site.id}`).then(({ data }) => {
-          this.labels = data
-        }).catch(err => {})
-      },
-      // 显示标签弹框
-      setLabel() {
-        this.labelVisible = true
-      },
-      // 新增标签
-      addLabel() {
-        this.labels.push({
-          edit: true,
-          id: '',
-          labelName: ''
+        }).catch(() => {
+          this.classVisible = false
         })
-      },
-      // 编辑标签
-      editLabel(row) {
-        this.$set(row, 'edit', 1)
-      },
-      // 删除标签
-      delLabel(row, i) {
-        if (row.id) {
-          this.$confirm('确定要删除吗？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.$post(`${this.api.delLabel}?id=${row.id}`).then(res => {
-              Util.successMsg('删除成功')
-              this.getLabel()
-            }).catch(res => {})
-          }).catch(() => {})
-        } else {
-          this.labels.splice(i, 1)
-        }
-      },
-      // 提交标签
-      submitLabel(row, showMsg = 1) {
-        if (!row.labelName) return Util.errorMsg('请输入主题名称')
-        this.$post(`${this.api.checkLabel}?labelName=${row.labelName}&siteId=${this.site.id}&labelId=${row.id}`).then(res => {
-          this.$post(this.api[row.id ? 'updateLabel' : 'saveLabel'], {
-            labelName: row.labelName,
-            id: row.id,
-            siteId: this.site.id,
-            editorId: this.userId,
-            founderId: this.userId
-          }).then(res => {
-            showMsg && Util.successMsg((row.id ? '修改' : '新增') + '成功')
+      } else {
+        this.classVisible = false
+      }
+    },
+
+
+    // 获取标签
+    getLabel () {
+      this.$post(`${this.api.queryLabel}?siteId=${this.site.id}`).then(({ data }) => {
+        this.labels = data
+      }).catch(err => { })
+    },
+    // 显示标签弹框
+    setLabel () {
+      this.labelVisible = true
+    },
+    // 新增标签
+    addLabel () {
+      this.labels.push({
+        edit: true,
+        id: '',
+        labelName: ''
+      })
+    },
+    // 编辑标签
+    editLabel (row) {
+      this.$set(row, 'edit', 1)
+    },
+    // 删除标签
+    delLabel (row, i) {
+      if (row.id) {
+        this.$confirm('确定要删除吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.$post(`${this.api.delLabel}?id=${row.id}`).then(res => {
+            Util.successMsg('删除成功')
             this.getLabel()
-          }).catch(res => {})
-        }).catch(res => {})
-      },
-      // 关闭所属分类
-      closeLabel() {
-        const list = this.labels
-        if (list.find(e => e.edit && e.labelName)) {
-          this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
-            type: 'warning'
-          }).then(() => {
-            list.map(e => {
-              e.edit && e.labelName && this.submitLabel(e, 0)
-            })
-            this.labelVisible = false
-          }).catch(() => {
-            this.labelVisible = false
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.labels.splice(i, 1)
+      }
+    },
+    // 提交标签
+    submitLabel (row, showMsg = 1) {
+      if (!row.labelName) return Util.errorMsg('请输入主题名称')
+      this.$post(`${this.api.checkLabel}?labelName=${row.labelName}&siteId=${this.site.id}&labelId=${row.id}`).then(res => {
+        this.$post(this.api[row.id ? 'updateLabel' : 'saveLabel'], {
+          labelName: row.labelName,
+          id: row.id,
+          siteId: this.site.id,
+          editorId: this.userId,
+          founderId: this.userId
+        }).then(res => {
+          showMsg && Util.successMsg((row.id ? '修改' : '新增') + '成功')
+          this.getLabel()
+        }).catch(res => { })
+      }).catch(res => { })
+    },
+    // 关闭所属分类
+    closeLabel () {
+      const list = this.labels
+      if (list.find(e => e.edit && e.labelName)) {
+        this.$confirm('所填写内容暂未保存，是否保存？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          list.map(e => {
+            e.edit && e.labelName && this.submitLabel(e, 0)
           })
-        } else {
           this.labelVisible = false
-        }
-      },
+        }).catch(() => {
+          this.labelVisible = false
+        })
+      } else {
+        this.labelVisible = false
+      }
+    },
 
-      // 文章名称判重
-      nameChange(){
-        const { title, level, id } = this.form
-        if(title && title !== this.originalName){
-          this.$post(this.api.checkIfTheTitleIsRepeat, {
-            siteId: this.site.id,
-            title,
-            id: id || ''
-          }).then(res => {
-            this.nameRepeat = false
-          }).catch(res => {
-            this.nameRepeat = true
-          })
-        }else{
+    // 文章名称判重
+    nameChange () {
+      const { title, level, id } = this.form
+      if (title && title !== this.originalName) {
+        this.$post(this.api.checkIfTheTitleIsRepeat, {
+          siteId: this.site.id,
+          title,
+          id: id || ''
+        }).then(res => {
           this.nameRepeat = false
-        }
-      },
-      // 图片裁剪上传事件
-      customUpload(data) {
-        const formData = new FormData()
-        formData.append('file', data, this.file.name)
-        formData.append('quote', this.form.title)
-        formData.append('site', this.site.siteName)
-        formData.append('uploader', this.userName)
-        this.imgUpload(formData)
-      },
-      // 压缩图片
-      compress(img) {
-        const canvas = document.createElement('canvas')
-        const ctx = canvas.getContext('2d')
-        // let initSize = img.src.length;
-        const width = img.width
-        const height = img.height
-        canvas.width = width
-        canvas.height = height
-        // 铺底色
-        ctx.fillStyle = '#fff'
-        ctx.fillRect(0, 0, canvas.width, canvas.height)
-        ctx.drawImage(img, 0, 0, width, height)
-        // 进行压缩
-        const ndata = canvas.toDataURL('image/jpeg', 0.8)
-        return ndata
-      },
-      // base64转成bolb对象
-      dataURItoBlob(base64Data) {
-        let byteString
-        if (base64Data.split(',')[0].indexOf('base64') >= 0) {
-          byteString = atob(base64Data.split(',')[1])
-        } else {
-          byteString = unescape(base64Data.split(',')[1])
-        }
-        const mimeString = base64Data
-          .split(',')[0]
-          .split(':')[1]
-          .split(';')[0]
-        const ia = new Uint8Array(byteString.length)
-        for (let i = 0; i < byteString.length; i++) {
-          ia[i] = byteString.charCodeAt(i)
-        }
-        return new Blob([ia], {
-          type: mimeString
-        })
-      },
-      // 图片上传到服务器
-      imgUpload(formData) {
-        this.isUpload = true
-        Axios({
-          method: 'post',
-          url: this.api.upload,
-          data: formData,
-          headers: {
-            'Content-Type': 'multipart/form-data',
-            token: Util.local.get(Setting.tokenKey)
-          },
-        }).then(({ data }) => {
-          if (data.code === 401) {
-            Util.errorMsg(data.msg)
-            setTimeout(() => {
-              this.$store.dispatch('user/logout')
-            }, 1000)
-            return false
-          }
-          let url = this.form[this.isBanner ? 'bannerImg' : 'titleImg']
-          url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => {}).catch(e => {}) // 删除替换掉的图片
-          this.form[this.isBanner ? 'bannerImg' : 'titleImg'] = data.url
         }).catch(res => {
-          console.log(11, res)
+          this.nameRepeat = true
         })
-        this.$refs.cropper.isDisabled = false
-        this.isUpload = false
-        this.cropperModel = false
-      },
-      // 图片改变钩子
-      changeFile(file, isBanner) {
-        // 封面图跟banner的截取比例不一样，期刊详情模板的也不一样
-        this.fixedNumber = isBanner ?
-          [1, 0.26] :
-          this.form.articleTemplate == 26 ?
-            [1, 1.5] :
-            [1.76, 1]
-        this.isBanner = isBanner
-        const { size, name } = file
-        const ext = name.substring(name.lastIndexOf('.') + 1)
-        if (!Util.isImg(ext)) {
-          this.$message.error('请上传图片！')
+      } else {
+        this.nameRepeat = false
+      }
+    },
+    // 图片裁剪上传事件
+    customUpload (data) {
+      const formData = new FormData()
+      formData.append('file', data, this.file.name)
+      formData.append('quote', this.form.title)
+      formData.append('site', this.site.siteName)
+      formData.append('uploader', this.userName)
+      this.imgUpload(formData)
+    },
+    // 压缩图片
+    compress (img) {
+      const canvas = document.createElement('canvas')
+      const ctx = canvas.getContext('2d')
+      // let initSize = img.src.length;
+      const width = img.width
+      const height = img.height
+      canvas.width = width
+      canvas.height = height
+      // 铺底色
+      ctx.fillStyle = '#fff'
+      ctx.fillRect(0, 0, canvas.width, canvas.height)
+      ctx.drawImage(img, 0, 0, width, height)
+      // 进行压缩
+      const ndata = canvas.toDataURL('image/jpeg', 0.8)
+      return ndata
+    },
+    // base64转成bolb对象
+    dataURItoBlob (base64Data) {
+      let byteString
+      if (base64Data.split(',')[0].indexOf('base64') >= 0) {
+        byteString = atob(base64Data.split(',')[1])
+      } else {
+        byteString = unescape(base64Data.split(',')[1])
+      }
+      const mimeString = base64Data
+        .split(',')[0]
+        .split(':')[1]
+        .split(';')[0]
+      const ia = new Uint8Array(byteString.length)
+      for (let i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i)
+      }
+      return new Blob([ia], {
+        type: mimeString
+      })
+    },
+    // 图片上传到服务器
+    imgUpload (formData) {
+      this.isUpload = true
+      Axios({
+        method: 'post',
+        url: this.api.upload,
+        data: formData,
+        headers: {
+          'Content-Type': 'multipart/form-data',
+          token: Util.local.get(Setting.tokenKey)
+        },
+      }).then(({ data }) => {
+        if (data.code === 401) {
+          Util.errorMsg(data.msg)
+          setTimeout(() => {
+            this.$store.dispatch('user/logout')
+          }, 1000)
           return false
         }
-        // if (size / 1024 / 1024 > 5) {
-        //   this.$message.error('请上传5M以内的图片！')
-        //   return false
-        // }
-        this.file = file
-        this.cropperModel = true
-        this.$nextTick(() => {
-          this.$refs.cropper.updateImg({
-            url: window.URL.createObjectURL(file.raw),
-            size: file.size
-          })
+        let url = this.form[this.isBanner ? 'bannerImg' : 'titleImg']
+        url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => { }).catch(e => { }) // 删除替换掉的图片
+        this.form[this.isBanner ? 'bannerImg' : 'titleImg'] = data.url
+      }).catch(res => {
+        console.log(11, res)
+      })
+      this.$refs.cropper.isDisabled = false
+      this.isUpload = false
+      this.cropperModel = false
+    },
+    // 图片改变钩子
+    changeFile (file, isBanner) {
+      // 封面图跟banner的截取比例不一样，期刊详情模板的也不一样
+      this.fixedNumber = isBanner ?
+        [1, 0.26] :
+        this.isJournal ?
+          [1, 1.5] :
+          [1.76, 1]
+      this.isBanner = isBanner
+      const { size, name } = file
+      const ext = name.substring(name.lastIndexOf('.') + 1)
+      if (!Util.isImg(ext)) {
+        this.$message.error('请上传图片！')
+        return false
+      }
+      // if (size / 1024 / 1024 > 5) {
+      //   this.$message.error('请上传5M以内的图片！')
+      //   return false
+      // }
+      this.file = file
+      this.cropperModel = true
+      this.$nextTick(() => {
+        this.$refs.cropper.updateImg({
+          url: window.URL.createObjectURL(file.raw),
+          size: file.size
         })
-      },
-      // 附件删除
-      handleRemove(e, fileList) {
-        e.id ? this.$post(`${this.api.delContentFile}?id=${e.id}`).then(res => {
-          this.form.fileList = fileList
-        }).catch(res => {}) : (this.form.fileList = fileList)
-      },
-      // banner上传成功
-      uploadSuccessBanner(res) {
-        let url = this.form.bannerImg
-        url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => {}).catch(e => {})
-        this.form.bannerImg = res.url
-      },
-      // 附件上传之前的钩子
-      fileBeforeUpload(file) {
-        this.uploading++
-      },
-      // 附件上传成功
-      uploadSuccessFile(res) {
-        this.uploading--
-        this.form.id ?
-          this.$post(this.api.saveContentFile, {
-            contentId: this.form.id,
-            editorId: this.userId,
-            founderId: this.userId,
-            id: '',
-            fileName: res.original,
-            filePath: res.url
-          }).then(({ data }) => {
-            this.form.fileList.push({
-              name: res.original,
-              url: res.url,
-              id: data
-            })
-          }).catch(res => {}) :
+      })
+    },
+    // 附件删除
+    handleRemove (e, fileList) {
+      e.id ? this.$post(`${this.api.delContentFile}?id=${e.id}`).then(res => {
+        this.form.fileList = fileList
+      }).catch(res => { }) : (this.form.fileList = fileList)
+    },
+    // banner上传成功
+    uploadSuccessBanner (res) {
+      let url = this.form.bannerImg
+      url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => { }).catch(e => { })
+      this.form.bannerImg = res.url
+    },
+    // 附件上传之前的钩子
+    fileBeforeUpload (file) {
+      this.uploading++
+    },
+    // 附件上传成功
+    uploadSuccessFile (res) {
+      this.uploading--
+      this.form.id ?
+        this.$post(this.api.saveContentFile, {
+          contentId: this.form.id,
+          editorId: this.userId,
+          founderId: this.userId,
+          id: '',
+          fileName: res.original,
+          filePath: res.url
+        }).then(({ data }) => {
           this.form.fileList.push({
             name: res.original,
-            url: res.url
+            url: res.url,
+            id: data
           })
-      },
-      // 预览
-      preview() {
-        window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `#/article?articleId=${this.form.id}&siteId=${this.form.siteId}&id=${this.form.columnId}`)
-      },
-      // 返回
-      back() {
-        this.pass = true
-        const { updateTime } = this
-        // 更改了信息才需要提示
-        if (updateTime > 1) {
-          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.submit(this.form.isRelease)
-          }).catch(() => {
-            this.$router.back()
-          })
-        } else {
+        }).catch(res => { }) :
+        this.form.fileList.push({
+          name: res.original,
+          url: res.url
+        })
+    },
+    // 预览
+    preview () {
+      window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `#/article?articleId=${this.form.id}&siteId=${this.form.siteId}&id=${this.form.columnId}`)
+    },
+    // 返回
+    back () {
+      this.pass = true
+      const { updateTime } = this
+      // 更改了信息才需要提示
+      if (updateTime > 1) {
+        this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.submit(this.form.isRelease)
+        }).catch(() => {
           this.$router.back()
-        }
-      },
-      // 更新附件的状态为发布
-      updateFile(files, form, quoteId) {
-        files.map(e => {
-          this.$post(this.api.updateFile, {
-            id: e,
-            isRelease: form.isRelease,
-            quote: form.title,
-            quoteId
-          }).then(res => {}).catch(err => {})
         })
-      },
-      // 提交
-      submit(isRelease, next) {
-        if (this.submiting) return false
-        const form = JSON.parse(JSON.stringify(this.form))
-        if (!form.title) return Util.errorMsg('请填写标题')
-        if (this.nameRepeat) return Util.errorMsg('该标题已重复!')
-        if (typeof form.fatherId	=== 'object') form.fatherId	= form.fatherId[form.fatherId.length - 1]
-        const tId = form.articleTemplate
-        // 如果是发布
-        if (isRelease) {
-          // 每个模板需要展示的字段不一样，因此要根据模板id来判断必填
-          if (tId !== 25) {
-            if (!form.releaseTime) return Util.errorMsg('请选择发布日期')
+      } else {
+        this.$router.back()
+      }
+    },
+    // 更新附件的状态为发布
+    updateFile (files, form, quoteId) {
+      files.map(e => {
+        this.$post(this.api.updateFile, {
+          id: e,
+          isRelease: form.isRelease,
+          quote: form.title,
+          quoteId
+        }).then(res => { }).catch(err => { })
+      })
+    },
+    // 提交
+    submit (isRelease, next) {
+      if (this.submiting) return false
+      const form = JSON.parse(JSON.stringify(this.form))
+      if (!form.title) return Util.errorMsg('请填写标题')
+      if (this.nameRepeat) return Util.errorMsg('该标题已重复!')
+      if (typeof form.fatherId === 'object') form.fatherId = form.fatherId[form.fatherId.length - 1]
+      const tId = form.articleTemplate
+      // 如果是发布
+      if (isRelease) {
+        // 每个模板需要展示的字段不一样，因此要根据模板id来判断必填
+        if (tId !== 25) {
+          if (!form.releaseTime) return Util.errorMsg('请选择发布日期')
+        }
+        // 非出版物类型的栏目才需要判断下列必填
+        if (!this.isPublication) {
+          if (tId === 22 || tId === 23 || tId === 24) {
+            if (!form.titleImg) return Util.errorMsg('请上传封面')
           }
-          // 非出版物类型的栏目才需要判断下列必填
-          if (!this.isPublication) {
-            if (tId === 22 || tId === 23 || tId === 24) {
-              if (!form.titleImg ) return Util.errorMsg('请上传封面')
-            }
-            if (tId === 25) {
-              if ((!form.time || !form.time.length) && isRelease) return Util.errorMsg('请选择起止时间')
-              form.activityStartTime = form.time[0]
-              form.activityEndTime = form.time[1]
+          if (tId === 25) {
+            if ((!form.time || !form.time.length) && isRelease) return Util.errorMsg('请选择起止时间')
+            form.activityStartTime = form.time[0]
+            form.activityEndTime = form.time[1]
+          }
+          if (tId === 24 && form.connectionType !== 2) {
+            if (form.connectionType === 1) {
+              if (!this.links.length) return Util.errorMsg('请选择站内链接')
             }
-            if (tId === 24 && form.connectionType !== 2) {
-              if (form.connectionType === 1) {
-                if (!this.links.length) return Util.errorMsg('请选择站内链接')
-              }
-              if (!this.otherLink.length && form.connectionType === 3) {
-                if (!this.otherLink.length) return Util.errorMsg('请选择栏目')
-              }
+            if (!this.otherLink.length && form.connectionType === 3) {
+              if (!this.otherLink.length) return Util.errorMsg('请选择栏目')
             }
-            if ((tId === 22 || tId === 23 || tId === 25) && !form.mainBody) return Util.errorMsg('请输入正文')
           }
+          if ((tId === 22 || tId === 23 || tId === 25) && !form.mainBody) return Util.errorMsg('请输入正文')
         }
-        if (this.uploading) return Util.errorMsg('文件正在上传，请上传完成后再发布')
-        if (form.connectionType === 1) {
-          form.linkAddress = this.links.join()
-          if (this.article) form.linkAddress += '-' + this.article
-        } else if (form.connectionType === 3) {
-          form.linkAddress = this.otherLink.join()
-          if (this.otherArticle) form.linkAddress += '-' + this.otherArticle
-        }
-        const { columnId, bannerImg, fileList, titleImg } = form
-        const fileId = []
-        if (typeof columnId === 'object') form.columnId = columnId[columnId.length - 1] // 如果更换了栏目id，值会变成数组，需要手动获取最后一个
-        // 获取几个附件的id，url后面的数字串即是附件id
-        if (bannerImg) fileId.push(bannerImg.substr(bannerImg.lastIndexOf('/') + 1))
-        if (titleImg) fileId.push(titleImg.substr(titleImg.lastIndexOf('/') + 1))
-        fileList && fileList.map(e => {
-          fileId.push(e[e.url ? 'url' : 'filePath'].substr(e[e.url ? 'url' : 'filePath'].lastIndexOf('/') + 1))
-        })
-        form.lableId = form.lableId.join(',')
+      }
+      if (this.uploading) return Util.errorMsg('文件正在上传，请上传完成后再发布')
+      if (form.connectionType === 1) {
+        form.linkAddress = this.links.join()
+        if (this.article) form.linkAddress += '-' + this.article
+      } else if (form.connectionType === 3) {
+        form.linkAddress = this.otherLink.join()
+        if (this.otherArticle) form.linkAddress += '-' + this.otherArticle
+      }
+      const { columnId, bannerImg, fileList, titleImg } = form
+      const fileId = []
+      if (typeof columnId === 'object') form.columnId = columnId[columnId.length - 1] // 如果更换了栏目id，值会变成数组，需要手动获取最后一个
+      // 获取几个附件的id，url后面的数字串即是附件id
+      if (bannerImg) fileId.push(bannerImg.substr(bannerImg.lastIndexOf('/') + 1))
+      if (titleImg) fileId.push(titleImg.substr(titleImg.lastIndexOf('/') + 1))
+      fileList && fileList.map(e => {
+        fileId.push(e[e.url ? 'url' : 'filePath'].substr(e[e.url ? 'url' : 'filePath'].lastIndexOf('/') + 1))
+      })
+      form.lableId = form.lableId.join(',')
 
-        form.releaseTime = Util.formatDate('yyyy-MM-dd', new Date(form.releaseTime)) // 发布日期转化为年月日格式
-        form.isRelease = isRelease
-        this.submiting = true
-        if (form.id) {
-          delete form.children
-          form.editorId = +this.$store.state.user.userId
-          this.$post(this.api.updateArticle, form).then(res => {
-            this.updateFile(fileId, form, form.id)
-            Util.successMsg('修改成功')
-            next ? next() : this.$router.push(`list?columnId=` + form.columnId + (form.columnId != this.originColumnId ? '&last=1' : '')) // 更改了所属栏目，则给列表传递一个last参数，跳转到最后一页
-          }).catch(err => {
-            this.submiting = false
-          })
-        } else {
-          this.$post(this.api.saveArticle, form).then(({ data }) => {
-            this.updateFile(fileId, form, data)
-            // 新增文章完后需要把上传的附件添加到文章附件表
-            form.fileList.map(e => {
-              this.$post(this.api.saveContentFile, {
-                contentId: data,
-                editorId: this.userId,
-                founderId: this.userId,
-                id: '',
-                fileName: e.name,
-                filePath: e.url
-              }).then(res => {}).catch(err => {})
-            })
-            Util.successMsg('创建成功')
-            next ? next() : this.$router.back()
-          }).catch(err => {
-            this.submiting = false
+      form.releaseTime = Util.formatDate('yyyy-MM-dd', new Date(form.releaseTime)) // 发布日期转化为年月日格式
+      form.isRelease = isRelease
+      this.submiting = true
+      if (form.id) {
+        delete form.children
+        form.editorId = +this.$store.state.user.userId
+        this.$post(this.api.updateArticle, form).then(res => {
+          this.updateFile(fileId, form, form.id)
+          Util.successMsg('修改成功')
+          next ? next() : this.$router.push(`list?columnId=` + form.columnId + (form.columnId != this.originColumnId ? '&last=1' : '')) // 更改了所属栏目，则给列表传递一个last参数，跳转到最后一页
+        }).catch(err => {
+          this.submiting = false
+        })
+      } else {
+        this.$post(this.api.saveArticle, form).then(({ data }) => {
+          this.updateFile(fileId, form, data)
+          // 新增文章完后需要把上传的附件添加到文章附件表
+          form.fileList.map(e => {
+            this.$post(this.api.saveContentFile, {
+              contentId: data,
+              editorId: this.userId,
+              founderId: this.userId,
+              id: '',
+              fileName: e.name,
+              filePath: e.url
+            }).then(res => { }).catch(err => { })
           })
-        }
-      },
-      
-    }
+          Util.successMsg('创建成功')
+          next ? next() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false
+        })
+      }
+    },
+
+  }
 };
 </script>
 
@@ -1474,121 +1564,122 @@ $upload-width: 220px;
 $upload-height: 102px;
 $upload-lg-height: 102px;
 /deep/ .avatar-uploader {
-  .el-upload {
-    position: relative;
-    width: $upload-width;
-    height: $upload-height;
-    border: 1px solid #DCDEE0;
-    border-radius: 2px;
-    cursor: pointer;
-    overflow: hidden;
-    .uploader-default {
-      display: flex;
-      height: $upload-height;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      text-align: center;
-      background: #FAFAFA;
-      p {
-        margin-top: 10px;
-        font-size: 14px;
-        color: #333;
-        line-height: 20px;
-      }
-    }
-  }
-  &.avatar-uploader-lg {
     .el-upload {
-      width: 100%;
-      max-width: 820px;
-      height: $upload-lg-height;
+        position: relative;
+        width: $upload-width;
+        height: $upload-height;
+        border: 1px solid #dcdee0;
+        border-radius: 2px;
+        cursor: pointer;
+        overflow: hidden;
+        .uploader-default {
+            display: flex;
+            height: $upload-height;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            text-align: center;
+            background: #fafafa;
+            p {
+                margin-top: 10px;
+                font-size: 14px;
+                color: #333;
+                line-height: 20px;
+            }
+        }
+    }
+    &.avatar-uploader-lg {
+        .el-upload {
+            width: 100%;
+            max-width: 820px;
+            height: $upload-lg-height;
 
-      .uploader-default {
+            .uploader-default {
+                height: $upload-lg-height;
+            }
+        }
+    }
+    .avatar {
+        display: block;
+        width: $upload-width;
+        height: $upload-height;
+    }
+    .avatar-lg {
+        display: block;
+        width: 100%;
         height: $upload-lg-height;
-      }
     }
-  }
-  .avatar {
-    display: block;
-    width: $upload-width;
-    height: $upload-height;
-  }
-  .avatar-lg {
-    display: block;
-    width: 100%;
-    height: $upload-lg-height;
-  }
-  .el-upload__tip {
-    margin-top: 0;
-    p {
-      font-size: 12px;
-      color: #333;
+    .el-upload__tip {
+        margin-top: 0;
+        p {
+            font-size: 12px;
+            color: #333;
+        }
     }
-  }
 }
 .style-wrap {
-  display: flex;
-  margin-top: 10px;
-  .label {
-    margin-right: 30px;
-  }
+    display: flex;
+    margin-top: 10px;
+    .label {
+        margin-right: 30px;
+    }
 }
 .styles {
-  display: flex;
-  flex-wrap: wrap;
-  width: 955px;
-  // height: 320px;
-  margin-top: 20px;
-  overflow: auto;
-  li {
-    margin: 0 20px 10px 0;
-    text-align: center;
-    cursor: pointer;
-    &:hover .review {
-      border-color: #2962FF;
-    }
-  }
-  .review {
     display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 170px;
-    height: 112px;
-    margin-bottom: 10px;
-    border: 1px solid #DCDEE0;
-    border-radius: 2px;
-    img {
-      width: 80px;
+    flex-wrap: wrap;
+    width: 955px;
+    // height: 320px;
+    margin-top: 20px;
+    overflow: auto;
+    li {
+        margin: 0 20px 10px 0;
+        text-align: center;
+        cursor: pointer;
+        &:hover .review {
+            border-color: #2962ff;
+        }
     }
-    .is-link {
-      width: 50px;
+    .review {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 170px;
+        height: 112px;
+        margin-bottom: 10px;
+        border: 1px solid #dcdee0;
+        border-radius: 2px;
+        img {
+            width: 80px;
+        }
+        .is-link {
+            width: 50px;
+        }
     }
-  }
 }
 .info {
-  position: absolute;
-  top: 8px;
-  left: -32px;
-  cursor: pointer;
+    position: absolute;
+    top: 8px;
+    left: -32px;
+    cursor: pointer;
 }
 .plus {
-  margin-bottom: 10px;
-  font-size: 18px;
-  color: #2962FF;
-  text-align: right;
-  cursor: pointer;
+    margin-bottom: 10px;
+    font-size: 18px;
+    color: #2962ff;
+    text-align: right;
+    cursor: pointer;
 }
 .set-btn {
-  margin-left: 10px !important;
+    margin-left: 10px !important;
 }
 .manage-dia {
-  .edit, .del {
-    font-size: 14px;
-    cursor: pointer;
-  }
-  .edit {
-    margin-right: 10px;
-  }
+    .edit,
+    .del {
+        font-size: 14px;
+        cursor: pointer;
+    }
+    .edit {
+        margin-right: 10px;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/contactUs.vue b/src/pages/column/page/contactUs.vue
index 9ffe97c..ddc7bce 100644
--- a/src/pages/column/page/contactUs.vue
+++ b/src/pages/column/page/contactUs.vue
@@ -31,36 +31,47 @@
         <div class="inner">
           <div class="contact">
             <div class="fields">
-              <h6>Contact us</h6>
-              <p class="text">发圣诞节快乐副驾驶打卡了分速度快了父级圣诞快乐</p>
-              <p class="text">发圣诞节快乐副驾驶打卡了分速度快了父级圣诞快乐</p>
-              <p class="text">发圣诞节快乐副驾驶打卡了分速度快了父级圣诞快乐</p>
+              <h6>{{ modules[1].form.title }}</h6>
+              <p class="text">{{ modules[1].form.address }}</p>
+              <p class="text">{{ modules[1].form.phone }}</p>
+              <p class="text">{{ modules[1].form.email }}</p>
+              <div class="cover"
+                   style="top: -20px;"
+                   @click="toSet(1)">点击更换文本</div>
+            </div>
+            <div class="c-wrap">
+              <img :src="modules[2].form.pic"
+                   alt=""
+                   class="pic">
+              <div class="cover"
+                   @click="toSet(2)">点击更换图片</div>
+            </div>
+            <div class="c-wrap m-t-20">
+              <el-table :data="modules[3].list"
+                        class="patent-table"
+                        ref="table"
+                        stripe
+                        header-align="center">
+                <el-table-column prop="dep"
+                                 label="部门"
+                                 align="center"
+                                 min-width="250"></el-table-column>
+                <el-table-column prop="contacts"
+                                 label="联系人"
+                                 align="center"
+                                 min-width="100"></el-table-column>
+                <el-table-column prop="phone"
+                                 label="电话"
+                                 align="center"
+                                 min-width="150"></el-table-column>
+                <el-table-column prop="email"
+                                 label="邮箱"
+                                 align="center"
+                                 min-width="150"></el-table-column>
+              </el-table>
+              <div class="cover"
+                   @click="toSet(3)">点击更换文本</div>
             </div>
-            <img src="http://10.10.11.7/images/contactUs/2.png"
-                 alt=""
-                 class="pic">
-            <el-table :data="list"
-                      class="patent-table"
-                      ref="table"
-                      stripe
-                      header-align="center">
-              <el-table-column prop="title"
-                               label="部门"
-                               align="center"
-                               min-width="250"></el-table-column>
-              <el-table-column prop="publishingHouse"
-                               label="联系人"
-                               align="center"
-                               min-width="100"></el-table-column>
-              <el-table-column prop="writersAndEditors"
-                               label="电话"
-                               align="center"
-                               min-width="150"></el-table-column>
-              <el-table-column prop="publicationYear"
-                               label="邮箱"
-                               align="center"
-                               min-width="150"></el-table-column>
-            </el-table>
           </div>
         </div>
       </div>
diff --git a/src/pages/column/page/governance.vue b/src/pages/column/page/governance.vue
index a403b18..ce8abba 100644
--- a/src/pages/column/page/governance.vue
+++ b/src/pages/column/page/governance.vue
@@ -3,9 +3,11 @@
     <div class="actions">
       <p class="page-name">页面设置/关于IASF-治理结构</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>
@@ -13,12 +15,15 @@
     <div class="modules">
       <div class="relative">
         <div class="single-banner">
-          <img class="banner-img" :src="modules[0].form.pic" alt="" />
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="" />
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block history gray">
@@ -26,34 +31,48 @@
           <div class="texts c-wrap">
             <div class="left">
               <h2>{{ modules[1].form.title }}</h2>
-              <div class="des" v-html="modules[1].form.des"></div>
+              <div class="des"
+                   v-html="modules[1].form.des"></div>
             </div>
-            <img class="bg" width="562" height="506" :src="modules[1].form.pic" alt="">
-            <div class="cover" style="top: -100px" @click="toSet(1)">点击更换标题、描述与图片</div>
+            <img class="bg"
+                 width="562"
+                 height="506"
+                 :src="modules[1].form.pic"
+                 alt="">
+            <div class="cover"
+                 style="top: -100px"
+                 @click="toSet(1)">点击更换标题、描述与图片</div>
           </div>
         </div>
       </div>
 
       <div class="cards">
         <ul>
-          <li v-for="(item, i) in modules[2].list" :key="i">{{ item.title }}</li>
-          <div class="cover" @click="toSet(2)">点击更换标题</div>
+          <li v-for="(item, i) in modules[2].list"
+              :key="i">{{ item.title }}</li>
+          <div class="cover"
+               @click="toSet(2)">点击配置文本</div>
         </ul>
       </div>
 
       <div class="block committee gray">
         <div class="inner c-wrap">
           <div class="left">
-            <h2>{{ modules[3].form.title }}</h2>
-            <div class="text" v-html="modules[3].form.des"></div>
+            <h2>{{ modules[2].list[curYear].list[0].title }}</h2>
+            <div class="text"
+                 v-html="modules[2].list[curYear].list[0].des"></div>
           </div>
-          <img class="pic" :src="modules[3].form.pic" alt="">
-          <div class="cover" @click="toSet(3)">点击更换标题、描述与图片</div>
+          <img class="pic"
+               :src="modules[2].list[curYear].list[0].pic"
+               alt="">
         </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>
 
@@ -62,12 +81,13 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
-      modules: Modules.governance
+      modules: Modules.governance,
+      curYear: 0
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -87,120 +107,123 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .history {
-  h2 {
-    padding-bottom: 15px;
-    font-size: 1.2rem;
-    color: #333;
-    &:after {
-      content: '';
-      display: block;
-      width: 65px;
-      height: 3px;
-      margin-top: 20px;
-      background: #0280F1;
+    h2 {
+        padding-bottom: 15px;
+        font-size: 1.2rem;
+        color: #333;
+        &:after {
+            content: '';
+            display: block;
+            width: 65px;
+            height: 3px;
+            margin-top: 20px;
+            background: #0280f1;
+        }
     }
-  }
-  .texts {
-    display: flex;
-    justify-content: space-between;
-    padding: 82px 0 50px 30px;
-    margin-top: 20px;
-    background-color: #fff;
-    border-radius: 100px 0px 0px 0px;
-    transition: .3s;
-    &:hover {
-      transform: scale(1.05);
+    .texts {
+        display: flex;
+        justify-content: space-between;
+        padding: 82px 0 50px 30px;
+        margin-top: 20px;
+        background-color: #fff;
+        border-radius: 100px 0px 0px 0px;
+        transition: 0.3s;
+        &:hover {
+            transform: scale(1.05);
+        }
+    }
+    .left {
+        width: 695px;
+    }
+    .des {
+        margin: 20px 0;
+        font-size: 1.2rem;
+        color: #181818;
+        line-height: 31px;
+    }
+    .bg {
+        margin: -122px 0 0 0;
     }
-  }
-  .left {
-    width: 695px;
-  }
-  .des {
-    margin: 20px 0;
-    font-size: 1.2rem;
-    color: #181818;
-    line-height: 31px;
-  }
-  .bg {
-    margin: -122px 0 0 0;
-  }
 }
 .cards {
-  padding: 60px 0;
-  ul {
-    position: relative;
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-    width: 1200px;
-    margin: 0 auto;
-  }
-  li {
-    width: 260px;
-    margin: 0 30px 50px 0;
-    line-height: 84px;
-    font-size: 1.2rem;
-    color: #333;
-    text-align: center;
-    @include ellipsis();
-    background: url(http://10.10.11.7/images/governance/3.png) 0 0/cover no-repeat;
-    cursor: pointer;
-    &:nth-child(2) {
-      background-image: url(http://10.10.11.7/images/governance/4.png);
+    padding: 60px 0;
+    ul {
+        position: relative;
+        display: flex;
+        justify-content: center;
+        flex-wrap: wrap;
+        width: 1200px;
+        margin: 0 auto;
     }
-    &:nth-child(3) {
-      background-image: url(http://10.10.11.7/images/governance/5.png);
+    li {
+        width: 368px;
+        margin: 0 30px 50px 0;
+        line-height: 84px;
+        font-size: 1.2rem;
+        color: #333;
+        text-align: center;
+        @include ellipsis();
+        background: url(http://10.10.11.7/images/governance/3.png) 0 0 / cover no-repeat;
+        cursor: pointer;
+        &:nth-child(2) {
+            background-image: url(http://10.10.11.7/images/governance/4.png);
+        }
+        &:nth-child(3) {
+            background-image: url(http://10.10.11.7/images/governance/5.png);
+        }
+        &:nth-child(4) {
+            background-image: url(http://10.10.11.7/images/governance/4.png);
+        }
+        &:nth-child(5) {
+            background-image: url(http://10.10.11.7/images/governance/7.png);
+        }
+        &:nth-child(6) {
+            background-image: url(http://10.10.11.7/images/governance/6.png);
+        }
+        &:nth-child(8) {
+            background-image: url(http://10.10.11.7/images/governance/6.png);
+        }
+        &:nth-child(3n) {
+            margin-right: 0;
+        }
+        &:hover {
+            color: #fff;
+            background: #0d84f2;
+        }
     }
-    &:nth-child(4) {
-      background-image: url(http://10.10.11.7/images/governance/4.png);
+}
+.committee {
+    .inner {
+        display: flex;
+        align-items: center;
     }
-    &:nth-child(5) {
-      background-image: url(http://10.10.11.7/images/governance/7.png);
+    .left {
+        width: 50%;
+        margin-right: 2%;
     }
-    &:nth-child(6) {
-      background-image: url(http://10.10.11.7/images/governance/6.png);
+    h2 {
+        margin-bottom: 20px;
+        font-size: 1.2rem;
+        font-family: PingFangSC-Medium, PingFang SC;
+        color: #333;
     }
-    &:nth-child(8) {
-      background-image: url(http://10.10.11.7/images/governance/6.png);
+    .text {
+        font-size: 1rem;
+        font-family: PingFangSC-Regular, PingFang SC;
+        line-height: 1.5;
+        color: #333;
     }
-    &:hover {
-      color: #fff;
-      background: #0D84F2;
+    .pic {
+        width: 48%;
+        height: 300px;
     }
-  }
-}
-.committee {
-  .inner {
-    display: flex;
-    align-items: center;
-  }
-  .left {
-    width: 50%;
-    margin-right: 2%;
-  }
-  h2 {
-    margin-bottom: 20px;
-    font-size: 1.2rem;
-    font-family: PingFangSC-Medium, PingFang SC;
-    color: #333;
-  }
-  .text {
-    font-size: 1rem;
-    font-family: PingFangSC-Regular, PingFang SC;
-    line-height: 1.5;
-    color: #333;
-  }
-  .pic {
-    width: 48%;
-    height: 300px;
-  }
 }
 </style>
diff --git a/src/pages/column/page/lightSources.vue b/src/pages/column/page/lightSources.vue
new file mode 100644
index 0000000..96d4df9
--- /dev/null
+++ b/src/pages/column/page/lightSources.vue
@@ -0,0 +1,254 @@
+<template>
+  <!-- 全球先进光源 -->
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/全球先进光源</p>
+      <div>
+        <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 @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+
+    <div class="modules">
+      <div class="relative">
+        <div class="single-banner">
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="" />
+          <div class="texts">
+            <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+          </div>
+        </div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
+      </div>
+
+      <div class="block gray">
+        <div class="inner c-wrap">
+          <h2 class="b-title wow fadeInUp">{{ modules[1].form.title }}</h2>
+          <p class="intro wow fadeInUp"
+             data-wow-delay="0.8s">{{ modules[1].form.des }}</p>
+          <img class="block-pic br wow fadeInLeft"
+               data-wow-delay="0.8s"
+               width="100%"
+               height="536"
+               :src="modules[1].form.pic"
+               alt="">
+          <div class="cover"
+               @click="toSet(1)">点击更换标题、描述、图片与链接</div>
+        </div>
+      </div>
+
+      <div class="block sources">
+        <div class="inner c-wrap">
+          <ul class="tabs wow fadeInLeft">
+            <li v-for="(item, i) in tabs"
+                :class="{active: item.id == active}"
+                :key="i"
+                @click="tabChange(item.id)">{{ item.name }}</li>
+          </ul>
+          <div v-if="!active"
+               class="c-wrap">
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>序号</th>
+                  <th>光源名称</th>
+                  <th>国家</th>
+                  <th>电子束能量（GeV）</th>
+                  <th>储存环周长(m)</th>
+                  <th>实验站数量</th>
+                  <th>代际</th>
+                  <th>建成/改造时间</th>
+                  <th>发射度(nm.rad)</th>
+                  <th>状态</th>
+                </tr>
+              </thead>
+              <template v-if="modules[2].list.length">
+                <tr v-for="(item, i) in modules[2].list"
+                    :key="i">
+                  <td>{{ item.name }}</td>
+                  <td>{{ item.country }}</td>
+                  <td>{{ item.gev }}</td>
+                  <td>{{ item.storage }}</td>
+                  <td>{{ item.stations }}</td>
+                  <td>{{ item.intergenerational }}</td>
+                  <td>{{ item.time }}</td>
+                  <td>{{ item.name }}</td>
+                  <td>{{ item.emittance }}</td>
+                  <td>{{ item.status }}</td>
+                </tr>
+              </template>
+              <tr v-else>
+                <td class="none">暂无数据</td>
+              </tr>
+            </table>
+            <div class="cover"
+                 @click="toSet(2)">点击更换表格</div>
+          </div>
+          <div v-else
+               class="c-wrap">
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>序号</th>
+                  <th>光源名称</th>
+                  <th>国家</th>
+                  <th>地点</th>
+                  <th>加速器技术</th>
+                  <th>能量/GeV</th>
+                  <th>波长范围/nm</th>
+                  <th>重复频率/Hz Repetition rate</th>
+                  <th>设施长度/m Overall length</th>
+                  <th>线站数量</th>
+                  <th>出光时间</th>
+                </tr>
+              </thead>
+              <template v-if="modules[3].list.length">
+                <tr v-for="(item, i) in modules[3].list"
+                    :key="i">
+                  <td>{{ item.name }}</td>
+                  <td>{{ item.country }}</td>
+                  <td>{{ item.address }}</td>
+                  <td>{{ item.accelerator }}</td>
+                  <td>{{ item.gev }}</td>
+                  <td>{{ item.wavelength }}</td>
+                  <td>{{ item.repetitive }}</td>
+                  <td>{{ item.facility }}</td>
+                  <td>{{ item.stations }}</td>
+                  <td>{{ item.status }}</td>
+                  <td>{{ item.time }}</td>
+                </tr>
+              </template>
+              <tr v-else>
+                <td class="none"
+                    colspan="11">暂无数据</td>
+              </tr>
+            </table>
+            <div class="cover"
+                 @click="toSet(3)">点击更换表格</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <Module ref="module"
+            :data.sync="curData"
+            :visible.sync="diaVisible"
+            @moduleSubmit="moduleSubmit" />
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins/page'
+import Modules from '@/const/modules'
+export default {
+  mixins: [mixins],
+  data () {
+    return {
+      modules: Modules.lightSources,
+      active: 0,
+      tabs: [
+        {
+          id: 0,
+          name: '同步辐射光源'
+        },
+        {
+          id: 1,
+          name: '自由电子激光'
+        },
+      ]
+    }
+  },
+  mounted () {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: '全球先进光源'
+      }
+    ])
+  },
+  methods: {
+    // tab回调
+    tabChange (i) {
+      this.active = i
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/page/page.scss';
+.block {
+    padding: 3.15rem 0;
+    .inner {
+        .b-title {
+            font-size: 2.25rem;
+            margin-bottom: 2.25rem;
+        }
+        .intro {
+            margin-bottom: 2.25rem;
+        }
+    }
+}
+.block-pic {
+    transition: 0.3s;
+    height: auto;
+    &.br {
+        border-radius: 270px;
+    }
+    &:hover {
+        transform: scale(1.05);
+    }
+}
+.sources {
+    background-color: #fff;
+}
+.tabs {
+    display: flex;
+    justify-content: flex-start;
+    box-shadow: 0px 2px 10px 0px rgba(223, 223, 223, 0.28);
+    li {
+        padding: 25px 19px;
+        margin: 0 10px;
+        font-size: 1.1rem;
+        color: #333;
+        border-bottom: 4px solid transparent;
+        text-shadow: 0px 2px 14px rgba(167, 167, 167, 0.26);
+        cursor: pointer;
+        &.active {
+            color: #1583ff;
+            border-bottom-color: #1583ff;
+        }
+    }
+}
+.table {
+    width: 100%;
+    margin-top: 20px;
+    border-collapse: collapse;
+    th,
+    td {
+        padding: 10px 10px;
+        font-size: 0.9rem;
+        text-align: left;
+    }
+    .none {
+        text-align: center;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/mission.vue b/src/pages/column/page/mission.vue
index 87d86f8..16b0d82 100644
--- a/src/pages/column/page/mission.vue
+++ b/src/pages/column/page/mission.vue
@@ -3,43 +3,54 @@
     <div class="actions">
       <p class="page-name">页面设置/关于IASF-使命愿景价值观</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">
         <div class="single-banner">
-          <img class="banner-img" :src="modules[0].form.pic" alt="" />
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="" />
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block">
         <div class="inner">
-          <div
-            class="item">
-            <img src="http://10.10.11.7/images/mission/2.png" alt="" />
+          <div class="item">
+            <img :src="modules[1].form.pic"
+                 alt="" />
             <div class="texts">
               <h6>{{ modules[1].form.title }}</h6>
-              <div class="des" v-html="modules[1].form.des"></div>
+              <div class="text"
+                   v-html="modules[1].form.des"></div>
             </div>
-            <div class="cover" style="left: -35px" @click="toSet(1)">点击更改标题概述与链接</div>
+            <div class="cover"
+                 style="left: -35px"
+                 @click="toSet(1)">点击更改标题概述与链接</div>
           </div>
-          <div
-            class="item">
-            <img src="http://10.10.11.7/images/mission/3.png" alt="" />
+          <div class="item">
+            <img :src="modules[2].form.pic"
+                 alt="" />
             <div class="texts rightText">
               <h6>{{ modules[2].form.title }}</h6>
-              <div class="des" v-html="modules[2].form.des"></div>
+              <div class="text"
+                   v-html="modules[2].form.des"></div>
             </div>
-            <div class="cover" style="right: -35px" @click="toSet(2)">点击更改标题概述与链接</div>
+            <div class="cover"
+                 style="right: -35px"
+                 @click="toSet(2)">点击更改标题概述与链接</div>
           </div>
         </div>
       </div>
@@ -48,25 +59,34 @@
         <div class="inner">
           <div class="c-wrap">
             <h6 class="m-title">{{ modules[3].form.title }}</h6>
-            <div class="cover" @click="toSet(3)">点击更换标题</div>
+            <div class="cover"
+                 @click="toSet(3)">点击更换标题</div>
           </div>
           <ul class="list">
             <template v-for="(item, i) in modules[4].list">
-              <li v-if="item.isEnable" :key="i">
-                <img :src="item.pic" alt="" class="pic">
+              <li v-if="item.isEnable"
+                  :key="i">
+                <img :src="item.pic"
+                     alt=""
+                     class="pic">
                 <div class="texts">
                   <h6>{{ item.title }}</h6>
-                  <div class="des" v-html="item.des"></div>
+                  <div class="des"
+                       v-html="item.des"></div>
                 </div>
               </li>
             </template>
-            <div class="cover" @click="toSet(4)">点击更换图片、标题、概述与链接</div>
+            <div class="cover"
+                 @click="toSet(4)">点击更换图片、标题、概述与链接</div>
           </ul>
         </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>
 
@@ -75,12 +95,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.mission
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -100,271 +120,133 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .inner {
-  width: 1200px;
+    width: 1200px;
 }
 .item {
-  position: relative;
-  margin-bottom: 58px;
-  &:hover {
-    .texts {
-      color: #fff;
-      transform: scale(1.05);
-      background: #32b6e9 !important;
-    }
-  }
-  img {
-    width: 90%;
-    height: 400px;
-  }
-  &:nth-child(2) .texts {
-    left: auto;
-    right: 0;
-    color: #fff;
-    background: rgba(40,179,255,0.34);
-  }
-  .texts {
-    position: absolute;
-    top: 79px;
-    left: -28px;
-    width: 532px;
-    padding: 70px 38px;
-    color: #333;
-    background: rgba(255, 241, 231, 0.84);
-    transition: 0.5s;
-  }
-  h6 {
-    margin-bottom: 14px;
-    font-size: 2rem;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-  }
-  .des {
-    font-size: 1rem;
-  }
-}
-.mind {
-  .m-title {
-    margin-bottom: 30px;
-    font-size: 2.2rem;
-    text-align: center;
-    color: #333;
-  }
-  .list {
     position: relative;
-    display: flex;
-    flex-wrap: wrap;
-  }
-  li {
-    display: inline-flex;
-    align-items: center;
-    width: calc((100% - 22px) / 2);
-    margin: 0 22px 22px 0;
-    background-color: #fff;
-    &:nth-child(even) {
-      margin-right: 0;
+    margin-bottom: 58px;
+    img {
+        width: 100%;
+        height: 400px;
     }
-    .pic {
-      width: 250px;
-      height: 230px;
+    &:nth-child(2) .texts {
+        left: auto;
+        right: -36px;
+        color: #fff;
+        background: rgba(40, 179, 255, 0.34);
     }
     .texts {
-      width: calc(100% - 250px);
-      padding: 0 20px;
+        position: absolute;
+        top: 79px;
+        left: -34px;
+        width: 532px;
+        padding: 70px 38px;
+        color: #333;
+        background: rgba(255, 241, 231, 0.84);
+        transition: 0.5s;
     }
     h6 {
-      margin-bottom: 20px;
-      font-size: 1.5rem;
-      color: #272727;
-      @include ellipsis();
+        margin-bottom: 14px;
+        font-size: 2rem;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
     }
     .des {
-      font-size: 1rem;
-      color: #666;
-      line-height: 1.5;
+        font-size: 1rem;
     }
-  }
 }
-@media (max-width: 1200px) {
-  body {
-    width: 100% !important;
-  }
-  .inner {
-    width: 100%;
-  }
-  .item {
-    img {
-      margin-left: 30px;
-    }
-    .rightText {
-      right: 12px !important;
-    }
-    .texts {
-      width: 85%;
-      box-sizing: border-box;
-      left: 12px;
-      .des{
-        -webkit-line-clamp: inherit
-      }
-    }
-  }
-}
-@media (max-width: 320px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 13rem;
-      }
-      .texts {
-        top: 6rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 1.5rem;
-          margin-bottom: .5rem;
-        }
-        .banner-des{
-          font-size: .85rem;
+.mind {
+    .m-title {
+        margin-bottom: 30px;
+        font-size: 2.2rem;
+        text-align: center;
+        color: #333;
+    }
+    .list {
+        position: relative;
+        display: flex;
+        flex-wrap: wrap;
+    }
+    li {
+        display: inline-flex;
+        align-items: center;
+        width: calc((100% - 22px) / 2);
+        margin: 0 22px 22px 0;
+        background-color: #fff;
+        &:nth-child(even) {
+            margin-right: 0;
         }
-      }
-    }
-  }
-  .block {
-    .inner {
-      img {
-        height: 18rem;
-      }
-      .texts {
-        padding: 1.25rem;
-        top: 1.5rem;
-      }
-    }
-  }
-}
-@media (min-width: 320px) and (max-width: 375px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 13rem;
-      }
-      .texts {
-        top: 6rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 1.5rem;
-          margin-bottom: .5rem;
+        .pic {
+            width: 250px;
+            height: 230px;
         }
-        .banner-des{
-          font-size: .85rem;
+        .texts {
+            width: calc(100% - 250px);
+            padding: 0 20px;
         }
-      }
-    }
-  }
-}
-@media (min-width: 375px) and (max-width: 480px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 20rem;
-      }
-      .texts {
-        top: 10rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 1.5rem;
-          margin-bottom: .5rem;
+        h6 {
+            margin-bottom: 20px;
+            font-size: 1.5rem;
+            color: #272727;
+            @include ellipsis();
         }
-        .banner-des{
-          font-size: .85rem;
+        .text {
+            font-size: 1rem;
+            color: #666;
+            line-height: 1.5;
         }
-      }
     }
-  }
 }
-@media (min-width: 480px) and (max-width: 640px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 25rem;
-      }
-      .texts {
-        top: 10rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 2rem;
-          margin-bottom: .5rem;
-        }
-        .banner-des{
-          font-size: .85rem;
-        }
-      }
+@media (max-width: 1200px) {
+    .inner {
+        width: 98%;
     }
-  }
-}
-@media (min-width: 640px) and (max-width: 768px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 35rem;
-      }
-      .texts {
-        top: 20rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 2rem;
-          margin-bottom: .5rem;
+    .item {
+        img {
+            margin-left: 30px;
         }
-        .banner-des{
-          font-size: .85rem;
+        .rightText {
+            right: 12px !important;
+        }
+        .texts {
+            width: 85%;
+            box-sizing: border-box;
+            left: 12px;
+            .des {
+                -webkit-line-clamp: inherit;
+            }
         }
-      }
     }
-  }
 }
-@media (min-width: 768px) and (max-width: 980px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 35rem;
-      }
-      .texts {
-        top: 20rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 2rem;
-          margin-bottom: .5rem;
+@media (max-width: 980px) {
+    .mind {
+        .list {
+            flex-direction: column;
         }
-        .banner-des{
-          font-size: .85rem;
+        li {
+            width: 100%;
         }
-      }
     }
-  }
 }
-@media (min-width: 980px) and (max-width: 1200px) {
-  .wrap {
-    .single-banner {
-      .banner-img {
-        height: 40rem;
-      }
-      .texts {
-        top: 20rem;
-        left: 12rem;
-        .banner-title{
-          font-size: 2rem;
-          margin-bottom: .5rem;
-        }
-        .banner-des{
-          font-size: .85rem;
+@media (max-width: 480px) {
+    .mind {
+        li {
+            .pic {
+                width: 150px;
+                height: 130px;
+            }
+            .texts {
+                width: calc(100% - 150px);
+            }
         }
-      }
     }
-  }
 }
 </style>
diff --git a/src/pages/column/page/researchTeam.vue b/src/pages/column/page/researchTeam.vue
index cee72d5..0830114 100644
--- a/src/pages/column/page/researchTeam.vue
+++ b/src/pages/column/page/researchTeam.vue
@@ -1,11 +1,14 @@
 <template>
+  <!-- 关于IASF-研究团队 -->
   <div class="wrap">
     <div class="actions">
       <p class="page-name">页面设置/关于IASF-研究团队</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>
@@ -13,41 +16,55 @@
     <div class="modules">
       <div class="relative">
         <div class="single-banner single-banner-overview">
-          <img class="banner-img" :src="modules[0].form.pic" alt="">
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="">
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="content">
         <div class="article">
           <div class="left">
             <ul class="teams">
-              <li v-for="(item, i) in modules[1].list" :key="i">
+              <li v-for="(item, i) in modules[1].list"
+                  :key="i">
                 <div class="line">
-                  <img src="http://10.10.11.7/images/researchTeam/3.png" alt="" class="icon">
+                  <img src="http://10.10.11.7/images/researchTeam/3.png"
+                       alt=""
+                       class="icon">
                   <span class="bold">{{ item.name }}</span>
                   <span class="val">/ {{ item.job }}</span>
                 </div>
                 <div class="line">
-                  <img src="http://10.10.11.7/images/researchTeam/4.png" alt="" class="icon">
+                  <img src="http://10.10.11.7/images/researchTeam/4.png"
+                       alt=""
+                       class="icon">
                   <span class="text">专业 {{ item.major }}</span>
                 </div>
                 <div class="line">
-                  <img src="http://10.10.11.7/images/researchTeam/5.png" alt="" class="icon">
+                  <img src="http://10.10.11.7/images/researchTeam/5.png"
+                       alt=""
+                       class="icon">
                   <span class="text">荣誉 {{ item.honor }}</span>
                 </div>
               </li>
-              <div class="cover" @click="toSet(1)">点击更换banner与链接</div>
+              <div class="cover"
+                   @click="toSet(1)">点击更换文本</div>
             </ul>
           </div>
         </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>
 
@@ -56,13 +73,13 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.researchTeam,
       title: ''
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -82,443 +99,443 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .content {
-  width: 1400px;
-  margin-top: 20px;
+    width: 1400px;
+    margin-top: 20px;
 }
 .article {
-  display: flex;
-  justify-content: center;
-  .left {
-    width: 66%;
-    .search {
-      display: inline-flex;
-      width: 34%;
-      input {
-        width: 100%;
-        height: 38px;
-        padding: 0 15px;
-        font-size: 14px;
-        color: #333;
-        background: #F7F7F7;
-        border: 0;
-        border-top-left-radius: 6px;
-        border-bottom-left-radius: 6px;
-        &:focus {
-          outline: none;
-        }
-      }
-    }
-  }
-  .teams {
-    position: relative;
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 30px;
-    li {
-      position: relative;
-      width: calc((100% - 10px) / 2);
-      padding: 20px 30px;
-      margin: 0 10px 10px 0;
-      background: url(http://10.10.11.7/images/researchTeam/2.png) 0 0/cover no-repeat;
-      &:nth-child(even) {
-        margin-right: 0;
-      }
-    }
-    .line {
-      display: flex;
-      align-items: center;
-      margin-bottom: 8px;
-    }
-    .icon {
-      margin-right: 8px;
-    }
-    .bold {
-      margin-right: 5px;
-      font-size: 1.1rem;
-      color: #333;
-    }
-    .val {
-      font-size: 1rem;
-      color: #999;
-    }
-    .text {
-      font-size: 1rem;
-      color: #666;
-    }
-  }
-  .notice {
     display: flex;
-    li {
-      position: relative;
-      width: calc((100% - 20px) / 2);
-      height: 300px;
-      padding: 20px;
-      background-color: #fff;
-    }
-    .pic {
-      width: 100%;
-      height: 100%;
+    justify-content: center;
+    .left {
+        width: 66%;
+        .search {
+            display: inline-flex;
+            width: 34%;
+            input {
+                width: 100%;
+                height: 38px;
+                padding: 0 15px;
+                font-size: 14px;
+                color: #333;
+                background: #f7f7f7;
+                border: 0;
+                border-top-left-radius: 6px;
+                border-bottom-left-radius: 6px;
+                &:focus {
+                    outline: none;
+                }
+            }
+        }
     }
-    .text {
-      position: absolute;
-      bottom: 20px;
-      left: 20px;
-      width: calc(100% - 40px);
-      font-size: 1.6rem;
-      line-height: 66px;
-      text-align: center;
-      color: #fff;
-      background: rgba(32,57,81,0.68);
+    .teams {
+        position: relative;
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 30px;
+        li {
+            position: relative;
+            width: calc((100% - 10px) / 2);
+            padding: 20px 30px;
+            margin: 0 10px 10px 0;
+            background: url(http://10.10.11.7/images/researchTeam/2.png) 0 0 / cover no-repeat;
+            &:nth-child(even) {
+                margin-right: 0;
+            }
+        }
+        .line {
+            display: flex;
+            align-items: center;
+            margin-bottom: 8px;
+        }
+        .icon {
+            margin-right: 8px;
+        }
+        .bold {
+            margin-right: 5px;
+            font-size: 1.1rem;
+            color: #333;
+        }
+        .val {
+            font-size: 1rem;
+            color: #999;
+        }
+        .text {
+            font-size: 1rem;
+            color: #666;
+        }
     }
-  }
-  .right {
-    width: 20%;
-  }
-  .column {
-    width: 100%;
-    margin-bottom: 25px;
-  }
-  /deep/.el-tree-node__content {
-    height: 44px;
-    background-color: #E5EDF8;
-    border-bottom: 2px solid #fff;
-  }
-  /deep/.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
-    color: #fff;
-    background-color: #0f5698;
-  }
-  .list {
-    margin-bottom: 20px;
-    li {
-      padding: 16px 0;
-      border-bottom: 1px solid #D8D8D8;
+    .notice {
+        display: flex;
+        li {
+            position: relative;
+            width: calc((100% - 20px) / 2);
+            height: 300px;
+            padding: 20px;
+            background-color: #fff;
+        }
+        .pic {
+            width: 100%;
+            height: 100%;
+        }
+        .text {
+            position: absolute;
+            bottom: 20px;
+            left: 20px;
+            width: calc(100% - 40px);
+            font-size: 1.6rem;
+            line-height: 66px;
+            text-align: center;
+            color: #fff;
+            background: rgba(32, 57, 81, 0.68);
+        }
     }
-    .text {
-      margin-bottom: 5px;
-      font-size: 14px;
-      cursor: pointer;
-      &:hover {
-        color: $main-color;
-      }
+    .right {
+        width: 20%;
     }
-    .date {
-      font-size: 12px;
-      color: #999;
+    .column {
+        width: 100%;
+        margin-bottom: 25px;
+    }
+    /deep/.el-tree-node__content {
+        height: 44px;
+        background-color: #e5edf8;
+        border-bottom: 2px solid #fff;
+    }
+    /deep/.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+        color: #fff;
+        background-color: #0f5698;
+    }
+    .list {
+        margin-bottom: 20px;
+        li {
+            padding: 16px 0;
+            border-bottom: 1px solid #d8d8d8;
+        }
+        .text {
+            margin-bottom: 5px;
+            font-size: 14px;
+            cursor: pointer;
+            &:hover {
+                color: $main-color;
+            }
+        }
+        .date {
+            font-size: 12px;
+            color: #999;
+        }
     }
-  }
 }
 @media (max-width: 1200px) {
-  .content {
-    width: 98%;
-  }
-  .article {
-    flex-direction: column;
-    .left, .right {
-      width: 100%;
+    .content {
+        width: 98%;
     }
-    .left {
-      margin-bottom: 30px;
+    .article {
+        flex-direction: column;
+        .left,
+        .right {
+            width: 100%;
+        }
+        .left {
+            margin-bottom: 30px;
+        }
     }
-  }
 }
 
 @media (min-width: 280px) and (max-width: 750px) {
-  .article {
-    .recruit {
-      li {
-        flex-direction: column;
-      }
-      .pic {
-        width: 100%;
-        margin-bottom: 10px;
-      }
-    }
-    .notice {
-      flex-direction: column;
-      li {
-        width: 100%;
-      }
-    }
-  }
-}
-@media (max-width: 1200px) {
-  .content {
     .article {
-      flex-direction: column;
-      .left {
-        width: 100%;
         .recruit {
-          li {
-            flex-direction: column;
-            .pic {
-              width: 100%;
-
+            li {
+                flex-direction: column;
             }
-            .texts {
-              margin-top: .8rem;
+            .pic {
+                width: 100%;
+                margin-bottom: 10px;
             }
-          }
         }
         .notice {
-          flex-direction: column;
-          li {
-            width: 100%;
-          }
+            flex-direction: column;
+            li {
+                width: 100%;
+            }
         }
-      }
-      .right{
-        width: 100%;
-        .el-tree {
-          display: none;
+    }
+}
+@media (max-width: 1200px) {
+    .content {
+        .article {
+            flex-direction: column;
+            .left {
+                width: 100%;
+                .recruit {
+                    li {
+                        flex-direction: column;
+                        .pic {
+                            width: 100%;
+                        }
+                        .texts {
+                            margin-top: 0.8rem;
+                        }
+                    }
+                }
+                .notice {
+                    flex-direction: column;
+                    li {
+                        width: 100%;
+                    }
+                }
+            }
+            .right {
+                width: 100%;
+                .el-tree {
+                    display: none;
+                }
+            }
         }
-      }
     }
-  }
 }
 @media (max-width: 320px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 13rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 7rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 13rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 13rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 7rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 13rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 13rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 13rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 320px) and (max-width: 375px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 15rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 7rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 15rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 15rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 7rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 15rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 15rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 15rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 375px) and (max-width: 480px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 18rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 10rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 18rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 18rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 10rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 18rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 18rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 18rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 480px) and (max-width: 640px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 20rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 12rem;
-      }
-    }
-  }
-    .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 22rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 20rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 12rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 22rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 22rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 22rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 640px) and (max-width: 768px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 22rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 14rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 26rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 22rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 14rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 26rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 26rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 26rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 768px) and (max-width: 980px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 26rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 16rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 30rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 26rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 16rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 30rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 30rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 30rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 @media (min-width: 980px) and (max-width: 1200px) {
-  .wrap  {
-    .single-banner {
-      .banner-img {
-        height: 30rem;
-      }
-      .texts {
-        left: 3rem;
-        top: 18rem;
-      }
-    }
-  }
-  .content {
-    .article {
-      .left {
-        .recruit {
-          li {
-            .pic {
-              height: 35rem;
+    .wrap {
+        .single-banner {
+            .banner-img {
+                height: 30rem;
+            }
+            .texts {
+                left: 3rem;
+                top: 18rem;
             }
-          }
         }
-        .notice {
-          li {
-            height: auto;
-            .pic {
-              height: 35rem;
+    }
+    .content {
+        .article {
+            .left {
+                .recruit {
+                    li {
+                        .pic {
+                            height: 35rem;
+                        }
+                    }
+                }
+                .notice {
+                    li {
+                        height: auto;
+                        .pic {
+                            height: 35rem;
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/scientific.vue b/src/pages/column/page/scientific.vue
index 0fca062..cc8bdf0 100644
--- a/src/pages/column/page/scientific.vue
+++ b/src/pages/column/page/scientific.vue
@@ -3,101 +3,90 @@
     <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">
         <div class="single-banner">
-          <img class="banner-img" :src="modules[0].form.pic" alt="" />
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="" />
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
             <p class="banner-des des">{{ modules[0].form.des }}</p>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block gray">
         <div class="inner">
           <ul class="items">
             <li>
-              <img class="pic" :src="modules[1].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[1].form.pic"
+                   alt="">
               <div class="texts">
                 <h6>{{ modules[1].form.title }}</h6>
-                <div class="text" v-html="modules[1].form.des"></div>
-                <img class="icon" src="@/assets/images/arrow.png" alt="">
+                <div class="text"
+                     v-html="modules[1].form.des"></div>
+                <img class="icon"
+                     src="@/assets/images/arrow.png"
+                     alt="">
               </div>
-              <div class="cover" @click="toSet(1)">点击更换图片、标题、概述与链接</div>
+              <div class="cover"
+                   @click="toSet(1)">点击更换图片、标题、概述与链接</div>
             </li>
             <li>
-              <img class="pic" :src="modules[2].form.pic" alt="">
+              <img class="pic"
+                   :src="modules[2].form.pic"
+                   alt="">
               <div class="texts">
                 <h6>{{ modules[2].form.title }}</h6>
-                <div class="text" v-html="modules[2].form.des"></div>
-                <img class="icon" src="@/assets/images/arrow.png" alt="">
+                <div class="text"
+                     v-html="modules[2].form.des"></div>
+                <img class="icon"
+                     src="@/assets/images/arrow.png"
+                     alt="">
               </div>
-              <div class="cover" @click="toSet(2)">点击更换图片、标题、概述与链接</div>
+              <div class="cover"
+                   @click="toSet(2)">点击更换图片、标题、概述与链接</div>
             </li>
           </ul>
         </div>
       </div>
 
-      <div class="block program">
-        <div class="inner">
-          <div class="title">
-            <h5>
-              {{ modules[3].form.title }}
-              <span class="sub">{{ modules[3].form.subTitle }}</span>
-            </h5>
-            <span class="more">MORE</span>
-            <div class="cover" @click="toSet(3)">点击更换标题与小标题</div>
-          </div>
-          <div class="c-wrap">
-            <div class="slide">
-              <div class="texts">
-                <h6>超快自由电子激光脉冲特性诊断研究方面取得重要进展</h6>
-                <div class="des">X射线自由电子激光已经成为了化学、生物、物理等领域不可或缺的研究手段。对于绝大多数自由电子激研究院紧密围绕高水平建设综合性国家科学中心战略目标，面向国民经济主战场和世界科技前沿…</div>
-                <div class="meta">发表日期：2022.01.10 &emsp;浏览量：备份</div>
-              </div>
-              <img class="pic" src="@/assets/images/survey3.png" alt="">
-            </div>
-            <ul class="list">
-              <li>
-                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
-                <p class="date">2022.10.10</p>
-              </li>
-              <li>
-                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
-                <p class="date">2022.10.10</p>
-              </li>
-              <li>
-                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
-                <p class="date">2022.10.10</p>
-              </li>
-            </ul>
-            <div class="cover" @click="toSet(4)">关联栏目</div>
-          </div>
-        </div>
-      </div>
-      
       <div class="about">
         <div class="inner">
           <div class="texts">
-            <div class="title wow fadeInUp" data-wow-delay="0.7s">{{ modules[5].form.title }}</div>
-            <div class="des wow fadeInDown" data-wow-delay="1s" v-html="modules[5].form.des"></div>
+            <div class="title wow fadeInUp"
+                 data-wow-delay="0.7s">{{ modules[3].form.title }}</div>
+            <div class="des wow fadeInDown"
+                 data-wow-delay="1s"
+                 v-html="modules[3].form.des"></div>
+            <img class="m-t-10"
+                 width="42"
+                 src="@/assets/images/arrow-white.png"
+                 alt="">
           </div>
-          <img src="@/assets/images/arrow-white.png" alt="">
         </div>
-        <div class="cover" @click="toSet(5)">点击更换标题、描述与链接</div>
+        <div class="cover"
+             @click="toSet(3)">点击更换标题、描述与链接</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>
 
@@ -106,12 +95,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.scientific
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -131,177 +120,177 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .items {
-  li {
-    position: relative;
-    height: 600px;
-    margin-bottom: 60px;
-    &:nth-child(even) {
-      .texts {
-        left: auto;
-        right: 100px;
-      }
+    li {
+        position: relative;
+        height: 600px;
+        margin-bottom: 60px;
+        &:nth-child(even) {
+            .texts {
+                left: auto;
+                right: 100px;
+            }
+        }
+        .pic {
+            width: 100%;
+            height: 100%;
+        }
+        .texts {
+            position: absolute;
+            top: 100px;
+            left: 80px;
+            width: 500px;
+            min-height: 350px;
+            padding: 30px;
+            color: #333;
+            background-color: rgba(255, 255, 255, 0.85);
+            border-radius: 0px 0px 100px 0px;
+            border-top: 4px solid #0280f1;
+        }
+        h6 {
+            font-size: 1.2rem;
+            font-family: PingFangSC-Medium, PingFang SC;
+        }
+        .text {
+            margin: 1rem 0;
+            font-size: 1rem;
+            line-height: 1.6;
+        }
+        .icon {
+            width: 40px;
+        }
     }
-    .pic {
-      width: 100%;
-      height: 100%;
+}
+.program {
+    background: #fff;
+    .title {
+        position: relative;
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-end;
+        padding-bottom: 25px;
+        margin-bottom: 30px;
+        border-bottom: 1px solid #ddd;
+        align-items: center;
+        h5 {
+            padding-left: 16px;
+            font-size: 1.6rem;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333333;
+            line-height: 1;
+            border-left: 6px solid #2b96ef;
+        }
+        .sub {
+            font-size: 1.1rem;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #afb7bf;
+        }
+        .more {
+            font-size: 0.8rem;
+            color: #666;
+            cursor: pointer;
+        }
+    }
+    .slide {
+        display: flex;
+        margin-bottom: 14px;
+        cursor: pointer;
     }
     .texts {
-      position: absolute;
-      top: 100px;
-      left: 80px;
-      width: 500px;
-      min-height: 350px;
-      padding: 30px;
-      color: #333;
-      background-color: rgba(255, 255, 255, .85);
-      border-radius: 0px 0px 100px 0px;
-      border-top: 4px solid #0280F1;
+        width: 51%;
+        padding: 56px;
+        background: #fbfbfb;
+        h6 {
+            font-size: 1.3rem;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333333;
+        }
+        .des {
+            margin: 35px 0 25px;
+            font-size: 1rem;
+            color: #666;
+            line-height: 32px;
+        }
+        .meta {
+            font-size: 0.9rem;
+            color: #666;
+        }
     }
-    h6 {
-      font-size: 1.2rem;
-      font-family: PingFangSC-Medium, PingFang SC;
+    .img-wrap {
+        width: 49%;
+        height: 430px;
+        overflow: hidden;
     }
-    .text {
-      margin: 1rem 0;
-      font-size: 1rem;
-      line-height: 1.6;
+    .pic {
+        width: 100%;
+        height: 100%;
+        transition: 0.5s;
     }
-    .icon {
-      width: 40px;
+    .list {
+        display: flex;
+        li {
+            width: calc((100% - 28px) / 3);
+            height: 204px;
+            padding: 36px 22px;
+            margin-right: 14px;
+            background: url(../../../assets/images/sfel/7.png) no-repeat center;
+            background-size: 100% 100%;
+            transition: 0.5s;
+            cursor: pointer;
+            &:nth-child(2) {
+                background-image: url(../../../assets/images/sfel/8.png);
+            }
+            &:nth-child(3) {
+                margin-right: 0;
+                background-image: url(../../../assets/images/sfel/9.png);
+            }
+        }
+        .des {
+            height: 90px;
+            margin-bottom: 30px;
+            font-size: 1rem;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #ffffff;
+            line-height: 30px;
+        }
+        .date {
+            font-size: 0.9rem;
+            font-family: LaoSangamMN;
+            color: #ffffff;
+        }
     }
-  }
 }
-.program {
-  background: #fff;
-  .title {
+.about {
     position: relative;
-    display: flex;
-    justify-content: space-between;
-    align-items: flex-end;
-    padding-bottom: 25px;
-    margin-bottom: 30px;
-    border-bottom: 1px solid #ddd;
-    align-items: center;
-    h5 {
-      padding-left: 16px;
-      font-size: 1.6rem;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #333333;
-      line-height: 1;
-      border-left: 6px solid #2B96EF;
-    }
-    .sub {
-      font-size: 1.1rem;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #AFB7BF;
-    }
-    .more {
-      font-size: .8rem;
-      color: #666;
-      cursor: pointer;
+    padding: 10rem 0 3rem;
+    text-align: center;
+    background: url(../../../assets/images/about-bg.png) no-repeat center center;
+    background-size: 100% 100%;
+    .texts {
+        padding: 2.375rem 3.75rem;
+        color: #fff;
+        background: rgba(111, 69, 36, 0.56);
+        border-radius: 17px;
+        transition: 0.3s;
     }
-  }
-  .slide {
-    display: flex;
-    margin-bottom: 14px;
-    cursor: pointer;
-  }
-  .texts {
-    width: 51%;
-    padding: 56px;
-    background: #FBFBFB;
-    h6 {
-      font-size: 1.3rem;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #333333;
+    .title {
+        margin-bottom: 1rem;
+        font-size: 2.2rem;
     }
     .des {
-      margin: 35px 0 25px;
-      font-size: 1rem;
-      color: #666;
-      line-height: 32px;
-    }
-    .meta {
-      font-size: .9rem;
-      color: #666;
+        font-size: 1rem;
+        line-height: 1.6;
     }
-  }
-  .img-wrap {
-    width: 49%;
-    height: 430px;
-    overflow: hidden;
-  }
-  .pic {
-    width: 100%;
-    height: 100%;
-    transition: .5s;
-  }
-  .list {
-    display: flex;
-    li {
-      width: calc((100% - 28px) / 3);
-      height: 204px;
-      padding: 36px 22px;
-      margin-right: 14px;
-      background: url(../../../assets/images/sfel/7.png)  no-repeat center;
-      background-size: 100% 100%;
-      transition: .5s;
-      cursor: pointer;
-      &:nth-child(2) {
-        background-image: url(../../../assets/images/sfel/8.png);
-      }
-      &:nth-child(3) {
-        margin-right: 0;
-        background-image: url(../../../assets/images/sfel/9.png);
-      }
-    }
-    .des {
-      height: 90px;
-      margin-bottom: 30px;
-      font-size: 1rem;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #FFFFFF;
-      line-height: 30px;
-    }
-    .date {
-      font-size: .9rem;
-      font-family: LaoSangamMN;
-      color: #FFFFFF;
-    }
-  }
-}
-.about {
-  position: relative;
-  padding: 10rem 0 3rem;
-  text-align: center;
-  background: url(../../../assets/images/about-bg.png)  no-repeat center center;
-  background-size: 100% 100%;
-  .texts {
-    padding: 2.375rem 3.75rem;
-    color: #fff;
-    background: rgba(111, 69, 36, .56);
-    border-radius: 17px;
-    transition: .3s;
-  }
-  .title {
-    margin-bottom: 1rem;
-    font-size: 2.2rem;
-  }
-  .des {
-    font-size: 1rem;
-    line-height: 1.6;
-  }
 }
 </style>
diff --git a/src/pages/column/page/talent.vue b/src/pages/column/page/talent.vue
index f2eae7d..fc9bfb6 100644
--- a/src/pages/column/page/talent.vue
+++ b/src/pages/column/page/talent.vue
@@ -1,11 +1,14 @@
 <template>
+  <!-- 人才队伍 -->
   <div class="wrap">
     <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>
@@ -13,32 +16,41 @@
     <div class="modules">
       <div class="relative">
         <div class="single-banner">
-          <img class="banner-img" :src="modules[0].form.pic" alt="">
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="">
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
             <p class="banner-des">{{ modules[0].form.des }}</p>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
 
       <div class="block talent">
         <div class="inner">
           <div class="item">
-            <img class="pic" :src="modules[1].form.pic" alt="">
+            <img class="pic"
+                 :src="modules[1].form.pic"
+                 alt="">
             <div class="texts">
               <h6>{{ modules[1].form.title }}</h6>
               <div class="des">{{ modules[1].form.des }}</div>
             </div>
-            <div class="cover" @click="toSet(1)">点击更改图片、标题概述与链接</div>
+            <div class="cover"
+                 @click="toSet(1)">点击更改图片、标题概述与链接</div>
           </div>
           <div class="item">
-            <img class="pic" :src="modules[2].form.pic" alt="">
+            <img class="pic"
+                 :src="modules[2].form.pic"
+                 alt="">
             <div class="texts">
               <h6>{{ modules[2].form.title }}</h6>
               <div class="des">{{ modules[2].form.des }}</div>
             </div>
-            <div class="cover" @click="toSet(2)">点击更改图片、标题概述与链接</div>
+            <div class="cover"
+                 @click="toSet(2)">点击更改图片、标题概述与链接</div>
           </div>
         </div>
       </div>
@@ -46,50 +58,65 @@
       <div class="style c-wrap">
         <div class="c-wrap">
           <h6>{{ modules[3].form.title }}</h6>
-          <div class="cover" @click="toSet(3)">点击更换标题</div>
+          <div class="cover"
+               @click="toSet(3)">点击更换标题</div>
         </div>
         <div class="c-wrap">
-          <el-carousel :interval="4000" type="card" height="510px">
+          <el-carousel :interval="4000"
+                       type="card"
+                       height="510px">
             <template v-for="(item, i) in modules[4].list">
-              <el-carousel-item v-if="item.isEnable" :key="i">
+              <el-carousel-item v-if="item.isEnable"
+                                :key="i">
                 <div class="item">
-                  <img :src="item.pic" alt="">
+                  <img :src="item.pic"
+                       alt="">
                   <p class="text">{{ item.des }}</p>
                 </div>
               </el-carousel-item>
             </template>
           </el-carousel>
-          <div class="cover" @click="toSet(4)">点击更改图片、标题概述与链接</div>
+          <div class="cover"
+               @click="toSet(4)">点击更改图片、标题概述与链接</div>
         </div>
       </div>
 
       <div class="block intro">
         <div class="inner">
           <div class="item">
-            <img class="pic" :src="modules[5].form.pic" alt="">
+            <img class="pic"
+                 :src="modules[5].form.pic"
+                 alt="">
             <div class="texts">
               <p class="type">{{ modules[5].form.subTitle }}</p>
               <h6>{{ modules[5].form.title }}</h6>
               <div class="des">{{ modules[5].form.des }}</div>
               <el-button type="primary">查看更多</el-button>
             </div>
-            <div class="cover" @click="toSet(5)">点击更改图片、标题、小标题、概述与链接</div>
+            <div class="cover"
+                 @click="toSet(5)">点击更改图片、标题、小标题、概述与链接</div>
           </div>
           <div class="item">
-            <img class="pic" :src="modules[6].form.pic" alt="">
+            <img class="pic"
+                 :src="modules[6].form.pic"
+                 alt="">
             <div class="texts">
               <p class="type">{{ modules[6].form.subTitle }}</p>
               <h6>{{ modules[6].form.title }}</h6>
               <div class="des">{{ modules[6].form.des }}</div>
               <el-button type="primary">查看更多</el-button>
             </div>
-            <div class="cover" @click="toSet(6)">点击更改图片、标题、小标题、概述与链接</div>
+            <div class="cover"
+                 @click="toSet(6)">点击更改图片、标题、小标题、概述与链接</div>
           </div>
         </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>
 
@@ -98,12 +125,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.talent
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -123,118 +150,118 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .wrap {
-  background: #F8F9FB;
+    background: #f8f9fb;
 }
 .talent {
-  .inner {
-    width: 1504px;
-  }
-  .item {
-    position: relative;
-    display: flex;
-    padding: 42px;
-    margin-bottom: 36px;
-    background: #fff;
-    &:nth-child(even) {
-      flex-direction: row-reverse;
-      .texts {
-        padding-left: 0;
-      }
+    .inner {
+        width: 1504px;
+    }
+    .item {
+        position: relative;
+        display: flex;
+        padding: 42px;
+        margin-bottom: 36px;
+        background: #fff;
+        &:nth-child(even) {
+            flex-direction: row-reverse;
+            .texts {
+                padding-left: 0;
+            }
+        }
+    }
+    .pic {
+        width: 602px;
+        height: 465px;
+    }
+    .texts {
+        padding: 98px 72px 30px 80px;
+    }
+    h6 {
+        margin-bottom: 24px;
+        font-size: 50px;
+        font-family: PingFangSC-Light, PingFang SC;
+        font-weight: 300;
+        color: #333333;
+    }
+    .des {
+        font-size: 18px;
+        color: #333;
+        line-height: 33px;
     }
-  }
-  .pic {
-    width: 602px;
-    height: 465px;
-  }
-  .texts {
-    padding: 98px 72px 30px 80px;
-  }
-  h6 {
-    margin-bottom: 24px;
-    font-size: 50px;
-    font-family: PingFangSC-Light, PingFang SC;
-    font-weight: 300;
-    color: #333333;
-  }
-  .des {
-    font-size: 18px;
-    color: #333;
-    line-height: 33px;
-  }
 }
 .style {
-  h6 {
-    margin-bottom: 59px;
-    font-size: 48px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    text-align: center;
-    color: #333333;
-  }
-  .item {
-    position: relative;
-  }
-  img {
-    width: 100%;
-    height: 100%;
-  }
-  .text {
-    position: absolute;
-    bottom: 45px;
-    left: 0;
-    width: 100%;
-    padding: 0 30px;
-    line-height: 68px;
-    font-size: 24px;
-    color: #fff;
-    background: rgba(0,0,0,0.38);
-  }
+    h6 {
+        margin-bottom: 59px;
+        font-size: 48px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        text-align: center;
+        color: #333333;
+    }
+    .item {
+        position: relative;
+    }
+    img {
+        width: 100%;
+        height: 100%;
+    }
+    .text {
+        position: absolute;
+        bottom: 45px;
+        left: 0;
+        width: 100%;
+        padding: 0 30px;
+        line-height: 68px;
+        font-size: 24px;
+        color: #fff;
+        background: rgba(0, 0, 0, 0.38);
+    }
 }
 .intro {
-  .inner {
-    width: 1504px;
-  }
-  .item {
-    position: relative;
-    display: flex;
-    align-items: center;
-    margin-bottom: 36px;
-    background: #fff;
-    &:nth-child(even) {
-      flex-direction: row-reverse;
+    .inner {
+        width: 1504px;
+    }
+    .item {
+        position: relative;
+        display: flex;
+        align-items: center;
+        margin-bottom: 36px;
+        background: #fff;
+        &:nth-child(even) {
+            flex-direction: row-reverse;
+        }
+    }
+    .pic {
+        width: 848px;
+        height: 505px;
+    }
+    .texts {
+        padding: 0 58px;
+    }
+    .type {
+        font-size: 18px;
+        color: #333;
+    }
+    h6 {
+        margin: 20px 0;
+        font-size: 28px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333333;
+    }
+    .des {
+        margin-bottom: 30px;
+        font-size: 16px;
+        color: #333;
+        line-height: 30px;
     }
-  }
-  .pic {
-    width: 848px;
-    height: 505px;
-  }
-  .texts {
-    padding: 0 58px;
-  }
-  .type {
-    font-size: 18px;
-    color: #333;
-  }
-  h6 {
-    margin: 20px 0;
-    font-size: 28px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #333333;
-  }
-  .des {
-    margin-bottom: 30px;
-    font-size: 16px;
-    color: #333;
-    line-height: 30px;
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/talentCenter.vue b/src/pages/column/page/talentCenter.vue
index ca4e84b..6360602 100644
--- a/src/pages/column/page/talentCenter.vue
+++ b/src/pages/column/page/talentCenter.vue
@@ -1,11 +1,14 @@
 <template>
+  <!-- 人才中心 -->
   <div class="wrap">
     <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>
@@ -13,26 +16,34 @@
     <div class="modules">
       <div class="relative">
         <div class="single-banner single-banner-overview">
-          <img class="banner-img" :src="modules[0].form.pic" alt="">
+          <img class="banner-img"
+               :src="modules[0].form.pic"
+               alt="">
           <div class="texts">
             <h6 class="banner-title">{{ modules[0].form.title }}</h6>
           </div>
         </div>
-        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+        <div class="cover"
+             @click="toSet(0)">点击更换banner与链接</div>
       </div>
       <div class="content">
         <div class="article">
           <div class="left">
             <div class="c-wrap">
               <h6 class="title">{{ modules[1].form.title }}</h6>
-              <div class="text" v-html="modules[1].form.des"></div>
-              <div class="cover" @click="toSet(1)">点击更换标题与描述</div>
+              <div class="text"
+                   v-html="modules[1].form.des"></div>
+              <div class="cover"
+                   @click="toSet(1)">点击更换标题与描述</div>
             </div>
             <ul class="recruit">
               <li>
                 <div class="c-wrap m-r-10">
-                  <img class="pic" :src="modules[2].form.pic" alt="">
-                  <div class="cover" @click="toSet(2)">点击更换图片</div>
+                  <img class="pic"
+                       :src="modules[2].form.pic"
+                       alt="">
+                  <div class="cover"
+                       @click="toSet(2)">点击更换图片</div>
                 </div>
                 <div class="texts">
                   <div class="c-wrap">
@@ -40,20 +51,28 @@
                       <h6 class="c-title">{{ modules[3].form.title }}</h6>
                       <div class="more">查看更多 ></div>
                     </div>
-                    <div class="des" v-html="modules[3].form.des"></div>
-                    <div class="cover" @click="toSet(3)">点击更换标题、链接与描述</div>
+                    <div class="des"
+                         v-html="modules[3].form.des"></div>
+                    <div class="cover"
+                         @click="toSet(3)">点击更换标题、链接与描述</div>
                   </div>
                   <p class="hot">热门岗位</p>
                   <div class="labels">
-                    <p v-for="(item, i) in modules[4].list" :key="i" class="label">{{ item.title }}</p>
-                    <div class="cover" @click="toSet(4)">点击更换标签</div>
+                    <p v-for="(item, i) in modules[4].list"
+                       :key="i"
+                       class="label">{{ item.title }}</p>
+                    <div class="cover"
+                         @click="toSet(4)">点击更换标签</div>
                   </div>
                 </div>
               </li>
               <li>
                 <div class="c-wrap m-r-10">
-                  <img class="pic" :src="modules[5].form.pic" alt="">
-                  <div class="cover" @click="toSet(5)">点击更换图片</div>
+                  <img class="pic"
+                       :src="modules[5].form.pic"
+                       alt="">
+                  <div class="cover"
+                       @click="toSet(5)">点击更换图片</div>
                 </div>
                 <div class="texts">
                   <div class="c-wrap">
@@ -61,27 +80,38 @@
                       <h6 class="c-title">{{ modules[6].form.title }}</h6>
                       <div class="more">查看更多 ></div>
                     </div>
-                    <div class="des" v-html="modules[6].form.des"></div>
-                    <div class="cover" @click="toSet(6)">点击更换标题、链接与描述</div>
+                    <div class="des"
+                         v-html="modules[6].form.des"></div>
+                    <div class="cover"
+                         @click="toSet(6)">点击更换标题、链接与描述</div>
                   </div>
                   <p class="hot">热门岗位</p>
                   <div class="labels">
-                    <p v-for="(item, i) in modules[7].list" :key="i" class="label">{{ item.title }}</p>
-                    <div class="cover" @click="toSet(7)">点击更换标签</div>
+                    <p v-for="(item, i) in modules[7].list"
+                       :key="i"
+                       class="label">{{ item.title }}</p>
+                    <div class="cover"
+                         @click="toSet(7)">点击更换标签</div>
                   </div>
                 </div>
               </li>
             </ul>
             <ul class="notice">
               <li class="m-r-10">
-                <img class="pic" :src="modules[8].form.pic" alt="">
+                <img class="pic"
+                     :src="modules[8].form.pic"
+                     alt="">
                 <p class="text">{{ modules[8].form.title }}</p>
-                <div class="cover" @click="toSet(8)">点击更换图片、标题与链接</div>
+                <div class="cover"
+                     @click="toSet(8)">点击更换图片、标题与链接</div>
               </li>
               <li>
-                <img class="pic" :src="modules[9].form.pic" alt="">
+                <img class="pic"
+                     :src="modules[9].form.pic"
+                     alt="">
                 <p class="text">{{ modules[9].form.title }}</p>
-                <div class="cover" @click="toSet(9)">点击更换图片、标题与链接</div>
+                <div class="cover"
+                     @click="toSet(9)">点击更换图片、标题与链接</div>
               </li>
             </ul>
           </div>
@@ -89,7 +119,10 @@
       </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>
 
@@ -98,12 +131,12 @@ import mixins from '@/mixins/page'
 import Modules from '@/const/modules'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       modules: Modules.talentCenter
     }
   },
-  mounted() {
+  mounted () {
     this.$store.commit('user/setCrumbs', [
       {
         name: '站点管理',
@@ -123,150 +156,150 @@ export default {
     ])
   },
   methods: {
-    
+
   }
 };
 </script>
 
 <style lang="scss" scoped>
-@import "../../../styles/page/page.scss";
+@import '../../../styles/page/page.scss';
 .wrap {
-  background-color: #F9FAFA;
+    background-color: #f9fafa;
 }
 .content {
-  width: 1400px;
-  padding-top: 40px;
+    width: 1400px;
+    padding-top: 40px;
 }
 .article {
-  display: flex;
-  justify-content: center;
-  .left {
-    width: 66%;
-    .title {
-      padding-bottom: 10px;
-      font-size: 1.2rem;
-      color: #666;
-      border-bottom: 1px solid #EAEEF2;
-    }
-    .text {
-      margin-top: 20px;
-      font-size: 1.1rem;
-      color: #333;
-      line-height: 28px;
-      p {
-        margin-bottom: 20px;
-      }
-    }
-  }
-  .recruit {
-    li {
-      display: flex;
-      padding: 20px;
-      margin-bottom: 24px;
-      background-color: #fff;
-    }
-    .pic {
-      width: 410px;
-      height: 250px;
-      margin-right: 20px;
-    }
-    .c-title {
-      font-size: 1.2rem;
-      columns: #333;
-    }
-    .more {
-      font-size: .8rem;
-      color: #0648A8;
-      cursor: pointer;
-    }
-    .des {
-      margin: 20px 0;
-      font-size: 1rem;
-      color: #666;
-      line-height: 22px;
+    display: flex;
+    justify-content: center;
+    .left {
+        width: 66%;
+        .title {
+            padding-bottom: 10px;
+            font-size: 1.2rem;
+            color: #666;
+            border-bottom: 1px solid #eaeef2;
+        }
+        .text {
+            margin-top: 20px;
+            font-size: 1.1rem;
+            color: #333;
+            line-height: 28px;
+            p {
+                margin-bottom: 20px;
+            }
+        }
     }
-    .hot {
-      margin-bottom: 10px;
-      font-size: 1.1rem;
-      color: #333;
+    .recruit {
+        li {
+            display: flex;
+            padding: 20px;
+            margin-bottom: 24px;
+            background-color: #fff;
+        }
+        .pic {
+            width: 410px;
+            height: 250px;
+            margin-right: 20px;
+        }
+        .c-title {
+            font-size: 1.2rem;
+            columns: #333;
+        }
+        .more {
+            font-size: 0.8rem;
+            color: #0648a8;
+            cursor: pointer;
+        }
+        .des {
+            margin: 20px 0;
+            font-size: 1rem;
+            color: #666;
+            line-height: 22px;
+        }
+        .hot {
+            margin-bottom: 10px;
+            font-size: 1.1rem;
+            color: #333;
+        }
+        .labels {
+            position: relative;
+            display: flex;
+            flex-wrap: wrap;
+        }
+        .label {
+            padding: 5px 15px;
+            margin: 0 15px 15px 0;
+            font-size: 1rem;
+            border-radius: 22px;
+            border: 1px solid #666;
+        }
     }
-    .labels {
-      position: relative;
-      display: flex;
-      flex-wrap: wrap;
+    .notice {
+        display: flex;
+        li {
+            position: relative;
+            width: calc((100% - 20px) / 2);
+            height: 300px;
+            padding: 20px;
+            background-color: #fff;
+        }
+        .pic {
+            width: 100%;
+            height: 100%;
+        }
+        .text {
+            position: absolute;
+            bottom: 20px;
+            left: 20px;
+            width: calc(100% - 40px);
+            font-size: 1.6rem;
+            line-height: 66px;
+            text-align: center;
+            color: #fff;
+            background: rgba(32, 57, 81, 0.68);
+        }
     }
-    .label {
-      padding: 5px 15px;
-      margin: 0 15px 15px 0;
-      font-size: 1rem;
-      border-radius: 22px;
-      border: 1px solid #666;
+    .right {
+        width: 20%;
     }
-  }
-  .notice {
-    display: flex;
-    li {
-      position: relative;
-      width: calc((100% - 20px) / 2);
-      height: 300px;
-      padding: 20px;
-      background-color: #fff;
+    .column {
+        width: 100%;
+        margin-bottom: 25px;
     }
-    .pic {
-      width: 100%;
-      height: 100%;
+    /deep/.el-tree-node__content {
+        height: 44px;
+        background-color: #e5edf8;
+        border-bottom: 2px solid #fff;
     }
-    .text {
-      position: absolute;
-      bottom: 20px;
-      left: 20px;
-      width: calc(100% - 40px);
-      font-size: 1.6rem;
-      line-height: 66px;
-      text-align: center;
-      color: #fff;
-      background: rgba(32,57,81,0.68);
+    /deep/.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+        color: #fff;
+        background-color: #0f5698;
     }
-  }
-  .right {
-    width: 20%;
-  }
-  .column {
-    width: 100%;
-    margin-bottom: 25px;
-  }
-  /deep/.el-tree-node__content {
-    height: 44px;
-    background-color: #E5EDF8;
-    border-bottom: 2px solid #fff;
-  }
-  /deep/.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
-    color: #fff;
-    background-color: #0f5698;
-  }
-  .list {
-    margin-bottom: 20px;
-    li {
-      padding: 16px 0;
-      border-bottom: 1px solid #D8D8D8;
-    }
-    .text {
-      margin-bottom: 5px;
-      font-size: 14px;
-      cursor: pointer;
-      &:hover {
-        color: $main-color;
-      }
-    }
-    .date {
-      font-size: 12px;
-      color: #999;
+    .list {
+        margin-bottom: 20px;
+        li {
+            padding: 16px 0;
+            border-bottom: 1px solid #d8d8d8;
+        }
+        .text {
+            margin-bottom: 5px;
+            font-size: 14px;
+            cursor: pointer;
+            &:hover {
+                color: $main-color;
+            }
+        }
+        .date {
+            font-size: 12px;
+            color: #999;
+        }
     }
-  }
 }
 @media (max-width: 1420px) {
-  .content {
-    width: 98%;
-  }
+    .content {
+        width: 98%;
+    }
 }
 </style>
\ No newline at end of file
diff --git a/src/router/modules/column.js b/src/router/modules/column.js
index d2ec0a1..2b8ea21 100644
--- a/src/router/modules/column.js
+++ b/src/router/modules/column.js
@@ -160,26 +160,32 @@ export default {
     {
       path: `estate/index`,
       component: () => import('@/pages/column/page/estate/index'),
+      meta: { title: '产业光源-首页' }
     },
     {
       path: `estate/event`,
       component: () => import('@/pages/column/page/estate/event'),
+      meta: { title: '产业光源-大事记' }
     },
     {
       path: `estate/location`,
       component: () => import('@/pages/column/page/estate/location'),
+      meta: { title: '产业光源-地理位置' }
     },
     {
       path: `estate/orgSetup`,
       component: () => import('@/pages/column/page/estate/orgSetup'),
+      meta: { title: '产业光源-机构设置' }
     },
     {
       path: `estate/survey`,
       component: () => import('@/pages/column/page/estate/survey'),
+      meta: { title: '产业光源-深圳产业光源' }
     },
     {
       path: `talentCenter`,
       component: () => import('@/pages/column/page/talentCenter'),
+      meta: { title: '人才中心' }
     },
     {
       path: `governance`,
@@ -196,10 +202,12 @@ export default {
     {
       path: `overview`,
       component: () => import('@/pages/column/page/overview'),
+      meta: { title: '概况' }
     },
     {
       path: `mission`,
       component: () => import('@/pages/column/page/mission'),
+      meta: { title: '关于IASF-使命愿景价值观' }
     },
     {
       path: `scientific`,
@@ -216,10 +224,22 @@ export default {
     {
       path: `speech`,
       component: () => import('@/pages/column/page/speech'),
+      meta: { title: '关于IASF-院长致辞' }
     },
     {
       path: `talentCentre`,
       component: () => import('@/pages/column/page/talentCentre'),
+      meta: { title: '人才中心' }
+    },
+    {
+      path: `contactUs`,
+      component: () => import('@/pages/column/page/contactUs'),
+      meta: { title: '联系我们' }
+    },
+    {
+      path: `lightSources`,
+      component: () => import('@/pages/column/page/lightSources'),
+      meta: { title: '全球先进光源' }
     },
   ]
 }