Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,7 @@ package com.dsk.web.controller.dsk;
 
 
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.dskService.EnterpriseProjectService;
 import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
 import java.util.Map;
 
 /**
@@ -27,112 +29,136 @@ public class EnterpriseProjectController {
     EnterpriseProjectService enterpriseProjectService;
 
 
-    @ApiOperation(value = "土地交易员列表")
+    @ApiOperation(value = "土地交易列表")
     @RequestMapping(value = "/landTransactionPage", method = RequestMethod.POST)
-    public TableDataInfo landTransactionPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.landTransactionPage(paramMap);
+    public TableDataInfo landTransactionPage(@RequestBody @Valid EnterpriseProjectLandTransactionPageBody body) throws Exception {
+        return enterpriseProjectService.landTransactionPage(body);
     }
 
     @ApiOperation(value = "土地用途列表")
     @RequestMapping(value = "/landUse", method = RequestMethod.POST)
-    public R landUse(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.landUse(paramMap);
+    public R landUse(@RequestBody @Valid EnterpriseProjectLandUseBody body) throws Exception {
+        return enterpriseProjectService.landUse(body);
     }
 
     @ApiOperation(value = "土地信息详情")
     @RequestMapping(value = "/landDetail",method = RequestMethod.POST)
-    public R landDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.landDetail(paramMap);
+    public R landDetail(@RequestBody @Valid EnterpriseProjectLandDetailBody body) throws Exception {
+        return enterpriseProjectService.landDetail(body);
     }
 
     @ApiOperation(value = "拟建项目列表")
     @RequestMapping(value = "/approvalProjectPage",method = RequestMethod.POST)
-    public TableDataInfo approvalProjectPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.approvalProjectPage(paramMap);
+    public TableDataInfo approvalProjectPage(@RequestBody @Valid EnterpriseProjectApprovalProjectPageBody body) throws Exception {
+        return enterpriseProjectService.approvalProjectPage(body);
     }
 
     @ApiOperation(value = "拟建项目详情基本信息")
     @RequestMapping(value = "/approvalInfoDetail",method = RequestMethod.POST)
-    public R approvalInfoDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.approvalInfoDetail(paramMap);
+    public R approvalInfoDetail(@RequestBody @Valid EnterpriseProjectApprovalInfoDetailBody body) throws Exception {
+        return enterpriseProjectService.approvalInfoDetail(body);
     }
 
     @ApiOperation(value = "拟建项目详情立项审批列表")
     @RequestMapping(value = "/approvalExaminePage",method = RequestMethod.POST)
-    public TableDataInfo approvalExaminePage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.approvalExaminePage(paramMap);
+    public TableDataInfo approvalExaminePage(@RequestBody @Valid EnterpriseProjectApprovalExaminePageBody body) throws Exception {
+        return enterpriseProjectService.approvalExaminePage(body);
     }
 
     @ApiOperation(value = "拟建项目详情民间推介列表")
     @RequestMapping(value = "/approvalMarketingPage", method = RequestMethod.POST)
-    public TableDataInfo approvalMarketingPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.approvalMarketingPage(paramMap);
+    public TableDataInfo approvalMarketingPage(@RequestBody @Valid EnterpriseProjectApprovalMarketingPageBody body) throws Exception {
+        return enterpriseProjectService.approvalMarketingPage(body);
     }
 
     @ApiOperation(value = "专项债项目列表")
-    @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
-    public TableDataInfo specialDebtPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.specialDebtPage(paramMap);
+    @RequestMapping(value = "/specialDebtProjectPage", method = RequestMethod.POST)
+    public TableDataInfo specialDebtProjectPage(@RequestBody @Valid Object  body) throws Exception {
+        return enterpriseProjectService.specialDebtProjectPage(body);
     }
 
     @ApiOperation(value = "专项债项目详情")
-    @RequestMapping(value = "/specialDebtDetail", method = RequestMethod.POST)
-    public R specialDebtDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.specialDebtDetail(paramMap);
+    @RequestMapping(value = "/specialDebtProjectDetail", method = RequestMethod.POST)
+    public R specialDebtProjectDetail(@RequestBody @Valid Object body) throws Exception {
+        return enterpriseProjectService.specialDebtProjectDetail(body);
+    }
+
+    @ApiOperation(value = "专项债列表")
+    @RequestMapping(value = "/specialDebtPage", method = RequestMethod.POST)
+    public TableDataInfo specialDebtPage(@RequestBody @Valid Object  body) throws Exception {
+        return enterpriseProjectService.specialDebtPage(body);
     }
 
     @ApiOperation(value = "招标公告列表")
     @RequestMapping(value = "/bidNoticePage",method = RequestMethod.POST)
-    public TableDataInfo bidNoticePage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticePage(paramMap);
+    public TableDataInfo bidNoticePage(@RequestBody @Valid EnterpriseProjectBidNoticePageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticePage(body);
     }
 
     @ApiOperation(value = "招标公告招标类别")
     @RequestMapping(value = "/bidNoticeTenderStage", method = RequestMethod.POST)
-    public R bidNoticeTenderStage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticeTenderStage(paramMap);
+    public R bidNoticeTenderStage(@RequestBody @Valid EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeTenderStage(body);
     }
 
     @ApiOperation(value = "招标公告招标地区")
-    @RequestMapping(value = "/bidNoticeProvince", method = RequestMethod.POST)
-    public R bidNoticeProvince(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticeProvince(paramMap);
+    @RequestMapping(value = "/bidNoticeArea", method = RequestMethod.POST)
+    public R bidNoticeArea(@RequestBody @Valid EnterpriseProjectBidNoticeAreaBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeArea(body);
     }
 
     @ApiOperation(value = "招标公告详情")
     @RequestMapping(value = "/bidNoticeDetail", method = RequestMethod.POST)
-    public R bidNoticeDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticeDetail(paramMap);
+    public R bidNoticeDetail(@RequestBody @Valid EnterpriseProjectBidNoticeDetailBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeDetail(body);
     }
 
     @ApiOperation(value = "招标计划列表")
     @RequestMapping(value = "/bidPlanPage",method = RequestMethod.POST)
-    public TableDataInfo bidPlanPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidPlanPage(paramMap);
+    public TableDataInfo bidPlanPage(@RequestBody @Valid Object body) throws Exception {
+        return enterpriseProjectService.bidPlanPage(body);
     }
 
     @ApiOperation(value = "招标计划详情")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
-    public R bidPlanDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidPlanDetail(paramMap);
+    public R bidPlanDetail(@RequestBody @Valid Object body) throws Exception {
+        return enterpriseProjectService.bidPlanDetail(body);
     }
 
     @ApiOperation(value = "标讯pro招标公告列表")
     @RequestMapping(value = "/bidNoticeProPage", method = RequestMethod.POST)
-    public TableDataInfo bidNoticeProPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticeProPage(paramMap);
+    public TableDataInfo bidNoticeProPage(@RequestBody @Valid EnterpriseProjectBidNoticeProPageBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProPage(body);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告项目类别")
+    @RequestMapping(value = "/bidNoticeProProjectType", method = RequestMethod.POST)
+    public R bidNoticeProProjectType(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProProjectType(body);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告工程类别")
+    @RequestMapping(value = "/bidNoticeProProjectPurposes", method = RequestMethod.POST)
+    public R bidNoticeProProjectPurposes(@RequestBody @Valid EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProProjectPurposes(body);
+    }
+
+    @ApiOperation(value = "标讯pro招标公告评标办法")
+    @RequestMapping(value = "/bidNoticeProAssessmentWay", method = RequestMethod.POST)
+    public R bidNoticeProAssessmentWay(@RequestBody @Valid EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProAssessmentWay(body);
     }
 
     @ApiOperation(value = "标讯pro招标公告详情")
     @RequestMapping(value = "/bidNoticeProDetail", method = RequestMethod.POST)
-    public R bidNoticeProDetail(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.bidNoticeProDetail(paramMap);
+    public R bidNoticeProDetail(@RequestBody @Valid EnterpriseProjectBidNoticeProDetailBody body) throws Exception {
+        return enterpriseProjectService.bidNoticeProDetail(body);
     }
 
     @ApiOperation(value = "行政许可列表")
     @RequestMapping(value = "/creditXzxkPage", method = RequestMethod.POST)
-    public TableDataInfo creditXzxkPage(@RequestBody Map<String, Object> paramMap) throws Exception {
-        return enterpriseProjectService.creditXzxkPage(paramMap);
+    public TableDataInfo creditXzxkPage(@RequestBody @Valid EnterpriseProjectCreditXzxkPageBody body) throws Exception {
+        return enterpriseProjectService.creditXzxkPage(body);
     }
 
 }

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

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

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

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

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

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

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 1金额倒序，2金额正序，3计划开工时间倒序，4计划开工时间正序，13计划完工时间倒序，14计划完工时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+}

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

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

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

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

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticePageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /**
+     * 类型
+     */
+    private String tenderStage;
+
+    /*
+     * 1金额倒序，2金额正序，3时间倒序，4时间正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+    /**
+     * 省份
+     */
+    private List<Integer> provinceIds;
+
+    /**
+     * 市份
+     */
+    private List<Integer> cityIds;
+
+    /**
+     * 县
+     */
+    private List<Integer> areaIds;
+
+}

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

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

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

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

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeProPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+    /**
+     * 项目类别
+     */
+    private String projectType;
+
+    /**
+     * 工程用途
+     */
+    private String projectPurposes;
+
+    /**
+     * 评标办法
+     */
+    private String bidAssessmentWay;
+
+
+
+}

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

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

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

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

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidNoticeTenderStageBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectCreditXzxkPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+}

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

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

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectLandTransactionPageBody extends BasePage {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    /**
+     * 土地用途
+     */
+    private List<String> landUse;
+
+    /**
+     * 查询关键字
+     */
+    private String keys;
+
+
+    /*
+     * 1金额倒序，2金额正序，3时间倒序，4时间正序，11面积倒序，12面积正序
+     */
+    @NotNull(message = "排序条件不能为空")
+    private Integer sort;
+
+}

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

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectLandUseBody  {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+
+
+}

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

+import request from '@/utils/request'
+//新增项目
+export function addProject(param) {
+  return request({
+    url: '/business/info/add',
+    method: 'POST',
+    data: param
+  })
+}
+//商机列表
+export function getProjectlist(param) {
+  return request({
+    url: '/business/info/list',
+    method: 'GET',
+    params: param
+  })
+}
+

dsk-operate-ui/src/api/riskInformation/punish.js

+import request from '@/utils/request'
+
+// 行政处罚列表
+export function penalizePage(data) {
+  return request({
+    url: '/enterpriseCredit/penalizePage',
+    method: 'post',
+    data:data
+  })
+}
+
+// 行政处罚类型
+export function penalizeReasonType(data) {
+  return request({
+    url: '/enterpriseCredit/penalizeReasonType',
+    method: 'post',
+    data:data
+  })
+}

dsk-operate-ui/src/assets/styles/public.css

