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

pages/risk-level-control/risk-four-color-map/list.vue

@@ -35,6 +35,15 @@
           <view class="flex-between mt-10 subtitle">
             <text>风险四色图数：{{item.fourCount}}</text>
           </view>
+          <view class="flex-between mt-10 subtitle">
+            <text>风险告知卡数：{{item.gaoCount}}</text>
+          </view>
+          <view class="flex-between mt-10 subtitle">
+            <text>三人以上分布图数：{{item.threePeopleCount}}</text>
+          </view>
+          <view class="flex-between mt-10 subtitle">
+            <text>人员聚集场所分布图数：{{item.PeoplesCount}}</text>
+          </view>
           <view class="flex-end mt-10 see_btn">
             <u-button type="primary" text="查看" size="mini" @click="fnNavigatorDetail(item.CORPINFO_ID)"></u-button>
           </view>
@@ -52,7 +61,7 @@ export default {
   data() {
     return {
       KEYWORDS: '',
-      pageSize: 10,
+      pageSize: 20,
       currentPage: 1,
       totalPage: 0,
       list: [],