修改

dsk-operate-ui/.env.development

@@ -12,8 +12,8 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 
 # 子系统地址
-# VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
-VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.9:3400"
+VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
+# VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.9:3400"
 
 # Bi大屏系统地址
 VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"

dsk-operate-ui/src/views/detail/groupAccount/component/landtransaction.vue

@@ -225,7 +225,16 @@
             document.removeEventListener('click', this.handleSearch1);
           }
         }
-      }
+      },
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.queryParams.combineId=newVal;
+            this.handleSearch()
+          }
+        },
+        deep: true, // 深度监听
+      },
     },
     created() {
       this.searchDic()

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -232,7 +232,17 @@
             document.removeEventListener('click', this.handleSearch1);
           }
         }
-      }
+      },
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.customerId=newVal;
+            this.handleQuery()
+            this.getMemberCount()
+          }
+        },
+        deep: true, // 深度监听
+      },
     },
     created() {
       this.handleQuery()
@@ -294,9 +304,9 @@
         this.paramsData=params || {};
         this.tableLoading=true;
         let data = this.getAreaList(params || this.queryParams)
-        if(!data.combineId){
+        // if(!data.combineId){
           data.combineId=this.customerId;
-        }
+        // }
         this.dataEXCEL=JSON.parse(JSON.stringify(data));
         memberList(data).then(res=>{
           this.isSkeleton = false

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -67,6 +67,17 @@
     props: ['customerId','combineName'],
     mixins: [mixin],
     components:{ExportDialog},
+    watch:{
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.queryParams.combineId=newVal;
+            this.handleQuery()
+          }
+        },
+        deep: true, // 深度监听
+      },
+    },
     data(){
       return{
         isSkeleton:true,

dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue

@@ -62,6 +62,17 @@
     components:{
       QualificationsDetail
     },
+    watch:{
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.queryParams.combineId=newVal;
+            this.getCertificateList()
+          }
+        },
+        deep: true, // 深度监听
+      },
+    },
     data(){
       return{
         isSkeleton:true,

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue

@@ -281,6 +281,23 @@
     props: ['customerId'],
     mixins: [mixin],
     components:{},
+    watch:{
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.queryParams.combineId=newVal;
+            this.queryParams1.combineId=newVal;
+            this.handleQuery()
+            this.getBidByYear()
+            this.getGroupByMoney()
+            this.getGroupByType()
+            this.getGroupByLowerRate()
+            this.getPeojectTop()
+          }
+        },
+        deep: true, // 深度监听
+      },
+    },
     data(){
       return{
         queryParams: {

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

@@ -63,6 +63,17 @@
     props: ['customerId','combineName'],
     mixins: [mixin],
     components:{CustomTimeSelect,CustomMoneySelect,ExportDialog},
+    watch:{
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.queryParams.combineId=newVal;
+            this.handleQuery()
+          }
+        },
+        deep: true, // 深度监听
+      },
+    },
     data(){
       return{
         isSkeleton:true,

dsk-operate-ui/src/views/detail/groupAccount/component/zhaobiao.vue

@@ -27,6 +27,24 @@
         name:this.combineName
       }
     },
+    watch:{
+      customerId: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.id=newVal;
+          }
+        },
+        deep: true, // 深度监听
+      },
+      combineName: {
+        handler(newVal, olVal) {
+          if (newVal) {
+            this.name=newVal;
+          }
+        },
+        deep: true, // 深度监听
+      },
+    },
     created() {
 
     },

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

@@ -3,7 +3,7 @@
     <div class="header-container">
       <div class="flex-box part-header">
         <img class="header-logo" :src="details && details.logoUrl || require('@/assets/images/detail/company_logo.png')">
-        {{name || '--'}}
+        {{details.companyName || '--'}}
       </div>
     </div>
     <div class="flex-box group-main" ref="contentData">
@@ -11,12 +11,24 @@
         <side-bar ref="sidebar" :statisticObj="statisticObj" @currentPath="showPartPage" :pathName="currentPath.pathName" :customerId="customerId"/>
       </div>
       <div class="group-right">
+        <div class="data-list">
+          <div class="list">
+            <div class="item" v-for="(item,index) in detailsList" :class="{'color': color === index}" @click="clickItem(item,index)">
+              <img class="logo" :src="item.logoUrl || require('@/assets/images/detail/company_logo.png')" />
+              <div style="float: left">
+                <h3>{{item.companyName}}</h3>
+                <p>集团成员：{{item.combineMemberNum}}</p>
+                <p>集团本身：{{item.combineMemberName}}</p>
+              </div>
+            </div>
+          </div>
+        </div>
         <div id="groupBox" v-if="customerId">
