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

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

@@ -26,67 +26,67 @@ public class EnterpriseBussinessController {
     @Autowired
     EnterpriseBussinessService enterpriseBussinessService;
 
-    @ApiOperation(value = "客户信息列表")
+    @ApiOperation(value = "客户信息列表（openApi）")
     @RequestMapping(value = "/clientPage", method = RequestMethod.POST)
     public TableDataInfo clientPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.clientPage(paramMap);
     }
 
-    @ApiOperation(value = "客户项目列表")
+    @ApiOperation(value = "客户项目列表（openApi）")
     @RequestMapping(value = "/clientProjectPage", method = RequestMethod.POST)
     public TableDataInfo clientProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.clientProjectPage(paramMap);
     }
 
-    @ApiOperation(value = "投标记录列表（开标记录）")
+    @ApiOperation(value = "投标记录列表（开标记录）（openApi）")
     @RequestMapping(value = "/tenderPage",method = RequestMethod.POST)
     public TableDataInfo tenderPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.tenderPage(paramMap);
     }
 
-    @ApiOperation(value = "投标记录详情（开标记录）")
+    @ApiOperation(value = "投标记录详情（开标记录）（openApi）")
     @RequestMapping(value = "/tenderDetail",method = RequestMethod.POST)
     public R tenderDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.tenderDetail(paramMap);
     }
 
-    @ApiOperation(value = "供应商列表")
+    @ApiOperation(value = "供应商列表（openApi）")
     @RequestMapping(value = "/supplierPage",method = RequestMethod.POST)
     public TableDataInfo supplierPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.supplierPage(paramMap);
     }
 
-    @ApiOperation(value = "供应商项目列表")
+    @ApiOperation(value = "供应商项目列表（openApi）")
     @RequestMapping(value = "/supplierProjectPage",method = RequestMethod.POST)
     public TableDataInfo supplierProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.supplierProjectPage(paramMap);
     }
 
-    @ApiOperation(value = "中标项目详情")
+    @ApiOperation(value = "中标项目详情（openApi）")
     @RequestMapping(value = "/projectDetail", method = RequestMethod.POST)
     public R projectDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.projectDetail(paramMap);
     }
 
-    @ApiOperation(value = "招标代理常合作代理机构列表")
+    @ApiOperation(value = "招标代理常合作代理机构列表（openApi）")
     @RequestMapping(value = "/oftenAgencyPage",method = RequestMethod.POST)
     public TableDataInfo oftenAgencyPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.oftenAgencyPage(paramMap);
     }
 
-    @ApiOperation(value = "招标合作明细列表")
+    @ApiOperation(value = "招标合作明细列表（openApi）")
     @RequestMapping(value = "/bidCooperatePage", method = RequestMethod.POST)
     public TableDataInfo bidCooperatePage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.bidCooperatePage(paramMap);
     }
 
-    @ApiOperation(value = "历史发包列表")
+    @ApiOperation(value = "历史发包列表（openApi）")
     @RequestMapping(value = "/historySendPage", method = RequestMethod.POST)
     public TableDataInfo historySendPage(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.historySendPage(paramMap);
     }
 
-    @ApiOperation(value = "历史发包省份")
+    @ApiOperation(value = "历史发包省份（openApi）")
     @RequestMapping(value = "/historySendProvince", method = RequestMethod.POST)
     public R historySendProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
         return enterpriseBussinessService.historySendProvince(paramMap);

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

@@ -29,97 +29,97 @@ public class EnterpriseCreditController {
     EnterpriseCreditService enterpriseCreditService;
 
     @RequestMapping(value = "/penalizePage", method = RequestMethod.POST)
-    @ApiOperation(value = "行政处罚列表")
+    @ApiOperation(value = "行政处罚列表（openApi）")
     public TableDataInfo penalizePage(@RequestBody @Valid EnterpriseCreditPenalizePageBody body) throws Exception {
         return enterpriseCreditService.penalizePage(body);
     }
 
     @RequestMapping(value = "/penalizeReasonType", method = RequestMethod.POST)
-    @ApiOperation(value = "行政处罚类型")
+    @ApiOperation(value = "行政处罚类型（openApi）")
     public R penalizeReasonType(@RequestBody @Valid EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
         return enterpriseCreditService.penalizeReasonType(body);
     }
 
     @RequestMapping(value = "/abnormalPage", method = RequestMethod.POST)
-    @ApiOperation(value = "经营异常列表")
+    @ApiOperation(value = "经营异常列表（openApi）")
     public TableDataInfo abnormalPage(@RequestBody @Valid EnterpriseCreditAbnormalPageBody body) throws Exception {
         return enterpriseCreditService.abnormalPage(body);
     }
 
     @RequestMapping(value = "/abnormalYears", method = RequestMethod.POST)
-    @ApiOperation(value = "经营异常年份")
+    @ApiOperation(value = "经营异常年份（openApi）")
     public R abnormalYears(@RequestBody @Valid EnterpriseCreditAbnormalYearsBody body) throws Exception {
         return enterpriseCreditService.abnormalYears(body);
     }
 
     @RequestMapping(value = "/executedPersonsPage", method = RequestMethod.POST)
-    @ApiOperation(value = "被执行人列表")
+    @ApiOperation(value = "被执行人列表（openApi）")
     public TableDataInfo executedPersonsPage(@RequestBody @Valid EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
         return enterpriseCreditService.executedPersonsPage(body);
     }
 
     @RequestMapping(value = "/executedPage", method = RequestMethod.POST)
-    @ApiOperation(value = "失信被执行人列表")
+    @ApiOperation(value = "失信被执行人列表（openApi）")
     public TableDataInfo executedPage(@RequestBody @Valid EnterpriseCreditExecutedPageBody body) throws Exception {
         return enterpriseCreditService.executedPage(body);
     }
 
     @RequestMapping(value = "/lawsuitsPage", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书列表")
+    @ApiOperation(value = "裁判文书列表（openApi）")
     public TableDataInfo lawsuitsPage(@RequestBody @Valid EnterpriseCreditLawsuitsPageBody body) throws Exception {
         return enterpriseCreditService.lawsuitsPage(body);
     }
 
     @RequestMapping(value = "/lawsuitsCauseAction", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书案由")
+    @ApiOperation(value = "裁判文书案由（openApi）")
     public R lawsuitsCauseAction(@RequestBody @Valid EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
         return enterpriseCreditService.lawsuitsCauseAction(body);
     }
 
     @RequestMapping(value = "/lawsuitsRole", method = RequestMethod.POST)
-    @ApiOperation(value = "裁判文书身份")
+    @ApiOperation(value = "裁判文书身份（openApi）")
     public R lawsuitsRole(@RequestBody @Valid EnterpriseCreditLawsuitsRoleBody body) throws Exception {
         return enterpriseCreditService.lawsuitsRole(body);
     }
 
     @RequestMapping(value = "/noticesPage", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告列表")
+    @ApiOperation(value = "法院公告列表（openApi）")
     public TableDataInfo noticesPage(@RequestBody @Valid EnterpriseCreditNoticePageBody body) throws Exception {
         return enterpriseCreditService.noticesPage(body);
     }
 
     @RequestMapping(value = "/noticesType", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告类型")
+    @ApiOperation(value = "法院公告类型（openApi）")
     public R noticesType(@RequestBody @Valid EnterpriseCreditNoticeTypeBody body) throws Exception {
         return enterpriseCreditService.noticesType(body);
     }
 
     @RequestMapping(value = "/noticesRole", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告身份")
+    @ApiOperation(value = "法院公告身份（openApi）")
     public R noticesRole(@RequestBody @Valid EnterpriseCreditNoticeRoleBody body) throws Exception {
         return enterpriseCreditService.noticesRole(body);
     }
 
     @RequestMapping(value = "/noticesCaseReason", method = RequestMethod.POST)
-    @ApiOperation(value = "法院公告案由")
+    @ApiOperation(value = "法院公告案由（openApi）")
     public R noticesCaseReason(@RequestBody @Valid EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
         return enterpriseCreditService.noticesCaseReason(body);
     }
 
     @RequestMapping(value = "/kaitingPage", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告列表")
+    @ApiOperation(value = "开庭公告列表（openApi）")
     public TableDataInfo kaitingPage(@RequestBody @Valid EnterpriseCreditKaitingPageBody body) throws Exception {
         return enterpriseCreditService.kaitingPage(body);
     }
 
     @RequestMapping(value = "/kaitingCauseAction", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告案由")
+    @ApiOperation(value = "开庭公告案由（openApi）")
     public R kaitingCauseAction(@RequestBody @Valid EnterpriseCreditKaitingCauseActionBody body) throws Exception {
         return enterpriseCreditService.kaitingCauseAction(body);
     }
 
     @RequestMapping(value = "/kaitingPureRole", method = RequestMethod.POST)
-    @ApiOperation(value = "开庭公告当事人身份")
+    @ApiOperation(value = "开庭公告当事人身份（openApi）")
     public R kaitingPureRole(@RequestBody @Valid EnterpriseCreditKaitingPureRoleBody body) throws Exception {
         return enterpriseCreditService.kaitingPureRole(body);
     }

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

@@ -29,133 +29,133 @@ public class EnterpriseProjectController {
     EnterpriseProjectService enterpriseProjectService;
 
 
-    @ApiOperation(value = "土地交易列表")
+    @ApiOperation(value = "土地交易列表（openApi）")
     @RequestMapping(value = "/landTransactionPage", method = RequestMethod.POST)
     public TableDataInfo landTransactionPage(@RequestBody @Valid EnterpriseProjectLandTransactionPageBody body) throws Exception {
         return enterpriseProjectService.landTransactionPage(body);
     }
 
-    @ApiOperation(value = "土地用途列表")
+    @ApiOperation(value = "土地用途列表（openApi）")
     @RequestMapping(value = "/landUse", method = RequestMethod.POST)
     public R landUse(@RequestBody @Valid EnterpriseProjectLandUseBody body) throws Exception {
         return enterpriseProjectService.landUse(body);
     }
 
-    @ApiOperation(value = "土地信息详情")
+    @ApiOperation(value = "土地信息详情（openApi）")
     @RequestMapping(value = "/landDetail",method = RequestMethod.POST)
     public R landDetail(@RequestBody @Valid EnterpriseProjectLandDetailBody body) throws Exception {
         return enterpriseProjectService.landDetail(body);
     }
 
-    @ApiOperation(value = "拟建项目列表")
+    @ApiOperation(value = "拟建项目列表（openApi）")
     @RequestMapping(value = "/approvalProjectPage",method = RequestMethod.POST)
     public TableDataInfo approvalProjectPage(@RequestBody @Valid EnterpriseProjectApprovalProjectPageBody body) throws Exception {
         return enterpriseProjectService.approvalProjectPage(body);
     }
 
-    @ApiOperation(value = "拟建项目详情基本信息")
+    @ApiOperation(value = "拟建项目详情基本信息（openApi）")
     @RequestMapping(value = "/approvalInfoDetail",method = RequestMethod.POST)
     public R approvalInfoDetail(@RequestBody @Valid EnterpriseProjectApprovalInfoDetailBody body) throws Exception {
         return enterpriseProjectService.approvalInfoDetail(body);
     }
 
-    @ApiOperation(value = "拟建项目详情立项审批列表")
+    @ApiOperation(value = "拟建项目详情立项审批列表（openApi）")
     @RequestMapping(value = "/approvalExaminePage",method = RequestMethod.POST)
     public TableDataInfo approvalExaminePage(@RequestBody @Valid EnterpriseProjectApprovalExaminePageBody body) throws Exception {
         return enterpriseProjectService.approvalExaminePage(body);
     }
 
-    @ApiOperation(value = "拟建项目详情民间推介列表")
+    @ApiOperation(value = "拟建项目详情民间推介列表（openApi）")
     @RequestMapping(value = "/approvalMarketingPage", method = RequestMethod.POST)
     public TableDataInfo approvalMarketingPage(@RequestBody @Valid EnterpriseProjectApprovalMarketingPageBody body) throws Exception {
         return enterpriseProjectService.approvalMarketingPage(body);
     }
 
-    @ApiOperation(value = "专项债项目列表")
+    @ApiOperation(value = "专项债项目列表（openApi）")
     @RequestMapping(value = "/specialDebtProjectPage", method = RequestMethod.POST)
     public TableDataInfo specialDebtProjectPage(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectPageBody  body) throws Exception {
         return enterpriseProjectService.specialDebtProjectPage(body);
     }
 
-    @ApiOperation(value = "专项债项目详情")
+    @ApiOperation(value = "专项债项目详情（openApi）")
     @RequestMapping(value = "/specialDebtProjectDetail", method = RequestMethod.POST)
     public R specialDebtProjectDetail(@RequestBody @Valid EnterpriseProjectSpecialDebtProjectDetailBody body) throws Exception {
         return enterpriseProjectService.specialDebtProjectDetail(body);
     }
 
-    @ApiOperation(value = "专项债列表")
+    @ApiOperation(value = "专项债列表（openApi）")
     @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
     public TableDataInfo specialDebtPage(@RequestBody @Valid EnterpriseProjectSpecialDebtPageBody body) throws Exception {
         return enterpriseProjectService.specialDebtPage(body);
     }
 
-    @ApiOperation(value = "招标公告列表")
+    @ApiOperation(value = "招标公告列表（openApi）")
     @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
     public TableDataInfo bidNoticePage(@RequestBody @Valid EnterpriseProjectBidNoticePageBody body) throws Exception {
         return enterpriseProjectService.bidNoticePage(body);
     }
 
-    @ApiOperation(value = "招标公告招标类别")
+    @ApiOperation(value = "招标公告招标类别（openApi）")
     @RequestMapping(value = "/bidNoticeTenderStage", method = RequestMethod.POST)
     public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
         return enterpriseProjectService.bidNoticeTenderStage(body);
     }
 
-    @ApiOperation(value = "招标公告招标地区")
+    @ApiOperation(value = "招标公告招标地区（openApi）")
     @RequestMapping(value = "/bidNoticeArea", method = RequestMethod.POST)
     public R bidNoticeArea(@RequestBody @Valid EnterpriseProjectBidNoticeAreaBody body) throws Exception {
         return enterpriseProjectService.bidNoticeArea(body);
     }
 
-    @ApiOperation(value = "招标公告详情")
+    @ApiOperation(value = "招标公告详情（openApi）")
     @RequestMapping(value = "/bidNoticeDetail", method = RequestMethod.POST)
     public R bidNoticeDetail(@RequestBody @Valid EnterpriseProjectBidNoticeDetailBody body) throws Exception {
         return enterpriseProjectService.bidNoticeDetail(body);
     }
 
-    @ApiOperation(value = "招标计划列表")
+    @ApiOperation(value = "招标计划列表（openApi）")
     @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
     public TableDataInfo bidPlanPage(@RequestBody @Valid EnterpriseProjectBidPlanPageBody body) throws Exception {
         return enterpriseProjectService.bidPlanPage(body);
     }
 
-    @ApiOperation(value = "招标计划详情")
+    @ApiOperation(value = "招标计划详情（openApi）")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
     public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {
         return enterpriseProjectService.bidPlanDetail(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告列表")
+    @ApiOperation(value = "标讯pro招标公告列表（openApi）")
     @RequestMapping(value = "/bidNoticeProPage", method = RequestMethod.POST)
     public TableDataInfo bidNoticeProPage(@RequestBody @Valid EnterpriseProjectBidNoticeProPageBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProPage(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告项目类别")
+    @ApiOperation(value = "标讯pro招标公告项目类别（openApi）")
     @RequestMapping(value = "/bidNoticeProProjectType", method = RequestMethod.POST)
     public R bidNoticeProProjectType(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProProjectType(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告工程类别")
+    @ApiOperation(value = "标讯pro招标公告工程类别（openApi）")
     @RequestMapping(value = "/bidNoticeProProjectPurposes", method = RequestMethod.POST)
     public R bidNoticeProProjectPurposes(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProProjectPurposes(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告评标办法")
+    @ApiOperation(value = "标讯pro招标公告评标办法（openApi）")
     @RequestMapping(value = "/bidNoticeProAssessmentWay", method = RequestMethod.POST)
     public R bidNoticeProAssessmentWay(@RequestBody @Valid EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProAssessmentWay(body);
     }
 
-    @ApiOperation(value = "标讯pro招标公告详情")
+    @ApiOperation(value = "标讯pro招标公告详情（openApi）")
     @RequestMapping(value = "/bidNoticeProDetail", method = RequestMethod.POST)
     public R bidNoticeProDetail(@RequestBody @Valid EnterpriseProjectBidNoticeProDetailBody body) throws Exception {
         return enterpriseProjectService.bidNoticeProDetail(body);
     }
 
-    @ApiOperation(value = "行政许可列表")
+    @ApiOperation(value = "行政许可列表（openApi）")
     @RequestMapping(value = "/creditXzxkPage", method = RequestMethod.POST)
     public TableDataInfo creditXzxkPage(@RequestBody @Valid EnterpriseProjectCreditXzxkPageBody body) throws Exception {
         return enterpriseProjectService.creditXzxkPage(body);

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -74,4 +74,12 @@ public class BusinessOpportunityRadarController {
     public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
         return opportunityRadarService.jskBidPlanPage(compose);
     }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlan/getCapitalSourceSelect")
+    public AjaxResult getCapitalSourceSelect() {
+        return opportunityRadarService.getCapitalSourceSelect();
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -27,4 +27,7 @@ public interface BusinessOpportunityRadarService {
     AjaxResult bondProjectPage(ComposeQueryDto compose);
 
     AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+
+    AjaxResult getCapitalSourceSelect();
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -82,4 +82,10 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
         Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
+
+    @Override
+    public AjaxResult getCapitalSourceSelect() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

dsk-operate-ui/src/api/detail/party-a/overview.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 // 企业数据统计
 export function statistic(data) {
   return request({
-    url: '/enterprise/statistic（建设库）',
+    url: '/enterprise/statistic',
     method: 'post',
     data: data
   })

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

@@ -237,7 +237,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Bidding/details/:id(\\d+)',
+	      path: '/radar/Bidding/details/:id',
 	      component: () => import('@/views/radar/Bidding/details'),
 	      name: 'BiddingDetails',
 	      meta: { title: '招标计划详情', icon: 'radar' }

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

@@ -43,6 +43,7 @@
             <template  v-if="form.type==4">
               <el-select
                 class="form-content-width"
+                :class="form.value.length > 1 ? 'selectTag' : ''"
                 v-model="form.value"
                 multiple
                 collapse-tags
@@ -247,6 +248,22 @@ export default {
     ::v-deep .form-content-width{
       width: 170px;
     }
+    ::v-deep .selectTag{
+      .el-select__tags{
+        .el-tag{
+          &:first-child{
+            width: 90px;
+          }
+        }
+      }
+    }
+    ::v-deep .el-select__tags{
+      .el-tag{
+        &:first-child{
+          width: 100%;
+        }
+      }
+    }
   }
   .ability-total{
     font-size: 12px;

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -143,12 +143,7 @@ export default {
   components: {
     Detail
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       ifEmpty:false,
@@ -522,7 +517,7 @@ export default {
 
 ::v-deep .cooperate-detail{
   .miantitle, .app-container{
-    margin: 12px 0;
+    //margin: 12px 0;
   }
 }
 

dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue

@@ -81,12 +81,7 @@ export default {
   components: {
     Tables
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       ifEmpty:false,

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

@@ -7,26 +7,26 @@
           <el-popover
             placement="top-start"
             trigger="hover"
-            content="历史招标总数">
+            content="统计企业历年来公开招标总数">
             <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
           </el-popover>
-          <span class="zbph-item-num">{{dataAll.bidAmount || '--'}}</span></div>
+          <span class="zbph-item-num">{{dataAll.totalCount || '--'}}</span></div>
         <div>近一年招标总数
           <el-popover
             placement="top-start"
             trigger="hover"
-            content="近一年招标总数">
+            content="统计企业近一年公开招标总数">
             <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
           </el-popover>
           <span class="zbph-item-num">{{dataAll.lastYearCount || '--'}}</span></div>
-        <div>历史招标总额
+        <div>历史招标总额（万元）
           <el-popover
             placement="top-start"
             trigger="hover"
-            content="历史招标总额">
+            content="统计企业历年来公开招标项目总金额">
             <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
           </el-popover>
-          <span class="zbph-item-num">{{dataAll.bidAmount || '--'}}</span></div>
+          <span class="zbph-item-num">{{dataAll.bidAmount?parseFloat(dataAll.bidAmount.toFixed(6)):'--'}}</span></div>
       </div>
       <div class="zbph-account">招标动态
         <div class="labels">
@@ -56,7 +56,7 @@
             prop="companyName"
             label="公司名称">
             <template slot-scope="scope">
-              <router-link to="" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
+              <router-link :to="`/company/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link">{{ scope.row.companyName }}</router-link>
             </template>
           </el-table-column>
           <el-table-column
@@ -76,6 +76,7 @@
 </template>
 
 <script>
+import {encodeStr} from "@/assets/js/common"
 import {bidDataGroup, supplierPage} from '@/api/detail/party-a/overview'
 import * as echarts from 'echarts'
 export default {
@@ -83,6 +84,7 @@ export default {
   props: ['companyId'],
   data() {
     return {
+      encodeStr,
       datatype:'3',//切换类型
       dataAll: {},
       dtdata:[],//数据
@@ -96,9 +98,6 @@ export default {
     this.handleSupplier()
   },
   mounted() {
-    this.$nextTick(()=>{
-      this.getDT(3)
-    })
   },
   methods: {
     async handleBid(){
@@ -106,6 +105,13 @@ export default {
       if(res.code==200){
         let {totalCount, lastYearCount, bidAmount} = res.data
         this.dataAll = {totalCount, lastYearCount, bidAmount}
+        this.dtdata=res.data.groupCount.map(item=>{
+          return item.count
+        })
+        this.dttime=res.data.groupCount.map(item=>{
+          return item.span
+        })
+        this.initDT(this.dtdata,this.dttime)
       }
     },
     async handleSupplier() {
@@ -113,6 +119,7 @@ export default {
       if(res.code==200){
         this.tableData = res.rows
         this.tableData.forEach((item, index) => {
+          item.amount = item.amount?parseFloat(item.amount.toFixed(6)):0
           item.ico = require(`@/assets/images/detail/overview/ywwl_top${index+1}.png`)
         })
       }
@@ -180,55 +187,7 @@ export default {
     },
     getDT(type){
       this.datatype = type
-      let time = new Date()
-      let week = ['周一','周二','周三','周四','周五','周六','周日']
-      let weekdata = [200,150,300,240,400,380,460]
-      let monthdata = [400,200,350,170,190,280,260,308,406,387,458,695,125,360,512,546,298,365,458,536,345,200,150,300,240,400,380,460,472,365,547]
-      let yeardata = [1908,1500,2300,1456,2354,2564,1254,1236,4561,4521,1236,4561,3521]
-      let datas = []
-      let labels = []
-      switch (type) {
-        case 3:
-          time = time.getDay()
-          // week.length = time
-          weekdata.length = time
-          for(var i=0;i<7;i++){
-            if(i > time){
-              weekdata.push('')
-            }
-          }
-          labels = week
-          datas = weekdata
-          break;
-        case 2:
-          let days = new Date(time.getFullYear(),time.getMonth()+1,0).getDate()//获取到本月天数
-          time = time.getDate()
-          monthdata.length = time
-          for(var i=1;i<=days;i++){
-            labels.push(i+'日')
-            if(i > time){
-              monthdata.push("")
-            }
-          }
-          datas = monthdata
-          break;
-        case 1:
-          time = time.getMonth()+1
-          yeardata.length = time
-          for(var i=1;i<=12;i++){
-            labels.push(i+'月')
-            if(i>time){
-              yeardata.push('')
-            }
-          }
-          datas = yeardata
-          break;
-        default:
-          break;
-      }
-      this.dtdata = datas
-      this.dttime = labels
-      this.initDT(datas,labels)
+      this.handleBid()
     }
   }
 }

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

@@ -57,7 +57,6 @@ export default {
     }
   },
   created() {
-    this.handleStatistic()
     this.handleQuery()
   },
   mounted() {
@@ -120,6 +119,11 @@ export default {
         changePath(this, it.pathName)
       }
     }
+  },
+  watch: {
+    statistic(newVal, oldVal) {
+      this.handleStatistic()
+    }
   }
 }
 </script>

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

@@ -133,19 +133,20 @@ export default {
   props: ['companyId', 'companyInfo', 'statistic'],
   data() {
     return {
+      newStatic: null,
       labelList: [], //企业标签
       claimLoading: false,
       ifClaim: false, //是否认领
       showMore: false,
       showState: false,
       graphList: [
-        {id: 1, name:'业务往来', intro:[{id: 101, name:'客户', val:0, category:'global', field:'customer'},{id: 102, name:'供应商', val:0, category:'global', field:'supplier'}], ico:require('@/assets/images/detail/overview/company_ywwl.png')},
-        {id: 2, name:'商机线索', intro:[{id: 201, name:'专项债项目', val:0, category:'xxx', field:'yy'},{id: 202, name:'招标计划', val:0, category:'xxx', field:'zz'}], ico:require('@/assets/images/detail/overview/company_sjxs.png')},
-        {id: 3, name:'城投拿地', intro:[{id: 301, name:'土地交易', val:0, category:'global', field:'landInfo'},{id: 302, name:'行政许可', val:0, category:'business', field:'adminLicensing'}], ico:require('@/assets/images/detail/overview/company_ctnd.png')},
-        {id: 4, name:'对外投资', intro:[{id: 401, name:'企业经营实力展现'}], ico:require('@/assets/images/detail/overview/company_dwtz.png')},
-        {id: 5, name:'股权穿透', intro:[{id: 501, name:'瞬息掌握企业关系'}], ico:require('@/assets/images/detail/overview/company_gqct.png')},
-        {id: 6, name:'企业架构', intro:[{id: 601, name:'企业架构关联图'}], ico:require('@/assets/images/detail/overview/company_qyjg.png')},
-        {id: 7, name:'工商信息', intro:[{id: 701, name:'企业基础工商登记信息'}], ico:require('@/assets/images/detail/overview/company_gsxx.png')}
+        {id: 1, name:'业务往来', isShow:true, intro:[{id: 101, name:'客户', val:0, category:'global', field:'customer'},{id: 102, name:'供应商', val:0, category:'global', field:'supplier'}], ico:require('@/assets/images/detail/overview/company_ywwl.png')},
+        {id: 2, name:'商机线索', isShow:true, intro:[{id: 201, name:'专项债项目', val:0, category:'xxx', field:'yy'},{id: 202, name:'招标计划', val:0, category:'xxx', field:'zz'}], ico:require('@/assets/images/detail/overview/company_sjxs.png')},
+        {id: 3, name:'城投拿地', isShow:true, intro:[{id: 301, name:'土地交易', val:0, category:'global', field:'landInfo'},{id: 302, name:'行政许可', val:0, category:'business', field:'adminLicensing'}], ico:require('@/assets/images/detail/overview/company_ctnd.png')},
+        {id: 4, name:'对外投资', isShow:true, intro:[{id: 401, name:'企业经营实力展现'}], ico:require('@/assets/images/detail/overview/company_dwtz.png')},
+        {id: 5, name:'股权穿透', isShow:true, intro:[{id: 501, name:'瞬息掌握企业关系'}], ico:require('@/assets/images/detail/overview/company_gqct.png')},
+        {id: 6, name:'企业架构', isShow:true, intro:[{id: 601, name:'企业架构关联图'}], ico:require('@/assets/images/detail/overview/company_qyjg.png')},
+        {id: 7, name:'工商信息', isShow:true, intro:[{id: 701, name:'企业基础工商登记信息'}], ico:require('@/assets/images/detail/overview/company_gsxx.png')}
       ],  //企业链图
       //风险扫描
       labelArr:['失信联合惩戒企业','司法纠纷','注销'], //负向经营状态
@@ -153,13 +154,11 @@ export default {
     }
   },
   created() {
-    this.handleStatistic()
-    this.getCompanyInfo() //处理曾用名
   },
   mounted() {
     this.getClaimStatus() //获取企业认领状态
-    this.companySwiper()  //swiper滚动板块
     this.handleWidth()  //企业背景是否收起
+    this.companySwiper()  //swiper滚动板块
   },
   methods: {
     //认领
@@ -186,20 +185,27 @@ export default {
       })
     },
     getCompanyInfo(){
-      if(this.companyInfo.historyNames && typeof this.companyInfo.historyNames=='string'){  //曾用名
+      if(this.companyInfo.historyNames && typeof this.companyInfo.historyNames=='string'){  //曾用名)
         this.companyInfo.historyNames = JSON.parse(this.companyInfo.historyNames)
       }
     },
     handleStatistic() {
       this.graphList.forEach((item, index) => {
+        let number = null
         if(item.intro){
           item.intro.forEach((it, idx) => {
             if(it.category || it.field){
               it.val = this.statistic[it.category]?this.statistic[it.category][it.field]:0
+              number +=it.val
             }
           })
         }
+        if(number===0){
+          item.isShow = false
+        }
       })
+      this.graphList = this.graphList.filter(item => item.isShow)
+      this.companySwiper()  //swiper滚动板块
     },
     //获取认领状态
     async getClaimStatus(){
@@ -259,7 +265,11 @@ export default {
   },
   watch: {
     companyInfo(newVal, oldVal) {
+      this.getCompanyInfo() //处理曾用名
       this.handleWidth()
+    },
+    statistic(newVal, oldVal) {
+      this.handleStatistic()
     }
   }
 }

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

@@ -7,9 +7,9 @@
           <li class="swiper-slide" v-for="(item, index) in operList" :key="index">
             <div class="swiper-div">
               <div class="operations-title">{{item.bratingSubjectLevel}}-<span>{{item.ratingDate}}</span></div>
-              <div class="flex-box text-cl1 operations-info">
-                {{item.bondType}}
-                <span><img src="@/assets/images/detail/overview/oper_source.png">{{item.creditRatingAgency}}</span>
+              <div class="flex-box operations-info">
+                <div>{{item.bondType || '--'}}</div>
+                <span class="text-cl1"><img src="@/assets/images/detail/overview/oper_source.png">{{item.creditRatingAgency || '--'}}</span>
               </div>
             </div>
           </li>
@@ -48,7 +48,6 @@ export default {
   },
   created() {
     this.handleQuery()
-    this.handleFinancial()
   },
   mounted() {
     this.companySwiper()
@@ -68,6 +67,9 @@ export default {
       let res = await bondCreditRating({cid: this.companyId})
       if(res.code==200){
         this.operList = res.data
+        this.$nextTick(() => {
+          this.companySwiper()
+        })
       }
     },
     handleFinancial(){
@@ -75,10 +77,15 @@ export default {
         let { totalAssets, belongNetAssets, creditBalance, operatingIncome, totalLiabilities } = this.financial
         let jyqkObj = { totalAssets, belongNetAssets, creditBalance, operatingIncome, totalLiabilities }
         this.gsjyList.forEach((item, index) => {
-          item.amount = jyqkObj[Object.keys(jyqkObj)[index]]
+          item.amount = jyqkObj[Object.keys(jyqkObj)[index]]?parseFloat(jyqkObj[Object.keys(jyqkObj)[index]].toFixed(2)):0
         })
       }
     }
+  },
+  watch: {
+    financial(newVal, oldVal) {
+      this.handleFinancial()
+    }
   }
 }
 </script>
@@ -119,8 +126,12 @@ export default {
               justify-content: space-between;
               font-size: 14px;
               color: #416587;
+              div{
+                flex-shrink: 0;
+              }
               span{
                 font-size: 12px;
+                margin-left: 6px;
                 img{
                   width: 10px;
                   height: 10px;

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

@@ -6,24 +6,36 @@
       <el-tab-pane label="对外投资" name="second"></el-tab-pane>
     </el-tabs>
     <div class="table-item">
-      <div class="rela-person" v-if="activeName=='first'">实际控制人：<router-link to="" tag="a" class="a-link">{{financial&&financial.actualController || '--'}}</router-link></div>
-      <el-table :data="holderData" border style="width: 100%" v-if="activeName=='first'">
+      <div class="rela-person" v-if="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div>
+      <el-table :data="holderData" border style="width: 100%" v-show="activeName=='first'">
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ holderParams.pageNum * holderParams.pageSize - holderParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
         <el-table-column prop="stockName" min-width="140" label="股东名称"></el-table-column>
-        <el-table-column prop="xxx" label="持股数量（亿）"></el-table-column>
-        <el-table-column prop="xxx" label="持股比例"></el-table-column>
-        <el-table-column prop="xxx" label="法定代表人"></el-table-column>
-        <el-table-column prop="xxx" label="成立日期"></el-table-column>
+        <el-table-column prop="shouldCapiConv" label="持股数量（亿）"></el-table-column>
+        <el-table-column label="持股比例">
+          <template slot-scope="scope">
+            <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="法定代表人">
+          <template slot-scope="scope">
+            <span>{{scope.row.corporatePerson || '--'}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="成立日期">
+          <template slot-scope="scope">
+            <span>{{scope.row.registeredDate || '--'}}</span>
+          </template>
+        </el-table-column>
       </el-table>
-      <el-table :data="shipData" border style="width: 100%" v-else>
+      <el-table :data="shipData" border style="width: 100%" v-show="activeName=='second'">
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ shipParams.pageNum * shipParams.pageSize - shipParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
-        <el-table-column prop="investName" min-width="140" label="被投资企业名称">
+        <el-table-column min-width="140" label="被投资企业名称">
           <template slot-scope="scope">
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName" v-html="scope.row.investName"></router-link>
+            <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName" v-html="scope.row.investName"></router-link>
             <div v-else v-html="scope.row.investName  || '--'"></div>
             <div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
               <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
@@ -41,18 +53,20 @@
         </el-table-column>
         <el-table-column prop="shouldCapi" label="认缴出资额（万元）"></el-table-column>
       </el-table>
-      <div class="rela-more" v-if="activeName=='second'&& shipTotal>shipParams.pageSize"><router-link to="" tag="a" class="a-link">查看更多数据 ></router-link></div>
+      <div class="rela-more" v-if="activeName=='second'&& shipTotal>shipParams.pageSize"><span class="a-link" @click="handlePath">查看更多数据 ></span></div>
     </div>
   </div>
 </template>
 
 <script>
+import {encodeStr, changePath} from "@/assets/js/common"
 import {bestStockPage, investment} from '@/api/detail/party-a/overview'
 export default {
   name: 'Relationship',
   props: ['companyId', 'financial'],
   data() {
     return {
+      encodeStr,
       activeName:'first',
       //表格数据
       holderData:[],
@@ -60,13 +74,13 @@ export default {
         cid: this.companyId,
         isHistory: 0,
         pageNum: 1,
-        pageSize: 20
+        pageSize: 100
       },
       shipData:[],
       shipParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 10
+        pageSize: 5
       },
       shipTotal: 0
     }
@@ -83,6 +97,9 @@ export default {
         this.activeName=='first'?this.holderData = res.rows:this.shipData = res.rows
       }
       this.activeName=='second'?this.shipTotal = res.total:''
+    },
+    handlePath(){
+      changePath(this, 'overseas')
     }
   }
 }
@@ -135,6 +152,9 @@ export default {
     .rela-more{
       padding-top: 16px;
       text-align: center;
+      span{
+        cursor: pointer;
+      }
     }
   }
 </style>

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

@@ -48,7 +48,7 @@ export default {
           tz:'',
           bl:''
         },
-        {
+        /*{
           name:'企业公告',
           value:'',
           category:'xxx',
@@ -67,11 +67,11 @@ export default {
         {
           name:'对外投资变更',
           value:'',
-          category:'basic',
-          field:'outboundInvestment',
+          category:'xxx',
+          field:'yy',
           tz:'',
           bl:''
-        },
+        },*/
         {
           name:'法院公告',
           value:'',
@@ -80,14 +80,14 @@ export default {
           tz:'',
           bl:''
         },
-        {
+        /*{
           name:'立案信息',
           value:'',
           category:'xxx',
           field:'zz',
           tz:'',
           bl:''
-        },
+        },*/
         {
           name:'被执行人',
           value:'',
@@ -108,12 +108,8 @@ export default {
     }
   },
   created() {
-    this.handView()
   },
   mounted() {
-    this.$nextTick(()=>{
-      this.getDT()
-    })
   },
   methods: {
     handView(){
@@ -126,6 +122,10 @@ export default {
         let it = {name:item.name, value:number, tz: '', bl:parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2))+'%'}
         return it
       })
+      this.viewData.sort((a, b) => {
+        return a.value < b.value ? 1 : -1;
+      })
+      this.getDT()
     },
     getDT(){
       let myChart = echarts.init(document.getElementById("echartsRisk"))
@@ -172,6 +172,11 @@ export default {
       }
       myChart.setOption(option)
     }
+  },
+  watch: {
+    statistic(newVal, oldVal) {
+      this.handView()
+    }
   }
 }
 </script>
@@ -185,7 +190,6 @@ export default {
     .clue-box{
       width: 100%;
       justify-content: space-between;
-      align-items: normal;
       margin-top: 20px;
       .clue-echarts{
         width: calc(50% - 8px);

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

@@ -33,7 +33,7 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 20
+        pageSize: 100
       },
       //表格数据
       tableData:[]

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

@@ -3,14 +3,14 @@
     <div class="tender-list">
       <div class="common-title">招标公告</div>
       <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
-        <div class="flex-box tender-title">{{item.projectName}}<span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
+        <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
         <span class="tender-time">{{item.contact}} {{item.issueTime}}</span>
       </div>
     </div>
     <div class="tender-list">
       <div class="common-title">企业动态</div>
       <div class="tender-item" v-for="(item, index) in trendList" :key="index">
-        <div class="flex-box tender-title">{{item.xxx}}<span :class="item.tag=='新增分支机构'?'style2':item.tag=='新增施工工法'?'style3':'style1'">{{item.tag}}</span></div>
+        <div class="flex-box tender-title"><div class="text-cl1" :title="tendTitle(item.details)">{{tendTitle(item.details)}}</div><span :class="item.parentDimension=='新增分支机构'?'style2':item.parentDimension=='新增施工工法'?'style3':'style1'">{{item.parentDimension}}</span></div>
         <span class="tender-time">{{item.createTime}}</span>
       </div>
     </div>
@@ -34,18 +34,28 @@ export default {
       //招标公告数据
       zbggList:[],
       trendParams: {
-        companyId: this.companyId,
+        companyId: '2453',
         pageNum: 1,
         pageSize: 5
       },
       //企业动态数据
-      trendList:[
-        {name: '深圳北站片区正建超大型商场，预计2026年建成', tag: '对外投资变更', time: '03-21'},
-        {name: '深圳北站片区正建超大型商场，预计2026年建成', tag: '新增分支机构', time: '03-21'},
-        {name: '深圳北站片区正建超大型商场，预计2026年建成', tag: '新增分支机构', time: '03-21'},
-        {name: '深圳北站片区正建超大型商场，预计2026年建成', tag: '新增施工工法', time: '03-21'},
-        {name: '深圳北站片区正建超大型商场，预计2026年建成', tag: '新增施工工法', time: '03-21'}
-      ]
+      trendList:[]
+    }
+  },
+  computed: {
+    tendTitle() {
+      return function(val) {
+        let str = ''
+        if(val){
+          for(let key in val){
+            str += key+'：'+ val[key]+'；'
+          }
+          str = str.substring(0, str.lastIndexOf('；'))
+        }else{
+          str = '--'
+        }
+        return str
+      }
     }
   },
   created() {
@@ -92,6 +102,9 @@ export default {
           color: #232323;
           justify-content: space-between;
           align-items: normal;
+          div{
+            width: calc(100% - 120px);
+          }
           span{
             height: 22px;
             line-height: 22px;
@@ -123,6 +136,7 @@ export default {
           }
         }
         .tender-time{
+          height: 28px;
           display: block;
           padding-top: 8px;
           color: rgba(35,35,35,0.4);

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

 <template>
   <div class="app-container part-container">
-    <div class="view-content"><Infoheader :companyId="companyId" :companyInfo="companyInfo" :statistic="statistic" v-if="isShow" /></div><!-- 企业信息 -->
-    <div class="view-content"><Operations :companyId="companyId" :financial="financial" v-if="isShow" /></div><!-- 公司经营 -->
+    <div class="view-content"><Infoheader :companyId="companyId" :companyInfo="companyInfo" :statistic="statistic" /></div><!-- 企业信息 -->
+    <div class="view-content"><Operations :companyId="companyId" :financial="financial" /></div><!-- 公司经营 -->
     <div class="view-content"><Bidding :companyId="companyId" /></div><!--招标偏好、业务往来-->
-    <div class="view-content"><Busclue :companyId="companyId" :statistic="statistic" v-if="statistic" /></div><!--商机线索-->
-    <div class="view-content"><Relationship :companyId="companyId" :financial="financial" v-if="isShow" /></div><!--关系企业-->
+    <div class="view-content"><Busclue :companyId="companyId" :statistic="statistic" /></div><!--商机线索-->
+    <div class="view-content"><Relationship :companyId="companyId" :financial="financial" /></div><!--关系企业-->
     <div class="view-content"><Senior :companyId="companyId" /></div><!--高管-->
-    <div class="view-content"><Risk :companyId="companyId" :statistic="statistic" v-if="isShow" /></div><!--风险概览-->
+    <div class="view-content"><Risk :companyId="companyId" :statistic="statistic" /></div><!--风险概览-->
     <div class="view-content"><Tender :companyId="companyId" /></div><!--招标公告、企业动态-->
   </div>
 </template>
@@ -68,7 +68,7 @@ export default {
     margin: 0;
     padding: 0;
     .view-content{
-      //margin-top: 12px;
+      margin-top: 12px;
     }
   }
 </style>

dsk-operate-ui/src/views/detail/party-a/preference/index.vue

@@ -160,12 +160,7 @@ export default {
   components: {
 
   },
-  props: {
-    customerIds: {
-      type: String,
-      default: ''
-    }
-  },
+  props: ['customerIds'],
   data() {
     return {
       autosize: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -33,12 +33,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/courtNotice.vue

@@ -35,12 +35,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/dishonesty.vue

@@ -33,12 +33,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/ifThePerson.vue

@@ -32,12 +32,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/judgment.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue

@@ -41,12 +41,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

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

@@ -37,12 +37,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    }
-  },
+  props: ['companyId'],
   data() {
     return {
       queryParams: {

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

@@ -35,16 +35,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    },
-    companyInfo: {
-      type: Object,
-      default: {}
-    }
-  },
+  props: ['companyId','companyInfo'],
   data() {
     return {
       addressList:'',

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

@@ -118,16 +118,7 @@ export default {
   components: {
 
   },
-  props: {
-    companyId: {
-      type: Number,
-      default: 0
-    },
-    companyInfo: {
-      type: Object,
-      default: {}
-    }
-  },
+  props: ['companyId', 'companyInfo'],
   data() {
     return {
       queryParams: {

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

@@ -35,7 +35,7 @@
           <el-table-column label="序号" width="50" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column label="公司名称" align="left" width="300">
+          <el-table-column label="公司名称" align="left" width="300" fixed>
             <template slot-scope="scope">
               <router-link to="" tag="a" class="a-link" v-html="scope.row.name"></router-link>
             </template>
@@ -148,12 +148,7 @@ export default {
         })
         params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
       }
-      if(this.aptitudeType || this.queryParams.ename){
-
-      }
-      console.log(params)
       enterprise(params).then(res => {
-        console.log(res.data)
         this.tableData=res.data.list;
         this.tableDataTotal=res.data.total;
       })

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -32,7 +32,7 @@
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.specialCapital || '-'}}<span>{{details.specialCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '亿' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />

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

@@ -51,12 +51,12 @@
               <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
             </template>
           </el-table-column>
-          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" sortable="custom" width="155" />
-          <el-table-column prop="projectCapital" label="项目资本金（亿）" sortable="custom"  width="155" />
-          <el-table-column prop="econData007" label="项目收益倍数（倍）" sortable="custom" width="150" />
-          <el-table-column prop="zxz" label="专项债金额（亿）" sortable="custom" width="150" />
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" width="170" />
-          <el-table-column prop="projectEntity" label="项目主体">
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" sortable="custom" width="155" />
+          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" sortable="custom"  width="155" />
+          <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" sortable="custom" width="150" />
+          <el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" :formatter="formatStatus" width="170" />
+          <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
             <!--</template>-->
@@ -190,6 +190,9 @@ export default {
       }
       myChart.setOption(option);
     },
+    formatStatus: function(row, column, cellValue) {
+      return cellValue? cellValue : '-'
+    },
     sortChange({ column, prop, order }){
       if(prop === 'number'){
         this.queryParams.field = 'count'

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

@@ -6,7 +6,7 @@
           <span class="common-title">全国经济大全</span>
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
-              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="querySubmit">
+              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="handleSearch">
                 <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
               </el-select>
             </el-form-item>
@@ -16,7 +16,7 @@
                 :options="addressList"
                 :props="props"
                 v-model="queryParams.address"
-                @change="querySubmit"
+                @change="handleSearch"
                 placeholder="地区选择"
                 collapse-tags
                 clearable></el-cascader>
@@ -51,8 +51,8 @@
               <img src="@/assets/images/icon_detailed.png" class="icon-detailed" @click="handleDetail(scope.row)">
             </template>
           </el-table-column>
-          <el-table-column label="GDP（元）" prop="gdp" :formatter="formatStatus" sortable="custom" min-width="115" align="right"></el-table-column>
-          <el-table-column label="GDP增速" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="100" align="right"></el-table-column>
+          <el-table-column label="GDP（亿元）" prop="gdp" :formatter="formatStatus" sortable="custom" min-width="115" align="right"></el-table-column>
+          <el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="100" align="right"></el-table-column>
           <el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
           <el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入 (亿元)" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
@@ -62,8 +62,8 @@
           <el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="left"></el-table-column>
           <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="left"></el-table-column>
           <el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="left"></el-table-column>
-          <el-table-column label="国有资产经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="left"></el-table-column>
-          <el-table-column label="国有资产经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="left"></el-table-column>
+          <el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="left"></el-table-column>
+          <el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="left"></el-table-column>
           <el-table-column label="固定资产投资（亿元）" prop="fixedInvestment" :formatter="formatStatus" width="160" align="left"></el-table-column>
           <el-table-column label="财政自给率（%）" prop="fiscalSelfSufficiencyRate" :formatter="formatStatus" width="160" align="left"></el-table-column>
           <el-table-column label="地方政府债务余额（亿元）" prop="govDebtBalance" :formatter="formatStatus" width="160" align="left"></el-table-column>
@@ -275,6 +275,10 @@
         this.pageIndex = 1;
         this.querySubmit()
       },
+      handleSearch(){
+        this.pageIndex = 1
+        this.querySubmit()
+      },
     }
   }
 </script>

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

@@ -80,10 +80,10 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对近五年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对近一年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
-        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近五年全国公开的招标项目，未公开的不含在内</p>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近一年全国公开的招标项目，未公开的不含在内</p>
       </div>
       <div class="main2">
         <div class="selectYear">
@@ -125,63 +125,26 @@ export default {
         { label: '近三年', value: '近三年' },
         { label: '近一年', value: '近一年' },
       ],
-      zbData:['广东','江苏','山东','浙江','河南','安徽','河北','四川','湖北','江西','甘肃','重庆','福建','云南','北京','湖南','山西'],
-      zbData1:[123,156,236,426,412,231,96,105,210,420,213,86,120,230,150,132,196],
       tableData:[
         {
-          area:'广东',
-          number:'123',
-          zb:'0.19%'
+          type:'',
+          count:'',
         },
         {
-          area:'江苏',
-          number:'156',
-          zb:'0.29%'
+          type:'',
+          count:'',
         },
         {
-          area:'山东',
-          number:'236',
-          zb:'0.34%'
+          type:'',
+          count:'',
         },
         {
-          area:'浙江',
-          number:'426',
-          zb:'0.34%'
+          type:'',
+          count:'',
         },
         {
-          area:'河南',
-          number:'412',
-          zb:'0.34%'
-        },
-        {
-          area:'安徽',
-          number:'231',
-          zb:'0.34%'
-        },
-        {
-          area:'河北',
-          number:'96',
-          zb:'0.34%'
-        },
-        {
-          area:'四川',
-          number:'105',
-          zb:'0.34%'
-        },
-        {
-          area:'湖北',
-          number:'210',
-          zb:'0.34%'
-        },
-        {
-          area:'江西',
-          number:'420',
-          zb:'0.34%'
-        },
-        {
-          area:'甘肃',
-          number:'213',
-          zb:'0.34%'
+          type:'',
+          count:'',
         },
       ],
       tableData1:[],

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

@@ -6,7 +6,7 @@
           <span class="common-title">全国建筑企业概览</span>
         </div>
       </div>
-      <div class="text">截止2022年8月1日，全国共有建筑工程施工总承包资质的企业197572家，其中特级资质企业118家，占比0.06%；一级资质企业3879家，占比1.96%；二级资质企业22235家，占比11.25%；三级资质企业171340家，占比86.73%</div>
+      <div class="text">截止{{currentdate}}，全国共有建筑工程施工总承包资质的企业{{total}}家，其中特级资质企业{{glDetail.tjCount}}家，占比{{glDetail.tjRate}}%；一级资质企业{{glDetail.tjCount}}家，占比{{glDetail.oneRate}}%；二级资质企业{{glDetail.twoCount}}家，占比{{glDetail.twoRate}}%；三级资质企业{{glDetail.threeCount}}家，占比{{glDetail.threeRate}}%</div>
       <div class="main1">
         <div style="height: 300px;">
           <div class="left">
@@ -107,7 +107,8 @@
           <span class="common-title">全国建筑企业备案分布</span>
         </div>
       </div>
-      <div class="text">通过对全国建筑工程总承包一级及以上资质企业的备案数据分析，我们发现这些优质企业主要去了广东、安徽、江西、福建、湖北、浙江等地开展经营。</div>
+      <div class="text">
+        通过对全国建筑工程总承包一级及以上资质企业的备案数据分析，我们发现这些优质企业主要去了<span v-for="(item,index) in rankList">{{item.province}}{{ rankList.length === index+1 ? '':'、'}}</span>等地开展经营。</div>
       <div class="main1">
         <div id="ba-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为公开企业备案地数据。</p>
@@ -124,7 +125,7 @@
             <template slot-scope="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column prop="province" label="地区"/>
-          <el-table-column prop="count" label="企业异地备案数量（个）"/>
+          <el-table-column prop="count" label="企业异地备案数量（个）" sortable/>
           <!--<el-table-column prop="zb" label="占比"/>-->
         </el-table>
       </div>
@@ -208,22 +209,28 @@ export default {
       dqData:[],
       qydqIndex:0,
       zbData:[],
-      jzdqData:[]
+      rankList:[],
+      jzdqData:[],
+      currentdate:'',
+      total:'',
+      glDetail:{},
     }
   },
   created() {
     this.getData()
-
+    var date = new Date()
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth()+ 1
+    var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+    this.currentdate=year + '-' +month + '-' + day;
   },
   methods: {
     getData(){
       //全国建筑企业概览
       certGroupByMajorAndLevel().then(res => {
-        this.glData=res.data;
-        this.jzglData=this.glData[0].levelList.reverse();
-
         let list=[];
         for (let i=0; i<res.data.length; i++){
+          res.data[i].levelList=res.data[i].levelList.reverse();
           let item={};
           item.major=res.data[i].major;
           for (let j=0; j<res.data[i].levelList.length; j++){
@@ -247,7 +254,16 @@ export default {
           // item.levelList=res.data[i].levelList.reverse();
           list.push(item)
         }
-        this.zzTableData=list
+        this.zzTableData=list;
+        this.glData=res.data;
+        this.jzglData=this.glData[0].levelList;
+        this.glDetail=list[0]
+        let total=0;
+        for(let i=0; i<this.jzglData.length; i++){
+          total=total+this.jzglData[i].count
+        }
+        this.total=total;
+
         this.initChart()
       })
       certGroupByMajorProvinceLevel().then(res => {
@@ -282,6 +298,15 @@ export default {
       })
       areaGroupByProvince().then(res => {
         this.zbData=res.data;
+
+        let arr=this.zbData.sort((old,New)=>{
+          return  New.count - old.count
+        })
+        let data=[]
+        for(let i=0; i<5; i++){
+          data.push(arr[i])
+        }
+        this.rankList=data;
         this.initChart2()
       })
     },
@@ -338,6 +363,7 @@ export default {
           }
         ]
       }
+      myChart.clear();
       myChart.setOption(option);
     },
     initChart1() {
@@ -563,7 +589,13 @@ export default {
     handleClick(type,index){
       if(type === 1){
         this.typeIndex=index;
-        this.jzglData=this.glData[index].levelList.reverse();
+        this.jzglData=this.glData[index].levelList;
+        let total=0
+        for(let i=0; i<this.jzglData.length; i++){
+          total=total+this.jzglData[i].count
+        }
+        this.total=total;
+        this.glDetail=this.zzTableData[index]
         this.initChart()
       }
       if(type === 2){

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -178,7 +178,7 @@
       }
     },
     created(){
-      this.thistag = this.$route.query.tag
+      this.thistag = this.$route.query.tag ? this.$route.query.tag : this.thistag
       this.prvinceTree()
       this.id = this.detailId ? this.detailId : this.$route.query.id
       //项目阶段