From fd65b8a6dc37a30e341b5c404ea272fade5041c1 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 17 Feb 2020 16:06:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=93=A8=E5=8D=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97=EF=BC=9A=E5=93=A8=E5=8D=A1=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A0=81=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/epidemicsentrypost.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/custom/epidemicsentrypost.vue b/src/views/modules/custom/epidemicsentrypost.vue
index 53b58858..8a72258c 100644
--- a/src/views/modules/custom/epidemicsentrypost.vue
+++ b/src/views/modules/custom/epidemicsentrypost.vue
@@ -27,6 +27,7 @@
       <el-table-column prop="sentryPostCode" label="哨卡编码" header-align="center" align="center"></el-table-column>
       <el-table-column prop="sentryPostName" label="哨卡名称" header-align="center" align="center"></el-table-column>
       <el-table-column prop="thirdSentryPostId" label="第三方哨卡id" header-align="center" align="center"></el-table-column>
+      <el-table-column prop="maCodeUrl" label="哨卡小程序码访问地址" header-align="center" align="center"></el-table-column>
       <el-table-column align="center" header-align="center"
                          label="小程序码"
                          :show-overflow-tooltip="true"

From 9108118cc6f5eaf3007ac1f3a5fbf1cdd76cf314 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 17 Feb 2020 16:49:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E5=92=8C=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/analysis/user/party.vue    | 22 +++++++++++++++++
 src/views/modules/analysis/user/register.vue | 26 ++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/src/views/modules/analysis/user/party.vue b/src/views/modules/analysis/user/party.vue
index 3d2cb53c..cba2bd31 100644
--- a/src/views/modules/analysis/user/party.vue
+++ b/src/views/modules/analysis/user/party.vue
@@ -32,6 +32,18 @@
             </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>
@@ -165,6 +177,16 @@ export default {
           label: '50岁以下最少人数'
         }
       ],
+      registerCounts: [
+        {
+          value: '0',
+          label: '注册人数最多'
+        },
+        {
+          value: '1',
+          label: '注册人数最少'
+        }
+      ],
       onLine: {
         id: '',
         onLineState: ''
diff --git a/src/views/modules/analysis/user/register.vue b/src/views/modules/analysis/user/register.vue
index 4c21e7d6..eb711d8d 100644
--- a/src/views/modules/analysis/user/register.vue
+++ b/src/views/modules/analysis/user/register.vue
@@ -32,6 +32,18 @@
             </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>
@@ -177,6 +189,20 @@ export default {
         value: '3',
         label: '50岁以下最少人数'
       }],
+      registerCounts: [
+        {
+          value: '2',
+          label: '注册用户最多'
+        },
+        {
+          value: '3',
+          label: '注册党员最多'
+        },
+        {
+          value: '4',
+          label: '注册居民最多'
+        }
+      ],
       onLine: {
         id: '',
         onLineState: ''