diff --git a/src/views/modules/activity/topic-close.vue b/src/views/modules/activity/topic-close.vue
new file mode 100644
index 0000000..5389be7
--- /dev/null
+++ b/src/views/modules/activity/topic-close.vue
@@ -0,0 +1,78 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="关闭原因"
+                    prop="processingOpinions">
+        <el-input v-model="dataForm.processingOpinions"
+                  type="textarea"
+                  placeholder="50字以内"></el-input>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        processingOpinions: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        processingOpinions: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http['post']('/property/topic/close', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/activity/topic-detail.vue b/src/views/modules/activity/topic-detail.vue
new file mode 100644
index 0000000..1a34e43
--- /dev/null
+++ b/src/views/modules/activity/topic-detail.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="project-handle">
+    <el-form :model="dataForm"
+             ref="dataForm"
+             style="width: 100%; height: 100%;">
+      <div class="project-detail">
+        <div class="project-detail-tip">话题详情</div>
+        <el-form label-position="right"
+                 label-width="120px">
+          <el-form-item label="话题内容:"
+                        prop="eventContent">
+            <div>{{dataForm.topicContent}}</div>
+            <el-image v-for="url in dataForm.images"
+                      style="width: 100px; height: 100px; margin-right: 10px"
+                      :key="url"
+                      :src="url"
+                      :preview-src-list="previewImgList"
+                      @click="clickImg(url)">
+            </el-image>
+          </el-form-item>
+          <el-form-item label="所属网格:"
+                        prop="allDeptNames">
+            <div>{{dataForm.allDeptNames}}</div>
+          </el-form-item>
+          <el-form-item label="话题来源:"
+                        prop="groupName">
+            <div>{{dataForm.groupName}}</div>
+          </el-form-item>
+          <el-form-item label="发言人:"
+                        prop="nickName">
+            <div>{{dataForm.nickname}}</div>
+          </el-form-item>
+          <el-form-item label="评论:">
+            <el-button type="primary"
+                       @click="innerVisible = true">点击查看评论</el-button>
+          </el-form-item>
+        </el-form>
+        <div class="container">
+          <div class="location"><span style="font-weight: bold;color: #606266">上报位置:</span> {{dataForm.topicAddress}}</div>
+          <div id="map"></div>
+        </div>
+      </div>
+      <div style="width: 100%; text-align:center; float:left;">
+        <el-button size="medium"
+                   style="width: 95px"
+                   type="primary"
+                   @click="back">返回</el-button>
+      </div>
+    </el-form>
+    <el-dialog width="90%"
+               title="评论"
+               :visible.sync="innerVisible"
+               append-to-body>
+      <el-table :data="commentsDTOs"
+                border
+                style="width: 100%;">
+        <el-table-column prop="user.userName"
+                         label="发言人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentTime"
+                         label="发言时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="content"
+                         label="发言内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="replyComment.userName"
+                         label="被回复人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="replyComment.content"
+                         label="被回复内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.shieldFlag === '0'"
+                       type="button"
+                       size="small"
+                       @click="deleteComment(scope.row.commentId)">屏蔽</el-button>
+            <el-button v-if="scope.row.shieldFlag === '1'"
+                       type="text"
+                       size="small">已屏蔽</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="pageIndex"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limitVal"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandleNew"
+                     @current-change="pageCurrentChangeHandleNew">
+      </el-pagination>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import BMap from 'BMap'
+import 'element-ui/lib/theme-chalk/timeline.css'
+import 'element-ui/lib/theme-chalk/timeline-item.css'
+import 'element-ui/lib/theme-chalk/image.css'
+export default {
+  data () {
+    return {
+      innerVisible: false,
+      dataForm: {
+        id: ''
+      },
+      previewImgList: [],
+      order: '',
+      orderField: '',
+      pageIndex: 1,
+      limitVal: 10,
+      total: 0,
+      commentsDTOs: []
+    }
+  },
+  mounted () {
+    this.dataForm.id = this.$route.query.id
+    this.init()
+  },
+  methods: {
+    back () {
+      this.$parent.selectComponent = 'TopicList'
+    },
+    initBmap (latitude, longitude) {
+      this.map = new BMap.Map('map')
+      const point = new BMap.Point(longitude, latitude)
+      var marker = new BMap.Marker(point)
+      this.map.addOverlay(marker)
+      this.map.centerAndZoom(point, 13)
+      this.map.enableScrollWheelZoom(true)
+    },
+    clickImg (url) {
+      this.previewImgList = []
+      this.previewImgList.push(url)
+    },
+    init () {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.getCommentList()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/topic/detail/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        this.initBmap(this.dataForm.topicLatitude, this.dataForm.topicLongitude)
+      }).catch(() => { })
+    },
+    pageSizeChangeHandleNew (val) {
+      this.pageIndex = 1
+      this.limitVal = val
+      this.getCommentList()
+    },
+    pageCurrentChangeHandleNew (val) {
+      this.pageIndex = val
+      this.getCommentList()
+    },
+    getCommentList () {
+      this.$http.get('/property/topiccomment/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.commentsDTOs = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.commentsDTOs = res.data.list
+        this.total = res.data.total
+      }).catch(() => { })
+    },
+    deleteComment (val) {
+      this.$http['post'](
+        '/property/topiccomment/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.$message({
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.getCommentList()
+          }
+        })
+      }).catch(() => { })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.project-handle {
+  .el-timeline {
+    padding-left: 9px;
+    font-size: 13px;
+  }
+}
+.el-form-item__label {
+  font-weight: bold;
+}
+</style>
+
+<style lang="scss" scoped>
+.project-handle {
+  width: 100%;
+  height: calc(100vh - 120px);
+  background: #ffffff;
+  box-sizing: border-box;
+  padding: 10px;
+  .project-detail {
+    width: 100%;
+    height: 80%;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    padding: 10px;
+    padding-top: 20px;
+    float: left;
+    margin-bottom: 1%;
+    position: relative;
+    .project-detail-tip {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 80px;
+      height: 30px;
+      line-height: 30px;
+      color: #ffffff;
+      background: #4ac38b;
+      text-align: center;
+    }
+    .el-form {
+      width: 58%;
+      height: 100%;
+      float: left;
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        width: 5px;
+        height: 1px;
+      }
+      &::-webkit-scrollbar-thumb {
+        border-radius: 5px;
+        background: #fff;
+      }
+      &::-webkit-scrollbar-track {
+        border-radius: 10px;
+        background: #fff;
+      }
+    }
+    .container {
+      width: 40%;
+      height: 100%;
+      float: right;
+      .location {
+        height: 30px;
+        line-height: 30px;
+      }
+      #map {
+        width: 100%;
+        height: calc(100% - 30px);
+      }
+    }
+  }
+  .project-progress {
+    width: 20%;
+    height: 100%;
+    float: right;
+    border: 2px solid #ccc;
+    box-sizing: border-box;
+    margin-left: 1%;
+    padding-top: 20px;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 1px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 5px;
+      background: #aaa;
+    }
+    &::-webkit-scrollbar-track {
+      border-radius: 10px;
+      background: #ccc;
+    }
+  }
+  .handle-operation {
+    width: 79%;
+    height: 49%;
+    box-sizing: border-box;
+    border: 2px solid #ccc;
+    float: left;
+  }
+}
+</style>
diff --git a/src/views/modules/activity/topic-list.vue b/src/views/modules/activity/topic-list.vue
new file mode 100644
index 0000000..f949b09
--- /dev/null
+++ b/src/views/modules/activity/topic-list.vue
@@ -0,0 +1,254 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__topic}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="ids"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="群名">
+          <el-select v-model="dataForm.groupId"
+                     clearable
+                     placeholder="请选择">
+            <el-option v-for="item in groupOptions"
+                       :key="item.groupId"
+                       :label="item.groupName"
+                       :value="item.groupId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="关键词"
+                      prop="keyword">
+          <el-input v-model="dataForm.keyword"
+                    placeholder=""
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item label="排序方式">
+          <el-select v-model="dataForm.orderType"
+                     clearable
+                     placeholder="请选择">
+            <el-option v-for="item in orderTypeOptions"
+                       :key="item.id"
+                       :label="item.name"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('activity:topic:export')"
+                     type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column label="序号"
+                         type="index"
+                         show-overflow-tooltip
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="nickname"
+                         label="发言人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="topicContent"
+                         label="话题内容"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="commentNum"
+                         label="评论数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="browseNum"
+                         label="浏览数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       size="small"
+                       @click="look(scope.row.id)">{{ $t('look') }}</el-button>
+            <el-button v-if="scope.row.state !== 20"
+                       type="text"
+                       size="small"
+                       @click="close(scope.row.id)">{{ $t('close') }}</el-button>
+            <el-button type="text"
+                       size="small"
+                       v-if="scope.row.state ===20"
+                       :disabled="true">已关闭</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <close v-if="closeVisible"
+             ref="close"
+             @refreshDataList="getDataList"></close>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import Close from './topic-close'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/topic/interestpage',
+        getDataListIsPage: true,
+        exportURL: '/property/topic/interestexport'
+      },
+      closeVisible: false,
+      dataForm: {
+        id: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        startTime: '',
+        endTime: '',
+        groupId: '',
+        keyword: '',
+        orderType: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      },
+      ids: [],
+      options: [],
+      groupOptions: [],
+      orderTypeOptions: [{
+        id: '0',
+        name: '按发布时间排序'
+      }, {
+        id: '1',
+        name: '按浏览数排序'
+      }, {
+        id: '2',
+        name: '按评论数排序'
+      }]
+    }
+  },
+  components: {
+    Close
+  },
+  created: function () {
+    this.getOptions()
+    this.getGroupList()
+  },
+  watch: {
+    'ids': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  methods: {
+    close (id) {
+      this.closeVisible = true
+      this.$nextTick(() => {
+        this.$refs.close.dataForm.id = id
+        this.$refs.close.init()
+      })
+    },
+    look (id) {
+      this.$parent.selectComponent = 'TopicDetail'
+      this.$router.push({ path: '/activity-topic', query: { id: id } })
+    },
+    getGroupList () {
+      this.$http.get('/property/group/groupList').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.groupOptions = res.data
+      }).catch(() => { })
+    },
+    getOptions () {
+      this.$http.get(`/sys/user/deptOptions/getByLoginUser`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      }).catch(() => { })
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/activity/topic.vue b/src/views/modules/activity/topic.vue
new file mode 100644
index 0000000..d812f57
--- /dev/null
+++ b/src/views/modules/activity/topic.vue
@@ -0,0 +1,29 @@
+<template>
+  <keep-alive include="TopicList">
+    <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+
+<script>
+import TopicList from './topic-list'
+import TopicDetail from './topic-detail'
+export default {
+  data () {
+    return {
+      selectComponent: TopicList
+    }
+  },
+  components: {
+    TopicList,
+    TopicDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = TopicList
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>