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

dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue

@@ -105,8 +105,9 @@
                 </div>
 
             </template>
+            <!-- 民营集团 -->
             <template v-if="activeIndex==3">
-                <div class="count">共{{ childList.length }}条</div>
+                <div class="count">共{{ childListTotal }}条</div>
                 <div class="child-wrap" :id="item.type"  v-for="(item,index) in childList" :key="index">
                     <div class="anchor"></div>
                     <div class="count1" >{{item.type}}<span> {{ item.total }}</span></div>
@@ -271,7 +272,8 @@ export default {
                                 item.page=1
                             })
                         }
-                        this.childList = res.data
+                        this.childList = res.data.list;
+                        this.childListTotal = res.data.total;
                     }
                 })
             }