修改

dsk-operate-ui/src/api/detail/groupAccount/groupAccount.js

 import request from "@/utils/request";
 
+// 集团logo
+export function combineMemberLogo(data) {
+  return request({
+    url: '/combine/info/combineMemberLogo',
+    method: 'post',
+    data: data
+  })
+}
 // 集团成员列表
 export function memberList(data) {
   return request({

dsk-operate-ui/src/views/detail/groupAccount/index.vue

 <template>
   <div class="app-container group-container">
-    <div class="header-container">
+    <div class="header-container" ref="header">
       <div class="flex-box part-header">
         <img class="header-logo" :src="require('@/assets/images/detail/company_logo.png')">
         {{name || '--'}}
@@ -30,6 +30,7 @@
   import Performance from "./component/performance"
   import Zhaobiao from "./component/zhaobiao"
   import { infoHeader } from '@/api/detail/party-a/index'
+  import {combineMemberLogo} from '@/api/detail/groupAccount/groupAccount'
   import elementResizeDetectorMaker from "element-resize-detector"
   export default {
     name: 'GroupAccount',
@@ -46,13 +47,16 @@
         },
         isCompany: false,
         isSkeleton: false,
-        name:''
+        name:'',
       }
     },
     created() {
       if (this.$route.params.id) { // customerId
         this.customerId = this.$route.params.id
       }
+      combineMemberLogo({combineId: this.customerId}).then(res=>{
+        console.log(res.data)
+      })
       // if (this.$route.query.path) { // 获取跳转对应板块
       //   this.currentPath.pathName = this.$route.query.path
       // }
@@ -60,6 +64,8 @@
       this.name=this.$route.query.name ? this.$route.query.name : '中建集团'
     },
     mounted(){
+      // this.mainWidth=this.$refs.header.offsetWidth;
+      // this.width=this.$refs.contentData.offsetWidth -160;
     },
     methods: {
       showPartPage(e){
@@ -81,6 +87,7 @@
   .group-main{
     margin-top: 12px;
     position: fixed;
+    /*width: 100%;*/
     width: calc(100% - 192px);
     height: calc(100vh - 155px);
     overflow-y: auto;
@@ -91,6 +98,7 @@
     padding-bottom: 16px;
     position: fixed;
     background: #FFFFFF;
+    width: 144px;
   }
   .group-right{
     min-width: 1088px;

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

 <template>
   <!-- <div style="width:calc(100% - 100px);" @click="showlist = false"> -->
-    
+
         <div  class="app-container enterprise_contatiner"  @click="showlist = false">
             <div class="title_wrap">
                 <div class="enterprise_title">
@@ -347,7 +347,7 @@ export default {
         search(page=1){
             this.page = page;
             if(!this.companyName.trim()){
-                return 
+                return
             }
             let data = {
                 keyword:this.companyName,
@@ -377,13 +377,13 @@ export default {
                 return this.$message.warning("抱歉，没找到相关数据,建议调整关键词或筛选条件，重新搜索")
             }
             let item = this.searchList[0]
-            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}`})
+            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}&cid=${item.combineMemberCid}`})
         },
         selCompany(item = this.searchList[0]){
             if(!item){
                 return this.$message.warning("抱歉，没找到相关数据,建议调整关键词或筛选条件，重新搜索")
             }
-            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}`})
+            this.$router.push({path:`/groupAccount/${item.combineId}?name=${item.combineName.replace(new RegExp("<font color='#FF204E'>", 'g'),'').replace(new RegExp("</font>", 'g'),'')}&cid=${item.combineMemberCid}`})
         },
     }
 }
@@ -658,5 +658,5 @@ export default {
                         }
                     }
                 }
-        } 
-</style>
\ No newline at end of file
+        }
+</style>

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -76,7 +76,7 @@ export default {
       tableData:[],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 20,
+      pageSize: 50,
       tableDataTotal: 0,
       show_page:true,
       MaxPage:500,

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -118,7 +118,7 @@ export default {
       tableData: [],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 20,
+      pageSize: 50,
       tableDataTotal: null,
       aptitudeCodeList:[],
       aptitudeType:'',

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -145,7 +145,7 @@
         tableData: [],
         tableLoading: false,
         pageIndex: 1,
-        pageSize: 20,
+        pageSize: 50,
         tableDataTotal: null,
         show_page:true,
         MaxPage:500,

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -314,7 +314,7 @@ export default {
       tableData:[],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 20,
+      pageSize: 50,
       tableDataTotal: null,
       selected:[],
       xzdjCalss:'',