diff --git a/public/styles/css/editor.css b/public/styles/css/editor.css
index e61a883..edb485a 100644
--- a/public/styles/css/editor.css
+++ b/public/styles/css/editor.css
@@ -1,83 +1,124 @@
-
 @font-face {
-  font-family: SFProDisplay;
-  src: url('./styles/font/SF-Pro-Display-Regular.otf');
+    font-family: SFProDisplay;
+    src: url('./styles/font/SF-Pro-Display-Regular.otf');
 }
 @font-face {
-  font-family: ProximaNova;
-  src: url('./styles/font/ProximaNova-Regular.otf');
+    font-family: ProximaNova;
+    src: url('./styles/font/ProximaNova-Regular.otf');
 }
-.mce-content-body:not([dir=rtl]) blockquote {
-  padding: 8px 15px;
-  border-left: 0;
-  background-color: #ededed;
+.mce-content-body:not([dir='rtl']) blockquote {
+    padding: 8px 15px;
+    border-left: 0;
+    background-color: #ededed;
 }
 .mce-content-body p {
-  margin: 0;
+    margin: 0;
 }
 .tiny-wrap {
-  /* width: 900px; */
-  margin: 0 auto;
+    /* width: 900px; */
+    margin: 0 auto;
+}
+.tiny-wrap .blue {
+    color: #1583ff;
 }
 .tiny-wrap blockquote p {
-  margin: 0;
-  font-style: italic;
+    margin: 0;
+    font-style: italic;
 }
 .tiny-wrap .block {
-  margin-bottom: 20px;
-  overflow: hidden;
+    margin-bottom: 20px;
+    overflow: hidden;
 }
 .tiny-wrap .block .fl {
-  float: left;
-  margin: 0 20px 0 0;
+    float: left;
+    margin: 0 20px 0 0;
 }
 .tiny-wrap .block .fr {
-  float: right;
-  margin: 0 0 0 20px;
+    float: right;
+    margin: 0 0 0 20px;
 }
 .tiny-wrap .block p {
-  margin: 0 0 10px;
-  font-size: 19px;
-  font-family: SFProDisplay;
-  font-weight: 400;
-  color: #101010;
-  line-height: 32px;
-}
-.tiny-wrap .en-block p, .tiny-wrap .en-block .img-des {
-  font-family: ProximaNova;
-  letter-spacing: -.0135em;
-  line-height: 1.5em;
+    margin: 0 0 10px;
+    font-size: 19px;
+    font-family: SFProDisplay;
+    font-weight: 400;
+    color: #101010;
+    line-height: 32px;
+    white-space: pre-wrap;
+}
+.tiny-wrap .en-block p,
+.tiny-wrap .en-block .img-des {
+    font-family: ProximaNova;
+    letter-spacing: -0.0135em;
+    line-height: 1.5em;
 }
 .tiny-wrap .block .tiny-title {
-  margin: 10px 0;
-  font-size: 24px;
-  font-family: SFProDisplay;
-  font-weight: 500;
-  color: #101010;
-  line-height: 32px;
+    margin: 10px 0;
+    font-size: 24px;
+    font-family: SFProDisplay;
+    font-weight: 500;
+    color: #101010;
+    line-height: 32px;
 }
 .tiny-wrap .quote {
-  padding: 15px;
-  margin-bottom: 10px;
-  font-size: 16px;
-  font-style: italic;
-  border: 1px solid #e3e3e3;
-  background-color: #f1f1f1;
+    padding: 15px;
+    margin-bottom: 10px;
+    font-size: 16px;
+    font-style: italic;
+    border: 1px solid #e3e3e3;
+    background-color: #f1f1f1;
 }
 .tiny-wrap .img-wrap {
-  text-align: center;
+    text-align: center;
 }
 .tiny-wrap .img-wrap img {
-  max-width: 600px;
-  max-height: 600px;
+    max-width: 600px;
+    max-height: 600px;
 }
 .tiny-wrap .block .img-des {
-  margin: 10px 0 0;
-  font-size: 14px;
-  color: #8d8d8d;
-  text-align: center;
+    margin: 10px 0 0;
+    font-size: 14px;
+    color: #8d8d8d;
+    text-align: center;
 }
 .tiny-wrap .block .pic {
-  width: 300px;
-  height: 190px;
-}
\ No newline at end of file
+    width: 300px;
+    height: 190px;
+}
+.tiny-wrap .people {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30px;
+}
+.tiny-wrap .people .pic {
+    max-width: 400px;
+    margin-right: 50px;
+}
+.tiny-wrap .people h6 {
+    font-size: 24px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
+}
+.tiny-wrap .people h6 {
+    margin-top: 20px;
+    font-size: 18px;
+    color: #333;
+    line-height: 35px;
+}
+.tiny-wrap .p-title {
+    display: flex;
+    align-items: center;
+    margin: 0 0 10px;
+    font-size: 22px;
+    font-weight: 400;
+    color: #333;
+}
+.tiny-wrap .p-title:before {
+    content: '';
+    width: 5px;
+    height: 19px;
+    margin-right: 8px;
+    background: #1583ff;
+    border-radius: 4px;
+}
diff --git a/src/components/modules/content.vue b/src/components/modules/content.vue
index 4be4910..cf528e7 100644
--- a/src/components/modules/content.vue
+++ b/src/components/modules/content.vue
@@ -1,74 +1,115 @@
 <template>
   <!-- 内容 -->
   <div>
-    <el-dialog title="编辑内容" :visible.sync="visible" width="600px" custom-class="module" :close-on-click-modal="false" :before-close="close">
-      <el-form ref="form" :model="data.form" :rules="rules" label-width="60px">
-        <el-form-item v-for="(item, i) in data.forms" :key="i" :prop="item.prop" :label="item.label">
-          <el-input v-if="item.type === 'input'" v-model="data.form[item.prop]" placeholder="请输入" maxlength="100"></el-input>
-          <el-input v-if="item.type === 'textarea'" v-model="data.form[item.prop]" type="textarea" placeholder="请输入" maxlength="300"></el-input>
-          <el-upload
-            v-if="item.type === 'upload' && item.crop"
-            class="uploader"
-            accept=".jpg,.png,.jpeg,.gif"
-            :on-change="res => changeFile(res, data.form)"
-            :show-file-list="false"
-            :action="api.upload"
-            :auto-upload="false">
-              <img v-if="data.form[item.prop]" :src="data.form[item.prop]" class="avatar">
-              <div class="uploader-default" v-else>
-                <i class="el-icon-plus"></i>
-                <p>上传图片</p>
-              </div>
-              <div slot="tip" class="el-upload__tip">
-                <p>只支持.jpg,.png格式</p>
-              </div>
+    <el-dialog title="编辑内容"
+               :visible.sync="visible"
+               width="700px"
+               custom-class="module"
+               :close-on-click-modal="false"
+               :before-close="close">
+      <el-form ref="form"
+               :model="data.form"
+               :rules="rules"
+               label-width="60px">
+        <el-form-item v-for="(item, i) in data.forms"
+                      :key="i"
+                      :prop="item.prop"
+                      :label="item.label">
+          <el-input v-if="item.type === 'input'"
+                    v-model="data.form[item.prop]"
+                    placeholder="请输入"
+                    maxlength="100"></el-input>
+          <el-input v-if="item.type === 'textarea'"
+                    v-model="data.form[item.prop]"
+                    type="textarea"
+                    placeholder="请输入"
+                    maxlength="300"></el-input>
+          <Editor v-if="item.type === 'editor'"
+                  api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
+                  v-model="data.form[item.prop]"
+                  :init="editorConfig" />
+          <el-upload v-if="item.type === 'upload' && item.crop"
+                     class="uploader"
+                     accept=".jpg,.png,.jpeg,.gif"
+                     :on-change="res => changeFile(res, data.form)"
+                     :show-file-list="false"
+                     :action="api.upload"
+                     :auto-upload="false">
+            <img v-if="data.form[item.prop]"
+                 :src="data.form[item.prop]"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传图片</p>
+            </div>
+            <div slot="tip"
+                 class="el-upload__tip">
+              <p>只支持.jpg,.png格式</p>
+            </div>
           </el-upload>
