diff --git a/src/api/index.js b/src/api/index.js
index 08ef546..6fecad1 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -47,6 +47,7 @@ export default {
   articleEnableOrDisable: `iasf/sysContent/articleEnableOrDisable`,
   saveArticle: `iasf/sysContent/save`,
   updateArticle: `iasf/sysContent/update`,
+  modifiedSort: `iasf/sysContent/modifiedSort`,
   longPageColumnList: `iasf/pageManagement/longPageColumnList`,
   searchAllBySite: `iasf/sysNavigationStyle/searchAllBySite`,
   updateStyle: `iasf/sysNavigationStyle/update`,
diff --git a/src/components/modules/content.vue b/src/components/modules/content.vue
index 3348652..4be4910 100644
--- a/src/components/modules/content.vue
+++ b/src/components/modules/content.vue
@@ -4,7 +4,7 @@
     <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="30"></el-input>
+          <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"
diff --git a/src/components/modules/link.vue b/src/components/modules/link.vue
index ab5541c..a365c09 100644
--- a/src/components/modules/link.vue
+++ b/src/components/modules/link.vue
@@ -126,6 +126,8 @@ export default {
     // 栏目列表
     getList() {
       this.$post(this.api.listWithTree, {
+        role: 1,
+        isadmin: false,
         siteId: this.site.id,
         columnName: '',
         templateId: '',
@@ -176,6 +178,8 @@ export default {
     // 获取指定站点的栏目列表
     getOtherColumn() {
       this.data.site && this.$post(this.api.listWithTree, {
+        role: 1,
+        isadmin: false,
         siteId: this.data.site,
         columnName: '',
         templateId: '',
diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue
index d34f3f0..977d7d8 100644
--- a/src/components/modules/module.vue
+++ b/src/components/modules/module.vue
@@ -61,7 +61,7 @@
       </template>
       <el-form v-else-if="data.type === 'form' || data.type === 'forms'" 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="30"></el-input>
+          <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'"
@@ -257,6 +257,8 @@ export default {
     // 站点切换回调
     siteChange(siteId) {
       this.$post(this.api.listWithTree, {
+        role: 1,
+        isadmin: false,
         siteId,
         columnName: '',
         templateId: '',
diff --git a/src/const/modules.js b/src/const/modules.js
index 1ac7a55..dfc9e25 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -4231,10 +4231,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '量子材料'
+        title: '量子材料',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
     {
@@ -4245,10 +4261,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '能源催化'
+        title: '能源催化',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
     {
@@ -4259,10 +4291,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '生物医药'
+        title: '生物医药',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
     {
@@ -4273,10 +4321,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '大气雾霾与团簇研究'
+        title: '大气雾霾与团簇研究',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
     {
@@ -4287,10 +4351,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '星际化学'
+        title: '星际化学',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
     {
@@ -4301,10 +4381,26 @@ export default {
           prop: 'title',
           label: '标题',
           required: true
-        }
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
       ],
       form: {
-        title: '原子分子物理'
+        title: '原子分子物理',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
       }
     },
   ],
@@ -4361,7 +4457,7 @@ export default {
           required: true
         },
         {
-          type: 'textarea',
+          type: 'editor',
           prop: 'des',
           label: '描述'
         }
@@ -4427,7 +4523,7 @@ export default {
         }
       ],
       form: {
-        des: `<p style="margin-bottom: 20px;line-height: 1.5;"><span style="font-family: 'Microsoft Yahei'; font-size: 19px;">&nbsp; &nbsp; &nbsp; S&sup3;FEL是光明科学城大科学装置集群的重要成员，建设地点位于深圳市光明区北片区，毗邻莲塘水库，占地面积约40万平方米，其中S&sup3;FEL装置的主体建筑总长约1800米。</span></p>
+        des: `<p style="margin-bottom: 60px;line-height: 1.5;"><span style="font-family: 'Microsoft Yahei'; font-size: 19px;">&nbsp; &nbsp; &nbsp; S&sup3;FEL是光明科学城大科学装置集群的重要成员，建设地点位于深圳市光明区北片区，毗邻莲塘水库，占地面积约40万平方米，其中S&sup3;FEL装置的主体建筑总长约1800米。</span></p>
         
         <img src="http://10.10.11.7/images/survey/2.png" alt="" >`
       }
@@ -4761,4 +4857,90 @@ export default {
       }
     },
   ],
+  deviceIntroLinear: [
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'textarea',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        title: 'S³FEL的光阴极注入器/电子枪利用光电效应产生高亮度电子束团，并将其加速到90 MeV。',
+        des: `主加速器基于超导连续波工作模式，采用三级加速、两级压缩的结构，将电子束团能量提高到2.5 GeV；同时在保持横向发射度不变的情况下，将电子束长度从几皮秒压缩到几十飞秒，峰值流强提升到800 A以上。相比基于常温加速技术的高增益FEL，超导直线加速器技术可以有效提高电子束流的重复频率，实现最高每秒106脉冲输出（常温加速技术为~102脉冲/秒），进而大幅度提高FEL激光的平均功率。`
+      }
+    },
+  ],
+  overviewSetup: [
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        },
+        {
+          type: 'textarea',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        pic: 'http://10.10.11.7/images/survey/1.png',
+        title: 'S³FEL概况',
+        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: '描述'
+        }
+      ],
+      form: {
+        title: '组织架构',
+        des: `       根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。`
+      }
+    },
+  ]
 }
\ No newline at end of file
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index 3938b1d..605afff 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -24,7 +24,7 @@ export default {
   // 页面离开的时候如果没有保存则提示
   beforeRouteLeave(to, from, next) {
     // 更改了信息才需要提示
-    if (!this.pass && this.originModules !== JSON.stringify(this.modules)) {
+    if (!this.pass && this.modules.length && this.originModules !== JSON.stringify(this.modules)) {
       this.$confirm(`所填写内容暂未保存，是否保存？`, '提示', {
         type: 'warning'
       }).then(() => {
diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index 6aea652..454f84c 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -711,6 +711,8 @@ export default {
       // 获取栏目
       getList() {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.site.id,
           columnName: '',
           templateId: '',
@@ -867,6 +869,8 @@ export default {
       // 获取指定站点的栏目列表
       getOtherColumn(val) {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.form.siteSelection,
           columnName: '',
           templateId: '',
@@ -1112,10 +1116,19 @@ export default {
             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 => {})
+        }).catch(res => {
+          console.log(11, res)
+        })
         this.$refs.cropper.isDisabled = false
         this.isUpload = false
         this.cropperModel = false
@@ -1184,7 +1197,7 @@ export default {
       },
       // 预览
       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}`)
+        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() {
diff --git a/src/pages/article/list/index.vue b/src/pages/article/list/index.vue
index f235943..fddd070 100644
--- a/src/pages/article/list/index.vue
+++ b/src/pages/article/list/index.vue
@@ -39,7 +39,20 @@
         <el-table-column v-if="settings[0].show" type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
         <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
         <el-table-column v-if="settings[1].show" show-overflow-tooltip prop="title" label="标题" align="center" min-width="150"></el-table-column>
+        <el-table-column prop="sequence" label="文章排序" align="center" min-width="110" sortable="custom">
+          <template slot-scope="scope">
+            <el-input
+              v-if="scope.row.editing"
+              class="squ-input"
+              v-model="scope.row.sequence"
+            ></el-input>
+            <span v-else>{{ scope.row.sequence }}</span>
+            <i v-if="scope.row.editing" class="el-icon-check squ-icon" @click="submitSequence(scope.row)"></i>
+            <i v-else class="el-icon-edit squ-icon" @click="editSequence(scope.row)"></i>
+          </template>
+        </el-table-column>
         <el-table-column v-if="settings[2].show" prop="columnName" label="栏目" align="center" min-width="120"></el-table-column>
+        <el-table-column prop="classificationName" label="所属分类" align="center" min-width="120"></el-table-column>
         <el-table-column v-if="settings[3].show" prop="typeId" label="栏目类型" align="center" min-width="100">
           <template slot-scope="scope">
             {{ types.find(e => e.id === scope.row.typeId).name }}
@@ -47,16 +60,17 @@
         </el-table-column>
         <el-table-column v-if="settings[4].show" prop="founderName" label="录入人" align="center" min-width="80"></el-table-column>
         <el-table-column v-if="settings[5].show" prop="editorName" label="修改人" align="center" min-width="80"></el-table-column>
-        <el-table-column v-if="settings[6].show" prop="updateTime" label="修改日期" align="center" min-width="140" sortable="custom"></el-table-column>
-        <el-table-column v-if="settings[7].show" prop="releaseTime" label="发布日期" align="center" min-width="140" sortable="custom"></el-table-column>
-        <el-table-column v-if="settings[8].show" prop="totalBrowsing" label="总浏览" align="center" min-width="80"></el-table-column>
+        <el-table-column v-if="settings[6].show" prop="updateTime" label="修改日期" align="center" min-width="150" sortable="custom"></el-table-column>
+        <el-table-column v-if="settings[7].show" prop="releaseTime" label="发布日期" align="center" min-width="100" sortable="custom"></el-table-column>
+        <el-table-column v-if="settings[8].show" prop="totalBrowsing" label="总浏览" align="center" min-width="70"></el-table-column>
         <el-table-column v-if="settings[9].show" prop="workNumber" label="状态" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.isRelease ? '已发布' : '草稿' }}
           </template>
         </el-table-column>
-        <el-table-column v-if="settings[10].show" label="操作" align="center" width="170">
+        <el-table-column v-if="settings[10].show" label="操作" align="center" width="210">
           <template slot-scope="scope">
+            <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text" @click="sticky(scope.row)">置顶</el-button>
             <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
             <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:编辑'" type="text" @click="edit(scope.row)">编辑</el-button>
             <el-button v-auth="'/site/list:' + siteName + ':内容管理:文章管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
@@ -117,7 +131,8 @@ export default {
         pageSize: 10,
         total: 0,
         modifiedTimeSort: '',
-        publicationTimeSort: 0,
+        publicationTimeSort: '',
+        ordinalSort: 0,
         multipleSelection: [],
         originSettings: [],
         settings: [
@@ -165,7 +180,8 @@ export default {
             name: '操作',
             show: true
           }
-        ]
+        ],
+        originList: []
       };
     },
     watch: {
@@ -199,6 +215,8 @@ export default {
       // 栏目树形
       getColumn() {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.$store.state.content.site.id,
           columnName: '',
           templateId: '',
@@ -222,6 +240,7 @@ export default {
           columnIds: [id],
           pageNum: this.page,
           pageSize: this.pageSize,
+          ordinalSort: this.ordinalSort,
           title: this.field === 'title' ? keyword : '',
           founder: this.field === 'founder' ? keyword : '',
           column: this.field === 'column' ? keyword : '',
@@ -231,8 +250,10 @@ export default {
         if (this.publicationTimeSort !== '') data.publicationTimeSort = this.publicationTimeSort
         this.$post(this.api.queryArticle, data).then(({ data }) => {
           data.records.map(e => {
+            e.editing = false
             e.releaseTime = e.releaseTime.split(' ')[0]
           })
+          this.originList = JSON.parse(JSON.stringify(data.records))
           this.list = data.records
           this.total = +data.total
         }).catch(err => {})
@@ -253,6 +274,22 @@ export default {
         this.page = 1
         this.getData()
       },
+      // 排序提交
+      submitSequence(row) {
+        if (!row.sequence) return Util.errorMsg('请输入排序')
+        this.$post(`${this.api.modifiedSort}?articleId=${row.id}&sequenceNumber=${row.sequence}`).then(res => {
+          this.initData()
+        }).catch(res => {})
+      },
+      // 编辑排序
+      editSequence(row) {
+        // this.originSequence = e.sequence
+        this.list.forEach(e => {
+          e.editing = false
+        })
+        // this.list = JSON.parse(JSON.stringify(this.originList))
+        row.editing = true
+      },
       // 批量删除
       batchDel() {
         const list = this.multipleSelection
@@ -297,20 +334,42 @@ export default {
       },
       // 排序回调
       sortChange(column) {
-        // 0默认倒序 1升序
+        const { order } = column
+        // 三个排序只能同时传1个，所以点了一个排序的时候要清除掉其余两个
+        // 两个时间0默认倒序 1升序
         if (column.prop === 'updateTime') {
-          this.modifiedTimeSort = column.order ? column.order === 'ascending' ? 1 : 0 : ''
-          if (column.order) this.publicationTimeSort = ''
+          this.modifiedTimeSort = order ? order === 'ascending' ? 1 : 0 : ''
+          if (order) {
+            this.publicationTimeSort = ''
+            this.ordinalSort = ''
+          }
         }
         if (column.prop === 'releaseTime') {
-          this.publicationTimeSort = column.order ? column.order === 'ascending' ? 1 : 0 : ''
-          if (column.order) this.modifiedTimeSort = ''
+          this.publicationTimeSort = order ? order === 'ascending' ? 1 : 0 : ''
+          if (order) {
+            this.modifiedTimeSort = ''
+            this.ordinalSort = ''
+          }
+        }
+        // 序号排序 0默认升序 1倒序
+        if (column.prop === 'sequence') {
+          this.ordinalSort = order ? order === 'ascending' ? 0 : 1 : ''
+          if (order) {
+            this.publicationTimeSort = ''
+            this.modifiedTimeSort = ''
+          }
         }
         this.getData()
       },
+      // 置顶
+      sticky(row) {
+        this.$post(`${this.api.modifiedSort}?articleId=${row.id}&sequenceNumber=1`).then(res => {
+          this.initData()
+        }).catch(res => {})
+      },
       // 预览
       preview(row) {
-        window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `/#/article?articleId=${row.id}&siteId=${this.$refs.column.getCurrentNode().siteId}&id=${row.columnId}`)
+        window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `#/article?articleId=${row.id}&siteId=${this.$refs.column.getCurrentNode().siteId}&id=${row.columnId}`)
       },
       // 编辑
       edit(row) {
@@ -332,4 +391,15 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.squ-icon {
+  margin-left: 5px;
+  cursor: pointer;
+}
+/deep/.squ-input {
+  width: auto;
+  .el-input__inner {
+    width: 60px;
+    padding: 0 10px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 268d028..e45e855 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -373,6 +373,8 @@ export default {
       // 获取当前站点的栏目列表
       getList() {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.site.id,
           columnName: '',
           templateId: '',
@@ -503,6 +505,8 @@ export default {
       // 获取指定站点的栏目列表
       getOtherColumn(val) {
         this.form.siteSelection && this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.form.siteSelection,
           columnName: '',
           templateId: '',
@@ -624,10 +628,6 @@ export default {
             size: file.size
           })
         })
-      },
-      // 预览
-      preview() {
-
       },
       // 更新附件的状态为发布
       updateFile(form, quoteId) {
@@ -690,7 +690,7 @@ export default {
       // 保存长页模板
       savePage(columnId) {
         const { listStyleId } = this.form
-        const module = Modules[this.pageStyle.find(e => e.id === listStyleId)] // 获取module.js里存的初始长页数据
+        const module = Modules[this.pageStyle.find(e => e.id == listStyleId).path] // 获取module.js里存的初始长页数据
         if (module) {
           this.$post(this.api[this.id ? 'updatePage' : 'savePage'], {
             columnId,
@@ -698,8 +698,8 @@ export default {
             sort: 1,
             founderId: this.userId,
             editorId: this.userId,
-            jsonBeforeEditing: module.path,
-            theEditedJson: module.path,
+            jsonBeforeEditing: module,
+            theEditedJson: module,
           }).then(res => {}).catch(err => {})
         }
       }
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 07cf3c8..543ef4b 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -237,6 +237,8 @@ export default {
     methods: {
       getData() {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.siteId,
           columnName: this.keyword,
           templateId: '',
@@ -289,7 +291,7 @@ export default {
       // 预览
       preview(row) {
         // 常规/子级优先栏目，则跳转到column；长页则跳转到对应的长页模板
-        window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `/#/${row.typeId === 3 ? row.path : 'column'}?id=${row.id}&siteId=${row.siteId}`)
+        window.open((Setting.isDev ? `http://${location.hostname}:8095` : this.$store.state.content.site.domainName) + `#/${row.typeId === 3 ? row.path : 'column'}?id=${row.id}&siteId=${row.siteId}`)
       },
       // 页面管理
       page(row) {
@@ -338,6 +340,8 @@ export default {
       // 更改排序
       sort() {
         this.$post(this.api.listWithTree, {
+          role: 1,
+          isadmin: false,
           siteId: this.siteId,
           columnName: '',
           templateId: '',
@@ -351,6 +355,7 @@ export default {
       // 递归处理排序参数
       sortList(list, result, parent = {}) {
         list.map((e, i) => {
+          if (!parent.id) this.sortLevel = 1
           result.push({
             id: e.id,
             fatherId: parent.id || 0,
@@ -360,8 +365,6 @@ export default {
           if (e.children.length) {
             ++this.sortLevel
             this.sortList(e.children, result, e)
-          } else {
-            this.sortLevel = 1
           }
         })
       },
diff --git a/src/pages/column/page/deviceIntroLinear.vue b/src/pages/column/page/deviceIntroLinear.vue
index 8a1c6ea..46825b5 100644
--- a/src/pages/column/page/deviceIntroLinear.vue
+++ b/src/pages/column/page/deviceIntroLinear.vue
@@ -1,48 +1,80 @@
 <template>
   <div class="wrap">
-    <div class="banner">装置介绍</div>
+    <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="block history gray">
-      <div class="inner">
-        <h2 class="wow fadeInLeft">超导直线加速器-1</h2>
-        <p class="en">Superconducting linac -1</p>
-        <div class="texts wow fadeInDown" data-wow-delay="0.5s">
-          <div class="left">
-            <h6>S³FEL的光阴极注入器/电子枪利用光电效应产生高亮度电子束团，并将其加速到90 MeV。</h6>
-            <div class="line"></div>
-            <div class="des">主加速器基于超导连续波工作模式，采用三级加速、两级压缩的结构，将电子束团能量提高到2.5 GeV；同时在保持横向发射度不变的情况下，将电子束长度从几皮秒压缩到几十飞秒，峰值流强提升到800 A以上。相比基于常温加速技术的高增益FEL，超导直线加速器技术可以有效提高电子束流的重复频率，实现最高每秒106脉冲输出（常温加速技术为~102脉冲/秒），进而大幅度提高FEL激光的平均功率。</div>
+    <div class="modules">
+      <div class="banner">装置介绍</div>
+
+      <div class="block history gray">
+        <div class="inner">
+          <h2 class="wow fadeInLeft">超导直线加速器-1</h2>
+          <p class="en">Superconducting linac -1</p>
+          <div class="texts wow fadeInDown" data-wow-delay="0.5s">
+            <div class="left c-wrap">
+              <h6>{{ modules[0].form.title }}</h6>
+              <div class="line"></div>
+              <div class="des">{{ modules[0].form.des }}</div>
+              <div class="cover" @click="toSet(0)">点击更改标题与概述</div>
+            </div>
+            <img class="bg" src="@/assets/images/device/10.png" alt="">
           </div>
-          <img class="bg" src="@/assets/images/device/10.png" alt="">
         </div>
       </div>
-    </div>
 
-    <div class="block intro">
-      <div class="inner">
-        <div class="left">
-          <h5>S³FEL超导直线加速器示意图</h5>
-          <img src="@/assets/images/device/11.png" alt="">
-        </div>
-        <div class="right">
-          <h6>S³FEL超导直线加速器性能指标</h6>
-          <img src="@/assets/images/device/12.png" alt="">
+      <div class="block intro">
+        <div class="inner">
+          <div class="left">
+            <h5>S³FEL超导直线加速器示意图</h5>
+            <img src="@/assets/images/device/11.png" alt="">
+          </div>
+          <div class="right">
+            <h6>S³FEL超导直线加速器性能指标</h6>
+            <img src="@/assets/images/device/12.png" alt="">
+          </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.deviceIntroLinear
     }
   },
   mounted() {
-    
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: '装置介绍'
+      }
+    ])
   },
   methods: {
     
diff --git a/src/pages/column/page/exp.vue b/src/pages/column/page/exp.vue
index 50f1eb5..9f82c58 100644
--- a/src/pages/column/page/exp.vue
+++ b/src/pages/column/page/exp.vue
@@ -36,32 +36,32 @@
         <li class="item1">
           <img src="@/assets/images/exp/2.png" alt="">
           <h6>{{ modules[2].form.title }}</h6>
-          <div class="cover" @click="toSet(2)">点击更改标题</div>
+          <div class="cover" @click="toSet(2)">点击更改标题与链接</div>
         </li>
         <li class="item2">
           <img src="@/assets/images/exp/3.png" alt="">
           <h6>{{ modules[3].form.title }}</h6>
-          <div class="cover" @click="toSet(3)">点击更改标题</div>
+          <div class="cover" @click="toSet(3)">点击更改标题与链接</div>
         </li>
         <li class="item3">
           <img src="@/assets/images/exp/4.png" alt="">
           <h6>{{ modules[4].form.title }}</h6>
-          <div class="cover" @click="toSet(4)">点击更改标题</div>
+          <div class="cover" @click="toSet(4)">点击更改标题与链接</div>
         </li>
         <li class="item4">
           <img src="@/assets/images/exp/5.png" alt="">
           <h6>{{ modules[5].form.title }}</h6>
-          <div class="cover" @click="toSet(5)">点击更改标题</div>
+          <div class="cover" @click="toSet(5)">点击更改标题与链接</div>
         </li>
         <li class="item5">
           <img src="@/assets/images/exp/6.png" alt="">
           <h6>{{ modules[6].form.title }}</h6>
-          <div class="cover" @click="toSet(6)">点击更改标题</div>
+          <div class="cover" @click="toSet(6)">点击更改标题与链接</div>
         </li>
         <li class="item6">
           <img src="@/assets/images/exp/7.png" alt="">
           <h6>{{ modules[7].form.title }}</h6>
-          <div class="cover" @click="toSet(7)">点击更改标题</div>
+          <div class="cover" @click="toSet(7)">点击更改标题与链接</div>
         </li>
       </ul>
     </div>
diff --git a/src/pages/column/page/overviewSetup.vue b/src/pages/column/page/overviewSetup.vue
new file mode 100644
index 0000000..54a2bc4
--- /dev/null
+++ b/src/pages/column/page/overviewSetup.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/NEWS&EVENTS</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="single-banner single-banner-overview">
+        <img class="banner-img" :src="modules[0].form.pic" alt="">
+        <div class="texts">
+          <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+        </div>
+      </div>
+
+      <ul class="tabs wow fadeInLeft">
+        <template v-for="(item, i) in tabs">
+          <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        </template>
+      </ul>
+
+      <div class="tab-content">
+        <div class="org">
+          <div class="left">
+            <h6>{{ modules[1].form.title }}</h6>
+            <p class="text">{{ modules[1].form.des }}</p>
+          </div>
+          <img class="pic" src="@/assets/images/about.png" alt="">
+        </div>
+        <div class="lg-bg">
+          <img width="100%" src="@/assets/images/about-bg.png" alt="">
+        </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.overviewSetup,
+      active: 4,
+      tabs: ['S³FEL介绍', '发展历程', 'S³FEL宣传片', '地理位置', '机构设置']
+    }
+  },
+  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";
+.tabs {
+  display: flex;
+  justify-content: center;
+  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;
+    }
+  }
+}
+.tab-content {
+  padding: 77px 0;
+}
+.org {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 1294px;
+  padding: 9px 86px 29px 116px;
+  margin: 0 auto 50px;
+  background: #FCFCFC;
+  border-radius: 160px;
+  .left {
+    width: 705px;
+  }
+  h6 {
+    font-size: 1.4rem;
+    font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
+    font-weight: bold;
+    color: #333;
+  }
+  .text {
+    margin-top: 10px;
+    font-size: 1rem;
+    color: #020202;
+    line-height: 2rem;
+  }
+  .pic {
+    width: 320px;
+    height: 282px;
+  }
+}
+.lg-bg {
+  width: 85%;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/sfel.vue b/src/pages/column/page/sfel.vue
index 1db7f3b..6608612 100644
--- a/src/pages/column/page/sfel.vue
+++ b/src/pages/column/page/sfel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/RESEARCH</p>
+      <p class="page-name">页面设置/SFEL</p>
       <div>
         <el-button type="primary" @click="preview">预览</el-button>
         <el-button @click="save(0)">保存为草稿</el-button>
diff --git a/src/router/modules/column.js b/src/router/modules/column.js
index ce111c5..3926b6f 100644
--- a/src/router/modules/column.js
+++ b/src/router/modules/column.js
@@ -133,6 +133,12 @@ export default {
       component: () => import('@/pages/column/page/overviewLocation'),
       meta: { title: '概况-地理位置' }
     },
+    {
+      name: `${pre}overviewSetup`,
+      path: `overviewSetup`,
+      component: () => import('@/pages/column/page/overviewSetup'),
+      meta: { title: '概况-机构设置' }
+    },
     {
       name: `${pre}sfel`,
       path: `sfel`,