-          <Members v-if="currentPath.pathName=='members'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
-          <Qualifications v-if="currentPath.pathName=='qualifications'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
-          <Landtransaction v-if="currentPath.pathName=='landtransaction'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
-          <Performance v-if="currentPath.pathName=='performance'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton"  :combineName="name"/>
-          <Zhaobiao v-if="currentPath.pathName=='zhaobiao'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton"  :combineName="name"/>
+          <Members v-if="currentPath.pathName=='members'" @handle-scroll="scrollToTop" :customerId="id" :isSkeleton="isSkeleton" :combineName="name"/>
+          <Qualifications v-if="currentPath.pathName=='qualifications'" @handle-scroll="scrollToTop" :customer-id="id" :isSkeleton="isSkeleton" :combineName="name"/>
+          <Landtransaction v-if="currentPath.pathName=='landtransaction'" @handle-scroll="scrollToTop" :customer-id="id" :isSkeleton="isSkeleton" :combineName="name"/>
+          <Performance v-if="currentPath.pathName=='performance'" @handle-scroll="scrollToTop" :customer-id="id" :isSkeleton="isSkeleton"  :combineName="name"/>
+          <Zhaobiao v-if="currentPath.pathName=='zhaobiao'" @handle-scroll="scrollToTop" :customer-id="id" :isSkeleton="isSkeleton"  :combineName="name"/>
         </div>
       </div>
     </div>
@@ -50,7 +62,10 @@
         isCompany: false,
         isSkeleton: false,
         name:'',
+        id:'',
         details:{},
+        detailsList:[],
+        color:0
       }
     },
     created() {
@@ -58,7 +73,10 @@
         this.customerId = this.$route.params.id
       }
       combineMemberLogo({combineId: this.customerId}).then(res=>{
-        this.details=res.data;
+        this.detailsList=res.data;
+        this.details=res.data[0];
+        this.name=this.$route.query.name ? this.$route.query.name : this.details.companyName
+        this.id = this.$route.params.id
       })
       infoMemberCount({combineId: this.customerId}).then(res=>{
         if(res.code==200){
@@ -68,12 +86,22 @@
       // if (this.$route.query.path) { // 获取跳转对应板块
       //   this.currentPath.pathName = this.$route.query.path
       // }
-      this.name=this.$route.query.name ? this.$route.query.name : this.details.companyName
+
     },
     mounted(){},
     methods: {
+      clickItem(item,index){
+        this.color=index;
+        this.combineId=item.combineId
+        this.id=item.combineId
+        this.name=item.combineName
+      },
       showPartPage(e){
-        this.currentPath = e
+        this.currentPath = e;
+        this.color=0;
+        this.combineId=this.details.combineId
+        this.id=this.details.combineId
+        this.name=this.details.combineName
       },
       scrollToTop() {
         this.$nextTick(() => {
@@ -113,6 +141,49 @@
     background: #FFFFFF;
     border-radius: 4px;
     margin-left: 160px;
+    .data-list{
+      margin: 16px;
+      .item{
+        width: 283px;
+        height: 88px;
+        border-radius: 4px;
+        margin-right: 16px;
+        display: inline-block;
+        border: 1px solid #EFEFEF;
+        padding: 12px;
+        cursor: pointer;
+        .logo{
+          width: 64px;
+          height: 64px;
+          border-radius: 2px;
+          float: left;
+          margin-right: 12px;
+        }
+        h3{
+          font-size: 16px;
+          font-weight: normal;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          width: 178px;
+          margin: 0;
+        }
+        p{
+          font-size: 12px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          width: 178px;
+          margin-top: 6px;
+          margin-bottom: 0;
+        }
+      }
+      .color{
+        background: #0081FF;
+        color:#fff;
+      }
+    }
+
     ::v-deep .el-table__header-wrapper{
       position: sticky;
       top:0;

dsk-operate-ui/src/views/market/index.vue

 <template>
   <div v-loading="loading" class="market-container">
     <iframe id="companyIframe" class="market-iframe" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" width="100%" :src="src" />
+    <!--<iframe id="companyIframe" class="market-iframe" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" width="100%" src="https://www.jianchayun.com/company/56546856314e567a69/?index=true" />-->
   </div>
 </template>
 

dsk-operate-ui/src/views/subsystem/index.vue

@@ -2,6 +2,7 @@
   <div class="subsystem-iframe-container">
     <iframe-com-ins ref="subsystemIframeContainer" :iframeStyles="urlQueryParams.iframeStyles" :styles="urlQueryParams.styles"
       :url="urlQueryParams.url"></iframe-com-ins>
+
   </div>
 </template>
 <script>