-          <el-upload
-            v-if="item.type === 'upload' && !item.crop"
-            class="uploader"
-            accept=".jpg,.png,.jpeg"
-            :on-success="res => uploadSuccess(res, data.form)"
-            :show-file-list="false"
-            :headers="headers"
-            :action="api.upload">
-              <img v-if="data.form[item.prop]" :src="data.form[item.prop]" class="avatar">
-              <div class="uploader-default" v-else>
-                <i class="el-icon-plus"></i>
-                <p>上传图片</p>
-              </div>
-              <div slot="tip" class="el-upload__tip">
-                <p>只支持.jpg,.png格式</p>
-              </div>
+          <el-upload v-if="item.type === 'upload' && !item.crop"
+                     class="uploader"
+                     accept=".jpg,.png,.jpeg"
+                     :on-success="res => uploadSuccess(res, data.form)"
+                     :show-file-list="false"
+                     :headers="headers"
+                     :action="api.upload">
+            <img v-if="data.form[item.prop]"
+                 :src="data.form[item.prop]"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
+              <i class="el-icon-plus"></i>
+              <p>上传图片</p>
+            </div>
+            <div slot="tip"
+                 class="el-upload__tip">
+              <p>只支持.jpg,.png格式</p>
+            </div>
           </el-upload>
           <template v-if="item.type === 'pic'">
-            <img v-if="data.form[item.prop]" :src="data.form[item.prop]" class="avatar">
-            <div class="uploader-default" v-else>
+            <img v-if="data.form[item.prop]"
+                 :src="data.form[item.prop]"
+                 class="avatar">
+            <div class="uploader-default"
+                 v-else>
               <i class="el-icon-picture-outline"></i>
             </div>
           </template>
-          <div v-if="item.type === 'link'" class="flex">
-            <el-input class="m-r-10" v-model="data.form.link.linkName"></el-input>
+          <div v-if="item.type === 'link'"
+               class="flex">
+            <el-input class="m-r-10"
+                      v-model="data.form.link.linkName"></el-input>
             <el-button @click="toLink(data.form)">设置链接</el-button>
           </div>
         </el-form-item>
       </el-form>
-      <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="contentSubmit">确定</el-button>
+        <el-button type="primary"
+                   @click="contentSubmit">确定</el-button>
       </span>
     </el-dialog>
 
-    <Link ref="link" :visible.sync="linkVisible" :data.sync="linkForm" @linkSubmit="linkSubmit" />
+    <Link ref="link"
+          :visible.sync="linkVisible"
+          :data.sync="linkForm"
+          @linkSubmit="linkSubmit" />
 
     <!-- 剪裁组件弹窗 -->
-    <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="fixed"
-        :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="fixed"
+               :fixedNumber.sync="fixedNumber"
+               @upload="customUpload" />
     </el-dialog>
   </div>
 </template>
@@ -78,18 +119,22 @@ import Link from '@/components/modules/link'
 import Setting from '@/setting'
 import Util from '@/libs/util'
 import Cropper from '@/components/img-upload/Cropper'
