Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

# Conflicts:
#	dsk-system/src/main/java/com/dsk/system/service/impl/BusinessOverviewServiceImpl.java

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessOverviewController.java

 package com.dsk.web.controller.business;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.SecurityUtils;
@@ -8,6 +9,7 @@ import com.dsk.system.service.IBusinessOverviewService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -46,4 +48,22 @@ public class BusinessOverviewController extends BaseController {
     public AjaxResult typeAnalyze(){
         return AjaxResult.success(baseService.typeAnalyze(new BusinessSearchDto(SecurityUtils.getUserId(),2)));
     }
+
+    /**
+     * 公招项目地区统计
+     * @return
+     */
+    @GetMapping("/countGroupByProvince")
+    public AjaxResult countGroupByProvince(@RequestBody JSONObject object){
+        return baseService.countGroupByProvince(object);
+    }
+
+    /**
+     * 公招项目投资金额统计
+     * @return
+     */
+    @GetMapping("/rangByMoney")
+    public AjaxResult rangByMoney(@RequestBody JSONObject object){
+        return baseService.rangByMoney(object);
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseBussinessController.java

@@ -43,7 +43,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
-    public Map<String, Object> clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
+    public TableDataInfo clientProjectPage(@RequestBody @Valid EnterpriseBussinessClientProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
@@ -67,7 +67,7 @@ public class EnterpriseBussinessController {
 
     @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
-    public Map<String, Object> supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
+    public TableDataInfo supplierProjectPage(@RequestBody @Valid EnterpriseBussinessSupplierProjectPageBody paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
@@ -102,4 +102,24 @@ public class EnterpriseBussinessController {
     }
 
 
+    @ApiOperation(value = "中标公示详情")
+    @RequestMapping(value = "/bidWinMergeDetail", method = RequestMethod.POST)
+    public R bidWinMergeDetail(@RequestBody EnterpriseBusinessBidWinMergeDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.bidWinMergeDetail(paramMap);
+    }
+
+
+    @ApiOperation(value = "四库业绩详情")
+    @RequestMapping(value = "/skyProjectDetail", method = RequestMethod.POST)
+    public R skyProjectDetail(@RequestBody EnterpriseBusinessSkyProjectDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.skyProjectDetail(paramMap);
+    }
+
+    @ApiOperation(value = "荣誉奖项详情")
+    @RequestMapping(value = "/awardDetail", method = RequestMethod.POST)
+    public R awardDetail(@RequestBody EnterpriseBusinessAwardDetailBody paramMap) throws Exception {
+        return enterpriseBussinessService.awardDetail(paramMap);
+    }
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessAwardDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessAwardDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessAwardDetailVo.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessAwardDetailVo {
+    /**
+     * 来源名称
+     */
+    private String sourceName;
+
+    /**
+     * 来源url
+     */
+    private String sourceUrl;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessBidWinMergeDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessBidWinMergeDetailBody {
+    /**
+     * 来源id
+     */
+    @NotNull(message = "id不能为空")
+    private String sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBusinessSkyProjectDetailBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBusinessSkyProjectDetailBody {
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空")
+    private Long sourceId;
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientPageBody.java

@@ -36,4 +36,15 @@ public class EnterpriseBussinessClientPageBody extends BasePage {
         return 0 == cid;
     }
 
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessClientProjectPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,10 +21,10 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 企业id
+     * 客户企业Id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer unitId;
+    private Integer companyId;
 
     /**
      * 查询关键字
@@ -32,7 +33,29 @@ public class EnterpriseBussinessClientProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid || 0 == unitId;
+        return 0 == cid || 0 == companyId;
     }
 
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
+    /**
+     * 金额起
+     */
+    private Double amountStart;
+
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -34,4 +35,15 @@ public class EnterpriseBussinessSupplierPageBody extends BasePage {
     public boolean isVaildCid() {
         return 0 == cid;
     }
+
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -7,6 +7,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.AssertFalse;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 @ToString
@@ -20,10 +21,10 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
     private Integer cid;
 
     /**
-     * 企业id
+     * 供应商企业Id
      */
     @NotNull(message = "企业id不能为空")
-    private Integer unitId;
+    private Integer companyId;
 
     /**
      * 查询关键字
@@ -32,8 +33,28 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
 
 
     public boolean isVaildCid() {
-        return 0 == cid || 0 == unitId;
+        return 0 == cid || 0 == companyId;
     }
-    
 
+
+    /**
+     * 来源
+     */
+    private List<String> sources;
+
+
+    /**
+     * 项目类型
+     */
+    private List<String> projects;
+
+    /**
+     * 金额起
+     */
+    private Double amountStart;
+
+    /**
+     * 金额止
+     */
+    private Double amountEnd;
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessVo.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseBussinessVo {
+    /**
+     * 来源Id
+     */
+    private String source_id;
+
+    /**
+     * 类型
+     */
+    private String source_type;
+
+}

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

+import request from "@/utils/request";
+
+// 集团成员列表
+export function memberList(data) {
+  return request({
+    url: '/combine/info/memberList',
+    method: 'post',
+    data: data
+  })
+}
+
+// 集团成员-主营业务
+export function memberCount(data) {
+  return request({
+    url: '/combine/info/group/memberCount',
+    method: 'post',
+    data: data
+  })
+}
+// 集团资质列表
+export function certificateList(data) {
+  return request({
+    url: '/combine/info/certificateList',
+    method: 'post',
+    data: data
+  })
+}
+// 集团资质列表-详情
+export function memberCertificateList(data) {
+  return request({
+    url: '/combine/info/member/certificateList',
+    method: 'post',
+    data: data
+  })
+}
+// 集团资质分组统计
+export function certificateCount(data) {
+  return request({
+    url: '/combine/info/group/certificateCount',
+    method: 'post',
+    data: data
+  })
+}
+
+// 集团业绩列表
+export function businessList(data) {
+  return request({
+    url: '/combine/info/businessList',
+    method: 'post',
+    data: data
+  })
+}

dsk-operate-ui/src/api/macro/macro.js

@@ -100,7 +100,16 @@ export function countNewsBidByMonth(param) {
     data: param
   })
 }
-//全国商机项目分析-全国土地交易项目年份统计
+
+//全国中标市场分析-全国中标项目统计
+export function countBidByType(param) {
+  return request({
+    url: '/marketAnalysis/countBidByType',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国各地区中标统计TOP10
 export function countBidGroupByProvince(param) {
   return request({
     url: '/marketAnalysis/countBidGroupByProvince',
@@ -108,6 +117,37 @@ export function countBidGroupByProvince(param) {
     data: param
   })
 }
+//全国中标市场分析-全国中标金额分析
+export function rangeBidMoney(param) {
+  return request({
+    url: '/marketAnalysis/rangeBidMoney',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国中标趋势分析
+export function rangeBidFiveYears() {
+  return request({
+    url: '/marketAnalysis/rangeBidFiveYears',
+    method: 'POST',
+  })
+}
+//全国中标市场分析-全国中标下浮率分析
+export function lowerRateByYear(param) {
+  return request({
+    url: '/marketAnalysis/lowerRateByYear',
+    method: 'POST',
+    data: param
+  })
+}
+//全国中标市场分析-全国中标业绩项目类型下浮率
+export function lowerRangeTenderType(param) {
+  return request({
+    url: '/marketAnalysis/lowerRangeTenderType',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

dsk-operate-ui/src/router/index.js

@@ -77,6 +77,7 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
+    hidden: true,
     redirect: 'urban',
     children: [
       {
@@ -101,6 +102,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/groupAccount',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: '/groupAccount/:id',
+        component: () => import('@/views/detail/groupAccount/index'),
+        name: 'GroupAccount',
+        meta: { title: '集团户详情', icon: 'enterprise', noCache: false },
+      }
+    ]
+  },
   {
     path: '/enterprise',
     component: Layout,

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

+<template>
+  <div id="detailPart" class="sides-container" :style="sideHeight?'height:'+sideHeight+'px':''">
+    <el-input
+      placeholder="搜索"
+      class="side-input"
+      v-model="searchText"
+      clearable
+      @input="handleSearch(true)"
+      @keyup.enter.native="handleSearch()">
+      <i slot="prefix" class="el-input__icon el-icon-search" @click="handleSearch()"></i>
+    </el-input>
+    <el-menu
+      ref="sideMenu"
+      :unique-opened="true"
+      :default-active="searchIndex?searchIndex:routeIndex"
+      class="detail-menu"
+      @open="handleOpen">
+      <template v-for="(item, index) in sideRoute">
+        <template>
+          <el-menu-item :index="index.toString()" @click="handleItem(item)">{{item.title}}</el-menu-item>
+        </template>
+      </template>
+    </el-menu>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Sidebar',
+  props: {
+    partBoxHeight: {
+      type: Number,
+      default: null
+    },
+    pathName: {
+      type: String,
+      default: null
+    },
+    customerId: {
+      type: String,
+      default: ''
+    },
+    isCompany: {
+      type: Boolean,
+      default: true
+    },
+  },
+  data() {
+    return {
+      searchText: '',
+      sideRoute: [
+        {title: '集团成员', pathName: 'members'},
+        {title: '集团资质', pathName: 'qualifications'},
+        {title: '集团业绩', pathName: 'performance'},
+      ],
+      defaultRoute: [],
+      customer:[
+        'members',
+        'qualifications',
+        'performance',
+      ],
+      uniqueOpened:false,
+      searchIndex: ''
+    }
+  },
+  computed: {
+    sideHeight() {
+      let sideHeight = document.getElementById("detailPart")?document.getElementById("detailPart").offsetHeight:null, bowerHeight = document.body.clientHeight-170 || null
+      if(this.partBoxHeight<bowerHeight) {
+        sideHeight = bowerHeight
+      }else{
+        sideHeight = '1222'/*this.partBoxHeight*/
+      }
+      return sideHeight
+    },
+    routeIndex(){
+      let idx = this.getRouteIdx('', this.pathName) || '0'
+      return idx
+    }
+  },
+  created() {
+    this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
+  },
+  watch:{
+
+  },
+  methods: {
+    handleOpen(key, keyPath) {
+
+    },
+    handleItem(item){
+      this.$emit("currentPath", item)
+    },
+    handleSearch(flag){
+      if((this.searchText&&!flag) || (!this.searchText&&flag)){
+        let idx = this.getRouteIdx(this.searchText)
+        if(idx){
+          if(idx.includes('-')){
+            let openIdx = idx.slice(0, 1)
+            this.sideRoute = [this.defaultRoute[openIdx]]
+            this.$refs.sideMenu.open(openIdx)
+          }else{
+            this.sideRoute = [this.defaultRoute[idx]]
+          }
+          this.searchIndex = '-1'
+        }else{
+          this.sideRoute = this.defaultRoute
+          this.searchIndex = ''
+        }
+      }
+    },
+    getRouteIdx(pathTitle, pathName){
+      let idx = '', sideArr = this.sideRoute==this.defaultRoute?this.sideRoute:this.defaultRoute
+      for(let i=0; i < sideArr.length; i++){
+        if(sideArr[i].title == pathTitle || sideArr[i].pathName == pathName){
+          idx = i.toString()
+          break
+        }else if(sideArr[i].children){
+          for(let j=0; j< sideArr[i].children.length ; j++){
+            if(sideArr[i].children[j].title == pathTitle || sideArr[i].children[j].pathName == pathName){
+              idx = i+'-'+j
+              break
+            }
+          }
+        }
+      }
+      return idx
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  #app{
+    .sides-container{
+      width: 144px;
+      min-height: calc(100vh - 170px);
+      padding-bottom: 20px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      .side-input{
+        width: 128px;
+        margin-top: 16px;
+        margin-left: 8px;
+        border: 0;
+        ::v-deep .el-input__inner{
+          height: 32px;
+          background: #F3F3F4;
+          border-radius: 20px;
+          border: 0;
+          &::placeholder {
+            color: #3D3D3D;
+          }
+        }
+        .el-icon-search{
+          line-height: 34px;
+          color: #0081FF;
+          cursor: pointer;
+        }
+      }
+      .detail-menu{
+        margin-top: 20px;
+        border-right: 0;
+        ::v-deep .el-menu-item, ::v-deep .el-submenu__title{
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
+          color: #232323;
+          padding: 0 0 0 16px !important;
+          text-align: initial !important;
+          &:hover, &:focus, &.is-active{
+            color: #0081FF !important;
+            background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
+          }
+          .el-submenu__icon-arrow{
+            color: #232323;
+            right: 48px;
+            margin-top: -5px;
+          }
+        }
+        .is-disabled:hover{
+          color: rgba(35, 35, 35, 0.8)!important;
+          &:before {
+            color: rgba(35, 35, 35, 0.8)!important;
+          }
+        }
+        ::v-deep .el-submenu .el-menu-item{
+          font-size: 12px;
+          color: rgba(35,35,35,0.8);
+          padding: 0 0 0 27px !important;
+          min-width: 144px !important;
+          position: relative;
+          &:before {
+            content: "";
+            position: absolute;
+            top: 14px;
+            left: 21px;
+            width: 2px;
+            height: 2px;
+            background: #0081FF;
+            border-radius: 50%;
+          }
+        }
+      }
+    }
+  }
+</style>

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

+<template>
+  <div class="performance">
+    <head-form
+      title="集团业绩"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    >
+      <template slot="slot">
+
+      </template>
+    </head-form>
+    <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+    <tables
+      v-if="!isSkeleton"
+      :indexFixed="true"
+      :defaultSort="defaultSort"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+      @sort-change="sortChange"
+    >
+      <template slot="bidTime" slot-scope="scope">
+        <div>{{formatDate(scope.row.bidTime)}}</div>
+      </template>
+      <template slot="companyName" slot-scope="scope">
+        <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+        <div v-else v-html="scope.row.companyName || '--'"></div>
+      </template>
+      <template slot="projectName" slot-scope="scope">
+        <router-link :to="`/biddetail/${scope.row.projectId}`" tag="a" class="a-link" v-if="scope.row.projectId" v-html="scope.row.projectName"></router-link>
+        <div v-else v-html="scope.row.projectName || '--'"></div>
+      </template>
+      <template slot="projectUnit" slot-scope="scope">
+        <router-link :to="scope.row.projectUnitUipId?`/enterprise/${encodeStr(scope.row.projectUnitId)}`:`/company/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.projectUnit" v-html="scope.row.projectUnit"></router-link>
+        <div v-else v-html="scope.row.projectUnit || '--'"></div>
+      </template>
+    </tables>
+  </div>
+</template>
+
+<script>
+  import mixin from '../../party-a/mixins/mixin'
+  import {businessList} from '@/api/detail/groupAccount/groupAccount'
+  import dataRegion from '@/assets/json/dataRegion'
+  import { getDictType } from '@/api/main'
+  export default {
+    name: 'qualifications',
+    props: ['companyId'],
+    mixins: [mixin],
+    components:{},
+    data(){
+      return{
+        isSkeleton:true,
+        tableLoading:false,
+        isDetails: false,
+        defaultSort: {prop: 'time', order: 'descending'},
+        queryParams: {
+          combineId: '81de7ca2a967d91c2afad9cb5fc30e6d',
+          pageNum: 1,
+          pageSize: 20
+        },
+        forData: [
+          {label: '中标时间', prop: 'bidTime',slot: true,minWidth: '100'},
+          {label: '中标成员', prop: 'companyName', slot: true,minWidth: '150'},
+          {label: '持股比例（%）', prop: 'stockPercent',minWidth: '150'},
+          {label: '项目名称', prop: 'projectName', slot: true,minWidth: '200'},
+          {label: '中标金额（万元）', prop: 'bidAmount',minWidth: '150'},
+          {label: '中标地区', prop: 'address',minWidth: '100'},
+          {label: '业绩类型', prop: 'boundType',minWidth: '100'},
+          {label: '项目类型', prop: 'projectType',minWidth: '100'},
+          {label: '业主单位', prop: 'projectUnit', slot: true,minWidth: '200'},
+        ],
+        formData: [
+          { type: 7, fieldName: 'combineMemberLevel', value: '',props: {multiple: true}, placeholder: '项目地区', options:[]},
+          { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[] },
+          { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
+          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: []},
+          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: []},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: []},
+          { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
+        ],
+        tableData:[],
+        tableDataTotal:0,
+        addressList: [],
+        cgblList: [
+          {name:'100%',value:'100%'},
+          {name:'50%以上',value:'50%以上'},
+          {name:'20%以上',value:'20%以上'},
+          {name:'5%以上',value:'5%以上'},
+          {name:'1%-5%',value:'1%-5%'},
+        ],
+        timeList: ['近三天', '近七天', '近半月', '自定义'],
+        moneyList: ['5000万以下', '5000万-1亿', '1亿-5亿', '5亿-10亿','10亿以上', '自定义'],
+      }
+    },
+    created() {
+      this.dataRegion()
+      this.handleQuery()
+      this.formData[1].timeList=this.timeList;
+      this.formData[2].moneyList=this.moneyList;
+      this.formData[5].options=this.cgblList;
+
+      //业绩类型
+      getDictType('bound_type').then(result=>{
+        let data = result.code == 200 ? result.data:[];
+        if(data.length > 0){
+          for (var i=0;i<data.length;i++){
+            this.formData[3].options.push({
+              name: data[i].dictLabel,
+              value: data[i].dictValue,
+            })
+          }
+        }
+      })
+      //项目类型
+      getDictType('project_type_new').then(result=>{
+        let data = result.code == 200 ? result.data:[];
+        if(data.length > 0){
+          for (var i=0;i<data.length;i++){
+            this.formData[4].options.push({
+              name: data[i].dictLabel,
+              value: data[i].dictValue,
+            })
+          }
+        }
+      })
+
+
+    },
+    methods: {
+      handleQuery(params){
+        this.isSkeleton = true
+        let data = params ? params : this.queryParams;
+        if(data.cgbl){
+          if(data.cgbl === '100%'){
+            data.minStockPercent=1
+          }
+          if(data.cgbl === '50%以上'){
+            data.minStockPercent=0.5
+          }
+          if(data.cgbl === '20%以上'){
+            data.minStockPercent=0.2
+          }
+          if(data.cgbl === '5%以上'){
+            data.minStockPercent=0.05
+          }
+          if(data.cgbl === '1%-5%'){
+            data.minStockPercent=0.01
+            data.maxStockPercent=0.05
+          }
+          delete data.cgbl
+        }
+        businessList(data).then(res=>{
+          this.tableData = res.code == 200 ? res.rows:[]
+          this.tableDataTotal = res.total
+          this.isSkeleton = false
+        })
+      },
+      formatDate(timestamp) {
+        var time = new Date(timestamp)
+        let year = time.getFullYear();
+        let month = time.getMonth() + 1 >= 10 ? parseInt(time.getMonth() + 1) : "0" + parseInt(time.getMonth() + 1);
+        let day = time.getDate() >= 10 ? time.getDate() : "0" + time.getDate();
+        return year + '-' + month + '-' + day
+      },
+      //地区
+      async dataRegion() {
+        var str = [];
+        for (let x = 0; x < 3; x++) {
+          for (let i = 0; i < dataRegion.length; i++) {
+            if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+              str.push({
+                'id': dataRegion[i].id,
+                "label": dataRegion[i].regionName,
+                "short": dataRegion[i].short,
+                "value": dataRegion[i].parentId,
+                "children": []
+              });
+            } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+              for (let j = 0; j < str.length; j++) {
+                if (str[j].id == dataRegion[i].parentId) {
+                  str[j].children.push({
+                    'id': dataRegion[i].id,
+                    "label": dataRegion[i].regionName,
+                    "short": dataRegion[i].short,
+                    "value": dataRegion[i].parentId,
+                    "children": []
+                  });
+                }
+              }
+            } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+              for (let j = 0; j < str.length; j++) {
+                for (let k = 0; k < str[j].children.length; k++) {
+                  if (str[j].children[k].id == dataRegion[i].parentId) {
+                    str[j].children[k].children.push({
+                      'id': dataRegion[i].id,
+                      "label": dataRegion[i].regionName,
+                      "short": dataRegion[i].short,
+                      "value": dataRegion[i].parentId
+                      // "children":[]
+                    });
+                  }
+                }
+              }
+            }
+          }
+        }
+        this.addressList = str;
+        this.formData[0].options=str;
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .performance{
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 16px;
+    .headForm{
+      margin-bottom: 14px;
+      .common-title{
+        margin-right: 24px;
+      }
+    }
+  }
+</style>

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

+<template>
+  <div class="qualifications">
+    <head-form
+      title="集团资质"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    />
+    <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
+    <tables
+      v-if="!isSkeleton"
+      :indexFixed="true"
+      :defaultSort="defaultSort"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+      @sort-change="sortChange"
+    >
+      <template slot="companyCount" slot-scope="scope">
+        <div style="cursor: pointer;color: #0081FF;" @click="handleClick($event, scope.row)" v-html="scope.row.companyCount || '--'"></div>
+      </template>
+    </tables>
+    <qualifications-detail
+      v-if="isDetails"
+      :data="rowData"
+      :title="title"
+      @cancel="isDetails=false" />
+  </div>
+</template>
+
+<script>
+  import mixin from '../../party-a/mixins/mixin'
+  import {certificateList,certificateCount} from '@/api/detail/groupAccount/groupAccount'
+  import QualificationsDetail from './qualificationsDetail'
+  export default {
+    name: 'qualifications',
+    props: ['companyId','companyInfo'],
+    mixins: [mixin],
+    components:{
+      QualificationsDetail
+    },
+    data(){
+      return{
+        isSkeleton:true,
+        tableLoading:false,
+        isDetails: false,
+        defaultSort: {prop: 'time', order: 'descending'},
+        queryParams: {
+          combineId:'54355f88a5b16d3e52f74931f5567853',
+          pageNum: 1,
+          pageSize: 10
+        },
+        forData: [
+          {label: '资质名称', prop: 'qualificationName'},
+          {label: '拥有该资质成员', prop: 'companyCount', slot: true},
+        ],
+        formData: [
+          { type: 4, fieldName: 'combineMemberLevel', value: '', placeholder: '筛选', options:[]},
+        ],
+        tableData:[],
+        tableDataTotal:0,
+        title:'',
+        rowData:''
+      }
+    },
+    created() {
+      this.handleQuery()
+      this.getCertificateList()
+    },
+    methods: {
+      handleQuery(params){
+        this.isSkeleton = true
+        let data = params ? params : this.queryParams
+        certificateList(data).then(res=>{
+          this.tableData = res.rows
+          this.tableDataTotal = res.total
+          this.isSkeleton = false
+        })
+      },
+      getCertificateList(){
+        certificateCount({combineId: this.queryParams.combineId}).then(res=>{
+          let data = res.data
+          for(let i=0; i<data.length; i++){
+            this.formData[0].options.push({
+              name:  data[i].qualificationName+ '（' + data[i].companyCount + '）',
+              value: data[i].qualificationType,
+            })
+          }
+        })
+      },
+      handleClick(e, data) {
+        this.title=this.companyInfo.companyName+data.qualificationName+'（'+ data.companyCount +'）'
+        this.rowData = data
+        this.isDetails = true
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .qualifications{
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 16px;
+    .headForm{
+      margin-bottom: 14px;
+      .common-title{
+        margin-right: 24px;
+      }
+    }
+  }
+</style>

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

+<template>
+  <div class="client-details">
+    <el-drawer
+      :visible.sync="drawer"
+      size="40%"
+      custom-class="client-drawer"
+      :with-header="false"
+      @closed="cancel">
+      <tables
+        :indexFixed="true"
+        :tableLoading="tableLoading"
+        :tableData="tableData"
+        :forData="forData"
+        :tableDataTotal="tableDataTotal"
+        :queryParams="queryParams"
+        @handle-current-change="handleCurrentChange"
+        style="margin: 12px;"
+      >
+        <template slot="companyName" slot-scope="scope">
+          <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.companyId)}`:`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+          <div v-else v-html="scope.row.companyName || '--'"></div>
+        </template>
+      </tables>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+  import mixin from '../../party-a/mixins/mixin'
+  import {memberCertificateList} from '@/api/detail/groupAccount/groupAccount'
+
+export default {
+  props: [
+    'data',
+    'title'
+  ],
+  components: { },
+  mixins: [mixin],
+  data() {
+    return {
+      drawer: false,
+      queryParams: {
+        id: this.data.id,
+        pageNum: 1,
+        pageSize: 10
+      },
+      formData: [
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目/工程名称查询', options: []},
+      ],
+      forData: [
+        {label: '拥有该资质成员', prop: 'companyName', slot: true},
+        {label: '成员共有资质（个）', prop: 'certificateCount'},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+      amountTotal: 0
+    }
+  },
+  created() {
+    this.drawer = true
+    this.handleQuery()
+  },
+  methods: {
+    async handleQuery(params) {
+      this.tableLoading = true
+      let param = params?params:this.queryParams
+      let res = await memberCertificateList(param)
+      this.tableLoading = false
+      if(res.code==200){
+        this.tableData = res.rows
+      }
+      this.tableDataTotal = res.total
+      // this.amountTotal = res.totalAmount
+    },
+    handlePic(url, isPic){
+      isPic ? url = 'https://imgs.jiansheku.com/'+url : ''
+      if(url){
+        window.open(url, "_blank")
+      }
+    },
+    linkTo(scope){
+      this.drawer = false
+      this.$router.push(`/biddetail/${scope.row.id}`)
+    },
+    cancel() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .client-details {
+    ::v-deep .client-drawer{
+      background: #FFFFFF;
+    }
+    .tip-img{
+      width: 14px;
+      height: 14px;
+      margin-right: 4px;
+      cursor: pointer;
+    }
+  }
+</style>

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

+<template>
+  <el-skeleton  animated>
+    <template slot="template">
+      <el-skeleton-item variant="text" style="width: 60%;"/>
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 60%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+    </template>
+  </el-skeleton>
+</template>
+
+<script>
+  export default {
+    name: 'skeleton'
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-skeleton__item{
+  height: 20px;
+  border-radius: 0;
+  margin: 9px 0;
+  background: #f0f0f0;
+}
+</style>

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

+<template>
+  <div class="app-container group-container">
+    <div class="header-container">
+      <div class="flex-box part-header">
+        <img class="header-logo" :src="require('@/assets/images/detail/company_logo.png')">
+        {{name || '--'}}
+      </div>
+    </div>
+    <div class="flex-box group-main">
+      <div class="group-left">
+        <side-bar ref="sidebar" @currentPath="showPartPage" :pathName="currentPath.pathName" :customerId="customerId"/>
+      </div>
+      <div class="group-right">
+        <div id="groupBox" v-if="customerId">
+          <Members v-if="currentPath.pathName=='members'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
+          <Qualifications v-if="currentPath.pathName=='qualifications'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
+          <Performance v-if="currentPath.pathName=='performance'" :company-id="companyId" :isSkeleton="isSkeleton" :companyInfo="companyInfo" />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { idRemark } from '@/api/common'
+  import SideBar from "./component/Sidebar"
+  import Members from "./component/members"
+  import Qualifications from "./component/qualifications"
+  import Performance from "./component/performance"
+  import { infoHeader } from '@/api/detail/party-a/index'
+  import elementResizeDetectorMaker from "element-resize-detector"
+  export default {
+    name: 'GroupAccount',
+    components:{
+      SideBar,Members,Qualifications,Performance
+    },
+    data(){
+      return{
+        companyId: '3068',  //企业Id（测试默认3068）
+        customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
+        companyInfo: {},
+        cooDetail: {},
+        currentPath: {
+          pathName: 'members'  //默认展示页
+        },
+        isCompany: false,
+        isSkeleton: false,
+        name:''
+      }
+    },
+    created() {
+      if (this.$route.params.id) { // customerId
+        this.customerId = this.$route.params.id
+      }
+      // if (this.$route.query.path) { // 获取跳转对应板块
+      //   this.currentPath.pathName = this.$route.query.path
+      // }
+      // this.$route.query.name=''
+      this.name=this.$route.query.name ? this.$route.query.name : '中建集团'
+    },
+    mounted(){
+    },
+    methods: {
+      showPartPage(e){
+        this.currentPath = e
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .group-container{
+    padding: 0;
+  }
+  .group-main{
+    margin-top: 12px;
+    align-items: initial;
+  }
+  .group-left{
+    margin-right: 16px;
+  }
+  .group-right{
+    min-width: 1088px;
+    width: 100%;
+    background: #FFFFFF;
+    border-radius: 4px;
+  }
+  .part-header{
+    font-size: 16px;
+    font-weight: bold;
+    color: #232323;
+    background: #FFFFFF;
+    padding: 14px 16px;
+    margin-top: 12px;
+    border-radius: 4px;
+    .header-logo{
+      width: 28px;
+      height: 28px;
+      margin-right: 16px;
+    }
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/component/CustomMoneySelect.vue

@@ -12,8 +12,27 @@
         <div class="arrow"></div>
         <div @click="handleClick(option)" :class="['option', value==option?'active':'']" :key="i" v-for="(option, i) in options">
           <template v-if="option == '自定义'">
-            <div class="number-box">
-              <input type="number" v-model="startMoney" class="number-input" clearable>&nbsp;&nbsp;至&nbsp;&nbsp;<input v-model="endMoney" class="number-input" type="text" clearable>&nbsp;&nbsp;万元&nbsp;&nbsp;<el-button @click.stop="handleConfirm" class="number-button" type="primary">确定</el-button>
+            <!--<div class="number-box">-->
+              <!--<input type="number" v-model="startMoney" class="number-input" clearable>&nbsp;&nbsp;至&nbsp;&nbsp;<input v-model="endMoney" class="number-input" type="text" clearable>&nbsp;&nbsp;万元&nbsp;&nbsp;<el-button @click.stop="handleConfirm" class="number-button" type="primary">确定</el-button>-->
+            <!--</div>-->
+            <div style="position: relative">
+              自定义
+              <div class="popper_box" style="position: absolute" v-if="value === '自定义'">
+                <div class="popper_wrap">
+                  从
+                  <el-input class="popper_input" type="number" clearable v-model="startMoney"></el-input>
+                  万
+                </div>
+                <div class="popper_wrap">
+                  到
+                  <el-input class="popper_input" type="number" clearable v-model="endMoney"></el-input>
+                  万
+                </div>
+                <div style="">
+                  <el-button size="mini" @click.stop="cancellation">取消</el-button>
+                  <el-button type="primary" size="mini" @click.stop="handleConfirm">确定</el-button>
+                </div>
+              </div>
             </div>
           </template>
           <template v-else>
@@ -88,11 +107,11 @@ export default {
         // const flag = document.getElementById('custom-money-select').contains(e.target)
         !flag ? this.isSelectOption = false : ''
 
-        if(this.value == '自定义' && !this.startMoney && !this.endMoney) {
-          this.value = ''
-          this.$emit('input', '')
-          this.$emit('handle-search')
-        }
+        // if(this.value == '自定义' && !this.startMoney && !this.endMoney) {
+        //   this.value = ''
+        //   this.$emit('input', '')
+        //   this.$emit('handle-search')
+        // }
       }, true)
     },
     // 清除
@@ -120,33 +139,42 @@ export default {
       this.value = value
       let moneyStr = ''
       if(value == '自定义') {
-        this.value = '自定义'
+        this.value = '自定义';
       }else {
         this.startMoney = ''
         this.endMoney = ''
         this.isSelectOption = false
         switch (value) {
+          case '10亿以上':
+            moneyStr = [100000]
+            break;
           case '一亿以上':
             moneyStr = [10000]
             break;
+          case '1亿-10亿':
+            moneyStr = [10000, 100000]
+            break;
+          case '1亿-5亿':
+            moneyStr = [10000, 50000]
+            break;
           case '5000万-1亿':
             moneyStr = [5000, 10000]
             break;
           case '1000万-5000万':
             moneyStr = [1000, 5000]
             break;
-          case '10亿以上':
-            moneyStr = [100000]
-            break;
-          case '1亿-10亿':
-            moneyStr = [10000, 100000]
-            break;
           case '2000万-1亿':
             moneyStr = [2000, 10000]
             break;
           case '400万-2000万':
             moneyStr = [400, 2000]
             break;
+          case '5000万以下':
+            moneyStr = [, 5000]
+            break;
+          case '1000万以下':
+            moneyStr = [, 1000]
+            break;
           case '400万以下':
             moneyStr = [, 400]
             break;
@@ -158,6 +186,13 @@ export default {
         this.$emit('handle-search')
       }
     },
+    // 自定义取消
+    cancellation(){
+      this.isSelectOption = false
+      this.value = ''
+      this.$emit('input', '')
+      this.$emit('handle-search')
+    },
     // 自定义确认点击后的回调
     handleConfirm() {
       this.isSelectOption = false
@@ -271,7 +306,7 @@ export default {
       .option {
         padding: 0 24px 0 16px;
         box-sizing: border-box;
-        width: 400px;
+        width: 140px;
         height: 36px;
         display: flex;
         justify-content: space-between;
@@ -294,8 +329,6 @@ export default {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
-            width: 206px;
-            border: 1px solid #DCDCDC;
             border-radius: 2px;
 
             &::-webkit-outer-spin-button,
@@ -360,5 +393,47 @@ export default {
       line-height: 30px;
       margin-left: 10px;
     }
+
+    .popper_box {
+      position: absolute;
+      left: 128px;
+      bottom: -15px;
+      background: #ffffff;
+      width: 186px;
+      color: #606266;
+      text-indent: 0;
+      padding: 16px;
+      padding-top: 0px;
+      border: 1px solid #e0e0e0;
+      .popper_wrap {
+        margin-top: 16px;
+        display: inline-block;
+        .popper_input {
+          width: 100px;
+          display: inline-block;
+          margin: 0px 8px;
+          line-height: 34px;
+        }
+        .el-input__inner {
+          width: 100px;
+        }
+      }
+      input::-webkit-outer-spin-button,
+      input::-webkit-inner-spin-button {
+        -webkit-appearance: none !important;
+      }
+      input[type='number'] {
+        -moz-appearance: textfield;
+      }
+    }
+    .popper_box div:last-child {
+      display: flex;
+      justify-content: center;
+      margin-top: 16px;
+    }
+
+
+
+
   }
 </style>

dsk-operate-ui/src/views/detail/party-a/component/CustomTimeSelect.vue

@@ -57,6 +57,10 @@ export default {
     dateTo: {
       type: String,
       default: ''
+    },
+    timeList: {
+      type: Array,
+      default: () => [],
     }
   },
   computed: {
@@ -103,6 +107,9 @@ export default {
       this.defaultValue = new Date(this.dateTo)
     }
     this.handleAppClick()
+    if(this.timeList&&this.timeList.length>0){
+      this.options = this.timeList
+    }
   },
   methods: {
     // 时间格式化
@@ -159,6 +166,18 @@ export default {
         let startTime = ''
         let endTime = new Date()
         switch (value) {
+          case '近三天':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 3)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
+          case '近七天':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 7)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
+          case '近半月':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 15)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
           case '近1年':
             startTime = new Date().setFullYear(new Date().getFullYear() - 1)
             if(this.dateTo){
@@ -309,7 +328,7 @@ export default {
 
       .el-picker-panel.el-date-range-picker.el-popper {
         left: 0 !important;
-        top: 205px !important;
+        /*top: 205px !important;*/
       }
 
       .popper__arrow {

dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue

@@ -51,12 +51,13 @@
                 style="max-width: 170px"
                 :placeholder="form.placeholder"
                 @change="changeSelect">
-                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
+                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" :disabled="item.disabled"/>
               </el-select>
             </template>
             <!-- 时间、自定义 -->
             <template v-else-if="form.type==5">
               <custom-time-select
+                :timeList="form.timeList"
                 v-model="form.value"
                 :placeholder="form.placeholder"
                 :dateFrom="form.dateFrom ? form.dateFrom : ''"
@@ -81,7 +82,6 @@
                 @change="changeSelect"
                 :placeholder="form.placeholder"
                 collapse-tags
-                style="margin-top: -1px;"
                 clearable></el-cascader>
             </template>
             <!-- 自定义 -->
@@ -143,6 +143,9 @@ export default {
     return {
 
     }
+  },
+  created() {
+
   },
   components: {
     CustomTimeSelect,
@@ -173,22 +176,22 @@ export default {
   }
   ::v-deep .el-input__inner{
     border: 1px solid #D9D9D9;
-    height: 32px;
-    line-height: 32px;
+    height: 34px;
+    line-height: 34px;
     padding-right: 27px;
   }
   ::v-deep .el-form-item{
     margin-right: 8px !important;
   }
   ::v-deep .el-input--medium .el-input__icon{
-    line-height: 32px;
+    line-height: 34px;
   }
   ::v-deep .el-cascader{
-    height: 32px;
-    line-height: 32px;
+    height: 34px;
+    line-height: 34px;
     .el-input{
       input{
-        height: 32px !important;
+        height: 34px !important;
       }
     }
     .el-cascader__tags{

dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue

@@ -147,7 +147,6 @@ export default {
   },
   created() {
     this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
-
   },
   watch:{
     statisticObj:{

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -288,7 +288,6 @@ export default {
         this.uipGroupDatalist = res.data
       })
     },
-
     changeXZDJ(index) {
       this.queryParams.uipExecutiveLevel = index;
       this.changes()

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

@@ -36,7 +36,7 @@
 
           </el-table-column>
           <el-table-column prop="gdp" label="GDP（亿元）" sortable width="120" :formatter="formatStatus"/>
-          <el-table-column prop="gdpGrowth" label="GDP增速（%）" sortable width="100" :formatter="formatStatus"/>
+          <el-table-column prop="gdpGrowth" label="GDP增速（%）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="gdpPerCapita" label="人均GDP（元）" sortable width="130" :formatter="formatStatus"/>
           <el-table-column prop="population" label="人口（万人）" sortable width="120" :formatter="formatStatus"/>
           <el-table-column prop="fixedInvestment" label="固定资产投资 （亿元） " sortable width="200" :formatter="formatStatus"/>
@@ -100,7 +100,6 @@ export default {
   },
   methods: {
     getData(){
-      this.isSkeleton = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:2 }
       if(this.queryParams.field){
         params.field=this.queryParams.field
@@ -118,6 +117,7 @@ export default {
         params.areaId=[this.provinceId[2]]
       }
       // params.provinceIds=[this.dataQuery.provinceId]
+      // this.isSkeleton = true
       nationalPage(params).then(res => {
         this.isSkeleton = false
         this.tableData = res.data.list

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

@@ -717,6 +717,9 @@ export default {
           //     province:this.dataQuery.province,
           //   }
           // })
+          console.log(this.dataQuery.provinceId)
+          console.log(this.dataQuery.province)
+          // return
           this.$router.push({name: 'Urban',
             params: {
               provinceId: this.dataQuery.provinceId,

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

@@ -31,7 +31,7 @@
           element-loading-text="Loading"
           border
           fit
-          height="640"
+          max-height="640"
           @sort-change="sortChange"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"

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

@@ -587,6 +587,13 @@
               },
               itemStyle:{
                 color: "#FFAB44",
+                normal: {
+                  label : {show: true},
+                  color:"#FFAB44",
+                  lineStyle: {
+                    color: "#FFAB44"
+                  }
+                }
               },
               //设置面积区域为渐变效果
               areaStyle: {

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

@@ -36,7 +36,7 @@
           element-loading-text="Loading"
           @sort-change="sortChange"
           border
-          height="640"
+          max-height="640"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
           :default-sort = "{prop: 'gdp', order: 'descending'}"
@@ -220,7 +220,7 @@
       },
       // 查询提交
       async querySubmit() {
-        this.isSkeleton = true
+        // this.isSkeleton = true
         const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:1 }
         if(this.queryParams.address){
           let arr = this.$refs.address.getCheckedNodes();

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

@@ -4,14 +4,14 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
         <el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
-        <!--<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>-->
-        <el-tab-pane label="全国中标市场分析" name="fourth"></el-tab-pane>
+        <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
+        <el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
       </el-tabs>
     </div>
 
     <Economic v-if="activeName === 'first'"></Economic>
     <Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
-    <!--<Zhongbiao v-if="activeName === 'third'"></Zhongbiao>-->
+    <Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
     <Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
   </div>
 </template>

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

@@ -153,7 +153,7 @@
             element-loading-text="Loading"
             @sort-change="sortChange"
             border
-            height="640"
+            max-height="640"
             fit
             highlight-current-row
           >
@@ -162,6 +162,7 @@
             </el-table-column>
             <el-table-column prop="companyName" label="公司名称" width="300" fixed>
               <template slot-scope="scope">
+                <!--<router-link  :to="`/groupAccount/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>-->
                 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
                 <span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === null || scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
                 <span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
@@ -249,7 +250,7 @@
     <el-dialog :visible.sync="claimVisible" width="244" custom-class='dialog-claim' :show-close="false">
       <div>认领成功，是否完善客户信息？</div>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="innerVisible = true">
+        <el-button @click="claimVisible = false">
           <router-link :to="`/enterprise/${encodeStr(companyId)}?customerId=${customerId}&path=business`" tag="a" >
             立即完善
           </router-link>
@@ -364,7 +365,10 @@ export default {
   created() {
     this.dataRegion()
     this.getType()
-    this.dataQuery=this.$route.query;
+    this.dataQuery=this.$route.params;
+    // console.log(this.dataQuery)
+    // console.log(this.$route.query)
+    // console.log(this.$route.params)
     if(this.dataQuery.provinceId){
       if(Array.isArray(this.dataQuery.province)){
         this.province=this.dataQuery.province[0];

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -130,9 +130,9 @@
           state:2,
         }
         getGZDB(params).then(result=>{
-          this.datalist = result.code == 200?result:[]
-          if(this.datalist){
-            this.yqnum = `已逾期 ${this.datalist.rows.length} 条`;
+          let datalist = result.code == 200?result:[]
+          if(datalist){
+            this.yqnum = `已逾期 ${datalist.rows.length} 条`;
           }
         })
       },

dsk-operate-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
         target: `http://47.104.91.229:9099/prod-api`,
         // target: `http://122.9.160.122:9011`,
         // target: `http://192.168.60.126:9011`,
-        // target: `http://192.168.60.27:8766`,
+        // target: `http://192.168.60.126:9098`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -3,10 +3,12 @@ package com.dsk.system.dskService;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,23 +58,40 @@ public class EnterpriseBussinessService {
 
     public TableDataInfo clientPage(EnterpriseBussinessClientPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public Map<String, Object> clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
+    public TableDataInfo clientProjectPage(EnterpriseBussinessClientProjectPageBody body) throws Exception {
         if (body.isVaildCid()) return null;
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/clientProjectPage2", BeanUtil.beanToMap(body, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -121,25 +140,46 @@ public class EnterpriseBussinessService {
 
 
     public TableDataInfo supplierPage(EnterpriseBussinessSupplierPageBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage", BeanUtil.beanToMap(body, false, false));
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierPage2", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public Map<String, Object> supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
-        if (body.isVaildCid()) return null;
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage", BeanUtil.beanToMap(body, false, false));
+    public TableDataInfo supplierProjectPage(EnterpriseBussinessSupplierProjectPageBody body) throws Exception {
+        if (body.isVaildCid()) {
+            return new TableDataInfo(new ArrayList<>(), 0);
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/supplierProjectPage2", BeanUtil.beanToMap(body, false, false));
         log.info(JSONUtil.toJsonStr(map));
+
         Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
         Map data = MapUtils.getMap(map, "data", null);
-        if (200 != code) throw new RuntimeException();
-        Integer count = MapUtils.getInteger(data, "totalCount", 0);
-        Object list = MapUtils.getObject(data, "list", "");
-        TableDataInfo tableDataInfo = new TableDataInfo((List<?>) list, count);
-        Map<String, Object> resMap = BeanUtil.beanToMap(tableDataInfo);
-        resMap.put("totalAmount", MapUtils.getDouble(data, "totalAmount", 0.0));
-        return resMap;
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+
+        for (Object supplierProject : list) {
+            Map<String, Object> dataMap = CommonUtils.assertAsMap(supplierProject);
+            dataMap.put("sourceId", null);
+            dataMap.put("sourceType", null);
+            String source = MapUtils.getString(dataMap, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBussinessVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBussinessVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBussinessVo vo = enterpriseBussinessVoList.get(0);
+                    dataMap.put("sourceId", vo.getSource_id());
+                    dataMap.put("sourceType", vo.getSource_type());
+                }
+            }
+        }
+        return new TableDataInfo(list, MapUtils.getInteger(data, "totalCount", 0));
     }
 
 
@@ -175,4 +215,34 @@ public class EnterpriseBussinessService {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/historySendProvince", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
+
+    public R bidWinMergeDetail(EnterpriseBusinessBidWinMergeDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/bidWinMergeDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R skyProjectDetail(EnterpriseBusinessSkyProjectDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/skyProjectDetail", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R awardDetail(EnterpriseBusinessAwardDetailBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseBussiness/awardDetail", BeanUtil.beanToMap(body, false, false));
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) {
+            throw new RuntimeException();
+        }
+        Map data = MapUtils.getMap(map, "data", null);
+        if (ObjectUtil.isNotEmpty(data)) {
+            String source = MapUtils.getString(data, "source");
+            if (ObjectUtil.isNotEmpty(source)) {
+                List<EnterpriseBusinessAwardDetailVo> enterpriseBussinessVoList = JSONUtil.toList(source, EnterpriseBusinessAwardDetailVo.class);
+                if (ObjectUtil.isNotEmpty(enterpriseBussinessVoList.get(0))) {
+                    EnterpriseBusinessAwardDetailVo vo = enterpriseBussinessVoList.get(0);
+                    return R.ok(vo);
+                }
+            }
+        }
+        return BeanUtil.toBean(map, R.class);
+    }
 }

dsk-system/src/main/java/com/dsk/system/service/IBusinessOverviewService.java

 package com.dsk.system.service;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
 import com.dsk.system.domain.business.vo.BusinessAnalyzeVo;
 
@@ -18,4 +20,8 @@ public interface IBusinessOverviewService {
 
     List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto);
 
+    AjaxResult countGroupByProvince(JSONObject object);
+
+    AjaxResult rangByMoney(JSONObject object);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -152,6 +152,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
                             vo.setInvestmentAmount(MapUtil.getDouble(map, "projectContractAmount"));
                         }
                         vo.setProjectType(MapUtil.getStr(map, "projectType"));
+                        vo.setProjectStage(MapUtil.getStr(map, "tenderStage"));
                         vo.setProjectCategory(MapUtil.getStr(map, "projectPurposes"));
                         vos.add(vo);
                     }

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessOverviewServiceImpl.java

 package com.dsk.system.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.annotation.DataScope;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.system.domain.business.dto.BusinessSearchDto;
 import com.dsk.system.domain.business.vo.BusinessAnalyzeVo;
 import com.dsk.system.mapper.BusinessInfoMapper;
 import com.dsk.system.service.IBusinessOverviewService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +27,9 @@ public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
     @Resource
     private BusinessInfoMapper businessInfoMapper;
 
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
     @Override
     @DataScope(userAlias = "u",deptAlias = "d")
     public Map<String, Object> statusStatistics(BusinessSearchDto dto) {
@@ -51,4 +59,16 @@ public class BusinessOverviewServiceImpl implements IBusinessOverviewService {
     public List<BusinessAnalyzeVo> typeAnalyze(BusinessSearchDto dto) {
         return businessInfoMapper.selectTypeAnalyze(dto);
     }
+
+    @Override
+    public AjaxResult countGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/countGroupByProvince", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult rangByMoney(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/project/rangByMoney", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }