Merge remote-tracking branch 'origin/master'

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/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/radar/components/debtProject/index.vue

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