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/assets/styles/project.scss

@@ -181,6 +181,7 @@
       margin-top: 2px;
       &:hover{
         background: url("../../assets/images/project/add_1.png") no-repeat center center;
+        background-size: 100%;
       }
     }
     .tips{
@@ -890,6 +891,7 @@
       float: left;
       margin-right: 8px;
       margin-top: -2px;
+      width: 24px;
     }
   }
 }

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/overview/index.vue

@@ -686,7 +686,7 @@ export default {
     color: #FFFFFF;
     .img{
       background: url("../../../assets/images/project/add_2.png") no-repeat center center;
-
+      background-size: 100%;
     }
   }
 }