+import Editor from '@tinymce/tinymce-vue'
+import editorConfig from '@/components/editor'
 import Axios from 'axios'
 export default {
   props: ['data', 'visible'],
   components: {
     Link,
-    Cropper
+    Cropper,
+    Editor,
   },
-  data() {
+  data () {
     return {
       headers: {
         token: Util.local.get(Setting.tokenKey)
       },
+      editorConfig,
       rules: {},
       linkVisible: false,
       linkForm: {},
@@ -104,17 +149,17 @@ export default {
     };
   },
   watch: {
-    visible(open) {
+    visible (open) {
       // 每次打开的时候处理参数
       open && this.handleForm()
     }
   },
-  mounted() {
+  mounted () {
     this.handleForm()
   },
   methods: {
     // 处理form表单参数
-    handleForm() {
+    handleForm () {
       const { forms, type } = this.data
       // 这两张类型的模块才需要处理参数
       if (type === 'form' || type === 'introduce') {
@@ -139,17 +184,17 @@ export default {
         })
       }
     },
-    close() {
+    close () {
       this.$emit('update:visible', false)
     },
     // 图片裁剪上传事件
-    customUpload(data) {
+    customUpload (data) {
       const formData = new FormData()
       formData.append('file', data, this.file.name)
       this.imgUpload(formData)
     },
     // 压缩图片
-    compress(img) {
+    compress (img) {
       const canvas = document.createElement('canvas')
       const ctx = canvas.getContext('2d')
       // let initSize = img.src.length;
@@ -166,7 +211,7 @@ export default {
       return ndata
     },
     // base64转成bolb对象
-    dataURItoBlob(base64Data) {
+    dataURItoBlob (base64Data) {
       let byteString
       if (base64Data.split(',')[0].indexOf('base64') >= 0) {
         byteString = atob(base64Data.split(',')[1])
@@ -186,7 +231,7 @@ export default {
       })
     },
     // 图片上传到服务器
-    imgUpload(formData) {
+    imgUpload (formData) {
       this.isUpload = true
       Axios({
         method: 'post',
@@ -198,13 +243,13 @@ export default {
         },
       }).then(({ data }) => {
         this.$set(this.curForm, 'pic', data.url)
-      }).catch(res => {})
+      }).catch(res => { })
       this.$refs.cropper.isDisabled = false
       this.isUpload = false
       this.cropperModel = false
     },
     // 图片改变钩子
-    changeFile(file, form) {
+    changeFile (file, form) {
       const { size, name } = file
       const ext = name.substring(name.lastIndexOf('.') + 1)
       if (!Util.isImg(ext)) {
@@ -226,17 +271,17 @@ export default {
       })
     },
     // 上传成功
-    uploadSuccess(res, row) {
+    uploadSuccess (res, row) {
       this.$set(row, 'pic', res.url)
     },
     // 展示链接设置
-    toLink(row, i = 0) {
+    toLink (row, i = 0) {
       this.linkVisible = true
       this.curIndex = i
       this.linkForm = row.link
     },
     // 链接设置提交
-    linkSubmit() {
+    linkSubmit () {
       const el = this.$refs.link
       const data = this.data.form ? this.data.form.link : this.data.list[this.curIndex].link
       let name
@@ -267,7 +312,7 @@ export default {
       this.linkVisible = false
     },
     // 模块设置提交
-    contentSubmit() {
+    contentSubmit () {
       this.$emit('contentSubmit')
     },
   }
@@ -275,11 +320,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/modules.js b/src/const/modules.js
index c4e7fa3..0f97301 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -6706,7 +6706,7 @@ export default {
           required: true
         },
         {
-          type: 'textarea',
+          type: 'editor',
           prop: 'des',
           label: '描述'
         }
@@ -9015,6 +9015,7 @@ export default {
 					stations: '',
 					status: '',
 					time: '',
+					status: '',
         }
       ]
     },
@@ -9647,7 +9648,7 @@ export default {
       }
     },
     {
-      type: 'introduce',
+      type: 'form',
       forms: [
         {
           type: 'upload',
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index c9feb7f..a260856 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -78,7 +78,7 @@ export default {
               e.originForm = modules[i].originForm
             }
           })
-          // this.modules = list
+          this.modules = list
           console.log("🚀 ~ file: index.js:85 ~ this.$post ~ list:", list)
         }
       }).catch(err => {})
diff --git a/src/pages/article/add/editor.js b/src/pages/article/add/editor.js
index 4c52572..146d881 100644
--- a/src/pages/article/add/editor.js
+++ b/src/pages/article/add/editor.js
@@ -179,7 +179,8 @@ export default {
   branding: false,
   width: 940,
   height: 650, //编辑器高度
-  min_height: 400,
+  // min_height: 400,
+  max_height: 650,
   content_css: [ //可设置编辑区内容展示的css，谨慎使用
     './styles/css/editor.css',
   ],
@@ -297,6 +298,83 @@ export default {
           </div>
         </div>
         ` 
+      },
+      { title: '人物详情', description: '', content: `
+        <div class="tiny-wrap">
+          <div class="people">
+						<img class="pic" src="http://10.10.11.7/images/team/5.png"/>
+						<div class="texts">
+							<h6>谢明远  XIE Mingyuan</h6>
+							<div class="text">
+								<p>同步辐射光源工程经理部  生物医药组 副研究员</p>
+								<p>负责深圳产业光源生物安全防护晶体学与成像实验站建设</p>
+								<p>深圳市海外高层次人才孔雀计划C类 </p>
+							</div>
+						</div>
+          </div>
+
+					<div class="block">
+						<h6 class="p-title">基本简介</h6>
+						<div class="block">
+							<p>职称：副教授</p>
+							<p>学位：博士</p>
+							<p>毕业学校：美国马里兰大学帕克分校</p>
+							<p>电子邮件：<span class="blue">xiemy@mail.iasf.ac.cn</span></p>
+						</div>
+					</div>
+					
+					<div class="block">
+						<h6 class="p-title">学术经历 </h6>
+						<div class="block">
+							<p>2014年            毕业于中山大学获理学博士学位。</p>
+							<p>2014-2015年   香港理工大学从事博士后研究工作；</p>
+							<p>2015-2016年   北京理工大学珠海学院信息学院任讲师，主要从事高功率单模光纤激光器、大芯径高功率多模光纤激光器以及基于光纤的系统的研发工作。</p>
+							<p>2016-2019      于中山大学物理学院任副研究员，主要开展藻类捕光蛋白结构和功能研究。</p>
+							<p>2019-2021      获得广东省青年优秀人才海外派出计划资助，赴德国电子同步加速器实验室DESY任访问学者，共同搭建世界上首台基于光学参量放大过程的波形相干合成光源；</p>
+							<p>2021年至今      深圳综合粒子设施研究院同步辐射光源经理部生物医药组任副研究员，负责深圳产业光源生物安全防护晶体学与成像实验站建设。</p>
+						</div>
+					</div>
+					
+					<div class="block">
+						<h6 class="p-title">学科方向</h6>
+						<div class="block">
+							<p>所在学科：材料物理</p>
+							<p>研究方向：分子模拟，计算材料学，统计力学</p>
+							<p>研究兴趣：软物质及复杂流体界面的分子模拟，熔盐传蓄热材料热物性的计算模拟</p>
+						</div>
+					</div>
+					
+					<div class="block">
+						<h6 class="p-title">学术业绩</h6>
+						<div class="block">
+							<p>长期从事材料界面、软物质和能源材料的分子模拟工作，迄今为止以第一作者或通讯作者发表论文16篇。</p>
+							<p>主持科研项目</p>
+							<p>国家自然科学基金青年项目（2019-2021）：超级电容器双电层结构的多尺度模拟研究（11804400）</p>
+							<p>国家自然科学基金面上项目（2022-2025）：接枝表面上液体输运性质的多尺度模拟（12174457）</p>
+						</div>
+					</div>
+					
+					<div class="block">
+						<h6 class="p-title">荣誉获奖</h6>
+						<div class="block">
+							<p>“百千万”人才工程、国家杰出青年科学基金项目、青年千人计划、中国科学院百人计划、珠江人才青年拔尖人才、深圳市高层次人</p>
+						</div>
+					</div>
+					
+					<div class="block">
+						<h6 class="p-title">代表论著</h6>
+						<div class="block">
+							<p>1) F. Liang, J. Ding and S. Liu*, Collective Solvation and Transport at Tetrahydrofuran–Silica Interfaces for Separation of Aromatic Compounds: Insight from Molecular Dynamics Simulations, Langmuir, 2021, 37, 2091-2103.</p>
+							<p>2) K. Ren, Y.-P. Wang and S. Liu*, The role of solute polarity on methanol–silica interfacial solvation: a molecular dynamics study, Phys. Chem. Chem. Phys., 2021, 23, 1092-1102.</p>
+							<p>3) Y.-P. Wang, K. Ren and S. Liu*, The joint effect of surface polarity and concentration on the structure and dynamics of acetonitrile solution: a molecular dynamics simulation study,  Phys. Chem. Chem. Phys., 2020, 22, 10322-10334.</p>
+							<p>4) K. Ren and S. Liu*, The effect of surface polarity on the structure and collective dynamics of liquid ethanol,  Phys. Chem. Chem. Phys., 2020, 22, 1204-1213.</p>
+							<p>5) R. C. Remsing, S. Liu and J. D. Weeks, Long-ranged Contributions to Solvation Free Energies from Theory and Short-ranged Models, Proc. Natl. Acad. Sci. 113, 2819-2826(2016).</p>
+							<p>6) S. Liu, J. Savage and G. A. Voth, Mesoscale Study of Proton Transport in Proton Exchange Membranes: Role of Morphologies. J. Phys. Chem. C., 119, 1753-1762 (2015).</p>
+							<p>7) S. Liu and J. T. Fourkas, Orientational Time Correlati.</p>
+						</div>
+					</div>
+        </div>
+        ` 
       }
   ],
   // content_security_policy: "https://cdn.tiny.cloud/1/rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda/tinymce/6/tinymce.min.js",
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index 533da24..ba1d672 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -240,7 +240,7 @@
                           end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item v-else-if="!isJournal"
+        <el-form-item v-else-if="!isJournal && !isThesis"
                       prop="author"
                       label="作者">
           <el-input placeholder="请输入作者"
@@ -270,7 +270,7 @@
                       class="inline-input"></el-input>
           </el-form-item>
         </div>
-        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || isOrg"
              class="item-line">
           <el-form-item prop="edit"
                         label="编辑">
@@ -335,7 +335,7 @@
           </el-form-item>
         </template>
 
-        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+        <div v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || isOrg"
              class="item-line">
           <el-form-item prop="source"
                         label="所属分类">
@@ -372,7 +372,7 @@
                        @click="setLabel">设置</el-button>
           </el-form-item>
         </div>
-        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23"
+        <el-form-item v-if="form.articleTemplate === 22 || form.articleTemplate === 23 || isPeople || isOrg"
                       prop="summary"
                       label="摘要">
           <el-input style="width: 940px"
@@ -461,14 +461,14 @@
         </div>
       </template>
 
-      <el-form-item v-if="form.articleTemplate !== 24 && form.articleTemplate !== 26"
+      <el-form-item v-if="form.articleTemplate !== 24 && form.articleTemplate !== 26 && !isPublication"
                     prop="mainBody"
                     label="正文">
         <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda'
                 v-model="form.mainBody"
                 :init="editorConfig" />
       </el-form-item>
-      <template v-if="isJournal">
+      <template v-if="isJournal || isPublication">
         <el-form-item prop="publicationTypeId"
                       label="出版物类型">
           <el-select style="width: 234px;"
@@ -901,6 +901,10 @@ export default {
     isPeople () {
       return this.form.articleTemplate === 72
     },
+    // 组织架构
+    isOrg () {
+      return this.form.articleTemplate === 69
+    },
     getModelData: {
       get () {
         const data = this.classifications.find(item => item.id === this.form.classificationId)
@@ -1412,9 +1416,11 @@ export default {
       // 封面图跟banner的截取比例不一样，期刊详情模板的也不一样
       this.fixedNumber = isBanner ?
         [1, 0.26] :
-        this.isJournal ?
-          [1, 1.5] :
-          [1.76, 1]
+        this.isPeople ?
+          [1, 1] :
+          this.isJournal ?
+            [1, 1.5] :
+            [1.76, 1]
       this.isBanner = isBanner
       const { size, name } = file
       const ext = name.substring(name.lastIndexOf('.') + 1)
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 362fd9c..c57b37b 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -1,110 +1,135 @@
 <template>
-  <div class="page" v-show="loaded">
+  <div class="page"
+       v-show="loaded">
     <p class="page-name mb">栏目</p>
-    <el-form :model="form" :rules="rules" class="input-form model" label-width="120px">
+    <el-form :model="form"
+             :rules="rules"
+             class="input-form model"
+             label-width="120px">
       <div class="item-line">
-        <el-form-item prop="columnName" label="栏目名称">
-          <el-input
-            placeholder="请输入栏目名称"
-            v-model="form.columnName"
-            clearable
-            maxlength="40"
-            @input="nameChange"
-          ></el-input>
+        <el-form-item prop="columnName"
+                      label="栏目名称">
+          <el-input placeholder="请输入栏目名称"
+                    v-model="form.columnName"
+                    clearable
+                    maxlength="40"
+                    @input="nameChange"></el-input>
         </el-form-item>
-        <el-form-item prop="fatherId" label="设置上级">
-          <el-cascader
-            ref="fatherId"
-            v-model="form.fatherId"
-            :options="columns"
-            :props="columnProps"
-            clearable
-            @change="fatherIdChange"></el-cascader>
+        <el-form-item prop="fatherId"
+                      label="设置上级">
+          <el-cascader ref="fatherId"
+                       v-model="form.fatherId"
+                       :options="columns"
+                       :props="columnProps"
+                       clearable
+                       @change="fatherIdChange"></el-cascader>
         </el-form-item>
       </div>
       <div class="item-line">
-        <el-form-item prop="typeId" label="栏目类型">
-          <el-select v-model="form.typeId" @change="typeChange">
-            <el-option
-              v-for="item in types"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
+        <el-form-item prop="typeId"
+                      label="栏目类型">
+          <el-select v-model="form.typeId"
+                     @change="typeChange">
+            <el-option v-for="item in types"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="pageSize" label="分页条数">
-          <el-input-number v-model="form.pageSize" :min="0" class="auto"></el-input-number>
+        <el-form-item prop="pageSize"
+                      label="分页条数">
+          <el-input-number v-model="form.pageSize"
+                           :min="0"
+                           class="auto"></el-input-number>
         </el-form-item>
-        <el-form-item prop="menuVisible" label="导航菜单可见">
-          <el-switch
-            v-model="form.menuVisible"
-            :active-value="0"
-            :inactive-value="1">
+        <el-form-item prop="menuVisible"
+                      label="导航菜单可见">
+          <el-switch v-model="form.menuVisible"
+                     :active-value="0"
+                     :inactive-value="1">
           </el-switch>
         </el-form-item>
       </div>
       <div class="line"></div>
       <template v-if="form.typeId === 1 || form.typeId === 4">
-        <el-form-item prop="columnBanner" label="栏目Banner">
-          <el-upload
-            class="avatar-uploader avatar-uploader-lg"
-            accept=".jpg,.png,.jpeg,.gif"
-            :on-change="changeFile"
-            :show-file-list="false"
-            :action="this.api.upload"
-            :auto-upload="false"
-          >
-            <img v-if="form.columnBanner" :src="form.columnBanner" class="avatar-lg">
-            <div class="uploader-default" v-else>
-              <img class="plus" src="@/assets/images/plus.png" alt="">
+        <el-form-item prop="columnBanner"
+                      label="栏目Banner">
+          <el-upload class="avatar-uploader avatar-uploader-lg"
+                     accept=".jpg,.png,.jpeg,.gif"
+                     :on-change="changeFile"
+                     :show-file-list="false"
+                     :action="this.api.upload"
+                     :auto-upload="false">
+            <img v-if="form.columnBanner"
+                 :src="form.columnBanner"
+                 class="avatar-lg">
+            <div class="uploader-default"
+                 v-else>
+              <img class="plus"
+                   src="@/assets/images/plus.png"
+                   alt="">
               <p>点击上传</p>
             </div>
-            <div slot="tip" class="el-upload__tip">
+            <div slot="tip"
+                 class="el-upload__tip">
               <p>请上传1920x500PX，5M以内的jpg，bmp，png格式</p>
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item prop="subtitle" label="栏目副标题">
-          <el-input
-            type="textarea"
-            placeholder="请输入栏目副标题"
-            v-model="form.subtitle"
-          ></el-input>
+        <el-form-item prop="subtitle"
+                      label="栏目副标题">
+          <el-input type="textarea"
+                    placeholder="请输入栏目副标题"
+                    v-model="form.subtitle"></el-input>
         </el-form-item>
-        <el-form-item prop="templateId" label="栏目模板">
-          <el-select v-model="form.templateId" @change="getStyle">
-            <el-option
-              v-for="item in templates"
-              :key="item.id"
-              :label="item.templateType"
-              :value="item.id">
+        <el-form-item prop="templateId"
+                      label="栏目模板">
+          <el-select v-model="form.templateId"
+                     @change="getStyle">
+            <el-option v-for="item in templates"
+                       :key="item.id"
+                       :label="item.templateType"
+                       :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="listStyleId" label="列表样式">
+        <el-form-item prop="listStyleId"
+                      label="列表样式">
           <ul class="styles">
-            <li v-for="(item, i) in listStyle" :key="i" @click="form.listStyleId = item.id">
+            <li v-for="(item, i) in listStyle"
+                :key="i"
+                @click="form.listStyleId = item.id">
               <div class="review">
-                <img style="width: 90px;max-height: 110px;" :src="require('@/assets/images/style/' + item.id + '.png')" alt="">
+                <img style="width: 90px;max-height: 110px;"
+                     :src="require('@/assets/images/style/' + item.id + '.png')"
+                     alt="">
               </div>
-              <el-radio v-model="form.listStyleId" :label="item.id">{{ item.style }}</el-radio>
+              <el-radio v-model="form.listStyleId"
+                        :label="item.id">{{ item.style }}</el-radio>
             </li>
           </ul>
         </el-form-item>
-        <el-form-item prop="detailStyleId" label="详情样式">
+        <el-form-item prop="detailStyleId"
+                      label="详情样式">
           <ul class="styles">
-            <li v-for="(item, i) in detailStyleId" :key="i" @click="form.detailStyleId = item.id">
+            <li v-for="(item, i) in detailStyleId"
+                :key="i"
+                @click="form.detailStyleId = item.id">
               <div class="review">
-                <img :style="{width: item.id == 24 ? '50px' : '90px', 'max-height': '110px'}" :src="require('@/assets/images/style/' + item.id + '.png')" alt="">
+                <img :style="{width: item.id == 24 ? '50px' : '90px', 'max-height': '110px'}"
+                     :src="require('@/assets/images/style/' + item.id + '.png')"
+                     alt="">
               </div>
-              <el-radio v-model="form.detailStyleId" :label="item.id">{{ item.style }}</el-radio>
+              <el-radio v-model="form.detailStyleId"
+                        :label="item.id">{{ item.style }}</el-radio>
             </li>
           </ul>
         </el-form-item>
       </template>
       <template v-if="form.typeId === 2">
-        <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>
@@ -113,85 +138,89 @@
         </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 v-if="form.typeId === 3">
-        <el-form-item prop="templateId" label="栏目模板">
+        <el-form-item prop="templateId"
+                      label="栏目模板">
           <el-select v-model="form.templateId">
-            <el-option
-              label="长页模板"
-              :value="9">
+            <el-option label="长页模板"
+                       :value="9">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="listStyleId" label="列表样式">
+        <el-form-item prop="listStyleId"
+                      label="列表样式">
           <ul class="styles">
-            <li v-for="(item, i) in pageStyle" :key="i" @click="form.listStyleId = item.id">
+            <li v-for="(item, i) in pageStyle"
+                :key="i"
+                @click="form.listStyleId = item.id">
               <div class="review">
-                <img :src="require('@/assets/images/page/' + item.pic + '.png')" alt="">
+                <img :src="require('@/assets/images/page/' + item.pic + '.png')"
+                     alt="">
               </div>
-              <el-radio v-model="form.listStyleId" :label="item.id">{{ item.style }}</el-radio>
+              <el-radio v-model="form.listStyleId"
+                        :label="item.id">{{ item.style }}</el-radio>
             </li>
           </ul>
         </el-form-item>
@@ -205,17 +234,21 @@
       </el-form-item> -->
     </el-form>
     <div class="btns">
-      <el-button type="primary" @click="submit(0)">确定</el-button>
+      <el-button type="primary"
+                 @click="submit(0)">确定</el-button>
       <el-button @click="$router.push('/column')">取消</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"
-        @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"
+               @upload="customUpload" />
     </el-dialog>
   </div>
 </template>
@@ -228,504 +261,506 @@ import Cropper from '@/components/img-upload/Cropper'
 import Axios from 'axios'
 import Modules from '@/const/modules'
 export default {
-    data() {
-        return {
-          loaded: false,
-          userId: +this.$store.state.user.userId,
-          site: this.$store.state.content.site,
-          isEdit: this.$route.query.type === 'edit',
-          nameRepeat: false,
-          listStyle: [],
-          detailStyleId: [],
-          types: ColumnConst.types,
-          templates: [],
-          pageStyle: [],
-          sites: [],
-          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,
-            fatherId: +this.$route.query.id || 0,
-            level: this.$route.query.level || 1,
-            columnName: '',
-            typeId: 1,
-            pageSize: 10,
-            menuVisible: 0,
-            columnBanner: '',
-            subtitle: '',
-            templateId: 1,
-            listStyleId: 1,
-            detailStyleId: 1,
-            connectionType: 1,
-            linkAddress	: '',
-            showWithDetails: 0,
-            siteSelection: '',
-            status: 1,
-            sort: 1,
-            isOpen: 1
-          },
-          rules: {
-            columnName: [
-              { required: true, message: '请输入栏目名称', trigger: 'blur' }
-            ],
-            typeId: [
-              { required: true, message: '请选择栏目类型', trigger: 'change' }
-            ],
-            pageSize: [
-              { required: true, message: '请输入分页条数', trigger: 'blur' }
-            ],
-            templateId: [
-              { required: true, message: '请输入栏目名称', trigger: 'blur' }
-            ],
-            listStyleId: [
-              { required: true, message: '请选择栏目模板', trigger: 'change' }
-            ],
-            detailStyleId: [
-              { required: true, message: '请选择详情样式', trigger: 'change' }
-            ],
-            connectionType: [
-              { required: true, message: '请选择连接类型', trigger: 'blur' }
-            ],
-          },
-          originTypeId: 1,
-          submiting: false, // 新增编辑防抖标识
-          updateTime: 0,
-          cropperModel: false,
-          isUpload: false,
-          file: {}, // 当前被选择的图片文件
-          fileId: '',
-          level: 0,
-          nameTimer: null
-        };
-    },
-    components: {
-      Cropper
-    },
-    computed: {
-      ...mapState('user', [
-        'userName'
-      ])
-    },
-    mounted() {
-      this.$store.commit('user/setCrumbs', [
-        {
-          name: '站点管理',
-          route: '/site'
-        },
-        {
-          name: '内容管理',
-          route: '/column'
-        },
-        {
-          name: '栏目管理',
-          route: '/column'
-        },
-        {
-          name: this.$route.query.type === 'edit' ? '编辑' : '新增'
-        }
-      ])
-      this.getList()
-      this.getSite()
-      this.getTemplate()
-    },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-      form: {
-        handler(val){
-          this.updateTime++
-        },
-        deep:true
+  data () {
+    return {
+      loaded: false,
+      userId: +this.$store.state.user.userId,
+      site: this.$store.state.content.site,
+      isEdit: this.$route.query.type === 'edit',
+      nameRepeat: false,
+      listStyle: [],
+      detailStyleId: [],
+      types: ColumnConst.types,
+      templates: [],
+      pageStyle: [],
+      sites: [],
+      columns: [],
+      articles: [],
+      otherArticles: [],
+      columnProps: {
+        checkStrictly: true,
+        value: 'id',
+        label: 'columnName'
       },
-    },
-    // 页面离开的时候如果没有保存则提示
-    beforeRouteLeave(to, from, next) {
-      if (this.submiting) {
-        next()
-      } else {
-        const { id } = this.form
-        const { updateTime } = this
-        // 更改了信息才需要提示
-        if (updateTime > 1) {
-          this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
-            type: 'warning'
-          }).then(() => {
-            this.submit(next)
-          }).catch(() => {
-            next()
-          })
-        } else {
-          next()
-        }
-      }
-    },
-    methods: {
-      // 获取当前站点的栏目列表
-      getList() {
-        this.$post(this.api.listWithTree, {
-          siteId: this.site.id,
-          columnName: '',
-          templateId: '',
-          typeId	: '',
-          isSort: 1
-        }).then(({ data }) => {
-          this.columns = data
-          if (this.isEdit) {
-            this.getData()
-            this.handleId(data)
-          } else {
-            this.getOtherColumn()
-            this.loaded = true
-          }
-        }).catch(err => {})
-      },
-      // 给当前栏目加上disabled禁止选中
-      handleId(list) {
-        list.forEach(e => {
-          if (this.isEdit && e.id == this.form.id) e.disabled = true 
-          e.children.length ? this.handleId(e.children) : delete e.children
-        })
-      },
-      // 文章列表
-      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.findColumn}?id=${this.form.id}`).then(({ data }) => {
-          this.form = data
-          if (data.typeId === 1 || data.typeId === 4) this.getStyle(0)
-          this.originTypeId = data.typeId
-          if (data.typeId === 2) {
-            if (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
-                }
-                this.$nextTick(() => {
-                  this.updateTime = 1
-                })
-                this.loaded = true
-              }).catch(err => {})
-            }
-          } else {
-            this.loaded = true
-          }
-          this.getOtherColumn()
-        }).catch(err => {})
-      },
-      // 栏目类型切换回调
-      typeChange(val) {
-        if (val === 1 || val === 4) {
-          this.form.templateId = 1
-          this.getStyle()
-        } else if (val == 3) {
-          this.form.templateId = 9
-          if (this.pageStyle.length) this.form.listStyleId = this.pageStyle[0].id
-        }
-      },
-      // 获取栏目模板
-      getTemplate() {
-        this.$post(this.api.listOfColumnTemplates).then(({ data }) => {
-          this.templates = data
-          this.isEdit || this.getStyle()
-        }).catch(err => {})
-        
-        this.$post(this.api.longPageListStyle).then(({ data }) => {
-          // 产业光源五个页面的path有斜杠，图片名没法用斜杠，所以改成驼峰
-          data.forEach(e => {
-            const { path } = e
-            let pic = path
-            if (path === 'estate/index') pic = 'estateIndex'
-            if (path === 'estate/survey') pic = 'estateSurvey'
-            if (path === 'estate/event') pic = 'estateEvent'
-            if (path === 'estate/orgSetup') pic = 'estateOrgSetup'
-            if (path === 'estate/location') pic = 'estateLocation'
-            e.pic = pic
-          })
-          this.pageStyle = data
-        }).catch(err => {})
-      },
-      // 根据模板id获取样式
-      getStyle(set = 1) {
-        const { templateId } = this.form
-        this.$post(`${this.api.theTemplateIdGetsTheStyle}?templateId=${templateId}`).then(({ data }) => {
-          this.listStyle = data.listingTemplateTypes
-          this.detailStyleId = data.detailsTypeOfTheTemplate
-          if (set) {
-            this.form.listStyleId = this.listStyle[templateId === 1 ? 1 : 0].id
-            this.form.detailStyleId = this.detailStyleId[0].id
-          }
-        }).catch(err => {})
-      },
-      // 获取站点列表
-      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 => {})
+      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,
+        fatherId: +this.$route.query.id || 0,
+        level: this.$route.query.level || 1,
+        columnName: '',
+        typeId: 1,
+        pageSize: 10,
+        menuVisible: 0,
+        columnBanner: '',
+        subtitle: '',
+        templateId: 1,
+        listStyleId: 1,
+        detailStyleId: 1,
+        connectionType: 1,
+        linkAddress: '',
+        showWithDetails: 0,
+        siteSelection: '',
+        status: 1,
+        sort: 1,
+        isOpen: 1
       },