@@ -131,10 +131,12 @@ select {
 .el-input__icon {
 	line-height: 34px;
 }
-.el-dropdown-link{
+
+.el-dropdown-link {
 	cursor: pointer;
 	color: #333333;
 }
+
 .el-dropdown-link .el-input {
 	width: 100%;
 }
@@ -158,9 +160,11 @@ select {
 .el-popper[x-placement^=top] {
 	margin-bottom: 12px;
 }
-.el-popper[x-placement^=bottom]{
+
+.el-popper[x-placement^=bottom] {
 	margin-top: 12px;
 }
+
 .el-select-dropdown .popper__arrow {
 	display: none;
 }
@@ -295,15 +299,18 @@ select {
 .select-multiple .el-tag__close.el-icon-close {
 	display: none;
 }
-.el-dropdown-land{
+
+.el-dropdown-land {
 	margin-right: 24px;
 }
-.el-dropdown-land .el-icon-caret-bottom{
+
+.el-dropdown-land .el-icon-caret-bottom {
 	color: #333333;
 	margin-left: 4px;
 }
- .land_date_picker{
-     position: absolute!important;
+
+.land_date_picker {
+	position: absolute !important;
 	visibility: hidden;
 	left: 100px;
 	top: 206px;
@@ -407,3 +414,97 @@ select {
 	color: #0081FF;
 	border-color: #0081FF;
 }
+
+.toolbar-right-download {
+	padding: 8px 21px;
+	margin: 0px;
+	cursor: pointer;
+	font-weight: 400;
+	color: #232323;
+	background: #FFFFFF;
+	border-radius: 5px 5px 5px 5px;
+	border: 1px solid #D9D9D9;
+	text-align: center;
+}
+.toolbar-right-download .el-icon-arrow-down{
+	margin-left: 8px;
+}
+
+.viewlist-el-popover {
+	min-width: 130px;
+	padding: 0px;
+}
+
+.viewlist-el-popover .pup_list {
+	line-height: 36px;
+	text-align: left;
+	margin: 5px 0;
+	cursor: pointer;
+}
+
+.viewlist-el-popover .pup_list li {
+	padding: 0 16px;
+}
+
+.viewlist-el-popover .pup_list li span {
+	position: relative;
+	display: inline-block;
+}
+
+.viewlist-el-popover .pup_list li .VIP {
+	width: 24px;
+	height: 12px;
+	top: 0px;
+	right: -8px;
+	position: absolute;
+}
+
+.viewlist-el-popover .pup_list li .SVIP {
+	width: 24px;
+	height: 12px;
+	top: 0px;
+	right: -10px;
+	position: absolute;
+}
+
+.viewlist-el-popover .pup_list li:hover {
+	color: #0081FF;
+	background: #F4F6F9;
+}
+
+.viewlist-el-popover .pup_list .activefield {
+	color: #0081FF;
+	background: #F4F6F9;
+}
+
+.viewlist-el-popover .pup_list_export li {
+	display: flex;
+	align-items: center;
+	padding-right: 0px;
+}
+
+.viewlist-el-popover .pup_list_export li img {
+	width: auto;
+	height: 12px;
+	margin-left: 4px;
+}
+
+.viewlist-el-popover .pup_zhclist .active {
+	color: #0081FF;
+	background: #F4F6F9;
+}
+
+.viewlist-el-popover .pup_zhclist li span:hover {
+	color: #0081FF;
+	font-weight: 400;
+}
+
+.viewlist-el-popover .pup_zhclist .active span {
+	color: #0081FF;
+	font-weight: 400;
+}
+
+.viewlist-el-popover .pup_list_export li .lowerRate_imgzhc {
+	width: 39px;
+	height: 14px;
+}
\ No newline at end of file

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

@@ -136,6 +136,20 @@ export const constantRoutes = [
 	      meta: { title: '企业专项债详情', icon: 'radar' }
 	    }
 	  ]
+	},
+	{
+	  path: '/Land',
+	  component: Layout,
+	  hidden: true,
+	  redirect: 'noredirect',
+	  children: [
+	    {
+	      path: '/radar/Land/details/:id(\\d+)',
+	      component: () => import('@/views/radar/Land/details'),
+	      name: 'LandDetails',
+	      meta: { title: '土地交易详情', icon: 'radar' }
+	    }
+	  ]
 	}
 ]
 

dsk-operate-ui/src/store/modules/user.js

@@ -7,7 +7,8 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    userId:'',
   },
 
   mutations: {
@@ -25,6 +26,9 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USERID: (state, userId) => {
+      state.userId = userId
     }
   },
 
@@ -60,6 +64,7 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERID', user.userId)
           resolve(res)
         }).catch(error => {
           reject(error)

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -283,7 +283,7 @@
 <script>
   import { getToken } from "@/utils/auth";
   import "@/assets/styles/project.scss"
-  import {getCustomerList,importData} from '@/api/custom/custom'
+  import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
   import prvinceTree from '@/assets/json/provinceTree'
   import axios from 'axios'
@@ -428,7 +428,7 @@ export default {
         list.push(item.cityId)
       if(item.districtId != null && item.districtId != "")
         list.push(item.districtId)
-      this.address = list
+      this.queryParam.address = list
       this.queryParam.registerAddress = item.registerAddress
       this.showlist = false
     },
@@ -441,7 +441,16 @@ export default {
       }
       this.$refs[formName].validate((valid) => {
         if (valid) {
-
+          addCustomer(this.queryParam).then(result=>{
+            if(result.code == 200){
+              this.$message.success('添加成功！')
+              this.dialogVisible = false
+              this.handleCurrentChange(1)
+              this.resetForm('ruleForm')
+            }else{
+              this.$message.error(result.msg)
+            }
+          })
         } else {
         }
       });

dsk-operate-ui/src/views/custom/overview/index.vue

@@ -149,8 +149,6 @@ export default {
         {name:'其他单位',sum:'44',point:'21%'},
       ],
       datatype:'1',//切换类型
-      dtdata:[],//数据
-      dttime:[],//坐标
       datalist:[
         {name:'重庆市江北区国有资本投资运营管理集团有限公司',time:'2023-05-30',text:'新增招标公告：【江北房地产综合开发公司名下不动产鲤鱼池片区资产评估项目】 公开选取【资产评估】机构的公告',tip1:'正向',tip2:'招标公告'},
         {name:'上海城投（集团）有限公司',time:'2023-05-29',text:'新增招标公告：北横通道新建工程——机电、装饰工程Ⅱ标段',tip1:'正向',tip2:'招标公告'},
@@ -404,8 +402,6 @@ export default {
         default:
           break;
       }
-      this.dtdata = datas
-      this.dttime = labels
       this.initDT(datas,labels)
     },
     handleCurrentChange(val) {

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

+<template>
+  <div class="headForm">
+    <div class="flex-box query-box">
+      <div class="flex-box query-params">
+        <span class="common-title" v-if="title">{{ title }}</span>
+        <div class="headForm-from">
+          <div class="from-item" :key="i" v-for="(form, i) in formData">
+            <!-- 单选 -->
+            <template v-if="form.type==1">
+                <el-select
+                  v-model="form.value"
+                  clearable
+                  class="form-content-width"
+                  style="max-width: 110px"
+                  :placeholder="form.placeholder"
+                  @change="changeSelect">
+                  <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
+                </el-select>
+            </template>
+            <!-- 年月日 -->
+            <template v-if="form.type==2">
+              <el-date-picker
+                @change="changeSelect"
+                class="fromTime"
+                style="width: 210px"
+                v-model="form.value"
+                type="daterange"
+                prefix-icon="fromTime-icon"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始月份"
+                end-placeholder="结束月份">
+              </el-date-picker>
+            </template>
+            <!-- 输入框 -->
+            <template  v-if="form.type==3">
+              <div class="cooperate-name">
+                <el-input v-model="form.value" placeholder="请输入关键词"></el-input>
+                <span @click="changeSelect">搜索</span>
+              </div>
+            </template>
+            <!-- 多选 -->
+            <template  v-if="form.type==4">
+              <el-select
+                class="form-content-width"
+                v-model="form.value"
+                multiple
+                collapse-tags
+                clearable
+                style="max-width: 170px"
+                :placeholder="form.placeholder"
+                @change="changeSelect">
+                <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value" />
+              </el-select>
+            </template>
+
+          </div>
+
+        </div>
+      </div>
+      <template v-if="slots">
+        <slot name="slot"></slot>
+      </template>
+      <div v-else class="flex-box">
+        <span class="flex-box ability-total" v-if="isTotal">共{{ total }}条</span>
+        <span class="flex-box ability-excel" v-if="isExcel" @click="clickEXCEL"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "HeadForm",
+  props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    queryParams: {
+      type: Object,
+      default: {}
+    },
+    formData: {
+      type: Array,
+      default: []
+    },
+    isTotal: {
+      type: Boolean,
+      default: true
+    },
+    total: {
+      type: Number,
+      default: 0
+    },
+    isExcel: {
+      type: Boolean,
+      default: false
+    },
+    slots: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods: {
+    changeSelect(){
+      console.log(this.formData)
+      this.$emit('handle-search')
+    },
+    clickEXCEL() {
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.headForm{
+  margin-bottom: 14px;
+  .common-title{
+    margin-right: 19px;
+  }
+  ::v-deep .el-input__inner{
+    border: 1px solid #EFEFEF;
+    height: 32px;
+    line-height: 32px;
+  }
+  ::v-deep .el-form-item{
+    margin-right: 8px !important;
+  }
+  ::v-deep .el-input--medium .el-input__icon{
+    line-height: 32px;
+  }
+  .headForm-from {
+    display: flex;
+    .from-item{
+      margin-right: 8px;
+      &:last-child{
+       margin-right: 0;
+      }
+      .cooperate-name {
+        display: flex;
+        span {
+          width: 60px;
+          height: 32px;
+          line-height: 32px;
+          font-size: 14px;
+          background: #F5F5F5;
+          text-align: center;
+          color: #0081FF;
+          border: 1px solid #EFEFEF;
+          border-left: 0;
+          cursor: pointer;
+        }
+        ::v-deep .el-input{
+          flex: 1;
+        }
+        ::v-deep .el-input__inner {
+          border-right: 0;
+          border-radius: 2px 0 2px 0;
+          width: 259px;
+        }
+      }
+      .fromTime{
+        ::v-deep .el-range-input{
+          width: 100%;
+        }
+        ::v-deep .el-range-separator, ::v-deep .el-range__close-icon{
+          line-height: 24px;
+          width: 20px;
+        }
+      }
+      .fromTime-icon {
+        display: none;
+      }
+    }
+    ::v-deep .form-content-width{
+      width: 170px;
+    }
+  }
+  .ability-total{
+    font-size: 12px;
+    color: #3D3D3D;
+    position: relative;
+    &:before{
+      content: '';
+      display: inline-block;
+      width: 2px;
+      height: 2px;
+      background: rgba(35,35,35,0.4);
+      margin-right: 4px;
+    }
+  }
+  .ability-excel{
+    font-size: 14px;
+    color: rgba(35,35,35,0.8);
+    margin-left: 16px;
+    cursor: pointer;
+    img{
+      width: 18px;
+      height: 18px;
+      margin-right: 4px;
+    }
+  }
+}
+</style>

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

@@ -66,18 +66,18 @@ export default {
           {title: '开标记录', pathName: ''}
         ]},
         {title: '城投分析', pathName: '', children: [
-          {title: '区域经济', pathName: ''},
-          {title: '城投那地', pathName: ''},
-          {title: '同地区城投', pathName: ''}
+          {title: '区域经济', pathName: 'regionalEconomies'},
+          {title: '城投那地', pathName: 'landAcquisition'},
+          {title: '同地区城投', pathName: 'sameRegion'}
         ]},
         {title: '风险信息', pathName: '', children: [
-          {title: '行政处罚', pathName: ''},
-          {title: '经营异常', pathName: ''},
-          {title: '被执行人', pathName: ''},
-          {title: '失信被执行人', pathName: ''},
-          {title: '裁判文书', pathName: ''},
-          {title: '法院公告', pathName: ''},
-          {title: '开庭公告', pathName: ''},
+          {title: '行政处罚', pathName: 'punish'},
+          {title: '经营异常', pathName: 'businessAnomaly'},
+          {title: '被执行人', pathName: 'ifThePerson'},
+          {title: '失信被执行人', pathName: 'dishonesty'},
+          {title: '裁判文书', pathName: 'judgment'},
+          {title: '法院公告', pathName: 'courtNotice'},
+          {title: '开庭公告', pathName: 'openacourtsessionNotice'},
           {title: '信用中国', pathName: ''}
         ]},
         {title: '商务信息', pathName: 'business'},

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

+<template>
+  <div class="Tables">
+    <div class="table-item">
+      <el-table
+        v-loading="tableLoading"
+        :data="tableData"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        @sort-change="sortChange"
+      >
+        <el-table-column
+          v-if="isIndex"
+          label="序号"
+          width="50"
+          align="left"
+          :fixed="indexFixed"
+          :resizable="false">
+          <template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
+        </el-table-column>
+        <template v-for="item in forData">
+          <el-table-column
+            v-if="item.slot"
+            :label="item.label"
+            :prop="item.prop"
+            :width="item.width"
+            align="left"
+            :fixed="item.fixed"
+            :sortable="item.sortable"
+            :resizable="false">
+              <template slot-scope="scope">
+                <slot :name="item.prop" :row="item" :index="scope.$index" :data="scope.row.punishReason"></slot>
+              </template>
+          </el-table-column>
+          <el-table-column
+            v-else
+            :label="item.label"
+            :prop="item.prop"
+            :width="item.width"
+            align="left"
+            :fixed="item.fixed"
+            :sortable="item.sortable"
+            :resizable="false" />
+        </template>
+      </el-table>
+    </div>
+    <div class="pagination-box">
+      <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Tables",
+  props: {
+    isIndex: {
+      type: Boolean,
+      default: true
+    },
+    indexFixed: {
+      type: Boolean,
+      default: false
+    },
+    tableLoading: {
+      type: Boolean,
+      default: false
+    },
+    tableData: {
+      type: Array,
+      default: []
+    },
+    forData: {
+      type: Array,
+      default: []
+    },
+    tableDataTotal: {
+      type: Number,
+      default: 0
+    },
+    queryParams: {
+      type: Object,
+      default: {}
+    },
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods:{
+    handleCurrentChange(e){
+      this.$emit('handle-current-change',e)
+    },
+    handleSizeChange(e){
+      this.$emit('handle-current-change',e)
+    },
+    sortChange(e){
+      this.$emit('sort-change',e)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -2,50 +2,31 @@
   <div class="cooperate">
 
     <template v-if="ifEmpty">
-      <div class="flex-box query-box">
-        <div class="flex-box query-params">
-          <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-            <el-form-item prop="stage">
-              <el-select v-model="queryParams.stage" clearable class="form-content-width" placeholder="请选择项目阶段">
-                <el-option v-for="(item, index) in stageOptions" :key="index" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="status">
-              <el-select v-model="queryParams.status" clearable class="form-content-width" placeholder="请选择项目状态">
-                <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.name" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item class="cooperate-name">
-              <el-input v-model="queryParams.name" placeholder="输入企业名称查询"></el-input>
-              <span>搜索</span>
-            </el-form-item>
-          </el-form>
-        </div>
+
+      <head-form
+        :form-data="formData"
+        :query-params="queryParams"
+        :total="tableDataTotal"
+        :isExcel="true"
+        :slots="true"
+        @handle-search="handleSearch"
+      >
+        <template slot="slot">
           <div class="flex-box query-add">
             <el-button type="primary" icon="el-icon-plus" @click="drawer = true">添加商务信息</el-button>
           </div>
-      </div>
-      <div class="table-item">
-        <el-table
-          v-loading="tableLoading"
-          :data="tableData"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-        >
-          <el-table-column label="序号" width="50" align="left">
-            <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
-          </el-table-column>
-          <el-table-column label="项目名称" prop="enterpriseName" min-width="70" align="left" />
-          <el-table-column label="项目阶段" prop="level" min-width="70" align="left" />
-          <el-table-column label="投资金额(万元)" prop="legalPerson" min-width="70" align="left" />
-          <el-table-column label="项目状态" prop="capital" min-width="115" align="right" />
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-      </div>
+        </template>
+      </head-form>
+
+      <tables
+        :tableLoading="tableLoading"
+        :tableData="tableData"
+        :forData="forData"
+        :tableDataTotal="tableDataTotal"
+        :queryParams="queryParams"
+        @handle-current-change="handleCurrentChange"
+      />
+
     </template>
     <template v-else>
       <div class="cooperate_empty">
@@ -154,17 +135,46 @@
 </template>
 
 <script>
+import mixin from '../mixins/mixin'
 export default {
   name: 'Cooperate',
+  mixins: [mixin],
   components: {
 
   },
   data() {
     return {
       ifEmpty:true,
-      queryParams:{
-
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'punishReason'},
+        {label: '项目阶段', prop: 'punishBegin', width: '120'},
+        {label: '投资金额(万元)', prop: 'punishResult', width: '140'},
+        {label: '项目状态', prop: 'fileNum', width: '90'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '项目阶段',
+          options: [
+            { name: '项目阶段', value: '1' },
+            { name: '项目阶段', value: '2' },
+            { name: '项目阶段', value: '3' },
+            { name: '项目阶段', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '项目状态',
+          options: [
+            { name: '项目状态', value: '1' },
+            { name: '项目状态', value: '2' },
+            { name: '项目状态', value: '3' },
+            { name: '项目状态', value: '4' }
+          ]
         },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入企业名称查询', options: []},
+      ],
       stageOptions:[],
       statusOptions:[],
       //列表

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

@@ -8,30 +8,19 @@
           <el-button type="primary" icon="el-icon-plus" @click="opennew">新增决策链条</el-button>
         </div>
       </div>
+
       <div class="table-item">
-        <el-table
-          v-loading="tableLoading"
-          :data="tableData"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-        >
-          <el-table-column label="序号" width="50" align="left">
-            <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
-          </el-table-column>
-          <el-table-column label="姓名" prop="enterpriseName" min-width="70" align="left" />
-          <el-table-column label="角色" prop="level" min-width="70" align="left" />
-          <el-table-column label="公司/机关" prop="legalPerson" min-width="70" align="left" />
-          <el-table-column label="职位" prop="capital" min-width="115" align="left" />
-          <el-table-column label="联系方式" prop="capital" min-width="115" align="left" />
-          <el-table-column label="内部维护人" prop="capital" min-width="115" align="left" />
-          <el-table-column label="备注" prop="capital" min-width="115" align="left" />
-        </el-table>
-      </div>
-      <div class="pagination-box">
-        <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+        <tables
+          :indexFixed="true"
+          :tableLoading="tableLoading"
+          :tableData="tableData"
+          :forData="forData"
+          :tableDataTotal="tableDataTotal"
+          :queryParams="queryParams"
+          @handle-current-change="handleCurrentChange"
+        />
       </div>
+
     </template>
     <template v-else>
       <div class="cooperate_empty">
@@ -94,10 +83,11 @@ import {
   getList,
   addChain
 } from '@/api/decisionMaking/decisionMaking'
+import Tables from "../component/Tables"
 export default {
   name: 'DecisionMaking',
   components: {
-
+    Tables
   },
   data() {
     return {
@@ -107,6 +97,15 @@ export default {
         pageNum:1,
         pageSize:10,
       },
+      forData: [
+        {label: '姓名', prop: 'punishReason', width: '124'},
+        {label: '角色', prop: 'punishBegin', width: '110'},
+        {label: '公司/机关', prop: 'punishResult', width: '268'},
+        {label: '职位', prop: 'fileNum', width: '110'},
+        {label: '联系方式', prop: 'cgrdm', width: '105'},
+        {label: '内部维护人', prop: 'office', width: '88'},
+        {label: '备注', prop: 'dataId'},
+      ],
       stageOptions:[],
       statusOptions:[],
       //列表
@@ -114,7 +113,7 @@ export default {
       tableData:[],
       pageIndex:1,
       pageSize:10,
-      tableDataTotal:0,
+      tableDataTotal:50,
       //弹窗
       dialogVisible: false,
     }
@@ -136,7 +135,7 @@ export default {
     },
     //分页
     handleCurrentChange(e){
-
+      console.log(e)
     },
     handleSizeChange(e){
 

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

@@ -15,6 +15,18 @@
           <Branch v-if="currentPath.pathName=='branch'" />
           <Financial v-if="currentPath.pathName=='financial'" :company-id="companyId" />
           <Business v-if="currentPath.pathName=='business'" />
+          <!-- 投诚分析 -->
+          <LandAcquisition v-if="currentPath.pathName=='landAcquisition'" />
+          <RegionalEconomies v-if="currentPath.pathName=='regionalEconomies'" />
+          <SameRegion v-if="currentPath.pathName=='sameRegion'" />
+          <!-- 风险信息 -->
+          <Punish v-if="currentPath.pathName=='punish'" />
+          <BusinessAnomaly v-if="currentPath.pathName=='businessAnomaly'" />
+          <IfThePerson v-if="currentPath.pathName=='ifThePerson'" />
+          <Dishonesty v-if="currentPath.pathName=='dishonesty'" />
+          <Judgment v-if="currentPath.pathName=='judgment'" />
+          <CourtNotice v-if="currentPath.pathName=='courtNotice'" />
+          <OpenacourtsessionNotice v-if="currentPath.pathName=='openacourtsessionNotice'" />
           <!-- 招标偏好 -->
           <Preference v-if="currentPath.pathName=='preference'" />
           <!-- 合作情况 -->
@@ -42,6 +54,16 @@ import Overseas from "./overview/overseas"   //企业概览-对外投资
 import Branch from "./overview/branch"   //企业概览-分支机构
 import Financial from "./financial" //财务简析
 import Business from "./business" //商务信息
+import LandAcquisition from "./urbanLnvestment/landAcquisition" //投诚分析-城投拿地
+import RegionalEconomies from "./urbanLnvestment/regionalEconomies" //投诚分析-区域经济
+import SameRegion from "./urbanLnvestment/sameRegion" //投诚分析-同地区城投
+import Punish from "./riskInformation/punish" //风险信息-行政处罚
+import BusinessAnomaly from "./riskInformation/businessAnomaly" //风险信息-经营异常
+import IfThePerson from "./riskInformation/ifThePerson" //风险信息-被执行人
+import Dishonesty from "./riskInformation/dishonesty" //风险信息-失信被执行
+import Judgment from "./riskInformation/judgment" //风险信息-判决文书
+import CourtNotice from "./riskInformation/courtNotice" //风险信息-法院公告
+import OpenacourtsessionNotice from "./riskInformation/openacourtsessionNotice" //风险信息-开庭公告
 import Preference from "./preference" //招标偏好
 import Cooperate from "./cooperate" //合作情况
 import DecisionMaking from "./decisionMaking" //决策链条
@@ -59,6 +81,16 @@ export default {
     Branch,
     Financial,
     Business,
+    LandAcquisition,
+    RegionalEconomies,
+    SameRegion,
+    Punish,
+    BusinessAnomaly,
+    IfThePerson,
+    Dishonesty,
+    Judgment,
+    CourtNotice,
+    OpenacourtsessionNotice,
     Preference,
     Cooperate,
     DecisionMaking,

dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js

+import HeadForm from "../component/HeadForm"
+import Tables from "../component/Tables"
+export default {
+  components: {
+    HeadForm,
+    Tables
+  },
+  data() {
+    return {
+
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    formParams(){
+      let condtion = {}
+      let reqData = {}
+      this.formData.forEach(item => {
+        if(item.value || (item.value && item.value.length)) {
+          if(item.fieldName == 'time') {
+            condtion[item.startTime] = item.value[0];
+            condtion[item.endTime] = item.value[1];
+            return
+          }
+          condtion[item.fieldName] = item.value
+        }
+      })
+      Object.keys(condtion).forEach(key => {
+        if(condtion[key]) {
+          reqData[key] = condtion[key]
+        }
+      })
+      if(this.queryParams && Object.keys(this.queryParams)) {
+        reqData = Object.assign(reqData, this.queryParams)
+      }
+      return reqData
+    },
+    //条件
+    handleSearch(){
+      let params = this.formParams()
+      params.pageNum = 1
+      this.handleQuery(params)
+    },
+    //分页
+    handleCurrentChange(e){
+      console.log(e)
+      let params = this.formParams()
+      params.pageNum = e
+      this.handleQuery(params)
+    },
+    handleSizeChange(e){
+
+    },
+    //排序
+    sortChange(e){
+      console.log(e)
+    }
+  }
+}

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

@@ -7,17 +7,26 @@
         </div>
       </div>
       <div class="query-params">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item>
-            <el-input v-model="queryParams.key"
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.key"
+              @focus="nowedit = 1"
+              placeholder="请输入商务条件特点"
+              class="textarea"
               type="textarea"
-                      :autosize="{ minRows: 8, maxRows: 8}"
+              :autosize="autosize"
               maxlength="500"
-                      show-word-limit
-                      placeholder="请输入商务条件特点">
+              :show-word-limit="true">
             </el-input>
-          </el-form-item>
-        </el-form>
+            <div class="flex btns" v-if="nowedit === 1">
+              <div class="flex">
+                <div class="btnsmall btn_primary">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="preference-item">
@@ -27,17 +36,26 @@
         </div>
       </div>
       <div class="query-params">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item>
-            <el-input v-model="queryParams.key"
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.key"
+              @focus="nowedit = 2"
+              placeholder="请输入决策链条"
+              class="textarea"
               type="textarea"
-                      :autosize="{ minRows: 8, maxRows: 8}"
+              :autosize="autosize"
               maxlength="500"
-                      show-word-limit
-                      placeholder="请输入决策链条">
+              :show-word-limit="true" >
             </el-input>
-          </el-form-item>
-        </el-form>
+            <div class="flex btns" v-if="nowedit === 2">
+              <div class="flex">
+                <div class="btnsmall btn_primary">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="preference-item">
@@ -47,17 +65,26 @@
         </div>
       </div>
       <div class="query-params">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item>
-            <el-input v-model="queryParams.key"
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.key"
+              @focus="nowedit = 3"
+              placeholder="请输入招投标流程特点"
+              class="textarea"
               type="textarea"
-                      :autosize="{ minRows: 8, maxRows: 8}"
+              :autosize="autosize"
               maxlength="500"
-                      show-word-limit
-                      placeholder="请输入招投标流程特点">
+              :show-word-limit="true">
             </el-input>
-          </el-form-item>
-        </el-form>
+            <div class="flex btns" v-if="nowedit === 3">
+              <div class="flex">
+                <div class="btnsmall btn_primary">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="preference-item">
@@ -67,17 +94,26 @@
         </div>
       </div>
       <div class="query-params">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
-          <el-form-item>
-            <el-input v-model="queryParams.key"
+        <div class="params-item">
+          <div class="flex-box item-flex">
+            <el-input
+              v-model="queryParams.key"
+              @focus="nowedit = 4"
+              placeholder="请输入履约阶段特点"
+              class="textarea"
               type="textarea"
-                      :autosize="{ minRows: 8, maxRows: 8}"
+              :autosize="autosize"
               maxlength="500"
-                      show-word-limit
-                      placeholder="请输入履约阶段特点">
+              :show-word-limit="true">
             </el-input>
-          </el-form-item>
-        </el-form>
+            <div class="flex btns" v-if="nowedit === 4">
+              <div class="flex">
+                <div class="btnsmall btn_primary">确定</div>
+                <div class="cancels " @click="nowedit = 0" style="">取消</div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
 
@@ -93,9 +129,15 @@ export default {
   },
   data() {
     return {
+      autosize: {
+        minRows: 8,
+        maxRows: 8
+      },
       queryParams:{
 
-      }
+      },
+      key:'',
+      nowedit: 0
     }
   },
   created() {
@@ -116,12 +158,34 @@ export default {
   padding: 16px;
   .query-params{
     margin-top:20px;
-    ::v-deep .el-form-item{
+    .params-item{
       width: 100%;
+      .el-textarea{
+        width: 800px;
+        textarea{
+          color: rgb(35, 35, 35);
+          border-radius: 2px;
+          border: 1px solid rgb(217, 217, 217);
+          font-size: 14px;
+          padding: 10px;
         }
-    ::v-deep .el-form-item__content{
-      width: 80%;
       }
+      .item-flex{
+        align-items: flex-end;
+        .btns{
+          .btnsmall{
+            width: 56px;
+            height: 28px;
+            line-height: 28px;
+            margin-left: 12px;
+          }
+          .cancels{
+            line-height: 28px;
+          }
+        }
+      }
+    }
+
   }
 }
 </style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="经营异常"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'BusinessAnomaly',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '列入原因', prop: 'inReason', width: '508'},
+        {label: '列入日期', prop: 'inDate', width: '95'},
+        {label: '做出决定机关（移入）', prop: 'department', width: '264'},
+        {label: '移出经营异常名录原因', prop: 'outReason', width: '320'},
+        {label: '移除日期', prop: 'outDate', width: '95'},
+        {label: '做出决定机关（移除）', prop: 'outDepartment', width: '264'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'years', value: '', placeholder: '列入时间',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        }
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="法院公告"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'CourtNotice',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '案由', prop: 'enterpriseName'},
+        {label: '公告时间', prop: 'level', width: '95'},
+        {label: '当事人', prop: 'capital', width: '240'},
+        {label: '案号', prop: 'cgrdm', width: '210'},
+        {label: '公告类型', prop: 'cgrssqy', width: '210'},
+        {label: '公告法院', prop: 'dataId', width: '280'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '公告类型',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '案由',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '身份',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="失信被执行人"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Dishonesty',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '失信被执行人行为具体情形', prop: 'executionDesc', width: '508'},
+        {label: '立案日期', prop: 'date', width: '95'},
+        {label: '履行情况', prop: 'executionStatus', width: '120'},
+        {label: '立案文号', prop: 'caseNumber', width: '210'},
+        {label: '执行依据文号', prop: 'docNumber', width: '360'},
+        {label: '执行法院', prop: 'court', width: '280'}
+      ],
+      formData: [
+        { type: 2, fieldName: 'time', value: '', placeholder: '执行时间',startTime: 'dateFrom',endTime: 'dateTo', options: []}
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="被执行人"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'IfThePerson',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '执行标的（元）', prop: 'amount', width: '140'},
+        {label: '案号', prop: 'caseNumber', width: '320'},
+        {label: '执行法院', prop: 'court'},
+        {label: '立案日期', prop: 'caseDate', width: '95'}
+      ],
+      formData: [
+        { type: 2, fieldName: 'time', value: '', placeholder: '执行时间',startTime: 'dateFrom',endTime: 'dateTo', options: []}
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="判决文书"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'Judgment',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '案由', prop: 'causeAction', width: '240'},
+        {label: '执行案号', prop: 'causeNo', width: '210'},
+        {label: '身份', prop: 'role', width: '120'},
+        {label: '当事人', prop: 'relatedCompanies', width: '240'},
+        {label: '案件金额（元）', prop: 'subAmount', width: '140'},
+        {label: '判决结果', prop: 'judgeresult', width: '508'},
+        {label: '判决日期', prop: 'date', width: '95'},
+      ],
+      formData: [
+        { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'role', value: '', placeholder: '身份',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 2, fieldName: 'tiem', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '搜索关键字', options: []}
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="开庭公告"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="false"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'OpenacourtsessionNotice',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '案由', prop: 'causeAction', width: '240'},
+        {label: '开庭日期', prop: 'hearingDate', width: '95'},
+        {label: '当事人', prop: 'relatedCompanies', width: '428'},
+        {label: '身份', prop: 'pureRole', width: '120'},
+        {label: '公告内容', prop: 'cgrssqy', width: '508'},
+        {label: '案号', prop: 'caseNo', width: '210'},
+        {label: '法院', prop: 'dataId', width: '280'},
+        {label: '法庭', prop: 'dataId', width: '180'},
+        {label: '承办部门', prop: 'dataId', width: '280'},
+        {label: '审判长/主判人', prop: 'dataId', width: '106'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 1, fieldName: 'pureRole', value: '', placeholder: '身份',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    toDetail(){
+      let Id = '111'
+      this.$router.push({ path: '/project/projectList/detail', query: Id });
+    },
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery(params) {
+      console.log(params)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="行政处罚"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :indexFixed="true"
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    >
+      <template slot="punishReason" slot-scope="scope">
+        <span :class="[isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
+          {{ scope.data }}
+          <span v-if="isOverHiddenFlag(scope.row.width, showList, scope.index, 0, scope.data)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
+        </span>
+      </template>
+    </tables>
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import {
+  penalizePage,
+  penalizeReasonType
+} from '@/api/riskInformation/punish'
+export default {
+  name: 'Punish',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
+        {label: '决定日期', prop: 'punishBegin', width: '95'},
+        {label: '处罚结果', prop: 'punishResult', width: '264'},
+        {label: '处罚文书号', prop: 'fileNum', width: '200'},
+        {label: '相关人员', prop: 'cgrdm', width: '88'},
+        {label: '处罚机关', prop: 'office', width: '264'},
+        {label: '处罚结束日期', prop: 'dataId', width: '100'},
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '处罚类别',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[
+        {
+          punishReason:'根据成都市住房和城乡建设局《关于持续开展建设工地扬尘治理专项攻坚行动的通知》（成住建发（2021]178号），对你单位参建的项目住宅、商业及配套设施（2020-510107-47-03-506368） （金茂府三期）（安监备案编号：WH-CJ-AJ-2021-001）监督检查中发现未湿法作业（现场存在露天切割石材，未采取降尘防尘措施）。）的违规行为，予以记录并扣分，预扣减施工企业现场信用信息得分0.05分，预扣减监理企业现场信用信息得分...预扣减施工企业现场信用信息得分0.05分，预扣减监理企业现场信用信息得分',
+          punishBegin:'2015-08-06',
+          punishResult:'列入全省3-6月份拖欠农民工工资预警项目,现予以限期整改通报。',
+          fileNum:'铜城建罚决字【2021)】18-5号',
+          cgrdm:'测试1',
+          office:'江苏省住房和城乡建设厅',
+          dataId:'2015-08-06',
+        }
+      ],
+      tableDataTotal:200,
+      showList:[],
+    }
+  },
+  created() {
+    this.dataRegion()
+    this.penalizeReasonTypeData()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      penalizePage(this.queryParams).then((res) => {
+        console.log(res)
+      })
+    },
+    penalizeReasonTypeData(){
+      penalizeReasonType({cid:6034}).then((res) => {
+        console.log(res)
+      })
+    },
+    handleQuery(params) {
+      console.log(params)
+    },
+    changeShowAll(row, column) {
+      this.showList.push({
+        row: row,
+        column: column
+      })
+    },
+    isOverHiddenFlag(data, showList, row, column, value) {
+      if(value && String(value).length > this.getLenth(data)) {
+        return !showList.some(item => item.row==row&&item.column==column)
+      }else {
+        return false
+      }
+    },
+    getLenth(data) {
+      return Math.floor(data / 12) * 5
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  input{
+    border: 1px solid #EFEFEF;
+  }
+  ::v-deep .el-form-item{
+    margin-right: 8px !important;
+  }
+  ::v-deep .el-table__body tr.current-row > td.el-table__cell{
+    background-color: #ffffff;
+  }
+  .query-box{
+    margin: 10px 0 20px;
+  }
+  .cell-span {
+    display: inline-block;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+    cursor: pointer;
+
+    >span {
+      display: inline-block;
+      width: 37px;
+      position: absolute;
+      right: 0;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 1;
+    }
+  }
+}
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="城投拿地"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+export default {
+  name: 'landAcquisition',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '项目名称', prop: 'punishReason', width: '508'},
+        {label: '土地用途', prop: 'punishBegin', width: '120'},
+        {label: '行业分类', prop: 'punishResult', width: '120'},
+        {label: '供地方式', prop: 'fileNum', width: '120'},
+        {label: '土地坐落', prop: 'cgrdm', width: '120'},
+        {label: '成交金额（万元）', prop: 'office', width: '130'},
+        {label: '总面积（㎡）', prop: 'dataId', width: '120'},
+        {label: '批准单位', prop: 'dataId', width: '120'},
+        {label: '签订日期', prop: 'dataId', width: '120'}
+      ],
+      formData: [
+        { type: 4, fieldName: 'penalizeReasonType', value: [], placeholder: '土地用途',
+          options: [
+            { name: '处罚类别1', value: '1' },
+            { name: '处罚类别2', value: '2' },
+            { name: '处罚类别3', value: '3' },
+            { name: '处罚类别4', value: '4' }
+          ]
+        },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
+      ],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      pageIndex:1,
+      pageSize:10,
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+    handleQuery() {
+
+    },
+    resetQuery() {
+
+    },
+    //分页
+    handleCurrentChange(e){
+
+    },
+    handleSizeChange(e){
+
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

+<template>
+  <div class="regionalEconomies">
+    <div class="flex-box query-box">
+      <div class="flex-box query-params">
+        <span class="common-title">区域经济</span>
+      </div>
+    </div>
+    <div class="table-item">
+      <el-table
+        :data="getValues"
+        :show-header="false"
+        border
+      >
+        <el-table-column
+          v-for="(item, index) in getHeaders"
+          :key="index"
+          :prop="item"
+        >
+        </el-table-column>
+      </el-table>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'regionalEconomies',
+  components: {
+
+  },
+  data() {
+    return {
+      tableData: [
+        {
+          zb:"2023年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+        {
+          zb:"2022年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+        {
+          zb:"2021年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+        {
+          zb:"2020年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+        {
+          zb:"2019年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+        {
+          zb:"2018年",
+          gdp:'129,118.58',
+          gdpzs:'124,369.67',
+          rjgdp:'134,369.67',
+        },
+      ],
+      headers: [
+        {
+          prop: 'zb',
+          label: '指标',
+        },
+        {
+          prop: 'name',
+          label: '经济',
+        },
+        {
+          prop: 'gdp',
+          label: 'GDP（亿元）',
+        },
+        {
+          prop: 'gdpzs',
+          label: 'GDP增速',
+        },
+        {
+          prop: 'rjgdp',
+          label: '人均GDP（元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '第一产业增加值（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '第二产业增加值（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '第三产业增加值（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '人口（万人）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '工业增加值（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '工业总产值（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '房地产开发投资（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '进出口总额（亿美元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '社会消费品零售总额（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '城镇居民人均可支配收入（元）',
+        },
+        {
+          prop: 'cz',
+          label: '财政',
+        },
+        {
+          prop: 'rjgdp',
+          label: '一般公共预算收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '般公共预算收入增速',
+        },
+        {
+          prop: 'rjgdp',
+          label: '税收收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '转移性收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '上级补助收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '一般公共预算支出（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '政府性基金收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '土地出让收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '政府性基金支出（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '国有资本经营收入（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '国有资本经营支出（亿元）',
+        },
+        {
+          prop: 'zw',
+          label: '债务',
+        },
+        {
+          prop: 'rjgdp',
+          label: '地方政府债务余额（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '一般债余额（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '专项债余额（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '地方政府债务限额（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '城投平台有息债务（亿元）',
+        },
+        {
+          prop: 'rjgdp',
+          label: '财政自给率',
+        },
+        {
+          prop: 'rjgdp',
+          label: '负债率',
+        },
+        {
+          prop: 'rjgdp',
+          label: '负债率-宽口径',
+        },
+        {
+          prop: 'rjgdp',
+          label: '债务率',
+        },
+        {
+          prop: 'rjgdp',
+          label: '债务率-宽口径',
+        },
+      ],
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+    getHeaders() {
+      return this.tableData.reduce((pre, cur, index) => pre.concat(`value${index}`), ['title'])
+    },
+    getValues() {
+      return this.headers.map(item => {
+        return this.tableData.reduce((pre, cur, index) => Object.assign(pre, {['value' + index]: cur[item.prop]}), {'title': item.label,});
+      });
+    }
+  },
+  methods: {
+    //地区
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.regionalEconomies{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+
+</style>

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

+<template>
+  <div class="corePersonnel">
+    <head-form
+      title="同地区城投"
+      :form-data="formData"
+      :query-params="queryParams"
+      :total="tableDataTotal"
+      :isExcel="true"
+      @handle-search="handleSearch"
+    />
+
+    <tables
+      :tableLoading="tableLoading"
+      :tableData="tableData"
+      :forData="forData"
+      :tableDataTotal="tableDataTotal"
+      :queryParams="queryParams"
+      @handle-current-change="handleCurrentChange"
+      @sort-change="sortChange"
+    />
+
+  </div>
+</template>
+
+<script>
+import mixin from '../mixins/mixin'
+import dataRegion from '@/assets/json/dataRegion'
+export default {
+  name: 'SameRegion',
+  mixins: [mixin],
+  components: {
+
+  },
+  data() {
+    return {
+      queryParams: {
+        cid: 6034,
+        pageNum: 1,
+        pageSize: 10
+      },
+      forData: [
+        {label: '企业名称', prop: 'punishReason'},
+        {label: '成员层级', prop: 'punishBegin', width: '120'},
+        {label: '法定代表人', prop: 'punishResult', width: '120'},
+        {label: '注册资本', prop: 'fileNum', width: '120', sortable:true},
+        {label: '成立日期', prop: 'cgrdm', width: '120', sortable:true},
+        {label: '实控人控股', prop: 'office', width: '130', sortable:true},
+        {label: '行业类型', prop: 'dataId', width: '120'},
+        {label: '所属省', prop: 'dataId', width: '120'},
+        {label: '所属市', prop: 'dataId', width: '120'},
+        {label: '所属区/县', prop: 'dataId', width: '120'}
+      ],
+      formData: [
+        { type: 1, fieldName: 'penalizeReasonType', value: '', placeholder: '筛选',
+          options: []
+        },
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词', options: []},
+      ],
+      props: {
+        value: 'id',
+        multiple: true,
+      },
+      addressList: [],
+      //列表
+      tableLoading:false,
+      tableData:[],
+      tableDataTotal:0,
+    }
+  },
+  created() {
+    this.dataRegion()
+  },
+  computed: {
+
+  },
+  methods: {
+    async dataRegion() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+      var str = [];
+      for (let x = 0; x < 3; x++) {
+        for (let i = 0; i < dataRegion.length; i++) {
+          if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+            str.push({
+              'id': dataRegion[i].id,
+              "label": dataRegion[i].regionName,
+              "short": dataRegion[i].short,
+              "value": dataRegion[i].parentId,
+              "children": []
+            });
+          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+            for (let j = 0; j < str.length; j++) {
+              if (str[j].id == dataRegion[i].parentId) {
+                str[j].children.push({
+                  'id': dataRegion[i].id,
+                  "label": dataRegion[i].regionName,
+                  "short": dataRegion[i].short,
+                  "value": dataRegion[i].parentId,
+                  "children": []
+                });
+              }
+            }
+          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+            for (let j = 0; j < str.length; j++) {
+              for (let k = 0; k < str[j].children.length; k++) {
+                if (str[j].children[k].id == dataRegion[i].parentId) {
+                  str[j].children[k].children.push({
+                    'id': dataRegion[i].id,
+                    "label": dataRegion[i].regionName,
+                    "short": dataRegion[i].short,
+                    "value": dataRegion[i].parentId
+                    // "children":[]
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+      this.addressList = str;
+    },
+    handleQuery() {
+
+    },
+    resetQuery() {
+
+    },
+    //分页
+    handleCurrentChange(e){
+
+    },
+    handleSizeChange(e){
+
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.corePersonnel{
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 16px;
+  .query-box{
+    margin: 10px 0 20px;
+  }
+}
+</style>

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

@@ -35,14 +35,14 @@ export default {
     }
   },
   created() {
-    let name = sessionStorage.getItem('currentTab')
-    if (name != "undefined" && name){
-      this.activeName = name;
-    }
+    // let name = sessionStorage.getItem('currentTab')
+    // if (name != "undefined" && name){
+    //   this.activeName = name;
+    // }
   },
   methods: {
     handleClick() {
-      sessionStorage.setItem('currentTab', this.activeName)
+      // sessionStorage.setItem('currentTab', this.activeName)
     }
   }
 }

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

+<template>
+  <div class="qgjjdq">
+    <div class="content">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <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 multiple collapse-tags class="form-content-width" placeholder="请选择年度" @change="querySubmit">
+                <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="area">
+              <el-cascader
+                ref="address"
+                :options="addressList"
+                :props="props"
+                v-model="queryParams.address"
+                @change="querySubmit"
+                placeholder="地区选择"
+                collapse-tags
+                clearable></el-cascader>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="flex-box query-ability">
+          <span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
+          <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        </div>
+      </div>
+      <div class="table-item">
+        <el-table
+          v-loading="tableLoading"
+          :data="tableData"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+        >
+          <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="地区" min-width="70" align="left" fixed>
+            <template slot-scope="scope">
+              <router-link to="" tag="a" class="a-link">{{ scope.row.address || '广东省' }}</router-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="年度明细" prop="dataId" width="90" align="left" fixed>
+            <template slot-scope="scope">
+              <img src="@/assets/images/icon_detailed.png" class="icon-detailed" @click="handleDetail(scope.row)">
+            </template>
+          </el-table-column>
+          <el-table-column label="GDP（元）" prop="dataId" sortable min-width="115" align="right" />
+          <el-table-column label="GDP增速" prop="cgrdm" sortable min-width="100" align="right" />
+          <el-table-column label="人均GDP（元）" prop="cgrssqy" sortable width="125" align="right" />
+          <el-table-column label="人口（万人）" prop="cgrssqy" sortable width="120" align="right" />
+          <el-table-column label="一般公共预算收入 (亿元)" prop="cgrzyhy" sortable width="170" align="right" />
+          <el-table-column label="一般公共预算收入增速（%）" prop="cgzzxs" sortable min-width="140" align="right" />
+          <el-table-column label="一般公共预算支出（亿元）" prop="cgfs" sortable width="140" align="left" />
+          <el-table-column label="政府性基金收入（亿元）" width="140" sortable align="left">
+            <template slot-scope="scope">
+              <router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>
+            </template>
+          </el-table-column>
+          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="cgfs" sortable width="150" align="left" />
+          <el-table-column label="政府性基金支出（亿元）" prop="cgfs" width="170" sortable align="left" />
+          <el-table-column label="国有资产经营收入（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="国有资产经营支出（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="固定资产投资（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="财政自给率（%）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="地方政府债务余额（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="一般债余额（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="专项债余额（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="地方政府债务限额（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="城投平台有息债务（亿元）" prop="cgfs" width="160" align="left" >
+            <template slot="header" slot-scope="scope">
+            <span>城投平台有息债务（亿元）
+              <el-tooltip popper-class="tips" effect="light" content="城投平台有息债务是该地区行政区划下所有的城投公司的短期债务与长期债务合计。其中，短期债务=短期借款+一年内到期的非流动负债+应付短期债券，长期债务=长期借款+应付长期债券。" placement="top">
+                <i class="el-icon-warning-outline"></i>
+              </el-tooltip>
+            </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="负债率（%）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="负债率（宽口径）（%）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="债务率（%）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="债务率（宽口径）（%）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="金融机构存款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="金融机构贷款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="第一产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="第二产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="第三产业增加值（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="工业增加值（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="工业总产值（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="进出口总额（亿美元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="社会消费品零售总额（亿元）" prop="cgfs" width="160" align="left" />
+          <el-table-column label="城镇居民人均可支配收入（元）" prop="cgfs" width="160" align="left" />
+        </el-table>
+      </div>
+      <div class="pagination-box">
+        <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+      </div>
+      <economies-detail ref="economiesDetail" />
+    </div>
+  </div>
+</template>
+
+<script>
+  import { browsedIndexPage } from '@/api/nationalEconomies'
+  import dataRegion from '@/assets/json/dataRegion'
+  import economiesDetail from './economies-detail'
+  import axios from 'axios'
+  export default {
+    name: 'NationalEconomies',
+    components: {
+      economiesDetail
+    },
+    data() {
+      return {
+        queryParams: {
+          year: '',
+          address: ''
+        },
+        yearOptions: [
+          { name: '2023年', value: '2023' },
+          { name: '2022年', value: '2022' },
+          { name: '2021年', value: '2021' },
+        ],
+        props: {
+          value: 'id',
+          multiple: true,
+        },
+        addressList: [],
+        tableData: [
+          {
+            dataId:'1',
+            cgrssqy:'100',
+            cgfs:'200'
+          }
+        ],
+        tableLoading: false,
+        pageIndex: 1,
+        pageSize: 10,
+        tableDataTotal: 0,
+      }
+    },
+    created() {
+      this.querySubmit()
+      this.dataRegion()
+    },
+    methods: {
+      //地区
+      async dataRegion() {
+        // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+        //   headers: {
+        //     'Content-Type': 'application/json'
+        //   }
+        // }).then(res => {
+        //   if (res.data.code == 200) {
+        //     console.log(res.data.data)
+        //   }
+        // })
+        var str = [];
+        for (let x = 0; x < 3; x++) {
+          for (let i = 0; i < dataRegion.length; i++) {
+            if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+              str.push({
+                'id': dataRegion[i].id,
+                "label": dataRegion[i].regionName,
+                "short": dataRegion[i].short,
+                "value": dataRegion[i].parentId,
+                "children": []
+              });
+            } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+              for (let j = 0; j < str.length; j++) {
+                if (str[j].id == dataRegion[i].parentId) {
+                  str[j].children.push({
+                    'id': dataRegion[i].id,
+                    "label": dataRegion[i].regionName,
+                    "short": dataRegion[i].short,
+                    "value": dataRegion[i].parentId,
+                    "children": []
+                  });
+                }
+              }
+            } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+              for (let j = 0; j < str.length; j++) {
+                for (let k = 0; k < str[j].children.length; k++) {
+                  if (str[j].children[k].id == dataRegion[i].parentId) {
+                    str[j].children[k].children.push({
+                      'id': dataRegion[i].id,
+                      "label": dataRegion[i].regionName,
+                      "short": dataRegion[i].short,
+                      "value": dataRegion[i].parentId
+                      // "children":[]
+                    });
+                  }
+                }
+              }
+            }
+          }
+        }
+        this.addressList = str;
+      },
+      // 查询提交
+      async querySubmit() {
+        // this.tableLoading = true
+        const params = { pageIndex: this.pageIndex, pageSize: this.pageSize, browsedType: 1 }
+
+        if(this.queryParams.address){
+          let arr = this.$refs.address.getCheckedNodes();
+          let provinceCode = [],cityCode = [],countyCode = [];
+          for (var i in arr) {
+            if (arr[i].parent) {
+              if (!arr[i].parent.checked) {
+                arr[i].hasChildren && cityCode.push(arr[i].value);
+                !arr[i].hasChildren && countyCode.push(arr[i].value);
+              }
+            } else {
+              provinceCode.push(arr[i].value)
+            }
+          }
+          if(provinceCode.length > 0){
+            params.procinceId=provinceCode.join(',')
+          }
+          if(cityCode.length > 0){
+            params.cityId=cityCode.join(',')
+          }
+          if(countyCode.length > 0){
+            params.districtId=countyCode.join(',')
+          }
+        }
+        console.log(params)
+
+        // browsedIndexPage(params).then(res => {
+        //   this.tableData = res.data.list
+        //   this.tableDataTotal = res.data.totalCount
+        // })
+        // // 延迟关闭加载效果
+        // setTimeout(() => {
+        //   this.tableLoading = false
+        // }, 200)
+      },
+      // 明细
+      handleDetail(row) {
+        this.$refs.economiesDetail.open(row)
+      },
+      // 重置页数
+      handleSizeChange(val) {
+        this.pageIndex = 1
+        this.pageSize = val
+        this.querySubmit()
+      },
+      // 跳转指定页数
+      handleCurrentChange(val) {
+        this.pageIndex = val
+        this.querySubmit()
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .qgjjdq{
+    .query-box{
+      margin: -8px 0 8px 0;
+      .query-params{
+        .el-form{
+          margin-left: 24px;
+        }
+      }
+    }
+    .content{
+      background: #ffffff;
+      padding: 16px;
+      margin-top: 12px;
+      .table-item{
+        ::v-deep .el-table{
+          th{
+            font-size: 12px !important;
+            font-weight: 400 !important;
+          }
+          .el-table__fixed-header-wrapper th{
+            background: #F0F3FA;
+          }
+          .caret-wrapper{
+            width: 10px;
+            /*<!--position: absolute;-->*/
+            /*<!--right: 12px;-->*/
+            /*<!--top: -3px;-->*/
+          }
+          /*.sort-caret{*/
+          /*position: initial;*/
+          /*}*/
+          /*.ascending{*/
+          /*margin-bottom: 3px;*/
+          /*}*/
+        }
+      }
+    }
+  }
+</style>

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

+<template>
+  <div class="zhaobiao">
+    <div class="zb-content content1">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">近五年全国招标数量</span>
+        </div>
+      </div>
+      <div class="text">近五年全国项目招标数量达到10,610,000个，招标数量前五的地区分别是广东（38251个）、江苏（36812个）、山东（32615个）、浙江（26341个）、河南（21621个）。</div>
+      <div class="main1">
+        <div id="zb-echarts" style="height: 250px"></div>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近5年全国公开的招标项目，未公开的不含在内</p>
+      </div>
+      <div class="main2">
+        <div class="flex-box query-box head">
+          <span>近五年全国招标总数<span class="number">10,610,000 </span>个</span>
+          <!--<el-select v-model="year" filterable multiple collapse-tags class="form-content-width" placeholder="请选择">-->
+            <!--<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />-->
+          <!--</el-select>-->
+        </div>
+        <div class="table-item">
+          <el-table
+            :data="tableData"
+            border
+            height="430"
+            fit
+            highlight-current-row
+          >
+            <el-table-column label="序号" width="50" align="left">
+              <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+            </el-table-column>
+            <el-table-column prop="area" label="地区"/>
+            <el-table-column prop="number" sortable label="招标数量"/>
+            <el-table-column prop="zb" sortable label="占比"/>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <div class="zb-content content2">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">全国招标项目概览</span>
+        </div>
+      </div>
+      <div class="text">通过对近五年全国招标数据进行分析，发现该企业主要集中在3月（230个）、6月（209个）进行招标。</div>
+      <div class="main1">
+        <div id="gl-echarts" style="height: 250px"></div>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近五年全国公开的招标项目，未公开的不含在内</p>
+      </div>
+      <div class="table-item">
+        <el-table
+          :data="tableData1"
+          border
+          height="430"
+          fit
+          highlight-current-row
+        >
+          <el-table-column label="序号" width="50" align="left">
+            <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column prop="area" label="月份"/>
+          <el-table-column prop="number" sortable label="招标数量"/>
+          <el-table-column prop="zb" sortable label="占比"/>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+export default {
+  name: 'NationalEconomies',
+  data() {
+    return {
+      year:'',
+      yearOptions: [
+        { name: '2023年', value: '2023' },
+        { name: '2022年', value: '2022' },
+        { name: '2021年', value: '2021' },
+      ],
+      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%'
+        },
+        {
+          area:'江苏',
+          number:'156',
+          zb:'0.29%'
+        },
+        {
+          area:'山东',
+          number:'236',
+          zb:'0.34%'
+        },
+        {
+          area:'浙江',
+          number:'426',
+          zb:'0.34%'
+        },
+        {
+          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%'
+        },
+      ],
+      glData:['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
+      glData1:[103,156,132,186,203,143,189,301,211,195,132,176],
+      tableData1:[
+        {
+          area:'1月',
+          number:'123',
+          zb:'0.19%'
+        },
+        {
+          area:'2月',
+          number:'156',
+          zb:'0.29%'
+        },
+        {
+          area:'3月',
+          number:'236',
+          zb:'0.34%'
+        },
+        {
+          area:'4月',
+          number:'426',
+          zb:'0.34%'
+        },
+        {
+          area:'5月',
+          number:'412',
+          zb:'0.34%'
+        },
+        {
+          area:'6月',
+          number:'231',
+          zb:'0.34%'
+        },
+        {
+          area:'7月',
+          number:'96',
+          zb:'0.34%'
+        },
+        {
+          area:'8月',
+          number:'105',
+          zb:'0.34%'
+        },
+        {
+          area:'9月',
+          number:'210',
+          zb:'0.34%'
+        },
+        {
+          area:'10月',
+          number:'420',
+          zb:'0.34%'
+        },
+        {
+          area:'11月',
+          number:'213',
+          zb:'0.34%'
+        },
+        {
+          area:'12月',
+          number:'213',
+          zb:'0.34%'
+        },
+      ],
+    }
+  },
+  created() {
+    this.$nextTick(()=>{
+      this.initChart()
+      this.initChart1()
+    })
+  },
+  methods: {
+    initChart() {
+      let myChart = echarts.init(document.getElementById("zb-echarts"))
+      let option = {
+        tooltip: {
+          trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
+          axisPointer: {// 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          left: '5',
+          right: '5',
+          top: '10',
+          bottom: '10',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: this.zbData
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: this.zbData1,
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                barBorderRadius: [4, 4, 0, 0],
+                color: '#165DFF',
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  textStyle: { //数值样式
+                    color: '#165DFF',
+                    fontSize: 16
+                  }
+                }
+              },
+              // 移入当前的柱状图时改变颜色
+              emphasis: {
+                color: '#3384FF',
+              }
+            }
+          }
+        ]
+      };
+      myChart.setOption(option);
+    },
+    initChart1() {
+      let myChart = echarts.init(document.getElementById("gl-echarts"))
+      let option = {
+        tooltip: {
+          trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
+          axisPointer: {// 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          left: '5',
+          right: '5',
+          top: '20',
+          bottom: '10',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: this.glData
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: this.glData1,
+            markPoint:{
+              data:[
+                {type:'max',name:'最大值'},
+              ]
+            },
+            type: 'bar',
+            barWidth: 20,
+            itemStyle: {
+              normal: {
+                barBorderRadius: [4, 4, 0, 0],
+                color: '#2ECFCF',
+              },
+            }
+          }
+        ]
+      };
+      myChart.setOption(option);
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .zhaobiao{
+    .zb-content{
+      background: #ffffff;
+      border-radius: 4px;
+      margin-top: 12px;
+      padding: 16px;
+    }
+    .text{
+      width: 100%;
+      line-height: 28px;
+      padding: 0 16px;
+      margin-top: 24px;
+      font-size: 12px;
+      color: rgba(35,35,35,0.8);
+      background: #F4F4F5;
+      border-radius: 2px;
+      margin-bottom: 24px;
+    }
+    .tips{
+      margin: 0;
+      font-size: 12px;
+      color: rgba(35,35,35,0.4);
+      i{
+        color:#909399;
+        margin-right: 9px;
+      }
+    }
+    .content1{
+      .main2{
+        margin-top: 30px;
+        .head{
+          span{
+            font-size: 12px;
+            color: rgba(35,35,35,0.8);
+          }
+          .number{
+            color:#FF3C3C;
+          }
+          ::v-deep .el-select{
+            width: 100px;
+            height: 32px;
+            .el-input{
+              width: 100%;
+              height: 32px;
+            }
+            .el-input__inner{
+              height: 32px !important;
+              line-height: 32px;
+            }
+          }
+        }
+      }
+      .table-item{
+        margin-top: 12px;
+      }
+    }
+    .content2{
+      .table-item{
+        margin-top: 32px;
+      }
+    }
+    .table-item{
+      ::v-deep .el-table{
+        .el-table__header-wrapper{
+          th{
+            padding: 0;
+          }
+        }
+      }
+    }
+  }
+</style>

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

+<template>
+  <div class="zhongbiao">
+    <div class="zb-content content1">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <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="main1">
+        <div style="height: 300px;">
+          <div class="left">
+            <div class="item" v-for="(item,index) in typeList" :class="typeIndex === index ? 'color':''" @click="handleClick(1,index)">{{item}}<i></i></div>
+          </div>
+          <div class="right">
+            <div id="gl-echarts" style="height: 260px;background: #ffffff;"></div>
+          </div>
+        </div>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为有效期内资质，未公开不包含在内</p>
+      </div>
+      <div class="main2">
+        <div class="flex-box query-box head">
+          <span>近五年全国招标总数<span class="number">10,610,000 </span>个</span>
+          <!--<el-select v-model="year" filterable multiple collapse-tags class="form-content-width" placeholder="请选择">-->
+            <!--<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />-->
+          <!--</el-select>-->
+        </div>
+        <div class="table-item">
+          <el-table
+            :data="zzTableData"
+            border
+            fit
+            highlight-current-row
+          >
+            <el-table-column label="序号" width="50" align="left">
+              <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+            </el-table-column>
+            <el-table-column prop="name" label="资质类型"/>
+            <el-table-column label="特级" align="center">
+              <el-table-column prop="number" label="数量（个）"/>
+              <el-table-column prop="zb" label="占比（%）"/>
+            </el-table-column>
+            <el-table-column label="一级" align="center">
+              <el-table-column prop="number" label="数量（个）"/>
+              <el-table-column prop="zb" label="占比（%）"/>
+            </el-table-column>
+            <el-table-column label="二级">
+              <el-table-column prop="number" label="数量（个）"/>
+              <el-table-column prop="zb" label="占比（%）"/>
+            </el-table-column>
+            <el-table-column label="三级">
+              <el-table-column prop="number" label="数量（个）"/>
+              <el-table-column prop="zb" label="占比（%）"/>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <div class="zb-content content2">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">全国建筑企业地区分布</span>
+        </div>
+      </div>
+      <div class="main1">
+        <div class="tabs">
+          <div class="item" v-for="(item,index) in typeList" :class="qydqIndex === index ? 'color':''" @click="handleClick(2,index)">{{item}}<i></i></div>
+        </div>
+        <div id="jzqy-echarts" style="height: 250px"></div>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为有效期内资质，未公开不包含在内</p>
+      </div>
+      <div class="table-item">
+        <el-table
+          :data="tableData"
+          border
+          height="470"
+          fit
+          highlight-current-row
+        >
+          <el-table-column label="序号" width="50" align="left">
+            <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column prop="area" label="地区"/>
+          <el-table-column label="特级" align="center">
+            <el-table-column prop="number" label="数量（个）"/>
+            <el-table-column prop="zb" label="占比（%）"/>
+          </el-table-column>
+          <el-table-column label="一级" align="center">
+            <el-table-column prop="number" label="数量（个）"/>
+            <el-table-column prop="zb" label="占比（%）"/>
+          </el-table-column>
+          <el-table-column label="二级">
+            <el-table-column prop="number" label="数量（个）"/>
+            <el-table-column prop="zb" label="占比（%）"/>
+          </el-table-column>
+          <el-table-column label="三级">
+            <el-table-column prop="number" label="数量（个）"/>
+            <el-table-column prop="zb" label="占比（%）"/>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="zb-content content3">
+      <div class="flex-box query-box">
+        <div class="flex-box query-params">
+          <span class="common-title">全国建筑企业备案分布</span>
+        </div>
+      </div>
+      <div class="text">通过对全国建筑工程总承包一级及以上资质企业的备案数据分析，我们发现这些优质企业主要去了广东、安徽、江西、福建、湖北、浙江等地开展经营。</div>
+      <div class="main1">
+        <div id="ba-echarts" style="height: 250px"></div>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为公开企业备案地数据。</p>
+      </div>
+      <div class="table-item">
+        <el-table
+          :data="tableData"
+          border
+          height="430"
+          fit
+          highlight-current-row
+        >
+          <el-table-column label="序号" width="50" align="left">
+            <template slot-scope="scope">{{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column prop="area" label="地区"/>
+          <el-table-column prop="number" label="企业异地备案数量（个）"/>
+          <el-table-column prop="zb" label="占比"/>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+export default {
+  name: 'NationalEconomies',
+  data() {
+    return {
+      year:'',
+      yearOptions: [
+        { name: '2023年', value: '2023' },
+        { name: '2022年', value: '2022' },
+        { name: '2021年', value: '2021' },
+      ],
+      glData:['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'],
+      glData1:[103,156,132,186,203,143,189,301,211,195,132,176],
+      tableData1:[
+        {
+          area:'1月',
+          number:'123',
+          zb:'0.19%'
+        },
+        {
+          area:'2月',
+          number:'156',
+          zb:'0.29%'
+        },
+        {
+          area:'3月',
+          number:'236',
+          zb:'0.34%'
+        },
+        {
+          area:'4月',
+          number:'426',
+          zb:'0.34%'
+        },
+        {
+          area:'5月',
+          number:'412',
+          zb:'0.34%'
+        },
+        {
+          area:'6月',
+          number:'231',
+          zb:'0.34%'
+        },
+        {
+          area:'7月',
+          number:'96',
+          zb:'0.34%'
+        },
+        {
+          area:'8月',
+          number:'105',
+          zb:'0.34%'
+        },
+        {
+          area:'9月',
+          number:'210',
+          zb:'0.34%'
+        },
+        {
+          area:'10月',
+          number:'420',
+          zb:'0.34%'
+        },
+        {
+          area:'11月',
+          number:'213',
+          zb:'0.34%'
+        },
+        {
+          area:'12月',
+          number:'213',
+          zb:'0.34%'
+        },
+      ],
+
+      typeList:['建筑工程企业','市政工程企业','公路工程企业','水利水电工程企业'],
+      typeIndex:0,
+      jzglData:['特级','一级','二级','三级'],
+      jzglData1:[103,156,132,186],
+      zzTableData:[
+        {
+          name:'建筑工程施工总承包',
+          number:'123',
+          zb:'0.19%'
+        },
+        {
+          name:'市政工程施工总承包',
+          number:'123',
+          zb:'0.19%'
+        },
+        {
+          name:'公路工程施工总承包',
+          number:'123',
+          zb:'0.19%'
+        },
+        {
+          name:'水利水电工程施工总承包',
+          number:'123',
+          zb:'0.19%'
+        },
+      ],
+
+      qydqIndex:0,
+      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%'
+        },
+        {
+          area:'江苏',
+          number:'156',
+          zb:'0.29%'
+        },
+        {
+          area:'山东',
+          number:'236',
+          zb:'0.34%'
+        },
+        {
+          area:'浙江',
+          number:'426',
+          zb:'0.34%'
+        },
+        {
+          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%'
+        },
+      ],
+
+    }
+  },
+  created() {
+    this.$nextTick(()=>{
+      this.initChart()
+      this.initChart1()
+      this.initChart2()
+    })
+  },
+  methods: {
+    initChart() {
+      let myChart = echarts.init(document.getElementById("gl-echarts"))
+      let option ={
+        tooltip: {
+          show:false
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: this.jzglData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        grid: {
+          top:40,
+          left:50,
+          right:40,
+          bottom:40,
+        },
+        series: [
+          {
+            data: this.jzglData1,
+            type: 'line',
+            smooth: true,
+            emphasis: {
+              disabled: true,
+              focus: 'none'
+            },
+            //设置折线颜色和粗细
+            lineStyle: {
+              width: 1,
+              color: "#0081FF",
+            },
+            itemStyle:{
+              color: "#4E8EFF",
+            },
+            //设置面积区域为渐变效果
+            areaStyle: {
+              color: echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                {
+                  offset: 0.2,
+                  color: "#DFEAFF",
+                },
+                {
+                  offset: 1,
+                  color: "#5895FF",
+                },
+              ]),
+            },
+          }
+        ]
+      }
+      myChart.setOption(option);
+    },
+    initChart1() {
+      let myChart = echarts.init(document.getElementById("jzqy-echarts"))
+      let option = {
+        tooltip: {
+          trigger: 'axis', //坐标轴触发，主要在柱状图，折线图等会使用类目轴的图表中使用
+          axisPointer: {// 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          left: '5',
+          right: '5',
+          top: '20',
+          bottom: '10',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: this.zbData
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            data: this.zbData1,
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                barBorderRadius: [4, 4, 0, 0],
+                color: '#165DFF',
+                label: {
+                  show: true, //开启显示
+                  position: 'top', //在上方显示
+                  textStyle: { //数值样式
+                    color: '#165DFF',
+                    fontSize: 16
+                  }
+                }
+              },
+              // 移入当前的柱状图时改变颜色
+              emphasis: {
+                color: '#3384FF',
+              }
+            }
+          }
+        ]
+      };
+      myChart.setOption(option);
+    },
+    initChart2() {
+      let myChart = echarts.init(document.getElementById("ba-echarts"))
+      let option ={
+        tooltip: {
+          show:false
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: this.zbData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        grid: {
+          top:20,
+          left:30,
+          right:20,
+          bottom:20,
+        },
+        series: [
+          {
+            data: this.zbData1,
+            type: 'line',
+            smooth: true,
+            emphasis: {
+              disabled: true,
+              focus: 'none'
+            },
+            //设置折线颜色和粗细
+            lineStyle: {
+              width: 1,
+              color: "#FFAB44",
+            },
+            itemStyle:{
+              color: "#FFAB44",
+            },
+            //设置面积区域为渐变效果
+            areaStyle: {
+              color: echarts.graphic.LinearGradient(0, 1, 0, 0, [
+                {
+                  offset: 0.2,
+                  color: "#FFEDD0",
+                },
+                {
+                  offset: 1,
+                  color: "#FFC671",
+                },
+              ]),
+            },
+          }
+        ]
+      }
+      myChart.setOption(option);
+    },
+    handleClick(type,index){
+      if(type === 1){
+        this.typeIndex=index;
+      }
+      if(type === 2){
+        this.qydqIndex=index;
+      }
+
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .zhongbiao{
+    .zb-content{
+      background: #ffffff;
+      border-radius: 4px;
+      margin-top: 12px;
+      padding: 16px;
+    }
+    .text{
+      width: 100%;
+      line-height: 28px;
+      padding: 0 16px;
+      margin-top: 24px;
+      font-size: 12px;
+      color: rgba(35,35,35,0.8);
+      background: #F4F4F5;
+      border-radius: 2px;
+      margin-bottom: 24px;
+    }
+    .tips{
+      margin: 0;
+      padding-top: 16px;
+      font-size: 12px;
+      color: rgba(35,35,35,0.4);
+      i{
+        color:#909399;
+        margin-right: 9px;
+      }
+    }
+    .content1{
+      .main1{
+        .left{
+          width: 20%;
+          float: left;
+          .item{
+            height: 74px;
+            line-height: 74px;
+            color: #333333;
+            font-size: 16px;
+            padding-left: 30px;
+            border-top: 1px solid #EAF3FF;
+            border-left: 1px solid #EAF3FF;
+            border-right: 1px solid #EAF3FF;
+            cursor: pointer;
+          }
+          .item:last-child{
+            border-bottom: 1px solid #EAF3FF;
+          }
+          .color{
+            background: #F0F3FA;
+            color:#0081FF;
+            i{
+              width: 4px;
+              height: 29px;
+              background: #0081FF;
+              border-radius: 10px;
+              display: inline-block;
+              float: right;
+              margin-top: 22px;
+            }
+          }
+        }
+        .right{
+          width: 79%;
+          float: right;
+          background: #F0F3FA;
+          height: 295px;
+          padding: 16px;
+        }
+      }
+      .main2{
+        margin-top: 30px;
+        .head{
+          span{
+            font-size: 12px;
+            color: rgba(35,35,35,0.8);
+          }
+          .number{
+            color:#FF3C3C;
+          }
+          ::v-deep .el-select{
+            width: 100px;
+            height: 32px;
+            .el-input{
+              width: 100%;
+              height: 32px;
+            }
+            .el-input__inner{
+              height: 32px !important;
+              line-height: 32px;
+            }
+          }
+        }
+      }
+      .table-item{
+        margin-top: 12px;
+      }
+    }
+    .content2{
+      .tabs{
+        margin-top: 32px;
+        margin-bottom: 24px;
+        .item{
+          display: inline-block;
+          color: #3D3D3D;
+          font-size: 14px;
+          margin-right: 24px;
+          cursor: pointer;
+        }
+        .color{
+          color: #3D3D3D;
+          font-weight: 700;
+          position: relative;
+          i{
+            width: 42px;
+            height: 2px;
+            background: #0081FF;
+            display: inline-block;
+            position: absolute;
+            bottom:-4px;
+            left: 50%;
+            transform: translate(-50%,0);
+          }
+
+        }
+      }
+      .table-item{
+        margin-top: 32px;
+      }
+    }
+    .content3{
+      .table-item{
+        margin-top: 32px;
+      }
+    }
+    .table-item{
+      ::v-deep .el-table{
+        .el-table__header-wrapper{
+          th{
+            padding: 0;
+          }
+        }
+      }
+    }
+  }
+</style>

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

 <template>
   <div class="app-container container-box nationalEconomies">
-    <div class="flex-box query-box">
-      <div class="flex-box query-params">
-        <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 multiple collapse-tags class="form-content-width" placeholder="请选择年度" @change="querySubmit">
-              <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.name" :value="item.value" />
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="area">
-            <el-cascader
-              ref="address"
-              :options="addressList"
-              :props="props"
-              v-model="queryParams.address"
-              @change="querySubmit"
-              placeholder="地区选择"
-              collapse-tags
-              clearable></el-cascader>
-          </el-form-item>
-        </el-form>
+    <div class="header">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
+        <el-tab-pane label="全国招标市场分析" name="second"></el-tab-pane>
+        <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
+      </el-tabs>
     </div>
-      <div class="flex-box query-ability">
-        <span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
-        <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
-      </div>
-    </div>
-    <div class="table-item">
-      <el-table
-        v-loading="tableLoading"
-        :data="tableData"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-      >
-        <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="地区" min-width="70" align="left" fixed>
-          <template slot-scope="scope">
-            <router-link to="" tag="a" class="a-link">{{ scope.row.address || '广东省' }}</router-link>
-          </template>
-        </el-table-column>
-        <el-table-column label="年度明细" prop="dataId" width="90" align="left" fixed>
-          <template slot-scope="scope">
-            <img src="@/assets/images/icon_detailed.png" class="icon-detailed" @click="handleDetail(scope.row)">
-          </template>
-        </el-table-column>
-        <el-table-column label="GDP（元）" prop="dataId" sortable min-width="115" align="right" />
-        <el-table-column label="GDP增速" prop="cgrdm" sortable min-width="100" align="right" />
-        <el-table-column label="人均GDP（元）" prop="cgrssqy" sortable width="125" align="right" />
-        <el-table-column label="人口（万人）" prop="cgrssqy" sortable width="120" align="right" />
-        <el-table-column label="一般公共预算收入 (亿元)" prop="cgrzyhy" sortable width="170" align="right" />
-        <el-table-column label="一般公共预算收入增速（%）" prop="cgzzxs" sortable min-width="140" align="right" />
-        <el-table-column label="一般公共预算支出（亿元）" prop="cgfs" sortable width="140" align="left" />
-        <el-table-column label="政府性基金收入（亿元）" width="140" sortable align="left">
-          <template slot-scope="scope">
-            <router-link to="/purchaserDetail" target="_blank" tag="a" class="a-link">{{ scope.row.zbwj }}</router-link>
-          </template>
-        </el-table-column>
-        <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="cgfs" sortable width="150" align="left" />
-        <el-table-column label="政府性基金支出（亿元）" prop="cgfs" width="170" sortable align="left" />
-        <el-table-column label="国有资产经营收入（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="国有资产经营支出（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="固定资产投资（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="财政自给率（%）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="地方政府债务余额（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="一般债余额（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="专项债余额（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="地方政府债务限额（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="城投平台有息债务（亿元）" prop="cgfs" width="160" align="left" >
-          <template slot="header" slot-scope="scope">
-            <span>城投平台有息债务（亿元）
-              <el-tooltip popper-class="tips" effect="light" content="城投平台有息债务是该地区行政区划下所有的城投公司的短期债务与长期债务合计。其中，短期债务=短期借款+一年内到期的非流动负债+应付短期债券，长期债务=长期借款+应付长期债券。" placement="top">
-                <i class="el-icon-warning-outline"></i>
-              </el-tooltip>
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="负债率（%）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="负债率（宽口径）（%）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="债务率（%）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="债务率（宽口径）（%）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="金融机构存款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="金融机构贷款余额（本外币）（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="第一产业增加值（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="第二产业增加值（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="第三产业增加值（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="工业增加值（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="工业总产值（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="进出口总额（亿美元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="社会消费品零售总额（亿元）" prop="cgfs" width="160" align="left" />
-        <el-table-column label="城镇居民人均可支配收入（元）" prop="cgfs" width="160" align="left" />
-      </el-table>
-    </div>
-    <div class="pagination-box">
-      <el-pagination background :current-page="pageIndex" :page-size="pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
-    </div>
-    <economies-detail ref="economiesDetail" />
+    <Economic v-if="activeName === 'first'"></Economic>
+    <ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
+    <ZhongBiao v-if="activeName === 'third'"></ZhongBiao>
   </div>
 </template>
 
 <script>
-import { browsedIndexPage } from '@/api/nationalEconomies'
-import dataRegion from '@/assets/json/dataRegion'
-import economiesDetail from './component/economies-detail'
-import axios from 'axios'
+  import Economic from './component/qgjjdq'
+  import ZhaoBiao from './component/zhaobiao'
+  import ZhongBiao from './component/zhongbiao'
 export default {
   name: 'NationalEconomies',
   components: {
-    economiesDetail
+    Economic,ZhaoBiao,ZhongBiao
   },
   data() {
     return {
-      queryParams: {
-        year: '',
-        address: ''
-      },
-      yearOptions: [
-        { name: '2023年', value: '2023' },
-        { name: '2022年', value: '2022' },
-        { name: '2021年', value: '2021' },
-      ],
-      props: {
-        value: 'id',
-        multiple: true,
-      },
-      addressList: [],
-      tableData: [
-        {
-          dataId:'1',
-          cgrssqy:'100',
-          cgfs:'200'
-        }
-      ],
-      tableLoading: false,
-      pageIndex: 1,
-      pageSize: 10,
-      tableDataTotal: 0
+      activeName: 'first'
     }
   },
   created() {
-    this.querySubmit()
-    this.dataRegion()
+
   },
   methods: {
-    //地区
-    async dataRegion() {
-      // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
-      //   headers: {
-      //     'Content-Type': 'application/json'
-      //   }
-      // }).then(res => {
-      //   if (res.data.code == 200) {
-      //     console.log(res.data.data)
-      //   }
-      // })
-      var str = [];
-      for (let x = 0; x < 3; x++) {
-        for (let i = 0; i < dataRegion.length; i++) {
-          if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
-            str.push({
-              'id': dataRegion[i].id,
-              "label": dataRegion[i].regionName,
-              "short": dataRegion[i].short,
-              "value": dataRegion[i].parentId,
-              "children": []
-            });
-          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
-            for (let j = 0; j < str.length; j++) {
-              if (str[j].id == dataRegion[i].parentId) {
-                str[j].children.push({
-                  'id': dataRegion[i].id,
-                  "label": dataRegion[i].regionName,
-                  "short": dataRegion[i].short,
-                  "value": dataRegion[i].parentId,
-                  "children": []
-                });
-              }
-            }
-          } else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
-            for (let j = 0; j < str.length; j++) {
-              for (let k = 0; k < str[j].children.length; k++) {
-                if (str[j].children[k].id == dataRegion[i].parentId) {
-                  str[j].children[k].children.push({
-                    'id': dataRegion[i].id,
-                    "label": dataRegion[i].regionName,
-                    "short": dataRegion[i].short,
-                    "value": dataRegion[i].parentId
-                    // "children":[]
-                  });
-                }
-              }
-            }
-          }
-        }
-      }
-      this.addressList = str;
-    },
-    // 查询提交
-    async querySubmit() {
-      // this.tableLoading = true
-      const params = { pageIndex: this.pageIndex, pageSize: this.pageSize, browsedType: 1 }
 
-      if(this.queryParams.address){
-        let arr = this.$refs.address.getCheckedNodes();
-        let provinceCode = [],cityCode = [],countyCode = [];
-        for (var i in arr) {
-          if (arr[i].parent) {
-            if (!arr[i].parent.checked) {
-              arr[i].hasChildren && cityCode.push(arr[i].value);
-              !arr[i].hasChildren && countyCode.push(arr[i].value);
-            }
-          } else {
-            provinceCode.push(arr[i].value)
-          }
-        }
-        if(provinceCode.length > 0){
-          params.procinceId=provinceCode.join(',')
-        }
-        if(cityCode.length > 0){
-          params.cityId=cityCode.join(',')
-        }
-        if(countyCode.length > 0){
-          params.districtId=countyCode.join(',')
-        }
-      }
-      console.log(params)
+    handleClick() {
 
-      // browsedIndexPage(params).then(res => {
-      //   this.tableData = res.data.list
-      //   this.tableDataTotal = res.data.totalCount
-      // })
-      // // 延迟关闭加载效果
-      // setTimeout(() => {
-      //   this.tableLoading = false
-      // }, 200)
-    },
-    // 明细
-    handleDetail(row) {
-      this.$refs.economiesDetail.open(row)
-    },
-    // 重置页数
-    handleSizeChange(val) {
-      this.pageIndex = 1
-      this.pageSize = val
-      this.querySubmit()
-    },
-    // 跳转指定页数
-    handleCurrentChange(val) {
-      this.pageIndex = val
-      this.querySubmit()
     }
   }
 }
@@ -274,15 +55,10 @@ export default {
   }
 </style>
 <style lang="scss" scoped>
-
-  .query-box{
-    margin: -8px 0 8px 0;
-    .query-params{
-      .el-form{
-        margin-left: 24px;
-      }
-    }
+  .app-container{
+    padding: 0;
   }
+
   .icon-detailed{
     width: 16px;
     height: 16px;
@@ -290,30 +66,42 @@ export default {
   }
 
   .nationalEconomies{
-    background: #ffffff;
     border-radius: 4px;
-    .table-item{
-      ::v-deep .el-table{
-        th{
-          font-size: 12px !important;
-          font-weight: 400 !important;
+    .header{
+      justify-content: space-between;
+      height: 48px;
+      background: #FFFFFF;
+      border-radius: 4px;
+      color: #232323;
+      ::v-deep .el-tabs{
+        height: 48px;
+        line-height: 48px;
+        .el-tabs__nav-wrap::after {
+          position: static !important;
         }
-        .el-table__fixed-header-wrapper th{
-          background: #F0F3FA;
+        .el-tabs__header{
+          margin: 0;
+          .el-tabs__item{
+            padding: 0 16px;
+            font-size: 16px;
           }
-        .caret-wrapper{
-          width: 10px;
-          /*<!--position: absolute;-->*/
-          /*<!--right: 12px;-->*/
-          /*<!--top: -3px;-->*/
+          .is-active{
+            font-weight: bold;
           }
-        /*.sort-caret{*/
-          /*position: initial;*/
-        /*}*/
-        /*.ascending{*/
-          /*margin-bottom: 3px;*/
-        /*}*/
         }
+        .el-tabs__content{
+          width: 100%;
         }
       }
+      .location{
+        font-size: 14px;
+        color: #0081FF;
+        i{
+          margin-right: 6px;
+          font-size: 16px;
+        }
+      }
+    }
+
+  }
 </style>

dsk-operate-ui/src/views/project/overview/index.vue

 <template>
   <div class="app-container">
-    项目概览
+    <div class="chart-top">
+      <div class="left">
+        <el-card class="box-card noborder">
+          <div class="flex">
+            <div class="top-icons">
+              <img class="top-img" src="@/assets/images/project/icon_6.png">
+              <div class="name">储备项目</div>
+              <div class="number">129</div>
+              <div class="compare">较上月<span class="ss">+3 <img src="@/assets/images/project/ss.png"></span></div>
+            </div>
+            <div class="top-icons">
+              <img class="top-img" src="@/assets/images/project/icon_7.png">
+              <div class="name">重点关注项目</div>
+              <div class="number">45</div>
+              <div class="compare">较上月<span class="xj">-1 <img src="@/assets/images/project/xj.png"></span></div>
+            </div>
+            <div class="top-icons">
+              <img class="top-img" src="@/assets/images/project/icon_8.png">
+              <div class="name">即将开始项目</div>
+              <div class="number">39</div>
+              <div class="compare">较上月<span class="ss">+3 <img src="@/assets/images/project/ss.png"></span></div>
+            </div>
+            <div class="top-icons">
+              <img class="top-img" src="@/assets/images/project/icon_9.png">
+              <div class="name">已签约项目数</div>
+              <div class="number">5</div>
+              <div class="compare">较上月<span class="ss">+1 <img src="@/assets/images/project/ss.png"></span></div>
+            </div>
+          </div>
+        </el-card>
+        <el-card class="box-card noborder">
+          <div class="cardtitles i">项目经营分析
+            <div class="labels">
+              <div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
+              <div :class="{'on':datatype==2}" @click="getDT(2)">月</div>
+              <div :class="{'on':datatype==3}" @click="getDT(3)">年</div>
+            </div>
+        </div>
+        <div id="xmjyfx" class="chart2"></div>
+        </el-card>
+      </div>
+      <el-card class="box-card noborder right">
+        <div class="cardtitles i">最近关注</div>
+        <div class="gzlist">
+          <div>
+            <img src="@/assets/images/project/fjxm.png">
+            <div>房建项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/szxm.png">
+            <div>市政项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/slxm.png">
+            <div>水利项目</div>
+          </div>
+        </div>
+        <el-divider></el-divider>
+        <div class="cardtitles i">储备项目类</div>
+        <div class="gzlist">
+          <div>
+            <img src="@/assets/images/project/EPC.png">
+            <div>EPC项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/tzxm.png">
+            <div>投资项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/fjxm.png">
+            <div>房建项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/dlxm.png">
+            <div>电力项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/szxm.png">
+            <div>市政项目</div>
+          </div>
+          <div>
+            <img src="@/assets/images/project/slxm.png">
+            <div>水利项目</div>
+          </div>
+        </div>
+        <div class="addnew" @click="addNew(true)"><div class="img"></div>新建项目</div>
+      </el-card>
+    </div>
+
+    <div class="chart-bot">
+      <el-card class="box-card noborder left">
+        <div class="p1">目标完成率</div>
+        <div class="p2">78.09<span>%</span></div>
+        <div class="p3">较上月 +12.15 % <span></span> 较上月 +1542 亿 <span></span><!--<span class="xj"></span>--></div>
+        <div class="p4">年度目标总额 1500.00 亿元</div>
+      </el-card>
+      <el-card class="box-card noborder right">
+        <div class="cardtitles i">跟进记录</div>
+        <div class="records">
+          <div class="recordlist">
+            <div class="rec_detail" v-for="(item,index) in recordlist.rows">
+
+              <div class="rec_time">
+                <i class="el-icon-time"></i>
+                <div>{{item.createTime && item.createTime.slice(0, 16)}}</div>
+              </div>
+              <div class="rec_con">
+                <div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
+                <div><span>{{item.content}}</span></div>
+                <div class="rec_text">
+                  <span>拜访对象：{{item.name||'--'}}</span>
+                  <span>职位：{{item.position||'--'}}</span>
+                  <span>拜访时间：{{item.createTime && item.createTime.slice(0, 10)}}</span>
+                  <span>下次拜访时间：{{item.nextVisitTime == null?'--': item.createTime.slice(0, 10)}}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <addproject v-if="isshow" @addproject="add" @cancel="addNew"></addproject>
   </div>
 </template>
 
 <script>
+  import "@/assets/styles/project.scss"
+  import * as echarts from 'echarts'
+  import addproject from '../projectList/component/addProject'
 export default {
   name: 'Overview',
+  components:{addproject},
   data() {
     return {
+      chartDom: '',
+      myChart: '',
+      option: '',
+      datatype:'1',//切换类型
+      recordlist:{rows:[
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+        {
+          content:"测试拜访功能",
+          createTime:"2023-05-26T16:51:23.000+08:00",
+          customerId:"2b871d36f4e3ff71a4ea51f4c548f5fc",
+          id:5,
+          name:"李永佳",
+          nextVisitTime:"2023-05-27T00:00:00.000+08:00",
+          position:"产品",
+          userId:104,
+          visitMode:"线下拜访",
+      },
+      ]},
+      isshow:false,
     }
   },
   created() {
+    // this.$route.push({ path: "/projectList" })
+  },
+  mounted(){
+    this.$nextTick(()=>{
+      this.chartDom = document.getElementById("xmjyfx")
+      this.myChart = echarts.init(this.chartDom)
+      this.getDT(1)
+    })
+    this.recordlist.rows.forEach(item=>{
+      item.createTime = this.gettime(item.createTime)
+      item.nextVisitTime = this.gettime(item.nextVisitTime)
+    })
   },
   methods: {
+    getDT(type){
+      this.datatype = type
+      let time = new Date()
+      let week = ['周一','周二','周三','周四','周五','周六','周日']
+      let weekdata1 = [200,150,300,240,400,380,460]
+      let weekdata2 = [100,250,320,140,300,350,410]
+      let weekdata3 = [210,180,200,280,400,280,360]
+      let monthdata1 = [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 monthdata2 = [420,250,380,190,110,200,250,318,436,320,478,605,140,310,552,516,250,300,258,436,245,240,140,200,140,300,390,410,450,300,587]
+      let monthdata3 = [300,240,310,185,170,210,240,208,416,357,450,645,155,330,522,506,200,315,200,506,355,210,180,100,280,410,310,400,410,320,580]
+      let yeardata1 = [1908,1500,2300,1456,2354,2564,1254,1236,4561,4521,1236,4561,3521]
+      let yeardata2 = [1920,1700,2400,1556,2400,2500,1420,1520,3850,4520,1500,4600,4500]
+      let yeardata3 = [1980,1600,2500,1356,2200,2600,1300,1450,4560,3400,1400,1500,2500]
+      let datas = []
+      let labels = []
+      switch (type) {
+        case 1:
+          time = time.getDay()
+          // week.length = time
+          weekdata1.length = time
+          weekdata2.length = time
+          weekdata3.length = time
+          for(var i=0;i<7;i++){
+            if(i > time){
+              weekdata1.push('')
+              weekdata2.push('')
+              weekdata3.push('')
+            }
+          }
+          labels = week
+          datas.push(weekdata1)
+          datas.push(weekdata2)
+          datas.push(weekdata3)
+          break;
+        case 2:
+          let days = new Date(time.getFullYear(),time.getMonth()+1,0).getDate()//获取到本月天数
+          time = time.getDate()
+          monthdata1.length = time
+          monthdata2.length = time
+          monthdata3.length = time
+          for(var i=1;i<days;i++){
+            labels.push(i+'日')
+            if(i > time){
+              monthdata1.push("")
+              monthdata2.push("")
+              monthdata3.push("")
+            }
+          }
+          datas.push(monthdata1)
+          datas.push(monthdata2)
+          datas.push(monthdata3)
+          break;
+        case 3:
+          time = time.getMonth()+1
+          yeardata1.length = time
+          yeardata2.length = time
+          yeardata3.length = time
+          for(var i=1;i<12;i++){
+            labels.push(i+'月')
+            if(i>time){
+              yeardata1.push('')
+              yeardata2.push('')
+              yeardata2.push('')
+            }
+          }
+          datas.push(yeardata1)
+          datas.push(yeardata2)
+          datas.push(yeardata3)
+          break;
+        default:
+          break;
+      }
+      this.initDT(datas,labels)
+    },
+    initDT(datas,labels){
+      this.chartDom = document.getElementById("xmjyfx")
+      this.myChart = echarts.init(this.chartDom)
+      //客户跟进动态
+      this.option = {
+        xAxis: {
+          type: 'category',
+          data: labels
+        },
+        yAxis: {
+          type: 'value'
+        },
+        grid:{
+          left:'4%',
+          top:'20%',
+          right:'2%',
+          bottom:'15%',
+        },
+        tooltip:{
+          axisPointer:{ //悬浮于圆点展示标签
+            type:'axis'
+          },
+          // trigger: 'axis'
+        },
+        legend: {
+          right: '151px',
+          top:"0px",
+          data: ['成交金额', '储备项目', '跟进动态']
+        },
+        series: [
+          {
+            name: '成交金额',
+            data: datas[0],
+            type: 'line',
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [{
+                  offset: 0, color: 'rgba(0, 129, 255, 0.5)'
+                }, {
+                  offset: 1, color: 'rgba(0, 129, 255, 0)'
+                } ],
+                global: false
+              }
+            },
+            itemStyle: {
+              normal:{
+                color:'#0081FF'
+              }
+            },
+            label:{
+              normal:{
+                show:false
+              }
+            },
+          },
+          {
+            name: '储备项目',
+            data: datas[1],
+            type: 'line',
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [{
+                  offset: 0, color: 'rgba(157, 220, 202, 1)'
+                }, {
+                  offset: 1, color: 'rgba(157, 220, 202, 0)'
+                } ],
+                global: false
+              }
+            },
+            itemStyle: {
+              normal:{
+                color:'#79C8B1'
+              }
+            },
+            label:{
+              normal:{
+                show:false
+              }
+            },
+          },
+          {
+            name: '跟进动态',
+            data: datas[2],
+            type: 'line',
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [{
+                  offset: 0, color: 'rgba(168, 144, 255, 1)'
+                }, {
+                  offset: 1, color: 'rgba(168, 144, 255, 0)'
+                } ],
+                global: false
+              }
+            },
+            itemStyle: {
+              normal:{
+                color:'#ACA5F7'
+              }
+            },
+            label:{
+              normal:{
+                show:false
+              }
+            },
+          },
+        ]
+      }
+      this.option && this.myChart.setOption(this.option)
+    },
+    gettime(time){
+      if(time == null || time == "")
+        return null
+      let times = new Date(time)
+      let year = times.getFullYear()
+      let month = times.getMonth()+1
+      month = month<10?"0"+month:month
+      let day = times.getDate()
+      day = day<10?"0"+day:day
+      let hour = times.getHours()
+      let minute = times.getMinutes()
+      let second = times.getSeconds()
+      return year+'-'+month+'-'+day+' '+hour+":"+minute+":"+second
+    },
+    addNew(isshow){
+      this.isshow = isshow
+    },
+    add(){
+      this.isshow = false
+      this.$router.push({ path: '/project/projectList' })
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+.chart-top{
+  height: 450px;
+  margin-bottom: 12px;
+  .left{
+    float: left;
+    width: calc(100% - 367px);
+    .box-card:first-child{
+      margin-bottom: 12px;
+      height: 124px;
+      padding: 16px;
+    }
+    .box-card:last-child{
+      height: 314px;
+    }
+  }
+  .right{
+    float: right;
+    height: 450px;
+    width: 353px;
+  }
+  .top-icons{
+    width: 33%;
+    height: 92px;
+    padding: 16px;
+    &::before{
+      content: ' ';
+      width: 1px;
+      height: 56px;
+      background: #EFEFEF;
+      float: left;
+      margin-left: -16px;
+    }
+    &:first-child:before{
+      width: 0;
+    }
+    .top-img{
+      float: left;
+      width: 48px;
+      margin: 0 8px 12px 0;
+    }
+    .name{
+      font-size: 12px;
+      line-height: 14px;
+    }
+    .number{
+      font-size: 18px;
+      font-weight: 700;
+      padding: 8px 0;
+    }
+    .compare{
+      font-size: 12px;
+      color: rgba(35, 35, 35, 0.40);
+      line-height: 12px;
+      .ss{
+        color: #0CBC6D;
+        padding-left: 3px;
+      }
+      .xj{
+        color: #FF3C3C;
+        padding-left: 3px;
+      }
+    }
+  }
+}
+.chart-bot{
+  height: 354px;
+  margin-bottom: 12px;
+  .left{
+    float: left;
+    width: 353px;
+    height: 100%;
+    background: url("../../../assets/images/project/glbj.png")no-repeat top center;
+    background-size: 100% 100%;
+    color: #FFFFFF;
+    padding-left: 32px;
+    .p1{
+      font-size: 18px;
+      font-weight: bold;
+      line-height: 18px;
+      padding-top: 56px;
+    }
+    .p2{
+      font-weight: bold;
+      font-size: 50px;
+      line-height: 40px;
+      margin-top: 24px;
+      height: 40px;
+      box-sizing: border-box;
+      font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+      >span{
+        font-size: 16px;
+        font-weight: 400;
+        padding-left: 13px;
+      }
+    }
+    .p3{
+      margin-top: 24px;
+      font-size: 12px;
+      >span{
+        display: inline-block;
+        margin-right: 34px;
+        width: 8px;
+        height: 10px;
+        background: url("../../../assets/images/project/ss_1.png") no-repeat center center;
+        background-size: 100% 100%;
+      }
+      .xj{
+        transform: rotateX(180deg);
+      }
+    }
+    .p4{
+      font-size: 16px;
+      color: #2A72F3;
+      font-weight: bold;
+      padding-left: 28px;
+      margin-top: 30px;
+      font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+    }
+  }
+  .right{
+    float: right;
+    height: 100%;
+    width: calc(100% - 369px);
+    .records{
+      margin-top: -17px;
+      height: 327px;
+      overflow-y: auto;
+      width: 100%;
+      padding-right: 47px;
+      box-sizing: border-box;
+    }
+  }
+}
+
+.cardtitles{
+  position: relative;
+  .labels{
+    width: 120px;
+    height: 22px;
+    position: absolute;
+    border-radius: 2px;
+    right: 24px;
+    top: 24px;
+    z-index: 2;
+    >div{
+      width: 40px;
+      height: 100%;
+      text-align: center;
+      line-height: 22px;
+      float: left;
+      opacity: 1;
+      border: 1px solid #EFEFEF;
+      margin-left: -1px;
+      font-weight: 400;
+      font-size: 12px;
+      color: rgba(35, 35, 35, 0.80);
+      cursor: pointer;
+      &.on{
+        background: #0081FF;
+        color: #FFFFFF;
+      }
+      &:first-child{
+        border-radius: 2px 0px 0px 2px;
+      }
+      &:last-child{
+        border-radius: 0px 2px 2px 0px;
+      }
+    }
+  }
+}
 
+.chart2{
+  width: 100%;
+  height: 285px;
+  margin-top: -20px;
+}
+.cardtitles.i{
+  line-height: 44px;
+  height: 44px;
+  &::after{
+    margin-top: 14px;
+  }
+}
+.gzlist{
+  padding: 0px 16px 10px;
+  margin-top: -06px;
+  >div{
+    display: inline-block;
+    height: 94px;
+    width: 33.3%;
+    text-align: center;
+    font-size: 12px;
+    padding-top: 16px;
+    >div{
+      line-height: 14px;
+    }
+  }
+}
+.el-divider{
+  margin: 0 16px;
+  color: #EFEFEF;
+  width: 320px;
+}
+.addnew{
+  width: 321px;
+  height: 40px;
+  background: #F4F6F9;
+  border-radius: 4px;
+  color: #0081FF;
+  line-height: 40px;
+  margin: auto;
+  font-size: 14px;
+  cursor: pointer;
+  .img{
+    float: left;
+    width: 16px;
+    height: 16px;
+    background: url("../../../assets/images/add.png") no-repeat center center;
+    display: inline-block;
+    margin: 12px 8px 0 114px;
+  }
+  &:hover{
+    background: #0081FF;
+    color: #FFFFFF;
+    .img{
+      background: url("../../../assets/images/project/add_2.png") no-repeat center center;
+
+    }
+  }
+}
 </style>

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

+<template>
+  <el-dialog
+    class="popups"
+    width="534px"
+      :visible.sync="isshow"
+    @close="resetForm('ruleForm')"
+  >
+    <div class="poptitle">
+      <img src="@/assets/images/economies/icon.png">
+      <span>添加客户</span>
+    </div>
+    <el-form class="popform j" :model="queryParam" :rules="rules" ref="ruleForm" label-width="130px">
+      <el-form-item label="项目名称：" class="row"  prop="projectName">
+        <el-input type="text" placeholder="请输入" v-model="queryParam.projectName"></el-input>
+      </el-form-item>
+      <el-form-item label="业主单位：" class="row"  prop="ownerCompany">
+        <el-input type="text" placeholder="请输入" v-model="queryParam.ownerCompany" @input="getCompany"></el-input>
+        <div class="resultlist" v-if="showlist">
+          <div v-for="(item,index) in companData" @click="selCompany(item)"><span  v-html="item.name"></span></div>
+        </div>
+      </el-form-item>
+      <el-form-item label="项目阶段：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectStage">
+          <el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目类型：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectType">
+          <el-option v-for="(item,index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="项目类别：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.projectCategory">
+          <el-option v-for="(item,index) in projectCategory" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="投资估算：" class="row">
+        <el-input type="text" placeholder="请输入金额" @input="number" v-model="queryParam.investmentAmount"></el-input>
+      </el-form-item>
+      <el-form-item label="可见范围：" class="row">
+        <el-select  placeholder="请选择" v-model="queryParam.isPrivate">
+          <el-option v-for="(item,index) in Privatelist" :key="index" :label="item.label" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <div class="popbot">
+        <div class="wordprimary">前往商机雷达寻找项目线索></div>
+        <div class="btn btn_cancel h32" @click="resetForm('ruleForm')">返回</div>
+        <div class="btn btn_primary h32" @click="submitForm('ruleForm')">新建商机</div>
+      </div>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+  import {getEnterprise,getDictType,} from '@/api/main'
+  import {addProject} from '@/api/project/project'
+  export default {
+    name: 'addProject',
+    data(){
+      return{
+        Privatelist:[
+          {
+          value:0,
+          label:'仅自己可见'
+        },{
+          value:1,
+            label:'他人可见'
+          }
+        ],//可见范围
+        isshow:true,
+        queryParam:{
+          userId:'',//用户id
+          projectName:'',//	项目名称
+          companyId:'',//企业id
+          ownerCompany:'',//业主单位
+          projectStage:'',//项目阶段
+          projectType:'',//项目类型
+          projectCategory:'',//项目类别
+          investmentAmount:'',//投资估算
+          isPrivate:0,//可见范围(0 仅自己可见，1 他人可见)
+        },
+        rules:{
+          projectName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+          ownerCompany:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+        },
+        showlist:false,
+        companData:[],//联想企业列表
+        projectStage:[],//项目阶段
+        projectType:[],//项目类型
+        projectCategory:[],//项目类别
+      }
+    },
+    mounted(){
+    },
+    created(){
+      //项目阶段
+      getDictType('project_stage_type').then(result=>{
+        this.projectStage = result.code == 200 ? result.data:[]
+      })
+      //项目类型
+      getDictType('project_type').then(result=>{
+        this.projectType = result.code == 200 ? result.data:[]
+      })
+      //项目类别
+      getDictType('project_category').then(result=>{
+        this.projectCategory = result.code == 200 ? result.data:[]
+      })
+    },
+    methods:{
+      //获取建设库客户
+      getCompany(value){
+        if (value.length>=2){
+          let param = {
+            keyword:value,
+            page:{
+              limit:20,
+              page:1
+            }
+          }
+          getEnterprise(JSON.stringify(param)).then(result=>{
+            if(result.code != 200)
+              return
+            this.showlist = true
+            this.companData = result.data.list
+          })
+        }
+      },
+      selCompany(item){
+        this.queryParam.companyId = item.jskEid
+        this.queryParam.ownerCompany = item.name.replace(/<[^>]+>/g, '')
+        this.showlist = false
+      },
+      //添加客户
+      submitForm(formName) {
+        this.queryParam.userId = this.$store.state.user.userId
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addProject(this.queryParam).then(result=>{
+              if(result.code == 200){
+                this.$message.success('添加成功！')
+                this.resetForm('ruleForm')
+                this.$emit('addproject')
+              }else{
+                this.$message.error(result.msg)
+              }
+            })
+          } else {
+          }
+        });
+      },
+      resetForm(formName) {
+        this.queryParam = {
+          projectName:'',//	项目名称
+          companyId:'',//企业id
+          ownerCompany:'',//业主单位
+          projectStage:'',//项目阶段
+          projectType:'',//项目类型
+          projectCategory:'',//项目类别
+          investmentAmount:'',//投资估算
+          isPrivate:0,//可见范围(0 仅自己可见，1 他人可见)
+        },
+        this.showlist = false
+        this.$emit("cancel",false)
+      },
+
+      //输入数字
+      number(value){
+        this.queryParam.investmentAmount = value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')//输入2位小数
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  .wordprimary{
+    display: inline;
+    padding-right: 26px;
+  }
+.btn_primary{
+  padding: 0;
+}
+</style>

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

@@ -51,10 +51,11 @@
               </div>
             </div>
             <div class="rec_con">
-              <div><strong>{{name}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
+              <div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
               <div><span>{{item.content}}</span></div>
               <div class="rec_text">
                 <span>拜访对象：{{item.name||'--'}}</span>
+                <span v-if="showtype == 'gjdt'">关联企业：{{item.companyName||'--'}}</span>
                 <span>职位：{{item.position||'--'}}</span>
                 <span>拜访时间：{{item.createTime && item.createTime.slice(0, 10)}}</span>
                 <span>下次拜访时间：{{item.nextVisitTime == null?'--': item.createTime.slice(0, 10)}}</span>
@@ -89,7 +90,6 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex'
   import "@/assets/styles/project.scss"
   import {getFollowList,addFollowRecord,getUserList,delFollowRecord} from '@/api/custom/custom'
   import {getEnterprise,getDictType,} from '@/api/main'
@@ -126,9 +126,6 @@
       }
     },
     computed: {
-      ...mapGetters([
-        'name'
-      ])
     },
     created(){
       //获取拜访方式

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card class="box-card noborder">
       <div class="btns">
-        <div class="btn btn_default h28" @click="showNew"><div class="img img1"></div>新建项目商机</div>
+        <div class="btn btn_default h28" @click="addNew(true)"><div class="img img1"></div>新建项目商机</div>
         <div class="btn btn_primary h28"><div class="img img2"></div>批量导入</div>
       </div>
       <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane w100">
@@ -18,22 +18,79 @@
               <span>
               地区团队
               </span>
-              <div class="selectInput" @click="getxmdq"><span class="selecttext">{{xmdqlabel}}<i class="el-icon-caret-bottom"></i></span>
-                <el-cascader class="input"
+            <div class="select-popper">
+				   		<span :class="{ color_text:searchParam.province.length ||searchParam.city.length ||searchParam.area.length,}">
+				   			项目地区{{searchParam.province.length ||searchParam.city.length ||searchParam.area.length? searchParam.province.length +searchParam.city.length +searchParam.area.length +"项": ""}}
+				   			<i class="el-icon-caret-bottom"></i>
+				   		</span>
+              <el-cascader class="cascader-region select-location"
                            ref="myCascader"
-                   :props='props' :options="options"
+              :props='props' :options="addressList"
               @change="handleChange"></el-cascader>
             </div>
           </div>
           <div class="selli">
               <span>
               项目信息
-              </span>aaa
+              </span>
+              <div class="select-popper">
+                <span class="color_text">
+                  项目类型{{searchParam.projectType.length? searchParam.projectType.length + "项": ""}}
+                  <i class="el-icon-caret-bottom"></i>
+                </span>
+                <el-select  placeholder="请选择" v-model="searchParam.projectType" multiple class="select-multiple">
+                  <el-option v-for="(item,index) in projectType" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                </el-select>
+              </div>
+              <div class="select-popper">
+                <el-dropdown @command="transactionPricehandleCommand"  trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
+                  <span class="el-dropdown-link" :class="searchParam.minAmount ||searchParam.maxAmount ? 'color_text': ''">
+                    投资估算{{searchParam.minAmount ||searchParam.maxAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
+                  </span>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item v-for="(item, i) in amountOptions" :class="searchParam.minAmount == item.value[0] &&searchParam.maxAmount == item.value[1] &&
+					                   !minAmount &&!maxAmount? 'color_text': '' " :key="i" :command="item.value">{{ item.label }}</el-dropdown-item>
+                    <el-dropdown-item command="" style="padding: 0; text-indent: 20px">
+                      <div @mouseenter="transactionPriceShowPopper = true" @mouseleave="transactionPriceShowPopper = false">
+										<span :class="(minAmount || maxAmount) &&searchParam.minAmount ==minAmount &&
+					                            searchParam.maxAmount == maxAmount? 'color_text': '' ">
+											自定义<i class="el-icon-arrow-right"></i>
+										</span>
+                        <div class="jabph_popper_box" style="position: absolute" v-if="transactionPriceShowPopper">
+                          <div class="jabph_popper_wrap">
+                            从
+                            <el-input class="jabph_popper_input" v-limit-num clearable v-model="minAmount"></el-input>
+                            万
+                          </div>
+                          <div class="jabph_popper_wrap">
+                            到
+                            <el-input class="jabph_popper_input" v-limit-num clearable v-model="maxAmount"></el-input>
+                            万
+                          </div>
+                          <div style="">
+                            <el-button size="mini" @click="transactionPriceCancel">取消</el-button>
+                            <el-button type="primary" size="mini" @click="transactionPricePopperConfirm">确定</el-button>
+                          </div>
+                        </div>
+                      </div>
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+              <div class="select-popper">
+                <span class="color_text">
+                  项目阶段{{searchParam.projectStage.length? searchParam.projectStage.length + "项": ""}}
+                  <i class="el-icon-caret-bottom"></i>
+                </span>
+                <el-select v-model="searchParam.projectStage" class="select-multiple" multiple placeholder="请选择">
+                  <el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+                </el-select>
+              </div>
           </div>
         </div>
         <div class="scbtns">
-          <div class="btn btn_primary h34">查询</div>
-          <div class="btn btn_cancel h34">重置</div>
+          <div class="btn btn_primary h34" @click="getList(1)">查询</div>
+          <div class="btn btn_cancel h34" @click="reset">重置</div>
         </div>
       </el-tabs>
     </el-card>
@@ -82,287 +139,150 @@
           </div>
         </div>
       </div>
-
-      <el-dialog
-        class="popups"
-        :visible.sync="dialogVisible"
-        width="464px">
-        <div class="poptitle">
-          <img src="@/assets/images/economies/icon.png">
-          <span>新建商机</span>
-        </div>
-        <el-form class="popform i" label-width="85px">
-          <div class="row">
-            <span class="left"><i>*</i>项目名称：</span>
-            <el-input type="text" placeholder="请输入"></el-input>
-          </div>
-          <div class="row">
-            <span class="left"><i>*</i>业主单位：</span>
-            <el-input type="text" placeholder="请输入"></el-input>
-          </div>
-          <div class="row">
-            <span class="left">项目阶段：</span>
-            <el-select  placeholder="请选择">
-              <el-option label="cccc" value="11"></el-option>
-              <el-option label="cccc" value="121"></el-option>
-            </el-select>
-          </div>
-          <div class="row">
-            <span class="left">项目类型：</span>
-            <el-select  placeholder="请选择">
-              <el-option label="cccc" value="11"></el-option>
-              <el-option label="cccc" value="121"></el-option>
-            </el-select>
-          </div>
-          <div class="row">
-            <span class="left">项目类别：</span>
-            <el-select  placeholder="请选择">
-              <el-option label="cccc" value="11"></el-option>
-              <el-option label="cccc" value="121"></el-option>
-            </el-select>
-          </div>
-          <div class="row">
-            <span class="left">投资估算：</span>
-            <el-input type="text" placeholder="请输入"></el-input>
-          </div>
-          <div class="row">
-            <span class="left">可见范围：</span>
-            <el-select  placeholder="请选择">
-              <el-option label="cccc" value="11"></el-option>
-              <el-option label="cccc" value="121"></el-option>
-            </el-select>
-          </div>
-          <div class="popbot">
-            <div class="wordprimary">前往商机雷达寻找项目线索></div>
-            <div class="btn btn_cancel h32" @click="cancel">取消</div>
-            <div class="btn btn_primary h32">新建商机</div>
-          </div>
-        </el-form>
-      </el-dialog>
     </el-card>
+
+    <addproject v-if="isshow" @addproject="add" @cancel="addNew"></addproject>
   </div>
 </template>
 
 <script>
   import "@/assets/styles/project.scss"
+  import prvinceTree from '@/assets/json/provinceTree'
+  import {getProjectlist} from '@/api/project/project'
+  import {getDictType,} from '@/api/main'
+  import addproject from './component/addProject'
 export default {
   name: 'ProjectList',
+  components:{addproject},
   data() {
     return {
-      props:{
-        multiple: true},
-      xmdq: [],
-      xmdqlabel:'项目地区',
+      props:{multiple: true},
       activeName:'first',
-      options: [
+      projectStage:[],//项目阶段
+      isshow:false,//新增商机
+      //项目地区
+      addressList:[],
+      addressType: [],
+      // 查询参数
+      minAmount:'',//投资估算最小值
+      maxAmount:'',//投资估算最大值
+      searchParam: {
+        projectName:'',//项目名称
+        ownerCompany:'',//业主单位
+        projectType:'',//项目类型
+        projectStage:'',//项目阶段
+        minAmount:'',//投资估算最小值
+        maxAmount:'',//投资估算最大值
+        Amount:'',//投资估算
+        province: [],
+        city: [],
+        area: [],
+        pageNum:1,
+        pageSize:10,
+      },
+      domicile:[],
+      projectType:[],//项目类型
+      projectCategory:[],//项目类别
+      amountOptions:[
         {
-        value: 'zhinan',
-        label: '指南',
-        children: [{
-          value: 'shejiyuanze',
-          label: '设计原则',
-          children: [{
-            value: 'yizhi',
-            label: '一致'
-          }, {
-            value: 'fankui',
-            label: '反馈'
-          }, {
-            value: 'xiaolv',
-            label: '效率'
-          }, {
-            value: 'kekong',
-            label: '可控'
-          }]
-        }, {
-          value: 'daohang',
-          label: '导航',
-          children: [{
-            value: 'cexiangdaohang',
-            label: '侧向导航'
-          }, {
-            value: 'dingbudaohang',
-            label: '顶部导航'
-          }]
-        }]
-      }, {
-        value: 'zujian',
-        label: '组件',
-        children: [{
-          value: 'basic',
-          label: 'Basic',
-          children: [{
-            value: 'layout',
-            label: 'Layout 布局'
-          }, {
-            value: 'color',
-            label: 'Color 色彩'
-          }, {
-            value: 'typography',
-            label: 'Typography 字体'
-          }, {
-            value: 'icon',
-            label: 'Icon 图标'
-          }, {
-            value: 'button',
-            label: 'Button 按钮'
-          }]
-        }, {
-          value: 'form',
-          label: 'Form',
-          children: [{
-            value: 'radio',
-            label: 'Radio 单选框'
-          }, {
-            value: 'checkbox',
-            label: 'Checkbox 多选框'
-          }, {
-            value: 'input',
-            label: 'Input 输入框'
-          }, {
-            value: 'input-number',
-            label: 'InputNumber 计数器'
-          }, {
-            value: 'select',
-            label: 'Select 选择器'
-          }, {
-            value: 'cascader',
-            label: 'Cascader 级联选择器'
-          }, {
-            value: 'switch',
-            label: 'Switch 开关'
-          }, {
-            value: 'slider',
-            label: 'Slider 滑块'
-          }, {
-            value: 'time-picker',
-            label: 'TimePicker 时间选择器'
-          }, {
-            value: 'date-picker',
-            label: 'DatePicker 日期选择器'
-          }, {
-            value: 'datetime-picker',
-            label: 'DateTimePicker 日期时间选择器'
-          }, {
-            value: 'upload',
-            label: 'Upload 上传'
-          }, {
-            value: 'rate',
-            label: 'Rate 评分'
-          }, {
-            value: 'form',
-            label: 'Form 表单'
-          }]
-        }, {
-          value: 'data',
-          label: 'Data',
-          children: [{
-            value: 'table',
-            label: 'Table 表格'
-          }, {
-            value: 'tag',
-            label: 'Tag 标签'
-          }, {
-            value: 'progress',
-            label: 'Progress 进度条'
-          }, {
-            value: 'tree',
-            label: 'Tree 树形控件'
-          }, {
-            value: 'pagination',
-            label: 'Pagination 分页'
-          }, {
-            value: 'badge',
-            label: 'Badge 标记'
-          }]
-        }, {
-          value: 'notice',
-          label: 'Notice',
-          children: [{
-            value: 'alert',
-            label: 'Alert 警告'
-          }, {
-            value: 'loading',
-            label: 'Loading 加载'
-          }, {
-            value: 'message',
-            label: 'Message 消息提示'
-          }, {
-            value: 'message-box',
-            label: 'MessageBox 弹框'
-          }, {
-            value: 'notification',
-            label: 'Notification 通知'
-          }]
-        }, {
-          value: 'navigation',
-          label: 'Navigation',
-          children: [{
-            value: 'menu',
-            label: 'NavMenu 导航菜单'
-          }, {
-            value: 'tabs',
-            label: 'Tabs 标签页'
-          }, {
-            value: 'breadcrumb',
-            label: 'Breadcrumb 面包屑'
-          }, {
-            value: 'dropdown',
-            label: 'Dropdown 下拉菜单'
-          }, {
-            value: 'steps',
-            label: 'Steps 步骤条'
-          }]
-        }, {
-          value: 'others',
-          label: 'Others',
-          children: [{
-            value: 'dialog',
-            label: 'Dialog 对话框'
-          }, {
-            value: 'tooltip',
-            label: 'Tooltip 文字提示'
-          }, {
-            value: 'popover',
-            label: 'Popover 弹出框'
-          }, {
-            value: 'card',
-            label: 'Card 卡片'
-          }, {
-            value: 'carousel',
-            label: 'Carousel 走马灯'
-          }, {
-            value: 'collapse',
-            label: 'Collapse 折叠面板'
-          }]
-        }]
-      }, {
-        value: 'ziyuan',
-        label: '资源',
-        children: [{
-          value: 'axure',
-          label: 'Axure Components'
-        }, {
-          value: 'sketch',
-          label: 'Sketch Templates'
-        }, {
-          value: 'jiaohu',
-          label: '组件交互文档'
-        }]
-      }],
-
-      dialogVisible:false,
+          label: "5000万以下",
+          value: [0,5000],
+        },
+        {
+          label: "5000万-1亿",
+          value: [5000,10000],
+        },
+        {
+          label: "1亿-3亿",
+          value: [10000,30000],
+        },
+        {
+          label: "3亿以上",
+          value: [30000,''],
+        },
+      ],
+      contractSignTimeValue: "",
+      transactionPriceShowPopper: false,
     }
   },
   created() {
+    this.prvinceTree()
+    // this.getList(1)
+    //项目阶段
+    getDictType('project_stage_type').then(result=>{
+      this.projectStage = result.code == 200 ? result.data:[]
+    })
+    //项目类型
+    getDictType('project_type').then(result=>{
+      this.projectType = result.code == 200 ? result.data:[]
+    })
+    //项目类别
+    getDictType('project_category').then(result=>{
+      this.projectCategory = result.code == 200 ? result.data:[]
+    })
   },
   methods: {
+    //获取商机列表
+    getList(pageNum){
+      this.searchParam.pageNum = pageNum
+      getProjectlist(this.searchParam).then(result=>{
+        console.log(result)
+      })
+    },
+    reset(){
+      this.searchParam ={
+          projectName:'',//项目名称
+          ownerCompany:'',//业主单位
+          projectType:'',//项目类型
+          projectStage:'',//项目阶段
+          minAmount:'',//投资估算最小值
+          maxAmount:'',//投资估算最大值
+          Amount:'',//投资估算
+          province: [],
+          city: [],
+          area: [],
+          pageNum:1,
+          pageSize:10,
+      }
+    },
+    //地区
+    async prvinceTree() {
+      // await axios.post("https://files.jiansheku.com/file/json/common/provinceTree.json", {}, {
+      //   headers: {
+      //     'Content-Type': 'application/json'
+      //   }
+      // }).then(res => {
+      //   if (res.data.code == 200) {
+      //     console.log(res.data.data)
+      //   }
+      // })
+      // console.log(prvinceTree)
+      this.addressList = prvinceTree;
+      this.getadd(this.addressList)
+    },
+    //处理项目地区
+    getadd(row) {
+      this.addrcallback(row,this.getadd)
+    },
+    addrcallback(row,callback){
+      if(row){
+        row.forEach(item => {
+          item.value = item.id
+          callback &&  callback(item.children)
+        })
+      }
+    },
+
     //新建项目
     showNew(){
-      this.dialogVisible = true
+      this.isshow = true
+    },
+    addNew(isshow){
+      this.isshow = isshow
     },
-    cancel(){
-      this.dialogVisible = false
+    add(){
+      this.isshow = false
+      this.getList(1)
     },
     toDetail(){
       let Id = '111'
@@ -375,27 +295,76 @@ export default {
 
     },
     handleChange(value) {
-      console.log(value);
-      this.xmdq = value
-      var labelString = this.$refs.myCascader.getCheckedNodes()[0].pathLabels;
-      console.log(labelString)
-      if(labelString.length>0){
-        let dq = ''
-        labelString.forEach((item,index)=>{
-          let str = ','
-          if(index == 0)
-            str = ''
-          dq += str + item
-        })
-        this.xmdqlabel = dq
-      }else{
-        this.xmdqlabel = '项目地区'
-      }
+      // console.log(value);
+      // var labelString = this.$refs.myCascader.getCheckedNodes()[0].pathLabels;
+      let arr = this.$refs.myCascader.getCheckedNodes();
+      // console.log(arr)
+      let province = [],
+        city = [],
+        area = [];
+      this.domicile = [];
+      for (var i in arr) {
+        if (arr[i].parent) {
+          if (!arr[i].parent.checked) {
+            arr[i].hasChildren && city.push(arr[i].value);
+            arr[i].hasChildren && this.domicile.push(arr[i].label);
+            !arr[i].hasChildren && area.push(arr[i].value);
+            !arr[i].hasChildren && this.domicile.push(arr[i].label);
+          }
+        } else {
+          province.push(arr[i].value);
+          this.domicile.push(arr[i].label);
+        }
+      }
+      var obj = JSON.parse(JSON.stringify(this.searchParam));
+      obj.province = province;
+      obj.city = city;
+      obj.area = area;
+      this.searchParam = obj;
+    },
+
+    transactionPricePopperConfirm() {
+      if (
+        this.minAmount &&
+        this.maxAmount &&
+        !(Number(this.maxAmount) > Number(this.minAmount))
+      ) {
+        return this.$message.warning("最小值必须小于最大值,请重新输入！");
+      }
+      this.transactionPriceShowPopper = false;
+      var obj = JSON.parse(JSON.stringify(this.searchParam));
+      obj.minAmount = this.minAmount;
+      obj.maxAmount = this.maxAmount;
+      this.searchParam = obj;
+      this.$refs.transactionPriceShowPopper.hide();
+    },
+    transactionPriceCancel() {
+      this.transactionPriceShowPopper = false;
+      this.$refs.transactionPriceShowPopper.hide();
+    },
+    transactionPricehandleCommand(command) {
+      if (command) {
+        this.$refs.transactionPriceShowPopper.hide();
+        var obj = JSON.parse(JSON.stringify(this.searchParam));
+        this.minAmount = "";
+        this.maxAmount = "";
+        if (command == "不限") {
+          obj.minAmount = "";
+          obj.maxAmount = "";
+        } else {
+          obj.minAmount = command[0];
+          obj.maxAmount = command[1];
+        }
+        this.searchParam = obj;
       }
+    },
   }
 }
 </script>
 <style lang="scss" scoped>
+  .jabph_popper_box{
+    left: 110px;
+  }
   .noborder{
     position: relative;
   }
@@ -562,26 +531,6 @@ export default {
       }
     }
   }
-  .selectInput{
-    position: relative;
-    display: inline-block;
-    &:hover{
-      .selecttext{color: #0081FF;
-      i{color: #0081FF;}}
-    }
-    .selecttext{
-      i{
-        margin-left: 5px;
-        color: #a7a7a7;
-      }
-    }
-    .input{
-      position: absolute;
-      left: 0;
-      opacity: 0;
-      height: 20px;
-    }
-  }
 
   .popbot{
     .wordprimary{

dsk-operate-ui/src/views/radar/Land/details.vue

+<template>
+	<div class="app-container qyzx-details">
+		<div class="bottomlist">
+			<ul class="bottomlist-content">
+				<li class="bottomlist-list">
+					<p class="list-titel">
+						绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
+					</p>
+
+					<div class="list-content">
+						<p class="list-content-text">
+							<span>受让人：</span>
+							<span class="blue">芜湖旭日机械制造有限公司</span>
+						</p>
+						<p class="list-content-text">
+							<span>成交金额：</span>
+							<span>12345.62万元</span>
+						</p>
+						<p class="list-content-text">
+							<span>总面积：</span>
+							<span>12345.62万</span>
+						</p>
+						<p class="list-content-text">
+							<span>合同签订：</span>
+							<span>2014-05-12</span>
+						</p>
+					</div>
+					<div class="list-content">
+						<p class="list-content-text">
+							<span>土地用途：</span>
+							<span>城镇村道路用地</span>
+						</p>
+						<p class="list-content-text">
+							<span>供应方式：</span>
+							<span>挂牌出让</span>
+						</p>
+					</div>
+
+				</li>
+			</ul>
+
+		</div>
+
+		<div class="content main3">
+			<div class="common-title">项目保障</div>
+			<div class="main3-box">
+				<p>
+					<label class="label">行政区</label>
+					<span>1.36倍</span>
+					<label class="label">电子监督号</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">项目名称</label>
+					<span class="span-one">1.36倍</span>
+					
+				</p>
+				<p>
+					<label class="label">项目位置</label>
+					<span class="span-one">1.36倍</span>
+					
+				</p>
+				<p>
+					<label class="label">面积</label>
+					<span>1.36倍</span>
+					<label class="label">土地来源</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">土地用途</label>
+					<span>1.36倍</span>
+					<label class="label">供地方式</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">土地使用年限</label>
+					<span>1.36倍</span>
+					<label class="label">行业分类</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">土地级别</label>
+					<span>1.36倍</span>
+					<label class="label">成交价格（万元）</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">土地使用权人</label>
+					<span class="span-one">1.36倍</span>
+				</p>
+				<p>
+					<label class="label">约定容积率</label>
+					<span>1.36倍</span>
+					<label class="label">批准单位</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">约定交地日起</label>
+					<span>1.36倍</span>
+					<label class="label">合同签订日期</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">约定开工时间</label>
+					<span>1.36倍</span>
+					<label class="label">约定竣工时间</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">实际开工时间</label>
+					<span>1.36倍</span>
+					<label class="label">实际峻工时间</label>
+					<span>1.36倍</span>
+				</p>
+			</div>
+		</div>
+		<div class="content main3">
+			<div class="common-title">地块基本信息</div>
+			<div class="main3-box">
+				<p>
+					<label class="label">地块名称</label>
+					<span>1.36倍</span>
+					<label class="label">建筑面积</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">容积率</label>
+					<span>1.36倍</span>
+					<label class="label">绿化率</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">建筑密度</label>
+					<span>1.36倍</span>
+					<label class="label">建筑限高</label>
+					<span>1.36倍</span>
+				</p>
+			</div>
+		</div>
+		<div class="content main3">
+			<div class="common-title">土地交易信息</div>
+			<div class="main3-box">
+				<p>
+					<label class="label">招拍挂起始时间</label>
+					<span>1.36倍</span>
+					<label class="label">招拍挂截止时间</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">报名起始时间</label>
+					<span>1.36倍</span>
+					<label class="label">报名截止日期</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">起始价</label>
+					<span>1.36倍</span>
+					<label class="label">竞买保证金</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">加价幅度</label>
+					<span>1.36倍</span>
+					<label class="label">投资强度</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">成交价</label>
+					<span>1.36倍</span>
+					<label class="label">受让人</label>
+					<span>1.36倍</span>
+				</p>
+				<p>
+					<label class="label">成交公示日期</label>
+					<span>1.36倍</span>
+					<label class="label">合同编号</label>
+					<span>1.36倍</span>
+				</p>
+			</div>
+		</div>
+		
+	</div>
+</template>
+
+<script>
+	import "@/assets/styles/public.css";
+	export default {
+
+		name: 'LandDetails',
+		data() {
+			return {
+				id: '',
+				tableData: [{
+					id: 0,
+					name: '20重庆债14(2005938)',
+					time: '2020-09-18',
+					gm: '285.24',
+					zj: '否',
+				}]
+			}
+		},
+		created() {
+			console.log(this.$route.params)
+			this.id = this.$route.params.id
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bottomlist {
+		width: 100%;
+		background-color: #FFFFFF;
+
+		border-radius: 4px 4px 4px 4px;
+
+		.bottomlist-title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 12px;
+			padding: 16px;
+			border-bottom: 1px solid #EFEFEF;
+
+			.title-right {
+				display: flex;
+				align-items: center;
+
+				p:first-child {
+					font-size: 12px;
+					font-weight: 400;
+					color: #3D3D3D;
+					margin-right: 10px;
+				}
+
+				p:last-child {
+					display: flex;
+					align-items: center;
+					font-size: 14px;
+					font-weight: 400;
+					color: rgba(35, 35, 35, 0.8);
+				}
+
+				img {
+					width: 18px;
+					height: 18px;
+				}
+			}
+
+		}
+
+		.bottomlist-content {
+
+			padding-bottom: 0px;
+		}
+
+		.bottomlist-list {
+			padding: 16px;
+			font-size: 14px;
+			border-bottom: 1px solid #EFEFEF;
+			padding-bottom: 14px;
+
+			.list-titel {
+				font-size: 16px;
+				font-weight: 700;
+				color: #3D3D3D;
+				line-height: 19px;
+
+				.list-titel-a {
+					text-decoration: none;
+					color: #3D3D3D;
+				}
+
+				a:hover,
+				a:visited,
+				a:link,
+				a:active {
+					color: #3D3D3D;
+				}
+			}
+
+			.content-label {
+				margin-top: 7px;
+
+				.list-label {
+					background: #F3F3FF;
+					color: #8491E8;
+					border-radius: 1px 1px 1px 1px;
+
+					padding: 3px 7px;
+					font-size: 12px;
+
+				}
+			}
+
+
+			.list-content {
+				margin-top: 3px;
+				display: flex;
+				justify-content: start;
+				align-items: center;
+
+				.list-content-text {
+					margin-top: 7px;
+					display: flex;
+					justify-content: start;
+					align-items: center;
+					margin-right: 27px;
+					font-size: 14px;
+
+					span:first-child {
+						font-weight: 400;
+						color: rgba(35, 35, 35, 0.4);
+						line-height: 15px
+					}
+
+					span:last-child {
+						font-weight: 400;
+						color: rgba(35, 35, 35, 0.8);
+						line-height: 15px
+					}
+
+					.blue {
+						color: #0081FF !important;
+						cursor: pointer;
+
+					}
+
+				}
+
+
+			}
+
+			.list-addree {
+				width: auto;
+				background: #F3F4F5;
+				display: inline-flex;
+				margin-top: 7px;
+
+				.list-content-text {
+					margin-top: 0px;
+
+					span {
+						line-height: 30px !important;
+					}
+				}
+
+				img {
+					width: 14px;
+					margin: 0 8px;
+
+				}
+			}
+
+
+		}
+
+		.bottomlist-list:hover {
+			background: #F6F9FC;
+			cursor: pointer;
+		}
+
+		.pagination {
+			padding: 14px;
+
+			.el-pagination {
+				float: right;
+			}
+		}
+	}
+
+	.app-container {
+		padding: 0;
+	}
+
+	.qyzx-details {
+		.tab {
+			font-size: 12px;
+			color: #A1A1A1;
+
+			span {
+				color: #232323;
+			}
+		}
+
+		.content {
+			margin-top: 16px;
+			background: #FFFFFF;
+			padding: 16px;
+			border-radius: 4px;
+		}
+
+		.common-title {
+			margin-bottom: 8px;
+		}
+
+		.main1 {
+			.title {
+				color: #232323;
+				font-size: 16px;
+				line-height: 28px;
+				font-weight: bold;
+				margin-bottom: 8px;
+				text-align: left;
+
+				img {
+					width: 28px;
+					height: 28px;
+					margin-bottom: -9px;
+					margin-right: 17px;
+				}
+			}
+
+			p {
+				color: #3D3D3D;
+				font-size: 14px;
+				margin: 0;
+			}
+		}
+
+		.main2 {
+			.list {
+				display: flex;
+				margin: 16px 0;
+			}
+
+			.item {
+				width: 24.5%;
+				margin-right: 16px;
+				height: 100px;
+				display: flex;
+				justify-content: space-between;
+				border-radius: 8px;
+
+				.item-left {
+					margin-left: 16px;
+					margin-top: 24px;
+
+					h4 {
+						color: #232323;
+						font-size: 22px;
+						line-height: 22px;
+						font-weight: bold;
+						margin: 0;
+
+						span {
+							font-weight: 400;
+							margin-left: 4px;
+							font-size: 18px;
+						}
+					}
+
+					p {
+						margin: 0;
+						color: #3D3D3D;
+						font-size: 14px;
+						padding-top: 8px;
+					}
+				}
+
+				.img {
+					width: 56px;
+					height: 56px;
+					margin-top: 22px;
+					margin-right: 12px;
+				}
+			}
+
+			.color1 {
+				background: rgba(246, 190, 59, 0.08);
+				border: 1px solid rgba(246, 190, 59, 0.2);
+			}
+
+			.color2 {
+				background: rgba(148, 216, 196, 0.102);
+				border: 1px solid rgba(73, 187, 154, 0.1);
+			}
+
+			.color3 {
+				background: rgba(57, 100, 199, 0.06);
+				border: 1px solid rgba(57, 100, 199, 0.1);
+			}
+
+			.color4 {
+				background: rgba(0, 129, 255, 0.04);
+				border: 1px solid rgba(0, 129, 255, 0.1);
+			}
+		}
+
+		.main3 {
+			.main3-box {
+				margin-top: 22px;
+				border-top: 1px solid #E6E9F0;
+
+				p {
+					display: flex;
+					align-items: center;
+					margin: 0;
+					border-left: 1px solid #E6E9F0;
+					border-bottom: 1px solid #E6E9F0;
+
+					.label {
+						width: 10%;
+						font-weight: 400;
+						line-height: 40px;
+						font-size: 12px;
+						height: 40px;
+						background: #F0F3FA;
+						padding-left: 12px;
+					}
+
+					span {
+						width: 40%;
+						color: #000;
+						height: 40px;
+						line-height: 40px;
+						padding-left: 12px;
+						font-size: 12px;
+					}
+					.span-one{
+						width: 90%;
+					}
+
+				}
+
+			}
+		}
+
+		.main4 {
+			.main4-box {
+				margin-top: 22px;
+
+				.label {
+					width: 14%;
+					background: #F0F3FA;
+					border: 1px solid #E6E9F0;
+					display: inline-block;
+					height: 40px;
+					line-height: 40px;
+					font-size: 12px;
+					color: rgba(35, 35, 35, 0.8);
+					padding-left: 12px;
+				}
+
+				span {
+					width: 19%;
+					display: inline-block;
+					height: 40px;
+					line-height: 40px;
+					border-top: 1px solid #E6E9F0;
+					border-bottom: 1px solid #E6E9F0;
+					padding-left: 12px;
+					font-size: 12px;
+				}
+
+				span:last-child {
+					width: 20%;
+					border-right: 1px solid #E6E9F0;
+				}
+			}
+		}
+
+		.main5 {
+			.table-item {
+				margin-top: 22px;
+			}
+		}
+	}
+</style>
\ No newline at end of file

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -199,15 +199,10 @@
 				</div>
 			</div>
 		</div>
-		<div id="landInfo_wrap">
 		
-			
-			<div class="data_list" v-if="showList">
-				<div style="height: 16px;width: 1200px;background: #F7F9FC;margin-left: -16px;"></div>
-				<div class="data_list_head">
-					共为您找到<span class="data_list_count"> {{ total }} </span>条相关结果
-					<div class="bottom-toolbar-right float_right">
-						<el-popover v-model="fieldshow" placement="bottom-end" trigger="click"
+			<div class="bottomlist">
+				<div class="bottomlist-title">
+					<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
 						popper-class="viewlist-el-popover">
 						<ul class="pup_list">
 							<li v-for="(itme,i) in fieldOptions" :class="itme.status?'active':''"
@@ -215,87 +210,80 @@
 								{{itme.value}}
 							</li>
 						</ul>
-							<span slot="reference" class="toolbar-right-download"
-								style="width: auto;padding: 0px 8px;margin-right:4px;">
-								{{fieldText}}<i class="el-icon-caret-bottom"
+						<span slot="reference" class="toolbar-right-download" >
+							{{fieldText}}<i class="el-icon-arrow-down"
 								:style="{transform:fieldshow?'rotate(180deg)':''}"></i>
 						</span>
 					</el-popover>
-
-						<span size="small" class="toolbar-right-download toolbar-right-download1"
-							@click="search('','','isExport')">
-							导出数据
-						</span>
-					</div>
+					<div class="title-right">
+						<p>共有{{total}}条</p>
+						<p>
+							<img src="@/assets/images/EXCEL.png" alt="">
+							<span>导出EXCEL</span>
+						</p>
 					</div>
 					  
-				<div v-if="total>0">
-					<div v-for="(item, index) in tableData" class="data_list_item" :key="index">
-						<router-link class="data_list_h1 data_list_h1_1" :to="`/biz/tdjy/${encodeStr(item.id)}.html`"
-							target="_blank"
-							:title="item.projectName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')"
-							v-if="item.id && item.projectName" v-html="item.projectName"></router-link>
-						<div class="data_list_h1" v-else-if="item.projectName" v-html="item.projectName"></div>
-						<div class="label_wrap">
-							<template v-if="item.companyName">
-								<span class="label_item">受让人：</span>
-								<router-link class="company" :to="`/enterprise/${encodeStr(item.companyId)}/`"
-									target="_blank"
-									:title="item.companyName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')"
-									v-if="item.companyId" v-html="item.companyName"></router-link>
-								<div class="label_con" v-else v-html="item.companyName"></div>
-							</template>
-							<template v-if="item.transactionPrice">
-								<span class="label_item">成交金额：</span><span
-									class="label_con">{{ item.transactionPrice + "万元" }}</span>
-							</template>
-							<template v-if="item.acreage">
-								<span class="label_item">出让面积：</span><span
-									class="label_con">{{ item.acreage + "m²" }}</span>
-							</template>
-							<template v-if="item.contractSignTime">
-								<span class="label_item">合同签订：</span><span
-									class="label_con">{{ item.contractSignTime }}</span>
-							</template>
 				</div>
-						<div class="label_wrap">
-							<template v-if="item.landUse">
-								<span class="label_item">土地用途：</span><span class="label_con">{{ item.landUse }}</span>
-							</template>
-							<template v-if="item.industry">
-								<span class="label_item" v-if="item.industry">行业分类：</span><span
-									class="label_con">{{ item.industry }}</span>
-							</template>
-							<template v-if="item.supplyLandWay">
-								<span class="label_item" v-if="item.supplyLandWay">供应方式：</span><span
-									class="label_con">{{ item.supplyLandWay }}</span>
-							</template>
-						</div>
-						<div class="label_wrap">
-							<!-- <img class="landArea_img" v-if="item.domicile" src="~/assets/img/landArea.png" alt="" /> -->
-							<template v-if="item.domicile">
-								<span class="label_item" v-if="item.domicile">行政区划：</span><span
-									class="label_con">{{ item.domicile }}</span>
-							</template>
-							<template v-if="item.landAddr">
-								<span class="label_item" v-if="item.landAddr">土地坐落：</span><span class="label_con"
-									v-html="item.landAddr"></span>
-							</template>
+				<ul class="bottomlist-content">
+					<li class="bottomlist-list">
+						<p class="list-titel">
+							 <router-link :to="'/radar/Land/details/'+ 1" tag="a" class="list-titel-a">绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
+						</p>
+						
+						<div  class="list-content">
+							<p class="list-content-text">
+								<span>受让人：</span>
+								<span class="blue">芜湖旭日机械制造有限公司</span>
+							</p>
+							<p class="list-content-text">
+								<span>成交金额：</span>
+								<span>12345.62万元</span>
+							</p>
+							<p class="list-content-text">
+								<span>总面积：</span>
+								<span>12345.62万</span>
+							</p>
+							<p class="list-content-text">
+								<span>合同签订：</span>
+								<span>2014-05-12</span>
+							</p>
 						</div>
+						<div  class="list-content">
+							<p class="list-content-text">
+								<span>土地用途：</span>
+								<span >城镇村道路用地</span>
+							</p>
+							<p class="list-content-text">
+								<span>供应方式：</span>
+								<span >挂牌出让</span>
+							</p>
 						</div>
+						<div  class="list-content list-addree">
+							<img src="@/assets/images/addree.png" alt="">
+							<p class="list-content-text">
+								<span>土地用途：</span>
+								<span >城镇村道路用地</span>
+							</p>
+							<p class="list-content-text">
+								<span>土地坐落：</span>
+								<span >锡山区云林街道春雷路东南、许巷路西</span>
+							</p>
 						</div>
+					</li>
+				</ul>
+				<div class="pagination clearfix"  v-show="total>0">
+					  <el-pagination
+					    background
+					    :page-size="pageSize"
+					    :current-page="page"
+					    @current-change="handleCurrentChange"
+					    layout="prev, pager, next"
+					    :total="total">
+					  </el-pagination>
 				</div>
+				
 			</div>
-		<!-- <div class="performance_pagination_wrap" v-if="showList&&total>0">
-      <Pagination
-        v-if="pageFlag"
-        ref="page"
-		:page='permissions.page'
-        @handle-current-change="handleCurrentChange"
-        @handle-size-change="handleSizeChange"
-        :total="total"
-      />
-    </div> -->
+		
 	</div>
 </template>
 
@@ -452,8 +440,31 @@
 				pageFlag: true,
 				
 				showList:true,
-				total:0,
+				fieldshow: false,
+				fieldText: '默认排序',
+				field: '', //查询结果排序方式
+				fieldOptions: [
+				  {
+				    key: "contractSignTime",
+				    value: "默认排序",
+				    status: true,
+				  },
+				  {
+				    key: "transactionPrice",
+				    value: "成交金额从大到小",
+				    status: false,
+				  },
+				  {
+				    key: "acreage",
+				    value: "出让面积从大到小",
+				    status: false,
+				  },
+				],
+				
 				tableData:[],
+				total:6000,
+				page:1,
+				pageSize:20
 			};
 		},
 	
@@ -935,11 +946,7 @@
 		},
 	};
 </script>
-<style lang="scss">
-	#landInfo_wrap {
 
-	}
-</style>
 <style lang="scss" scoped>
 	.content{
 	  padding: 0px 16px;
@@ -1029,11 +1036,15 @@
 	     border-radius: 4px 4px 4px 4px;
 		.bottomlist-title{
 			display: flex;
-			justify-content: end;
+			justify-content: space-between;
 			align-items: center;
 			margin-top: 12px;
-			padding: 24px ;
+			padding: 16px ;
 			border-bottom: 1px solid #EFEFEF;
+			 
+			.title-right{
+				display: flex;
+				align-items: center;
 				p:first-child{
 					font-size: 12px;
 					font-weight: 400;
@@ -1041,6 +1052,8 @@
 					margin-right: 10px;
 				}
 				p:last-child{
+					display: flex;
+					align-items: center;
 					font-size: 14px;
 					font-weight: 400;
 					color: rgba(35,35,35,0.8);
@@ -1050,12 +1063,14 @@
 					height: 18px;
 				}
 			}
+			
+		}
 		.bottomlist-content{
 			
 			padding-bottom: 0px;
 		}
 		.bottomlist-list{
-			padding: 14px;
+			padding: 16px;
 			font-size: 14px;
 			border-bottom: 1px solid #EFEFEF;
 			padding-bottom: 14px;
@@ -1120,6 +1135,23 @@
 				
 				
 			}
+			.list-addree{
+				width: auto;
+				background: #F3F4F5;
+				display: inline-flex;
+				margin-top: 7px;
+				.list-content-text{
+					margin-top: 0px;
+					span{
+						line-height: 30px!important;
+					}
+				}
+				img{
+					width: 14px;
+					margin: 0  8px;
+					
+				}
+			}
 			
 			
 		}
@@ -1135,148 +1167,5 @@
 		}
 	}
 	
-	#landInfo_wrap {
-		padding: 0 16px;
-		font-size: 14px;
-
-		.land_content_wrap {
-			display: flex;
-
-			.land_content_wrap_label {
-				color: #666666;
-				margin-right: 4px;
-			}
-		}
-
-		.data_list {
-			width: 1184px;
-			margin: 0 auto;
-
-			.data_list_head {
-				height: 50px;
-				line-height: 50px;
-				color: #666666;
-
-				.data_list_count {
-					color: #ff2a00;
-					font-weight: bold;
-				}
-			}
-
-			.data_list_item {
-				border-top: 1px solid #efefef;
-				padding: 24px 16px;
-				padding-left: 16px;
-				margin-left: -16px;
-
-				&:hover {
-					background: #f5faff;
-				}
-
-				.data_list_h1 {
-					width: 1168px;
-					font-size: 18px;
-					font-weight: bold;
-					color: #333333;
-					line-height: 24px;
-					margin-bottom: 6px;
-					word-break: break-all;
-					display: inline-block;
-				}
-
-				.data_list_h1_1 {
-					cursor: pointer;
-				}
-
-				.label_wrap {
-					font-size: 14px;
-					margin-top: 10px;
-					line-height: 18px;
-					display: flex;
-
-					.landArea_img {
-						width: 18px;
-						height: 17px;
-						margin-right: 4px;
-						position: relative;
-						top: -3px;
-					}
-
-					.label_item {
-						color: #999999;
-					}
-
-					.company {
-						color: #0081ff;
-						cursor: pointer;
-						margin-right: 20px;
-					}
-
-					.label_con {
-						color: #333333;
-						margin-right: 20px;
-					}
-				}
-			}
-		}
-
-		.content_li {
-			padding: 16px 0;
-			display: flex;
-			align-items: center;
-			position: relative;
-
-			.content_item {
-				.include-keywords {
-					display: flex;
-					align-items: center;
-					position: relative;
-
-					.lefttltel {
-						display: inline-block;
-						background: #f5f5f5;
-						color: #333;
-						border: 1px solid #efefef;
-						border-right: none;
-						opacity: 1;
-						width: 71px;
-						height: 40px;
-						text-align: center;
-						line-height: 40px;
-					}
-
-					.el-input {
-						line-height: 40px;
-						border-radius: 0;
-
-						::v-deep .el-input__inner {
-							width: 100%;
-							height: 40px;
-							line-height: 40px;
-							border-radius: 0;
-						}
-					}
 	
-					.commonly-input {
-						::v-deep .el-input__inner {
-							padding-right: 100px;
-						}
-					}
-
-					.commonly {
-						position: absolute;
-						top: 10px;
-						right: 16px;
-						font-size: 14px;
-						font-weight: 400;
-						color: #0081ff;
-						cursor: pointer;
-					}
-				}
-
-			}
-
-		}
-
-	}
 </style>
\ No newline at end of file

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -78,6 +78,7 @@
 			</div>
 		   
 		</div>
+		
 		<div class="bottomlist">
 			<div class="bottomlist-title">
 				  <p>共有{{total}}条</p>

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

@@ -28,97 +28,97 @@ public class EnterpriseCreditService {
 
 
     public TableDataInfo penalizePage(EnterpriseCreditPenalizePageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/penalizePage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/penalizePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R penalizeReasonType(EnterpriseCreditPenalizeReasonTypeBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/penalizeReasonType", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/penalizeReasonType", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo abnormalPage(EnterpriseCreditAbnormalPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/abnormalPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/abnormalPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R abnormalYears(EnterpriseCreditAbnormalYearsBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/abnormalYears", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/abnormalYears", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo executedPersonsPage(EnterpriseCreditExecutedPersonsPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/executedPersonsPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedPersonsPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo executedPage(EnterpriseCreditExecutedPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/executedPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/executedPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public TableDataInfo lawsuitsPage(EnterpriseCreditLawsuitsPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R lawsuitsCauseAction(EnterpriseCreditLawsuitsCauseActionBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsCauseAction", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsCauseAction", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R lawsuitsRole(EnterpriseCreditLawsuitsRoleBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/lawsuitsRole", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/lawsuitsRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo noticesPage(EnterpriseCreditNoticePageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R noticesType(EnterpriseCreditNoticeTypeBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesType", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesType", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R noticesRole(EnterpriseCreditNoticeRoleBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesRole", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R noticesCaseReason(EnterpriseCreditNoticeCaseReasonBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/noticesCaseReason", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/noticesCaseReason", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public TableDataInfo kaitingPage(EnterpriseCreditKaitingPageBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
     public R kaitingCauseAction(EnterpriseCreditKaitingCauseActionBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingCauseAction", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingCauseAction", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
     public R kaitingPureRole(EnterpriseCreditKaitingPureRoleBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseCredit/kaitingPureRole", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseCredit/kaitingPureRole", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 }

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

 package com.dsk.system.dskService;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.core.domain.R;
+import com.dsk.common.core.domain.model.*;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.utils.DskOpenApiUtil;
+import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -20,109 +24,154 @@ public class EnterpriseProjectService {
     private DskOpenApiUtil dskOpenApiUtil;
 
 
-    public TableDataInfo landTransactionPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo landTransactionPage(EnterpriseProjectLandTransactionPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landTransactionPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R landUse(Map<String, Object> body) throws Exception {
+    public R landUse(EnterpriseProjectLandUseBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landUse", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public R landDetail(Map<String, Object> body) throws Exception {
+    public R landDetail(EnterpriseProjectLandDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/landDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo approvalProjectPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo approvalProjectPage(EnterpriseProjectApprovalProjectPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R approvalInfoDetail(Map<String, Object> body) throws Exception {
+    public R approvalInfoDetail(EnterpriseProjectApprovalInfoDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalInfoDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo approvalExaminePage(Map<String, Object> body) throws Exception {
+    public TableDataInfo approvalExaminePage(EnterpriseProjectApprovalExaminePageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalExaminePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo approvalMarketingPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo approvalMarketingPage(EnterpriseProjectApprovalMarketingPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/approvalMarketingPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public TableDataInfo specialDebtPage(Map<String, Object> body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtPage", BeanUtil.beanToMap(body, false, false));
+    public TableDataInfo specialDebtProjectPage(Object body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtProjectPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R specialDebtDetail(Map<String, Object> body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtDetail", BeanUtil.beanToMap(body, false, false));
+    public R specialDebtProjectDetail(Object body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtProjectDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
+    public TableDataInfo specialDebtPage(Object body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/specialDebtPage", BeanUtil.beanToMap(body, false, false));
+        return dskOpenApiUtil.responsePage(map);
+    }
 
-    public TableDataInfo bidNoticePage(Map<String, Object> body) throws Exception {
+    public TableDataInfo bidNoticePage(EnterpriseProjectBidNoticePageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticePage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R bidNoticeTenderStage(Map<String, Object> body) throws Exception {
+    public R bidNoticeTenderStage(EnterpriseProjectBidNoticeTenderStageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeTenderStage", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public R bidNoticeProvince(Map<String, Object> body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProvince", BeanUtil.beanToMap(body, false, false));
+    public R bidNoticeArea(EnterpriseProjectBidNoticeAreaBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeArea", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public R bidNoticeDetail(Map<String, Object> body) throws Exception {
+    public R bidNoticeDetail(EnterpriseProjectBidNoticeDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo bidPlanPage(Map<String, Object> body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
+    public TableDataInfo bidPlanPage(Object body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseProject/bidPlanPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
 
-    public R bidPlanDetail(Map<String, Object> body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
+    public R bidPlanDetail(Object body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterpriseProject/bidPlanDetail", BeanUtil.beanToMap(body, false, false));
+        Map data = MapUtils.getMap(map, "data", null);
+        String contentId = MapUtils.getString(data, "contentId");
+        if (ObjectUtil.isEmpty(contentId)) {
+            return BeanUtil.toBean(map, R.class);
+        }
+
+//        HashMap<String, Object> contentParam = new HashMap<>();
+//        contentParam.put("data_type", "bid_plan");
+//        contentParam.put("filter_type", 2);
+//        contentParam.put("strategy_id", contentId);
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("data_type", "kaibiao");
+        param.put("filter_type", 2);
+        param.put("strategy_id", "647477d52ba0e4cb1410c7f6");
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(param, false, false));
+
+        Map contentData = MapUtils.getMap(contentMap, "data", null);
+
+        if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
             return BeanUtil.toBean(map, R.class);
         }
 
+        String htmlContent = MapUtils.getString(contentData, "htmlContent");
 
-    public TableDataInfo bidNoticeProPage(Map<String, Object> body) throws Exception {
+        map.put("content", htmlContent);
+
+        return BeanUtil.toBean(map, R.class);
+    }
+
+
+    public TableDataInfo bidNoticeProPage(EnterpriseProjectBidNoticeProPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
+    public R bidNoticeProProjectType(EnterpriseProjectBidNoticeProProjectTypeBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProProjectType", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidNoticeProProjectPurposes(EnterpriseProjectBidNoticeProProjectPurposesBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProProjectPurposes", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
+    public R bidNoticeProAssessmentWay(EnterpriseProjectBidNoticeProAssessmentWayBody body) throws Exception {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProAssessmentWay", BeanUtil.beanToMap(body, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
+
 
-    public R bidNoticeProDetail(Map<String, Object> body) throws Exception {
+    public R bidNoticeProDetail(EnterpriseProjectBidNoticeProDetailBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidNoticeProDetail", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
 
-    public TableDataInfo creditXzxkPage(Map<String, Object> body) throws Exception {
+    public TableDataInfo creditXzxkPage(EnterpriseProjectCreditXzxkPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/creditXzxkPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }

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

@@ -57,17 +57,17 @@ public class EnterpriseService {
 
     //todo 新数据，待入库
     public TableDataInfo partners(EnterprisePartnersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/partners", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo investment(EnterpriseInvestmentBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/investment", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo affiliates(EnterpriseAffiliatesBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/affiliates", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
@@ -105,22 +105,22 @@ public class EnterpriseService {
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/icInfo", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
     }
 
     public TableDataInfo changeInfo(EnterpriseChangeInfoBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/changeInfo", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo keymembers(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/keymembers", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 
     public TableDataInfo bestStockPage(EnterpriseKeymembersBody body) throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBodyLocal("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/bestStockPage", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
 }