From c76041968032703ee9b26778b2e0d522dccffa3c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 21 Dec 2021 18:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=91=E6=B0=91=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Statistics.vue                 | 63 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/packages/3.0.0/AppVillageActivity/components/Statistics.vue b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
index ee94c522..623d168d 100644
--- a/packages/3.0.0/AppVillageActivity/components/Statistics.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Statistics.vue
@@ -43,6 +43,7 @@
             v-model="time1"
             type="month"
             size="small"
+            @change="getInfo"
             value-format="yyyy-MM"
             placeholder="请选择月份">
           </el-date-picker>
@@ -84,6 +85,53 @@
           </div>
         </template>
       </ai-card>
+      <ai-card title="村民参与活动记录">
+        <template #content>
+          <ai-search-bar class="search-bar" bottomBorder>
+            <template slot="left">
+              <el-date-picker
+                v-model="time2"
+                type="month"
+                size="small"
+                @change="getInfo"
+                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
+            style="margin-top: 12px;"
+            :border="true"
+            tableSize="small"
+            :total="total"
+            :tableData="list"
+            :col-configs="colConfigs"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            :stripe="false"
+            @getList="getInfo">
+            <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
+              <template slot-scope="{ row }">
+                <div class="table-options">
+                  <el-button type="text" @click="id = row.id, form.categoryName = row.categoryName">编辑</el-button>
+                  <el-button type="text" @click="removeCate(row.id)">删除</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+        </template>
+      </ai-card>
     </template>
   </ai-list>
 </template>
@@ -112,15 +160,26 @@
           children: 'children',
           label: 'name'
         },
+        total: 0,
+        colConfigs: [
+          { prop: 'moduleName',  label: '模块名称', align: 'left', width: '200px' },
+          { prop: 'menuName', label: '关联菜单', align: 'center' },
+          { prop: 'id', label: 'ID', align: 'center' },
+          { prop: 'categoryStr', label: '文章分类', align: 'center' }
+        ],
         time1: '',
+        time2: '',
         chart2: '',
         areaId: '',
         currIndex: -1,
+        list: [],
         areaList: [],
         unitName: '',
         search: {
           current: 1,
-          areaId: ''
+          areaId: '',
+          size: 10,
+          name: ''
         }
       }
     },
@@ -217,7 +276,7 @@
       },
 
       getInfo () {
-        this.instance.post(`/app/appvillageactivityinfo/statistic?time1=${this.time1}`).then(res => {
+        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)