diff --git a/src/views/modules/property/leaderboard.vue b/src/views/modules/property/leaderboard.vue
index fb83ca5..58d0502 100644
--- a/src/views/modules/property/leaderboard.vue
+++ b/src/views/modules/property/leaderboard.vue
@@ -1,9 +1,15 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <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 :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 v-model="ids"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="时间"
@@ -28,7 +34,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="排名">
-          <el-select v-model="orderType" clearable
+          <el-select v-model="orderType"
+                     clearable
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -41,27 +48,61 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-if="this.orderType === '0'" 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="groupName" label="群名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column>
+      <el-table v-if="this.orderType === '0'"
+                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="groupName"
+                         label="群名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属网格"
+                         header-align="center"
+                         align="center"></el-table-column>
       </el-table>
-      <el-table v-if="this.orderType === '1'" 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="groupName" label="群名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="memberNum" label="群成员数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column>
+      <el-table v-if="this.orderType === '1'"
+                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="groupName"
+                         label="群名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="memberNum"
+                         label="群成员数量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属网格"
+                         header-align="center"
+                         align="center"></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 :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>
+      <close v-if="closeVisible"
+             ref="close"
+             @refreshDataList="getDataList"></close>
     </div>
   </el-card>
 </template>
@@ -74,7 +115,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/group/group/activity',
+        getDataListURL: '/property/group/activity',
         getDataListIsPage: true
       },
       closeVisible: false,
@@ -118,9 +159,9 @@ export default {
   watch: {
     'orderType': function (val) {
       if (val === '0') {
-        this.mixinViewModuleOptions.getDataListURL = '/group/group/activity'
+        this.mixinViewModuleOptions.getDataListURL = '/property/group/activity'
       } else {
-        this.mixinViewModuleOptions.getDataListURL = '/group/group/member'
+        this.mixinViewModuleOptions.getDataListURL = '/property/group/member'
       }
       this.getDataList()
     },
@@ -160,7 +201,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.options = res.data.options
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
diff --git a/src/views/modules/property/topic-close.vue b/src/views/modules/property/topic-close.vue
index 87c0556..5389be7 100644
--- a/src/views/modules/property/topic-close.vue
+++ b/src/views/modules/property/topic-close.vue
@@ -1,13 +1,24 @@
 <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-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>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -46,7 +57,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http['post']('/group/topic/close', this.dataForm).then(({ data: res }) => {
+        this.$http['post']('/property/topic/close', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -59,7 +70,7 @@ export default {
               this.$emit('refreshDataList')
             }
           })
-        }).catch(() => {})
+        }).catch(() => { })
       })
     }, 1000, { 'leading': true, 'trailing': false })
   }
diff --git a/src/views/modules/property/topic-detail.vue b/src/views/modules/property/topic-detail.vue
index 7aa74aa..c2fbbca 100644
--- a/src/views/modules/property/topic-detail.vue
+++ b/src/views/modules/property/topic-detail.vue
@@ -1,66 +1,104 @@
 <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>
+  <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>
-        <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>
+        <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>
@@ -115,7 +153,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`/group/topic/detail/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/property/topic/detail/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -124,7 +162,7 @@ export default {
           ...res.data
         }
         this.initBmap(this.dataForm.topicLatitude, this.dataForm.topicLongitude)
-      }).catch(() => {})
+      }).catch(() => { })
     },
     pageSizeChangeHandleNew (val) {
       this.pageIndex = 1
@@ -136,7 +174,7 @@ export default {
       this.getCommentList()
     },
     getCommentList () {
-      this.$http.get('/group/topiccomment/comments', { params: { id: this.dataForm.id, order: this.order, orderField: this.orderField, page: this.pageIndex, limit: this.limitVal }
+      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 = []
@@ -145,128 +183,128 @@ export default {
         }
         this.commentsDTOs = res.data.list
         this.total = res.data.total
-      }).catch(() => {})
+      }).catch(() => { })
     },
     deleteComment (val) {
       this.$http['post'](
-        '/group/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()
+        '/property/topiccomment/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           }
-        })
-      }).catch(() => {})
+          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;
-    }
+.project-handle {
+  .el-timeline {
+    padding-left: 9px;
+    font-size: 13px;
+  }
+}
+.el-form-item__label {
+  font-weight: bold;
+}
 </style>
 
 <style lang="scss" scoped>
-    .project-handle {
+.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(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;
-        }
+        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/property/topic-list.vue b/src/views/modules/property/topic-list.vue
index 1bdde25..fe5ef37 100644
--- a/src/views/modules/property/topic-list.vue
+++ b/src/views/modules/property/topic-list.vue
@@ -1,9 +1,15 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <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 :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 v-model="ids"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
           </el-cascader>
         </el-form-item>
         <el-form-item label="时间"
@@ -28,7 +34,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="群名">
-          <el-select v-model="dataForm.groupId" clearable
+          <el-select v-model="dataForm.groupId"
+                     clearable
                      placeholder="请选择">
             <el-option v-for="item in groupOptions"
                        :key="item.groupId"
@@ -37,11 +44,15 @@
             </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 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
+          <el-select v-model="dataForm.orderType"
+                     clearable
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -54,34 +65,72 @@
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('epdc: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">
+      <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>
+            <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 :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>
+      <close v-if="closeVisible"
+             ref="close"
+             @refreshDataList="getDataList"></close>
     </div>
   </el-card>
 </template>
@@ -94,9 +143,9 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/group/topic/page',
+        getDataListURL: '/property/topic/page',
         getDataListIsPage: true,
-        exportURL: '/group/topic/export'
+        exportURL: '/property/topic/export'
       },
       closeVisible: false,
       dataForm: {
@@ -185,7 +234,7 @@ export default {
       this.$router.push({ path: '/group-topic', query: { id: id } })
     },
     getGroupList () {
-      this.$http.get('/group/group/groupList').then(({ data: res }) => {
+      this.$http.get('/property/group/groupList').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -198,7 +247,7 @@ export default {
           return this.$message.error(res.msg)
         }
         this.options = res.data.options
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }