From be81c35f4cefc89e6bd44c7df65312c9abf90903 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Thu, 20 Feb 2020 09:57:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=BC=80=E9=80=9A=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E8=AE=AE=E9=A2=98=E6=95=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E4=B8=A4=E5=88=97=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/analysis/user/party.vue    | 25 +++----------
 src/views/modules/analysis/user/register.vue | 39 ++++++--------------
 2 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index a76df43c..b8917be0 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -21,10 +21,10 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
         </el-date-picker> &nbsp; &nbsp;
-        <el-form-item label="年龄排序">
+        <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
-                     placeholder="年龄排序">
+                     placeholder="排序规则">
             <el-option v-for="item in categorys"
                        :key="item.value"
                        :label="item.label"
@@ -32,18 +32,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-
-        <el-form-item label="注册排序">
-          <el-select v-model="dataForm.registerCount"
-                     clearable
-                     placeholder="注册排序">
-            <el-option v-for="item in registerCounts"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -175,15 +163,12 @@ export default {
         }, {
           value: '3',
           label: '50岁以下最少人数'
-        }
-      ],
-      registerCounts: [
-        {
-          value: '0',
+        }, {
+          value: '7',
           label: '注册人数最多'
         },
         {
-          value: '1',
+          value: '8',
           label: '注册人数最少'
         }
       ],
diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue
index e0bdba3f..1751b26d 100644
--- a/src/views/modules/analysis/user/register.vue
+++ b/src/views/modules/analysis/user/register.vue
@@ -21,10 +21,10 @@
                         start-placeholder="开始日期"
                         end-placeholder="结束日期">
         </el-date-picker> &nbsp; &nbsp;
-        <el-form-item label="类别">
+        <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
-                     placeholder="所属类别">
+                     placeholder="排序规则">
             <el-option v-for="item in categorys"
                        :key="item.value"
                        :label="item.label"
@@ -32,18 +32,6 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="注册排序">
-          <el-select v-model="dataForm.registerCount"
-                     clearable
-                     placeholder="注册排序">
-            <el-option v-for="item in registerCounts"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -188,21 +176,16 @@ export default {
       }, {
         value: '3',
         label: '50岁以下最少人数'
+      }, {
+        value: '4',
+        label: '注册用户最多'
+      }, {
+        value: '5',
+        label: '注册党员最多'
+      }, {
+        value: '6',
+        label: '注册居民最多'
       }],
-      registerCounts: [
-        {
-          value: '2',
-          label: '注册用户最多'
-        },
-        {
-          value: '3',
-          label: '注册党员最多'
-        },
-        {
-          value: '4',
-          label: '注册居民最多'
-        }
-      ],
       onLine: {
         id: '',
         onLineState: ''