-      // 获取指定站点的栏目列表
-      getOtherColumn(val) {
-        this.form.siteSelection && 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 => {})
+      rules: {
+        columnName: [
+          { required: true, message: '请输入栏目名称', trigger: 'blur' }
+        ],
+        typeId: [
+          { required: true, message: '请选择栏目类型', trigger: 'change' }
+        ],
+        pageSize: [
+          { required: true, message: '请输入分页条数', trigger: 'blur' }
+        ],
+        templateId: [
+          { required: true, message: '请输入栏目名称', trigger: 'blur' }
+        ],
+        listStyleId: [
+          { required: true, message: '请选择栏目模板', trigger: 'change' }
+        ],
+        detailStyleId: [
+          { required: true, message: '请选择详情样式', trigger: 'change' }
+        ],
+        connectionType: [
+          { required: true, message: '请选择连接类型', trigger: 'blur' }
+        ],
       },
-      // 栏目名称判重
-      nameChange(){
-        clearTimeout(this.nameTimer)
-        this.nameTimer = setTimeout(() => {
-          const { columnName, fatherId, id } = this.form
-          if (columnName && columnName !== this.originalName) {
-            const data = {
-              fatherId: fatherId.length ? fatherId[0] : 0,
-              siteId: this.site.id,
-              columnName,
-            }
-            if (id) data.id = +id
-            this.$post(this.api.sameLevelJudgment, data).then(res => {
-              this.nameRepeat = false
-            }).catch(res => {
-              this.nameRepeat = true
-            })
-          }else{
-            this.nameRepeat = false
-          }
-        }, 500)
+      originTypeId: 1,
+      submiting: false, // 新增编辑防抖标识
+      updateTime: 0,
+      cropperModel: false,
+      isUpload: false,
+      file: {}, // 当前被选择的图片文件
+      fileId: '',
+      level: 0,
+      nameTimer: null
+    };
+  },
+  components: {
+    Cropper
+  },
+  computed: {
+    ...mapState('user', [
+      'userName'
+    ])
+  },
+  mounted () {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
       },
