From 7f97333e20616e81acbdfece67ea91ce8e7e55d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 18:38:53 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E7=BD=91=E6=A0=BC=E5=BC=80?=
 =?UTF-8?q?=E9=80=9A=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../metausergridopining-add-or-update.vue     | 222 ++++++++++++++++++
 .../analysis/user/metausergridopining.vue     | 183 +++++++++++++++
 2 files changed, 405 insertions(+)
 create mode 100644 src/views/modules/analysis/user/metausergridopining-add-or-update.vue
 create mode 100644 src/views/modules/analysis/user/metausergridopining.vue

diff --git a/src/views/modules/analysis/user/metausergridopining-add-or-update.vue b/src/views/modules/analysis/user/metausergridopining-add-or-update.vue
new file mode 100644
index 00000000..1eb597fc
--- /dev/null
+++ b/src/views/modules/analysis/user/metausergridopining-add-or-update.vue
@@ -0,0 +1,222 @@
+<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="网格id" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格id"></el-input>
+      </el-form-item>
+          <el-form-item label="用户总数" prop="registerCount">
+          <el-input v-model="dataForm.registerCount" placeholder="用户总数"></el-input>
+      </el-form-item>
+          <el-form-item label="党员数" prop="partyCount">
+          <el-input v-model="dataForm.partyCount" placeholder="党员数"></el-input>
+      </el-form-item>
+          <el-form-item label="已注册居民" prop="residentCount">
+          <el-input v-model="dataForm.residentCount" placeholder="已注册居民"></el-input>
+      </el-form-item>
+          <el-form-item label="未注册居民" prop="unAuthorizedCount">
+          <el-input v-model="dataForm.unAuthorizedCount" placeholder="未注册居民"></el-input>
+      </el-form-item>
+          <el-form-item label="新闻发布数" prop="newsCount">
+          <el-input v-model="dataForm.newsCount" placeholder="新闻发布数"></el-input>
+      </el-form-item>
+          <el-form-item label="社群数" prop="communityCount">
+          <el-input v-model="dataForm.communityCount" placeholder="社群数"></el-input>
+      </el-form-item>
+          <el-form-item label="群成员数" prop="communityMemberCount">
+          <el-input v-model="dataForm.communityMemberCount" placeholder="群成员数"></el-input>
+      </el-form-item>
+          <el-form-item label="群话题数" prop="communityTopicCount">
+          <el-input v-model="dataForm.communityTopicCount" placeholder="群话题数"></el-input>
+      </el-form-item>
+          <el-form-item label="议题总数" prop="eventCount">
+          <el-input v-model="dataForm.eventCount" placeholder="议题总数"></el-input>
+      </el-form-item>
+          <el-form-item label="项目数" prop="itemCount">
+          <el-input v-model="dataForm.itemCount" placeholder="项目数"></el-input>
+      </el-form-item>
+          <el-form-item label="项目已解决数" prop="itemCloseCount">
+          <el-input v-model="dataForm.itemCloseCount" placeholder="项目已解决数"></el-input>
+      </el-form-item>
+          <el-form-item label="好评数" prop="itemPraiseCount">
+          <el-input v-model="dataForm.itemPraiseCount" placeholder="好评数"></el-input>
+      </el-form-item>
+          <el-form-item label="网格名称" prop="allDeptNames">
+          <el-input v-model="dataForm.allDeptNames" placeholder="网格名称"></el-input>
+      </el-form-item>
+          <el-form-item label="网格党建指导员姓名" prop="gridLeader">
+          <el-input v-model="dataForm.gridLeader" placeholder="网格党建指导员姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="注册时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="注册时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></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: '',
+        gridId: '',
+        registerCount: '',
+        partyCount: '',
+        residentCount: '',
+        unAuthorizedCount: '',
+        newsCount: '',
+        communityCount: '',
+        communityMemberCount: '',
+        communityTopicCount: '',
+        eventCount: '',
+        itemCount: '',
+        itemCloseCount: '',
+        itemPraiseCount: '',
+        allDeptNames: '',
+        gridLeader: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        registerCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partyCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        residentCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unAuthorizedCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        newsCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityMemberCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityTopicCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        eventCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        itemCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        itemCloseCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        itemPraiseCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`//metausergridopining/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('//metausergridopining/', 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/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
new file mode 100644
index 00000000..f55fa866
--- /dev/null
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -0,0 +1,183 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__metausergridopining}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </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(':metausergridopining:save')"
+                       type="primary"
+                       @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="$hasPermission(':metausergridopining:delete')"
+                       type="danger"
+                       @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          </el-form-item> -->
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <!-- <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="id"
+                         label="主键"
+                         header-align="center"
+                         align="center"></el-table-column> -->
+        <!-- <el-table-column prop="gridId"
+                         label="网格id"
+                         header-align="center"
+                         align="center"></el-table-column> -->
+        <el-table-column prop="allDeptNames"
+                         label="网格名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="gridLeader"
+                         label="网格党建指导员姓名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="registerCount"
+                         label="用户总数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="partyCount"
+                         label="党员数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="residentCount"
+                         label="已注册居民"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="unAuthorizedCount"
+                         label="未注册居民"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="newsCount"
+                         label="新闻发布数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="communityCount"
+                         label="社群数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="communityMemberCount"
+                         label="群成员数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="communityTopicCount"
+                         label="群话题数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="eventCount"
+                         label="议题总数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="itemCount"
+                         label="项目数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="itemCloseCount"
+                         label="项目已解决数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="itemPraiseCount"
+                         label="好评数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="updatedTime"
+                         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 v-if="$hasPermission(':metausergridopining:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission(':metausergridopining:delete')"
+                       type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './metausergridopining-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/metausergridopining/page',
+        getDataListIsPage: true,
+        deleteURL: '/analysis/metausergridopining',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      options: [],
+      deptIdList: []
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created () {
+    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(() => { })
+  },
+  watch: {
+    'deptIdList': function (val) {
+      console.log(this.deptIdList)
+      if (val.length !== 0) {
+        this.dataForm.gridId = val[val.length - 1]
+      } else {
+        this.dataForm.gridId = ''
+      }
+    }
+  }
+}
+</script>

From 066a183f8607ce1161cd3fff5a17f3f550b76855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 25 Mar 2020 18:48:45 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/analysis/user/metausergridopining.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
index f55fa866..bc426e67 100644
--- a/src/views/modules/analysis/user/metausergridopining.vue
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -11,6 +11,12 @@
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
+        <el-form-item label="截止日期">
+          <el-date-picker v-model="dataForm.createdTime"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -149,7 +155,8 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        createdTime: ''
       },
       options: [],
       deptIdList: []

From d421e67736e748a7de09f4caa1d94f0e4a7fd927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 26 Mar 2020 10:28:32 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/analysis/user/metausergridopining.vue      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
index bc426e67..a5b0d774 100644
--- a/src/views/modules/analysis/user/metausergridopining.vue
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -48,7 +48,7 @@
                          label="网格id"
                          header-align="center"
                          align="center"></el-table-column> -->
-        <el-table-column prop="allDeptNames"
+        <el-table-column prop="allDeptName"
                          label="网格名称"
                          header-align="center"
                          align="center"></el-table-column>
@@ -108,12 +108,12 @@
                          label="更新时间"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column :label="$t('handle')"
+        <!-- <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
                          width="150">
-          <!-- <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-button v-if="$hasPermission(':metausergridopining:update')"
                        type="text"
                        size="small"
@@ -122,8 +122,8 @@
                        type="text"
                        size="small"
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-          </template> -->
-        </el-table-column>
+          </template>
+        </el-table-column> -->
       </el-table>
       <el-pagination :current-page="page"
                      :page-sizes="[10, 20, 50, 100]"

From 14b34a45e9946ba286cfd52cc88bd9601c46913e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 26 Mar 2020 17:42:22 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/user/metauserregisterrank.vue    | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 src/views/modules/analysis/user/metauserregisterrank.vue

diff --git a/src/views/modules/analysis/user/metauserregisterrank.vue b/src/views/modules/analysis/user/metauserregisterrank.vue
new file mode 100644
index 00000000..45314dbb
--- /dev/null
+++ b/src/views/modules/analysis/user/metauserregisterrank.vue
@@ -0,0 +1,145 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__metauserregisterrank}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </el-form-item>
+        <el-form-item label="截止日期">
+          <el-date-picker v-model="dataForm.createdTime"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column prop="streetName"
+                         label="街道名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="userCount"
+                         label="用户总数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="partyMemberCount"
+                         label="党员数"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="residentCount"
+                         label="已注册居民"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="unAuthorizedCount"
+                         label="为注册居民"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="oldCount"
+                         label="年龄超过50岁"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="oldPercent"
+                         label="老龄化比例"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{(scope.row.oldPercent*100).toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column prop="youngCount"
+                         label="50岁以下用户数量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="youngPercent"
+                         label="年轻化比例"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{(scope.row.youngPercent*100).toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column prop="maleCount"
+                         label="男"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="femaleCount"
+                         label="女"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="unknownSexCount"
+                         label="未知性别"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="updatedTime"
+                         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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/metauserregisterrank/page',
+        getDataListIsPage: true,
+        deleteURL: '/analysis/metauserregisterrank',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        createdTime: ''
+      },
+      options: [],
+      deptIdList: []
+    }
+  },
+  created () {
+    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(() => { })
+  },
+  components: {
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.streetId = val[val.length - 1]
+      } else {
+        this.dataForm.streetId = ''
+      }
+    }
+  }
+}
+</script>

From e406c6fee2b0f5152a09d85b840af3e6c2c016d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 26 Mar 2020 19:00:49 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=85=9A=E5=91=98=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/user/metauserpartyrank.vue       | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 src/views/modules/analysis/user/metauserpartyrank.vue

diff --git a/src/views/modules/analysis/user/metauserpartyrank.vue b/src/views/modules/analysis/user/metauserpartyrank.vue
new file mode 100644
index 00000000..db295fc3
--- /dev/null
+++ b/src/views/modules/analysis/user/metauserpartyrank.vue
@@ -0,0 +1,132 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__metauserpartyrank}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </el-form-item>
+        <el-form-item label="截止日期">
+          <el-date-picker v-model="dataForm.createdTime"
+                          type="date"
+                          placeholder="选择日期">
+          </el-date-picker>
+        </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(':metauserpartyrank:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission(':metauserpartyrank:delete')"
+                     type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column prop="streetName"
+                         label="街道名称"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="partyMemberCount"
+                         label="已注册党员数量（已认证）"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="oldCount"
+                         label="年龄超过50岁党员数量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="oldPercent"
+                         label="老龄化比例"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{(scope.row.oldPercent*100).toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column prop="youngCount"
+                         label="年龄50岁以下的党员数量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="youngPercent"
+                         label="年轻化比例"
+                         header-align="center"
+                         align="center">
+          <template slot-scope="scope">
+            {{(scope.row.youngPercent*100).toFixed(2)}}%
+          </template>
+        </el-table-column>
+        <el-table-column prop="maleCount"
+                         label="男"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="femaleCount"
+                         label="女"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="unknownSexCount"
+                         label="未知性别"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="partyAuthFailureCount"
+                         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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/analysis/metauserpartyrank/page',
+        getDataListIsPage: true,
+        deleteURL: '/analysis/metauserpartyrank',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: '',
+        createdTime: ''
+      },
+      options: [],
+      deptIdList: []
+    }
+  },
+  components: {
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.streetId = val[val.length - 1]
+      } else {
+        this.dataForm.streetId = ''
+      }
+    }
+  }
+}
+</script>

From 410cbb58043481dff63c77be2ba97c85f4b4c5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Fri, 27 Mar 2020 14:54:20 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=89=E5=88=97=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/analysis/user/metausergridopining.vue  | 7 ++++++-
 src/views/modules/analysis/user/metauserpartyrank.vue    | 7 ++++++-
 src/views/modules/analysis/user/metauserregisterrank.vue | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/analysis/user/metausergridopining.vue b/src/views/modules/analysis/user/metausergridopining.vue
index a5b0d774..a3f3d867 100644
--- a/src/views/modules/analysis/user/metausergridopining.vue
+++ b/src/views/modules/analysis/user/metausergridopining.vue
@@ -20,6 +20,10 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
         <!-- <el-form-item>
             <el-button v-if="$hasPermission(':metausergridopining:save')"
                        type="primary"
@@ -152,7 +156,8 @@ export default {
         getDataListURL: '/analysis/metausergridopining/page',
         getDataListIsPage: true,
         deleteURL: '/analysis/metausergridopining',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/analysis/metausergridopining/export'
       },
       dataForm: {
         id: '',
diff --git a/src/views/modules/analysis/user/metauserpartyrank.vue b/src/views/modules/analysis/user/metauserpartyrank.vue
index db295fc3..d61954ba 100644
--- a/src/views/modules/analysis/user/metauserpartyrank.vue
+++ b/src/views/modules/analysis/user/metauserpartyrank.vue
@@ -20,6 +20,10 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission(':metauserpartyrank:save')"
                      type="primary"
@@ -107,7 +111,8 @@ export default {
         getDataListURL: '/analysis/metauserpartyrank/page',
         getDataListIsPage: true,
         deleteURL: '/analysis/metauserpartyrank',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/analysis/metauserpartyrank/export'
       },
       dataForm: {
         id: '',
diff --git a/src/views/modules/analysis/user/metauserregisterrank.vue b/src/views/modules/analysis/user/metauserregisterrank.vue
index 45314dbb..afe77fe6 100644
--- a/src/views/modules/analysis/user/metauserregisterrank.vue
+++ b/src/views/modules/analysis/user/metauserregisterrank.vue
@@ -20,6 +20,10 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"
@@ -109,7 +113,8 @@ export default {
         getDataListURL: '/analysis/metauserregisterrank/page',
         getDataListIsPage: true,
         deleteURL: '/analysis/metauserregisterrank',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/analysis/metauserregisterrank/export'
       },
       dataForm: {
         id: '',