diff --git a/src/assets/images/page/estateEvent.png b/src/assets/images/page/estateEvent.png
new file mode 100644
index 0000000..da7a20c
Binary files /dev/null and b/src/assets/images/page/estateEvent.png differ
diff --git a/src/assets/images/page/estateIndex.png b/src/assets/images/page/estateIndex.png
new file mode 100644
index 0000000..8a5a9be
Binary files /dev/null and b/src/assets/images/page/estateIndex.png differ
diff --git a/src/assets/images/page/estateLocation.png b/src/assets/images/page/estateLocation.png
new file mode 100644
index 0000000..6af2d60
Binary files /dev/null and b/src/assets/images/page/estateLocation.png differ
diff --git a/src/assets/images/page/estateOrgSetup.png b/src/assets/images/page/estateOrgSetup.png
new file mode 100644
index 0000000..104bc33
Binary files /dev/null and b/src/assets/images/page/estateOrgSetup.png differ
diff --git a/src/assets/images/page/estateSurvey.png b/src/assets/images/page/estateSurvey.png
new file mode 100644
index 0000000..8e36a07
Binary files /dev/null and b/src/assets/images/page/estateSurvey.png differ
diff --git a/src/const/modules.js b/src/const/modules.js
index 0eda4ea..83201d0 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -5105,4 +5105,634 @@ export default {
       }
     },
   ],
+  'estate/index': [
+    {
+      type: 'introduce',
+      forms: [
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true,
+          crop: false
+        },
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'link',
+          prop: 'link',
+          label: '链接'
+        }
+      ],
+      form: {
+        pic: '',
+        title: '',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        isEnable: 1
+      },
+      list: [
+        {
+          pic: 'http://10.10.11.7/images/estate/8.png',
+          title: '',
+          link: {
+            linkName: '无',
+            connectionType: 1,
+            columnId: [],
+            articleId: '',
+            linkAddress	: '',
+            site: '',
+            otherColumnId: [],
+            otherArticleId: '',
+            isOpen: 1
+          },
+          isEnable: 1
+        }
+      ]
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题'
+        }
+      ],
+      form: {
+        title: '新闻动态',
+        subTitle: 'NEWS CENTER'
+      }
+    },
+    {
+      type: 'column',
+      form: {
+        site: '',
+        column: '',
+        articleNum: '',
+        columnTitle: 1,
+        columnTitleCustom: ''
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题'
+        }
+      ],
+      form: {
+        title: '人才中心',
+        subTitle: ' TALENT CENTER'
+      }
+    },
+    {
+      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/estate/9.png',
+        title: '大湾区科技之光由你点亮！',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        des: `The light of science and technology in the Greater Bay Area is lit by you!
+
+              以宏伟事业吸引人才、以发展空间留住人才，以优厚待遇保障人才。`
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题'
+        }
+      ],
+      form: {
+        title: '学术活动',
+        subTitle: ' ACADEMIC ACTIVITIES'
+      }
+    },
+    {
+      type: 'column',
+      form: {
+        site: '',
+        column: '',
+        articleNum: '',
+        columnTitle: 1,
+        columnTitleCustom: ''
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'input',
+          prop: 'subTitle',
+          label: '小标题'
+        }
+      ],
+      form: {
+        title: '工程进展',
+        subTitle: 'PRROJECT PROGRESS'
+      }
+    },
+    {
+      type: 'column',
+      form: {
+        site: '',
+        column: '',
+        articleNum: '',
+        columnTitle: 1,
+        columnTitleCustom: ''
+      }
+    },
+  ],
+  'estate/survey': [
+    {
+      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/estate/4.png',
+        title: '概况',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'editor',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        title: '深圳产业光源概况',
+        des: `深圳中能同步辐射光源（深圳产业光源）建设单位为深圳综合粒子设施研究院和深圳市光明区人民政府，选址于光明区北片区大科学装置群内。深圳产业光源以“需求牵引、错位发展、特色突出、集智创新”为方针。围绕国家重大战略需求，以战略性新兴产业发展需求为牵引、以关键技术攻关为导向，聚焦服务深圳及粤港澳大湾区集成电路、生物医药、先进材料和先进制造等产业，设计建设一台储存环周长 696 m、电子能量为 3.0 GeV、发射度约100 pm·rad 的高性能中能同步辐射四代光源。项目建设内容由加速器、光束线、实验站、公共辅助四大部分组成，光束线站设计总容量约55条，首批建设27条。同时，为更高效便捷的服务产业用户，拟建设大数据中心、产业用户辅助实验系统等配套设施。`
+      }
+    },
+  ],
+  'estate/event': [
+    {
+      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/estate/4.png',
+        title: '概况',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      type: 'history',
+      historyForm: {
+        title: '',
+        isEnable: 1,
+        list: []
+      },
+      list: [],
+      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: '',
+        title: '',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        des: ``,
+        isEnable: 1
+      }
+    },
+  ],
+  'estate/orgSetup': [
+    {
+      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/estate/4.png',
+        title: '概况',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'input',
+          prop: 'title',
+          label: '标题',
+          required: true
+        },
+        {
+          type: 'editor',
+          prop: 'des',
+          label: '描述'
+        }
+      ],
+      form: {
+        title: '机构设置',
+        des: `根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。
+        `
+      }
+    },
+    {
+      type: 'form',
+      forms: [
+        {
+          type: 'upload',
+          prop: 'pic',
+          label: '图片',
+          required: true
+        },
+      ],
+      form: {
+        pic: 'http://10.10.11.7/images/estate/1.png',
+      },
+    },
+  ],
+  'estate/location': [
+    {
+      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/estate/4.png',
+        title: '概况',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        }
+      }
+    },
+    {
+      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/estate/5.png',
+        title: '过渡场地',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        des: `过渡场地地址：深圳市光明区新湖街道圳园路268号3号楼5层 
+        邮编：518107
+        同步辐射光源工程经理部办公地点位于深圳市光明区新湖街道圳园路268号3号楼5层 ，面积约2800平方米，分别设置办公与实验场地，具备开展参观交流、科研与日常工作的良好条件`
+      }
+    },
+    {
+      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/estate/6.png',
+        title: '实验室（硬X射线衍射测试平台）',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        des: `地址：深圳市光明区光侨大道3333号新健兴科技工业园A4栋3层邮编： 518107
+
+        硬X射线衍射测试平台位于深圳市光明区光侨大道3333号新健兴科技工业园A4栋3层，围绕9.2keV的高性能X射线，可实现2D-XRD （透射模式，秒级原位表征、二圆-XRD（反射模式）、微焦斑XRF（微焦光斑、1012phs/s/mm2通量密度）、2D-SAXS（透射/反射双模式、不同q值间管道切换）、微米成像（兼顾CT功能）五大实验功能。`
+      }
+    },
+    {
+      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/estate/7.png',
+        title: '研究院综合楼',
+        link: {
+          linkName: '无',
+          connectionType: 1,
+          columnId: [],
+          articleId: '',
+          linkAddress	: '',
+          site: '',
+          otherColumnId: [],
+          otherArticleId: '',
+          isOpen: 1
+        },
+        des: `地址：深圳市光明区光侨大道3333号新健兴科技工业园A4栋3层邮编： 518107
+
+        研究院首栋建筑（综合楼）位于大湾区综合性国家科学中心核心承载区的光明科学城大科学装置集群核心区内，共设七层，目前已于2021年12月29日顺利封顶。`
+      }
+    },
+  ],
 }
