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

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: ''

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: ''

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"