-      // 上级选择回调
-      fatherIdChange(val) {
-        const check = this.$refs.fatherId.getCheckedNodes()
-        this.form.level = check.length ? check[0].level + 1 : 1 // 更改了父级后要重新获取当前栏目level
-        this.nameChange()
+      {
+        name: '内容管理',
+        route: '/column'
       },
-      // 图片裁剪上传事件
-      customUpload(data) {
-        const formData = new FormData()
-        formData.append('file', data, this.file.name)
-        formData.append('quote', this.form.columnName)
-        formData.append('site', this.site.siteName)
-        formData.append('uploader', this.userName)
-        formData.append('quoteType', 1)
-        this.imgUpload(formData)
+      {
+        name: '栏目管理',
+        route: '/column'
       },
-      // 压缩图片
-      compress(img) {
-        const canvas = document.createElement('canvas')
-        const ctx = canvas.getContext('2d')
-        console.log("🚀 ~ file: index.vue:540 ~ compress ~ ctx", ctx,img.width)
-        // 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
+      {
+        name: this.$route.query.type === 'edit' ? '编辑' : '新增'
+      }
+    ])
+    this.getList()
+    this.getSite()
+    this.getTemplate()
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    form: {
+      handler (val) {
+        this.updateTime++
       },
-      // base64转成bolb对象
-      dataURItoBlob(base64Data) {
-        let byteString
-        if (base64Data.split(',')[0].indexOf('base64') >= 0) {
-          byteString = atob(base64Data.split(',')[1])
+      deep: true
+    },
+  },
+  // 页面离开的时候如果没有保存则提示
+  beforeRouteLeave (to, from, next) {
+    if (this.submiting) {
+      next()
+    } else {
+      const { id } = this.form
+      const { updateTime } = this
+      // 更改了信息才需要提示
+      if (updateTime > 1) {
+        this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.submit(next)
+        }).catch(() => {
+          next()
+        })
+      } else {
+        next()
+      }
+    }
+  },
+  methods: {
+    // 获取当前站点的栏目列表
+    getList () {
+      this.$post(this.api.listWithTree, {
+        siteId: this.site.id,
+        columnName: '',
+        templateId: '',
+        typeId: '',
+        isSort: 1
+      }).then(({ data }) => {
+        this.columns = data
+        if (this.isEdit) {
+          this.getData()
+          this.handleId(data)
         } else {
-          byteString = unescape(base64Data.split(',')[1])
+          this.getOtherColumn()
+          this.loaded = true
         }
-        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)
+      }).catch(err => { })
+    },
+    // 给当前栏目加上disabled禁止选中
+    handleId (list) {
+      list.forEach(e => {
+        if (this.isEdit && e.id == this.form.id) e.disabled = true
+        e.children.length ? this.handleId(e.children) : delete e.children
+      })
+    },
+    // 文章列表
+    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.findColumn}?id=${this.form.id}`).then(({ data }) => {
+        this.form = data
+        if (data.typeId === 1 || data.typeId === 4) this.getStyle(0)
+        this.originTypeId = data.typeId
+        if (data.typeId === 2) {
+          if (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
+              }
+              this.$nextTick(() => {
+                this.updateTime = 1
+              })
+              this.loaded = true
+            }).catch(err => { })
+          }
+        } else {
+          this.loaded = true
         }
-        return new Blob([ia], {
-          type: mimeString
+        this.getOtherColumn()
+      }).catch(err => { })
+    },
+    // 栏目类型切换回调
+    typeChange (val) {
+      if (val === 1 || val === 4) {
+        this.form.templateId = 1
+        this.getStyle()
+      } else if (val == 3) {
+        this.form.templateId = 9
+        if (this.pageStyle.length) this.form.listStyleId = this.pageStyle[0].id
+      }
+    },
+    // 获取栏目模板
+    getTemplate () {
+      this.$post(this.api.listOfColumnTemplates).then(({ data }) => {
+        this.templates = data
+        this.isEdit || this.getStyle()
+      }).catch(err => { })
+
+      this.$post(this.api.longPageListStyle).then(({ data }) => {
+        // 产业光源五个页面的path有斜杠，图片名没法用斜杠，所以改成驼峰
+        data.forEach(e => {
+          const { path } = e
+          let pic = path
+          if (path === 'estate/index') pic = 'estateIndex'
+          if (path === 'estate/survey') pic = 'estateSurvey'
+          if (path === 'estate/event') pic = 'estateEvent'
+          if (path === 'estate/orgSetup') pic = 'estateOrgSetup'
+          if (path === 'estate/location') pic = 'estateLocation'
+          e.pic = pic
         })
-      },
-      // 图片上传到服务器
-      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 }) => {
-          let url = this.form.columnBanner
-          url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => {}).catch(e => {}) // 删除替换掉的图片
-          this.form.columnBanner = data.url
-          this.fileId = data.id
-        }).catch(res => {})
-        this.$refs.cropper.isDisabled = false
-        this.isUpload = false
-        this.cropperModel = false
-      },
-      // 图片改变钩子
-      changeFile(file) {
-        const { size, name } = file
-        const ext = name.substring(name.lastIndexOf('.') + 1)
-        if (!Util.isImg(ext)) {
-          this.$message.error('请上传图片！')
-          return false
+        this.pageStyle = data
+      }).catch(err => { })
+    },
+    // 根据模板id获取样式
+    getStyle (set = 1) {
+      const { templateId } = this.form
+      this.$post(`${this.api.theTemplateIdGetsTheStyle}?templateId=${templateId}`).then(({ data }) => {
+        this.listStyle = data.listingTemplateTypes
+        const detailList = data.detailsTypeOfTheTemplate
+        if (templateId == 11) detailList.shift() // 出版物不用显示文章
+        this.detailStyleId = detailList
+        if (set) {
+          this.form.listStyleId = this.listStyle[templateId === 1 ? 1 : 0].id
+          this.form.detailStyleId = this.detailStyleId[templateId === 7 ? 1 : 0].id
         }
-        // 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
-          })
-        })
-      },
-      // 更新附件的状态为发布
-      updateFile(form, quoteId) {
-        this.fileId && this.$post(this.api.updateFile, {
-          id: this.fileId,
-          isRelease: 1,
-          quote: form.columnName,
-          quoteId
-        }).then(res => {
-          this.fileId = ''
-        }).catch(err => {})
-      },
-      // 提交
-      submit(next) {
-        if (this.submiting) return false
-        const { form } = this
-        if (!form.columnName) return Util.errorMsg('请填写栏目名称')
-        if (this.nameRepeat) return Util.errorMsg('同级下已存在重复栏目!')
-        if (!form.pageSize) return Util.errorMsg('请填写分页条数')
-        const { fatherId } = form
-        if (typeof fatherId	=== 'object') form.fatherId	= fatherId.length ? fatherId[fatherId.length - 1] : 0 // 选择了上级后结果会是数组，直接取最后一个id
-        if (form.typeId === 2 && form.connectionType !== 2) {
-          const { links, article, otherLink, otherArticle } = this
-          if (form.connectionType === 1) {
-            if (!links.length) return Util.errorMsg('请选择站内链接')
-            form.linkAddress = links.join()
-            if (article) form.linkAddress += '-' + article
-          }
-          if (form.connectionType === 3) {
-            if (!otherLink.length) return Util.errorMsg('请选择栏目')
-            form.linkAddress = otherLink.join()
-            if (otherArticle) form.linkAddress += '-' + otherArticle
-          }
+      }).catch(err => { })
+    },
+    // 获取站点列表
+    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.form.siteSelection && this.$post(this.api.listWithTree, {
+        siteId: this.form.siteSelection,
+        columnName: '',
+        templateId: '',
+        typeId: '',
+        isSort: 1
+      }).then(({ data }) => {
+        if (val) {
+          this.otherArticles = []
+          this.otherArticle = ''
+          this.otherLink = ''
         }
-        if (form.typeId !== 2 && !form.listStyleId) return Util.errorMsg('请选择列表样式')
-        this.submiting = true
-        if (this.isEdit) {
-          delete form.children
-          form.editorId = this.userId
-          this.$post(this.api.updateColumn, form).then(res => {
-            this.updateFile(form, form.id)
-            // 编辑前不是长页栏目，则需要重新保存长页模板
-            // if (this.originTypeId !== 3 && form.typeId === 3) this.savePage(form.id)
-            Util.successMsg("修改成功")
-            next ? next() : this.$router.back()
-          }).catch(err => {
-            this.submiting = false
+        this.otherColumns = data
+      }).catch(err => { })
+    },
+    // 栏目名称判重
+    nameChange () {
+      clearTimeout(this.nameTimer)
+      this.nameTimer = setTimeout(() => {
+        const { columnName, fatherId, id } = this.form
+        if (columnName && columnName !== this.originalName) {
+          const data = {
+            fatherId: fatherId.length ? fatherId[0] : 0,
+            siteId: this.site.id,
+            columnName,
+          }
+          if (id) data.id = +id
+          this.$post(this.api.sameLevelJudgment, data).then(res => {
+            this.nameRepeat = false
+          }).catch(res => {
+            this.nameRepeat = true
           })
         } else {
-          this.$post(this.api.saveColumn, form).then(({ data }) => {
-            this.updateFile(form, data)
-            // 栏目类型选择了长页栏目，才需要保存长页
-            form.typeId === 3 && this.savePage(data)
-            Util.successMsg("创建成功")
-            next ? next() : this.$router.back()
-          }).catch(err => {
-            this.submiting = false
-          })
+          this.nameRepeat = false
         }
-      },
-      // 保存长页模板
-      savePage(columnId) {
-        const { listStyleId } = this.form
-        const module = Modules[this.pageStyle.find(e => e.id == listStyleId).path] // 获取module.js里存的初始长页数据
-        if (module) {
-          this.$post(this.api[this.id ? 'updatePage' : 'savePage'], {
-            columnId,
-            state: 1,
-            sort: 1,
-            founderId: this.userId,
-            editorId: this.userId,
-            jsonBeforeEditing: module,
-            theEditedJson: module,
-          }).then(res => {}).catch(err => {})
+      }, 500)
+    },
+    // 上级选择回调
+    fatherIdChange (val) {
+      const check = this.$refs.fatherId.getCheckedNodes()
+      this.form.level = check.length ? check[0].level + 1 : 1 // 更改了父级后要重新获取当前栏目level
+      this.nameChange()
+    },
+    // 图片裁剪上传事件
+    customUpload (data) {
+      const formData = new FormData()
+      formData.append('file', data, this.file.name)
+      formData.append('quote', this.form.columnName)
+      formData.append('site', this.site.siteName)
+      formData.append('uploader', this.userName)
+      formData.append('quoteType', 1)
+      this.imgUpload(formData)
+    },
+    // 压缩图片
+    compress (img) {
+      const canvas = document.createElement('canvas')
+      const ctx = canvas.getContext('2d')
+      console.log("🚀 ~ file: index.vue:540 ~ compress ~ ctx", ctx, img.width)
+      // 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 }) => {
+        let url = this.form.columnBanner
+        url && this.$del(this.api.delFile, [url.split('/').pop()]).then(res => { }).catch(e => { }) // 删除替换掉的图片
+        this.form.columnBanner = data.url
+        this.fileId = data.id
+      }).catch(res => { })
+      this.$refs.cropper.isDisabled = false
+      this.isUpload = false
+      this.cropperModel = false
+    },
+    // 图片改变钩子
+    changeFile (file) {
+      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
+        })
+      })
+    },
+    // 更新附件的状态为发布
+    updateFile (form, quoteId) {
+      this.fileId && this.$post(this.api.updateFile, {
+        id: this.fileId,
+        isRelease: 1,
+        quote: form.columnName,
+        quoteId
+      }).then(res => {
+        this.fileId = ''
+      }).catch(err => { })
+    },
+    // 提交
+    submit (next) {
+      if (this.submiting) return false
+      const { form } = this
+      if (!form.columnName) return Util.errorMsg('请填写栏目名称')
+      if (this.nameRepeat) return Util.errorMsg('同级下已存在重复栏目!')
+      if (!form.pageSize) return Util.errorMsg('请填写分页条数')
+      const { fatherId } = form
+      if (typeof fatherId === 'object') form.fatherId = fatherId.length ? fatherId[fatherId.length - 1] : 0 // 选择了上级后结果会是数组，直接取最后一个id
+      if (form.typeId === 2 && form.connectionType !== 2) {
+        const { links, article, otherLink, otherArticle } = this
+        if (form.connectionType === 1) {
+          if (!links.length) return Util.errorMsg('请选择站内链接')
+          form.linkAddress = links.join()
+          if (article) form.linkAddress += '-' + article
+        }
+        if (form.connectionType === 3) {
+          if (!otherLink.length) return Util.errorMsg('请选择栏目')
+          form.linkAddress = otherLink.join()
+          if (otherArticle) form.linkAddress += '-' + otherArticle
         }
       }
+      if (form.typeId !== 2 && !form.listStyleId) return Util.errorMsg('请选择列表样式')
+      this.submiting = true
+      if (this.isEdit) {
+        delete form.children
+        form.editorId = this.userId
+        this.$post(this.api.updateColumn, form).then(res => {
+          this.updateFile(form, form.id)
+          // 编辑前不是长页栏目，则需要重新保存长页模板
+          // if (this.originTypeId !== 3 && form.typeId === 3) this.savePage(form.id)
+          Util.successMsg("修改成功")
+          next ? next() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false
+        })
+      } else {
+        this.$post(this.api.saveColumn, form).then(({ data }) => {
+          this.updateFile(form, data)
+          // 栏目类型选择了长页栏目，才需要保存长页
+          form.typeId === 3 && this.savePage(data)
+          Util.successMsg("创建成功")
+          next ? next() : this.$router.back()
+        }).catch(err => {
+          this.submiting = false
+        })
+      }
+    },
+    // 保存长页模板
+    savePage (columnId) {
+      const { listStyleId } = this.form
+      const module = Modules[this.pageStyle.find(e => e.id == listStyleId).path] // 获取module.js里存的初始长页数据
+      if (module) {
+        this.$post(this.api[this.id ? 'updatePage' : 'savePage'], {
+          columnId,
+          state: 1,
+          sort: 1,
+          founderId: this.userId,
+          editorId: this.userId,
+          jsonBeforeEditing: module,
+          theEditedJson: module,
+        }).then(res => { }).catch(err => { })
+      }
     }
+  }
 };
 </script>
 
@@ -734,96 +769,96 @@ $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: inline-flex;
-  flex-wrap: wrap;
-  li {
-    width: 170px;
-    margin-right: 20px;
-    text-align: center;
-    cursor: pointer;
-    &:hover .review {
-      border-color: #2962FF;
+    display: inline-flex;
+    flex-wrap: wrap;
+    li {
+        width: 170px;
+        margin-right: 20px;
+        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: 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: 50px;
+        }
     }
-  }
     .el-radio {
-      white-space: normal;
+        white-space: normal;
     }
 }
 /deep/.input-form .auto .el-input {
-  width: 119px;
+    width: 119px;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/column/page/iasf.vue b/src/pages/column/page/iasf.vue
index 0faa51c..1ebe700 100644
--- a/src/pages/column/page/iasf.vue
+++ b/src/pages/column/page/iasf.vue
@@ -317,7 +317,12 @@
 
     <ul class="tools">
       <li v-for="(item, i) in modules[18].list"
-          :key="i">{{ item.title }}</li>
+          :key="i">
+        <img :src="'http://10.10.11.7/images/iasf/icon' + (i < 4 ? i + 1 : 1) + '.png'"
+             alt=""
+             class="icon">
+        {{ item.title }}
+      </li>
       <div class="cover"
            @click="toSet(18)">点击更换导航</div>
     </ul>
diff --git a/src/pages/column/page/lightSources.vue b/src/pages/column/page/lightSources.vue
index 96d4df9..03130c1 100644
--- a/src/pages/column/page/lightSources.vue
+++ b/src/pages/column/page/lightSources.vue
@@ -95,7 +95,6 @@
             <table class="table">
               <thead>
                 <tr>
-                  <th>序号</th>
                   <th>光源名称</th>
                   <th>国家</th>
                   <th>地点</th>
@@ -105,6 +104,7 @@
                   <th>重复频率/Hz Repetition rate</th>
                   <th>设施长度/m Overall length</th>
                   <th>线站数量</th>
+                  <th>状态</th>
                   <th>出光时间</th>
                 </tr>
               </thead>