\ No newline at end of file
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 7cbf2ed..f5ee441 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -188,7 +188,7 @@
           <ul class="styles">
             <li v-for="(item, i) in pageStyle" :key="i" @click="form.listStyleId = item.id">
               <div class="review">
-                <img :src="require('@/assets/images/page/' + item.path + '.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>
             </li>
@@ -477,6 +477,17 @@ export default {
         }).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 => {})
       },
diff --git a/src/pages/column/page/estate/event/index.vue b/src/pages/column/page/estate/event/index.vue
new file mode 100644
index 0000000..0e2f853
--- /dev/null
+++ b/src/pages/column/page/estate/event/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <!-- 产业光源-大事记 -->
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/产业光源-概况-大事记</p>
+      <div>
+        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button @click="save(0)">保存为草稿</el-button>
+        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+    
+    <div class="modules">
+      <div class="relative">
+        <div class="single-banner 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>
+        <div class="cover" @click="toSet(0)">点击更换banner与链接</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="block history">
+        <div class="inner c-wrap">
+          <h2 class="wow fadeInLeft">大事记</h2>
+          <p class="en">DEVELOPMENT HISTORY</p>
+
+          <div v-if="modules[1].list.length" class="event">
+            <ul class="time">
+              <template v-for="(item, i) in modules[1].list">
+                <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}" @click="yearClick(i)">{{ item.title }}</li>
+              </template>
+            </ul>
+            <div class="right">
+              <h6 class="year">{{ modules[1].list[curYear].title }}</h6>
+              <ul class="list">
+                <template v-for="(e, j) in modules[1].list[curYear].list">
+                  <li v-if="e.isEnable" :key="j">
+                    <div class="texts">
+                      <p class="date">{{ e.title }}</p>
+                      <p class="text">{{ e.des }}</p>
+                    </div>
+                    <img v-if="e.pic" :src="e.pic" alt="" class="pic">
+                  </li>
+                </template>
+              </ul>
+            </div>
+          </div>
+          <div class="cover" style="min-height: 300px;" @click="toSet(1)">点击配置历程</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['estate/event'],
+      active: 0,
+      tabs: ['大事记'],
+      curYear: 0
+    }
+  },
+  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";
+.wrap {
+  background: url(http://10.10.11.7/images/overviewDevHistory/1.png) (right 505px)/auto no-repeat,
+              url(http://10.10.11.7/images/overviewDevHistory/2.png) (left bottom)/auto no-repeat;
+}
+.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;
+    }
+  }
+}
+.history {
+  h2 {
+    position: relative;
+    font-size: 2.2rem;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #1C1C1C;
+  }
+  .en {
+    margin: -15px 0 40px;
+    font-size: 2.2rem;
+    font-family: PingFangSC-Light, PingFang SC;
+    font-weight: 300;
+    color: #E3E3E3;
+  }
+}
+.event {
+  display: flex;
+  justify-content: center;
+  .time {
+    width: 200px;
+    padding-right: 10px;
+    margin-right: 20px;
+    border-right: 1px solid #ddd;
+    li {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      width: 190px;
+      padding-right: 45px;
+      line-height: 60px;
+      font-size: 1.4rem;
+      font-weight: 600;
+      font-family: SFProDisplay-Semibold, SFProDisplay;
+      color: #666;
+      box-shadow: inset 0px -1px 0px 0px #DDDDDD;
+      cursor: pointer;
+      &.active {
+        font-weight: 800;
+        color: #1A81F4;
+        background: linear-gradient(90deg, #FFFFFF 0%, #F3F8FF 100%);
+        &:before {
+          content: '';
+          width: 18px;
+          height: 18px;
+          background: url(http://10.10.11.7/images/overviewDevHistory/3.png) no-repeat;
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+  .right {
+    width: 1000px;
+  }
+  .year {
+    margin: 0 0 20px 20px;
+    font-size: 3.8rem;
+    font-family: ToppanBunkyuMidashiGothicStdN-ExtraBold, ToppanBunkyuMidashiGothicStdN;
+    font-weight: 800;
+    color: #1A81F4;
+  }
+  .list {
+    border-top: 1px solid #ddd;
+    li {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 30px;
+      border-bottom: 1px solid #ddd;
+    }
+    .texts {
+      width: 500px;
+    }
+    .date {
+      margin-bottom: 15px;
+      font-size: 1.2rem;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+    }
+    .text {
+      font-size: 1.1rem;
+      color: #333;
+      @include mul-ellipsis(3);
+      &:before {
+        content: '';
+        display: inline-block;
+        width: 7px;
+        height: 7px;
+        margin: 0 10px;
+        background-color: #666;
+        transform: rotate(45deg);
+      }
+    }
+    .pic {
+      width: 350px;
+      height: 195px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/estate/index/index.vue b/src/pages/column/page/estate/index/index.vue
new file mode 100644
index 0000000..8b0f8f6
--- /dev/null
+++ b/src/pages/column/page/estate/index/index.vue
@@ -0,0 +1,580 @@
+<template>
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/产业光源</p>
+      <div>
+        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button @click="save(0)">保存为草稿</el-button>
+        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+
+    <div class="modules">
+      <div class="relative">
+        <el-carousel height="480px" :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
+          <template v-for="(item, i) in modules[0].list">
+            <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
+              <img width="100%" height="100%" :src="item.pic" alt="">
+            </el-carousel-item>
+          </template>
+        </el-carousel>
+        <div class="cover" @click="toSet(0)">点击更换banner与链接</div>
+      </div>
+
+      <div class="block banner-block">
+        <div class="inner">
+          <div class="title">
+            <h5>
+              {{ modules[1].form.title }}
+              <span class="sub">{{ modules[1].form.subTitle }}</span>
+            </h5>
+            <span class="more">MORE</span>
+            <div class="cover" @click="toSet(1)">点击更换标题与小标题</div>
+          </div>
+          <div class="c-wrap">
+            <div class="sfel-banner">
+              <img style="width: 50%;height: 410px;overflow: hidden;" width="100%" height="480" src="http://10.10.11.7/images/about/5.png" alt="">
+              <div class="right">
+                <h6>IASF is driven to serve the Science and industry, and solve grand challenges through research and innovation. We are open and creative</h6>
+                <div class="des">Innovation centers are distributed in the bay areas, such as the San Francisco Bay area, the New York Bay area, and the Tokyo Bay area in Japan. And the Guangdong-Hong Kong-Macao Greater Bay </div>
+                <p class="meta">2022-07-24 | Research</p>
+              </div>
+            </div>
+            <ul class="card">
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/9.png" alt="">
+                <div class="texts">
+                  <p class="meta">2022-09-09 | Research</p>
+                  <div class="des">IASF is driven to serve the Science and industry, and solve grand </div>
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/10.png" alt="">
+                <div class="texts">
+                  <p class="meta">2022-09-09 | Research</p>
+                  <div class="des">IASF is driven to serve the Science and industry, and solve grand </div>
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/11.png" alt="">
+                <div class="texts">
+                  <p class="meta">2022-09-09 | Research</p>
+                  <div class="des">IASF is driven to serve the Science and industry, and solve grand </div>
+                  <img class="arrow" src="@/assets/images/arrow.png" alt="">
+                </div>
+              </li>
+            </ul>
+            <div class="cover" @click="toSet(2)">关联栏目</div>
+          </div>
+        </div>
+      </div>
+    
+      <div class="block talent">
+        <div class="inner">
+          <div class="title wow fadeInUp">
+            <h5>
+              {{ modules[3].form.title }}
+              <span class="sub">{{ modules[3].form.subTitle }}</span>
+            </h5>
+            <span class="more">MORE</span>
+            <div class="cover" @click="toSet(3)">点击更换标题与小标题</div>
+          </div>
+          <div class="shows">
+            <div class="left wow fadeInLeft" data-wow-delay="0.5s">
+              <h6>{{ modules[4].form.title }}</h6>
+              <div class="text" v-html="modules[4].form.des"></div>
+              <el-button type="primary" round>这里跳转</el-button>
+            </div>
+            <img :src="modules[4].form.pic" alt="" class="pic">
+            <div class="cover" @click="toSet(4)">点击更换标题、描述、图片与链接</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="block conference">
+        <div class="inner lg">
+          <div class="title">
+            <h5>
+              {{ modules[5].form.title }}
+              <span class="sub">{{ modules[5].form.subTitle }}</span>
+            </h5>
+            <span class="more">MORE</span>
+            <div class="cover" @click="toSet(5)">点击更换标题与小标题</div>
+          </div>
+          <div class="shows c-wrap">
+            <div class="left">
+              <img width="100%" height="100%" src="http://10.10.11.7/images/about/9.png" alt="">
+              <div class="text">关于2021年度深圳综合粒子设施研究院采购意向公开表</div>
+            </div>
+            <ul class="card-list">
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/10.png" alt="">
+                <div class="texts">
+                  <h6>专业技术培训 | 自由电子激光装置中的结构</h6>
+                  <p class="sum">加速器总体-直线加速器总体-高重频电子枪组…</p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/mine.png" alt="">
+                    邵佳航
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/time.png" alt="">
+                    会议时间: 2022年8月13日 14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/online.png" alt="">
+                    总部四楼大会议室
+                  </p>
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/10.png" alt="">
+                <div class="texts">
+                  <h6>专业技术培训 | 自由电子激光装置中的结构</h6>
+                  <p class="sum">加速器总体-直线加速器总体-高重频电子枪组…</p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/mine.png" alt="">
+                    邵佳航
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/time.png" alt="">
+                    会议时间: 2022年8月13日 14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/online.png" alt="">
+                    总部四楼大会议室
+                  </p>
+                </div>
+              </li>
+              <li>
+                <img class="pic" src="http://10.10.11.7/images/about/10.png" alt="">
+                <div class="texts">
+                  <h6>专业技术培训 | 自由电子激光装置中的结构</h6>
+                  <p class="sum">加速器总体-直线加速器总体-高重频电子枪组…</p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/mine.png" alt="">
+                    邵佳航
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/time.png" alt="">
+                    会议时间: 2022年8月13日 14:30
+                  </p>
+                  <p class="text">
+                    <img class="icon" src="@/assets/images/online.png" alt="">
+                    总部四楼大会议室
+                  </p>
+                </div>
+              </li>
+            </ul>
+            <div class="cover" @click="toSet(6)">关联栏目</div>
+          </div>
+        </div>
+      </div>
+      
+      <div class="block program">
+        <div class="inner c-wrap">
+          <div class="title">
+            <h5>
+              {{ modules[7].form.title }}
+              <span class="sub">{{ modules[7].form.subTitle }}</span>
+            </h5>
+            <span class="more">MORE</span>
+            <div class="cover" @click="toSet(7)">点击更换标题与小标题</div>
+          </div>
+          <div class="c-wrap">
+            <div class="slide">
+              <div class="texts">
+                <h6>超快自由电子激光脉冲特性诊断研究方面取得重要进展</h6>
+                <div class="des">X射线自由电子激光已经成为了化学、生物、物理等领域不可或缺的研究手段。对于绝大多数自由电子激研究院紧密围绕高水平建设综合性国家科学中心战略目标，面向国民经济主战场和世界科技前沿…</div>
+                <div class="meta">发表日期：2022.01.10 &emsp;浏览量：备份</div>
+              </div>
+              <img class="pic" src="@/assets/images/survey3.png" alt="">
+            </div>
+            <ul class="list">
+              <li>
+                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
+                <p class="date">2022.10.10</p>
+              </li>
+              <li>
+                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
+                <p class="date">2022.10.10</p>
+              </li>
+              <li>
+                <div class="des">X射线自由电子激光是基于国际最先进的超导加速器技术研发的装置，对于未来产业发展和基础科学应用有重要作用</div>
+                <p class="date">2022.10.10</p>
+              </li>
+            </ul>
+            <div class="cover" @click="toSet(8)">关联栏目</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins/page'
+import Modules from '@/const/modules'
+export default {
+  mixins: [mixins],
+  data() {
+    return {
+      modules: Modules['estate/index']
+    }
+  },
+  mounted() {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '站点管理',
+        route: '/site'
+      },
+      {
+        name: '内容管理',
+        route: '/column'
+      },
+      {
+        name: '栏目管理',
+        route: '/column'
+      },
+      {
+        name: '产业光源'
+      }
+    ])
+  },
+  methods: {
+    
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../../../../styles/page/page.scss";
+.title {
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  padding-bottom: 25px;
+  margin-bottom: 30px;
+  border-bottom: 1px solid #ddd;
+  h5 {
+    padding-left: 16px;
+    font-size: 36px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
+    line-height: 1;
+    border-left: 6px solid #2B96EF;
+  }
+  .sub {
+    font-size: 22px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #AFB7BF;
+  }
+  .more {
+    font-size: 14px;
+    color: #666;
+    cursor: pointer;
+  }
+}
+.lg {
+  width: 1505px;
+}
+/deep/.articles {
+  width: 50%;
+  .el-carousel__indicators--horizontal {
+    bottom: 20px;
+    left: 804px;
+  }
+}
+.banner-block {
+  background: url(../../../../../assets/images/sfel/2.png) 0 0/cover no-repeat;
+}
+.sfel-banner {
+  display: flex;
+  cursor: pointer;
+  .pic {
+    transition: .5s;
+    &:hover {
+      transform: scale(1.3);
+    }
+  }
+  .right {
+    position: relative;
+    width: 50%;
+    padding: 50px 50px 30px;
+    background: #1583FF;
+    color: #fff;
+    &:hover {
+      background: #465f85;
+      h6, .des, .meta {
+        color: #fff;
+        transform: translateY(15px);
+      }
+    }
+  }
+  .inds {
+    position: absolute;
+    bottom: 40px;
+    left: 60px;
+    display: flex;
+    li {
+      width: 10px;
+      height: 10px;
+      margin-right: 12px;
+      background: #FFFFFF;
+      border-radius: 50%;
+      transition: .2s;
+      &.active {
+        width: 30px;
+        background: rgba(255,255,255,0.3);
+        border-radius: 5px;
+      }
+    }
+  }
+  h6 {
+    font-size: 1.3rem;
+    transition: .3s;
+  }
+  .des {
+    margin: 30px 0;
+    font-size: .9rem;
+    line-height: 24px;
+    transition: .3s;
+  }
+  .meta {
+    font-size: .8rem;
+    transition: .3s;
+  }
+}
+.card {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 40px;
+  li {
+    width: calc((100% - 56px) / 3);
+    margin-right: 28px;
+    box-shadow: 0px 0px 20px 0px rgba(176,176,176,0.21);
+    border-radius: 6px;
+    transition: .3s;
+    &:hover {
+      transform: scale(1.05);
+    }
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+  .pic {
+    width: 100%;
+    height: 240px;
+  }
+  .texts {
+    padding: 40px 30px;
+  }
+  .meta {
+    font-size: 16px;
+    color: #666;
+  }
+  .des {
+    margin: 10px 0;
+    font-size: 20px;
+    font-family: SFProDisplay;
+    font-weight: 500;
+    color: #333;
+    line-height: 28px;
+  }
+  .arrow {
+    width: 36px;
+  }
+}
+
+.talent {
+  .shows {
+    position: relative;
+    display: flex;
+    color: #fff;
+    background: #1A2844;
+    border-radius: 0px 100px 0px 100px;
+    .left {
+      width: 50%;
+      padding: 120px 0 0 5%;
+    }
+    h6 {
+      font-size: 1.6rem;
+    }
+    .text {
+      margin: 20px 0;
+      font-size: 1rem;
+      line-height: 2;
+    }
+    .pic {
+      width: 50%;
+      height: 500px;
+    }
+  }
+}
+.conference {
+  background: url(../../../../../assets/images/sfel/4.png) 0 0/cover no-repeat;
+  .shows {
+    display: flex;
+  }
+  .left {
+    position: relative;
+    width: 688px;
+    height: 688px;
+    margin-right: 20px;
+    cursor: pointer;
+    .text {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      padding: 0 12px;
+      line-height: 59px;
+      font-size: 18px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #FFFFFF;
+      background-color: rgba(0, 0, 0, 0.57);
+    }
+  }
+  .card-list {
+    width: 784px;
+    li {
+      display: flex;
+      align-items: center;
+      padding: 14px;
+      margin-bottom: 21px;
+      background-color: #fff;
+      cursor: pointer;
+      transition: .3s;
+      &:last-child {
+        margin-bottom: 0;
+      }
+      &:hover {
+        transform: translateX(20px);
+      }
+    }
+    .pic {
+      width: 188px;
+      height: 188px;
+      margin-right: 36px;
+    }
+    h6 {
+      margin-bottom: 10px;
+      font-size: 20px;
+      color: #333;
+    }
+    .sum {
+      font-size: 16px;
+      color: #666;
+    }
+    .text {
+      display: flex;
+      align-items: center;
+      margin: 10px 0;
+    }
+    .icon {
+      margin-right: 5px;
+    }
+  }
+}
+
+.program {
+  background: #fff;
+  .slide {
+    display: flex;
+    margin-bottom: 14px;
+  }
+  .texts {
+    width: 51%;
+    padding: 56px;
+    background: #FBFBFB;
+    h6 {
+      font-size: 24px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333333;
+    }
+    .des {
+      margin: 35px 0 25px;
+      font-size: 16px;
+      color: #666;
+      line-height: 32px;
+    }
+    .meta {
+      font-size: 14px;
+      color: #666;
+    }
+  }
+  .pic {
+    width: 49%;
+    height: 430px;
+  }
+  .list {
+    display: flex;
+    li {
+      width: calc((100% - 44px) / 3);
+      padding: 36px 22px;
+      margin-right: 14px;
+      background: url(../../../../../assets/images/sfel/7.png) 0 0/cover no-repeat;
+      &:nth-child(2) {
+        background-image: url(../../../../../assets/images/sfel/8.png);
+      }
+      &:nth-child(3) {
+        margin-right: 0;
+        background-image: url(../../../../../assets/images/sfel/9.png);
+      }
+    }
+    .des {
+      margin-bottom: 30px;
+      font-size: 18px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 30px;
+    }
+    .date {
+      font-size: 16px;
+      font-family: LaoSangamMN;
+      color: #FFFFFF;
+    }
+  }
+}
+.tools {
+  position: absolute;
+  top: 600px;
+  left: 0;
+  width: 226px;
+  text-align: center;
+  .logo {
+    padding: 44px 0;
+    background: #0C60BE;
+    box-shadow: 0px 0px 20px 0px rgba(184,191,200,0.3);
+  }
+  .nav {
+    li {
+      padding: 0 10px;
+      font-size: 24px;
+      line-height: 83px;
+      color: #fff;
+      background-color: #1D1D1D;
+      cursor: pointer;
+      @include ellipsis;
+      &.active {
+        background-color: #1583FF;
+      }
+    }
+  }
+}
+@media (max-width: 1520px) {
+  .lg {
+    width: 98%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/estate/location/index.vue b/src/pages/column/page/estate/location/index.vue
new file mode 100644
index 0000000..0e3ca7d
--- /dev/null
+++ b/src/pages/column/page/estate/location/index.vue
@@ -0,0 +1,208 @@
+<template>
+  <!-- 产业光源-地理位置 -->
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/产业光源-概况-地理位置</p>
+      <div>
+        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button @click="save(0)">保存为草稿</el-button>
+        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+    
+    <div class="modules">
+      <div class="relative">
+        <div class="single-banner 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>
+        <div class="cover" @click="toSet(0)">点击更换banner与链接</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="item wow bounceInLeft" data-wow-delay="0.5s">
+          <div class="img-wrap">
+            <img class="pic" :src="modules[1].form.pic" alt="">
+          </div>
+          <div class="texts">
+            <h6>{{ modules[1].form.title }}</h6>
+            <div class="des">{{ modules[1].form.des }}</div>
+          </div>
+          <div class="cover" @click="toSet(1)">点击更改图片、标题概述与链接</div>
+        </div>
+        <div class="item wow bounceInRight" data-wow-delay="0.6s">
+          <div class="img-wrap">
+            <img class="pic" :src="modules[2].form.pic" alt="">
+          </div>
+          <div class="texts">
+            <h6>{{ modules[2].form.title }}</h6>
+            <div class="des">{{ modules[2].form.des }}</div>
+          </div>
+          <div class="cover" @click="toSet(2)">点击更改图片、标题概述与链接</div>
+        </div>
+        <div class="item wow bounceInLeft" data-wow-delay="0.5s">
+          <div class="img-wrap">
+            <img class="pic" :src="modules[3].form.pic" alt="">
+          </div>
+          <div class="texts">
+            <h6>{{ modules[3].form.title }}</h6>
+            <div class="des">{{ modules[3].form.des }}</div>
+          </div>
+          <div class="cover" @click="toSet(3)">点击更改图片、标题概述与链接</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['estate/location'],
+      active: 0,
+      tabs: ['地理位置']
+    }
+  },
+  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 {
+  width: 80%;
+  max-width: 1504px;
+  padding-bottom: 100px;
+  margin: 30px auto 0;
+  .item {
+    position: relative;
+    display: flex;
+    padding: 42px;
+    margin-bottom: 36px;
+    color: #333;
+    background: #F5F5F5 url(http://10.10.11.7/images/overviewSetup/1.png) right bottom/auto no-repeat;
+    transition: .5s;
+    &:nth-child(even) {
+      justify-content: space-between;
+      flex-direction: row-reverse;
+      background-position: 30% 100%;
+      .texts {
+        padding-left: 0;
+      }
+    }
+    &:hover {
+      // color: #fff;
+      // background: #005388;
+      .pic {
+        transform: scale(1.1);
+      }
+    }
+  }
+  .img-wrap {
+    height: 465px;
+    overflow: hidden;
+  }
+  .pic {
+    width: 100%;
+    height: 100%;
+    transition: .5s;
+  }
+  .texts {
+    width: 707px;
+    padding: 98px 72px 30px 80px;
+  }
+  h6 {
+    margin-bottom: 24px;
+    font-size: 2.4rem;
+    font-family: PingFangSC-Light, PingFang SC;
+    font-weight: 300;
+  }
+  .des {
+    font-size: 1rem;
+    line-height: 33px;
+    -webkit-line-clamp: 8;
+  }
+}
+@media (max-width: 1200px) {
+  .tabs {
+    overflow: hidden;;
+    overflow-x: auto;
+    white-space: normal;
+    justify-content: normal;
+    display: -webkit-box;
+    li {
+      white-space: normal;
+    }
+  }
+  .tab-content{
+    padding: 20px 0;
+    .org{
+    width: 100%;
+    padding:15px;
+    flex-direction: column;
+    .left{
+      width: 100%;
+    }
+  }
+  }
+ 
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/estate/orgSetup/index.vue b/src/pages/column/page/estate/orgSetup/index.vue
new file mode 100644
index 0000000..1bed901
--- /dev/null
+++ b/src/pages/column/page/estate/orgSetup/index.vue
@@ -0,0 +1,171 @@
+<template>
+  <!-- 产业光源-机构设置 -->
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/产业光源-概况-机构设置</p>
+      <div>
+        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button @click="save(0)">保存为草稿</el-button>
+        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+    
+    <div class="modules">
+      <div class="relative">
+        <div class="single-banner 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>
+        <div class="cover" @click="toSet(0)">点击更换banner与链接</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 c-wrap">
+            <h6>{{ modules[1].form.title }}</h6>
+            <p class="text" v-html="modules[1].form.des"></p>
+            <div class="cover" style="top: -73px;min-height: 300px" @click="toSet(1)">点击更换标题与描述</div>
+          </div>
+          <img class="pic" src="http://10.10.11.7/images/overviewSetup/1.png" alt="">
+        </div>
+        <div class="lg-bg c-wrap">
+          <img width="100%" :src="modules[2].form.pic" alt="">
+          <div class="cover" @click="toSet(2)">点击更换图片</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['estate/orgSetup'],
+      active: 0,
+      tabs: ['机构设置']
+    }
+  },
+  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;
+}
+@media (max-width: 1200px) {
+  .tabs {
+    overflow: hidden;;
+    overflow-x: auto;
+    white-space: normal;
+    justify-content: normal;
+    display: -webkit-box;
+    li {
+      white-space: normal;
+    }
+  }
+  .tab-content{
+    padding: 20px 0;
+    .org{
+    width: 100%;
+    padding:15px;
+    flex-direction: column;
+    .left{
+      width: 100%;
+    }
+  }
+  }
+ 
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/estate/survey/index.vue b/src/pages/column/page/estate/survey/index.vue
new file mode 100644
index 0000000..94fc8d1
--- /dev/null
+++ b/src/pages/column/page/estate/survey/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <!-- 产业光源-产业光源概况 -->
+  <div class="wrap">
+    <div class="actions">
+      <p class="page-name">页面设置/产业光源-概况-产业光源概况</p>
+      <div>
+        <el-button type="primary" @click="preview">预览</el-button>
+        <el-button @click="save(0)">保存为草稿</el-button>
+        <el-button type="primary" @click="save(1)">发布</el-button>
+        <el-button @click="back">放弃编辑</el-button>
+      </div>
+    </div>
+    
+    <div class="modules">
+      <div class="relative">
+        <div class="single-banner 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>
+        <div class="cover" @click="toSet(0)">点击更换banner与链接</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="survey c-wrap">
+          <h6>
+            {{ modules[1].form.title }}
+            <img class="title-bg" src="http://10.10.11.7/images/overviewIntro/2.png" alt="">
+          </h6>
+          <p class="text" v-html="modules[1].form.des"></p>
+          <div class="cover" @click="toSet(1)">点击更换标题与描述</div>
+        </div>
+        <div class="lg-bg">
+          <img width="100%" src="http://10.10.11.7/images/estate/3.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['estate/survey'],
+      active: 0,
+      tabs: ['产业光源概况']
+    }
+  },
+  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-top: 70px;
+}
+.survey {
+  width: 1294px;
+  min-height: 500px;
+  padding: 80px 86px 29px 37%;
+  margin: 0 auto 200px;
+  background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat;
+  border-radius: 160px;
+  h6 {
+    position: relative;
+    margin-bottom: 30px;
+    font-size: 1.4rem;
+    font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
+    font-weight: bold;
+    color: #333;
+  }
+  .title-bg {
+    position: absolute;
+    top: -40px;
+    left: -20px;
+  }
+  .text {
+    margin-top: 10px;
+    font-size: 1rem;
+    color: #020202;
+    line-height: 2rem;
+  }
+}
+.lg-bg {
+  width: 40%;
+}
+@media (max-width: 1200px) {
+  .tabs {
+    overflow: hidden;;
+    overflow-x: auto;
+    white-space: normal;
+    justify-content: normal;
+    display: -webkit-box;
+    li {
+      white-space: normal;
+    }
+  }
+  .tab-content{
+    padding: 20px 0;
+    .org{
+    width: 100%;
+    padding:15px;
+    flex-direction: column;
+    .left{
+      width: 100%;
+    }
+  }
+  }
+ 
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/column/page/overviewDevHistory.vue b/src/pages/column/page/overviewDevHistory.vue
index 74d5276..c119422 100644
--- a/src/pages/column/page/overviewDevHistory.vue
+++ b/src/pages/column/page/overviewDevHistory.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/发展历程</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/pages/column/page/overviewIntro.vue b/src/pages/column/page/overviewIntro.vue
index c92966a..ddb8592 100644
--- a/src/pages/column/page/overviewIntro.vue
+++ b/src/pages/column/page/overviewIntro.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/概况</p>
+      <p class="page-name">页面设置/SFEL-概况-S³FEL介绍</p>
       <div>
         <el-button type="primary" @click="preview">预览</el-button>
         <el-button @click="save(0)">保存为草稿</el-button>
diff --git a/src/pages/column/page/overviewLocation.vue b/src/pages/column/page/overviewLocation.vue
index 82e411d..95f70d3 100644
--- a/src/pages/column/page/overviewLocation.vue
+++ b/src/pages/column/page/overviewLocation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/概况</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/pages/column/page/overviewSetup.vue b/src/pages/column/page/overviewSetup.vue
index da70c6e..e7f567c 100644
--- a/src/pages/column/page/overviewSetup.vue
+++ b/src/pages/column/page/overviewSetup.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/NEWS&EVENTS</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/pages/column/page/overviewTrailer.vue b/src/pages/column/page/overviewTrailer.vue
index c41ec28..afb51aa 100644
--- a/src/pages/column/page/overviewTrailer.vue
+++ b/src/pages/column/page/overviewTrailer.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="actions">
-      <p class="page-name">页面设置/概况</p>
+      <p class="page-name">页面设置/SFEL-概况-S³FEL宣传片</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 ab3ef61..b6c8887 100644
--- a/src/router/modules/column.js
+++ b/src/router/modules/column.js
@@ -156,6 +156,26 @@ export default {
       path: `sfel`,
       component: () => import('@/pages/column/page/sfel'),
       meta: { title: 'SFEL' }
-    }
+    },
+    {
+      path: `estate/index`,
+      component: () => import('@/pages/column/page/estate/index'),
+    },
+    {
+      path: `estate/event`,
+      component: () => import('@/pages/column/page/estate/event'),
+    },
+    {
+      path: `estate/location`,
+      component: () => import('@/pages/column/page/estate/location'),
+    },
+    {
+      path: `estate/orgSetup`,
+      component: () => import('@/pages/column/page/estate/orgSetup'),
+    },
+    {
+      path: `estate/survey`,
+      component: () => import('@/pages/column/page/estate/survey'),
+    },
   ]
 }