Merge remote-tracking branch 'origin/dev' into dev

packages/3.0.0/AppVillageActivity/components/Statistics.vue

@@ -97,17 +97,6 @@
                 value-format="yyyy-MM"
                 placeholder="请选择月份">
               </el-date-picker>
-              <ai-download :instance="instance" url="/app/appcommunityhouseinfo/listExport" fileName="村民参与活动记录" style="left-right: 10px"></ai-download>
-            </template>
-            <template slot="right">
-              <el-input
-                v-model="search.name"
-                class="search-input"
-                size="small"
-                placeholder="请输入姓名"
-                clearable
-                suffix-icon="iconfont iconSearch">
-              </el-input>
             </template>
           </ai-search-bar>
           <ai-table
@@ -119,6 +108,7 @@
             :col-configs="colConfigs"
             :current.sync="search.current"
             :size.sync="search.size"
+            :isShowPagination="false"
             :stripe="false"
             @getList="getInfo">
             <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
@@ -162,10 +152,10 @@
         },
         total: 0,
         colConfigs: [
-          { prop: 'moduleName',  label: '模块名称', align: 'left', width: '200px' },
+          { prop: 'name',  label: '姓名', align: 'left' },
-          { prop: 'menuName', label: '关联菜单', align: 'center' },
+          { prop: 'gender', label: '性别', align: 'center' },
-          { prop: 'id', label: 'ID', align: 'center' },
+          { prop: 'number1', label: '报名次数', align: 'center' },
-          { prop: 'categoryStr', label: '文章分类', align: 'center' }
+          { prop: 'number2', label: '发布动态条数', align: 'center' }
         ],
         time1: '',
         time2: '',
@@ -223,7 +213,6 @@
         this.search.current = 1
 
         this.$nextTick(() => {
-          this.loading = true
           this.getInfo()
         })
       },
@@ -276,11 +265,13 @@
       },
 
       getInfo () {
+        this.loading = true
         this.instance.post(`/app/appvillageactivityinfo/statistic?time1=${this.time1}&time2=${this.time2}`).then(res => {
           if (res.code == 0) {
             this.info = res.data.total
             this.initChart1(res.data.twelve)
             this.initChart2(res.data.gender)
+            this.list = res.data.rank || []
             this.loading = false
           } else {
             this.loading = false