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

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

@@ -42,6 +42,8 @@ public class CompanySearchController {
      */
     @PostMapping("/page")
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        compose.getPage().setPage(compose.getPageNum());
+        compose.getPage().setLimit(compose.getPageSize());
         return opportunityRadarService.enterprisePage(compose);
     }
 }

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -41,4 +41,9 @@ public class CacheConstants
      * 登录账户密码错误次数 redis key
      */
     public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+    /**
+     * 查甲方 菜单选线
+     */
+    public static final String DATA_UIPGROUPDATA = "data:uipGroupData";
 }

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFollowRecord.java

@@ -70,8 +70,8 @@ public class BusinessFollowRecord extends BaseEntity
     private String visitWay;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date creatTime;
 
     public String getProjectName() {

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

 package com.dsk.common.dtos;
 
+import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  *
  */
 @Data
-public class ComposeQueryDto {
+public class ComposeQueryDto extends BasePage {
 
 	String region;
 

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

@@ -8,3 +8,12 @@ export const idRemark = (data) => {
     data: data
   })
 }
+
+// 认领用户
+export const claim= function claim(param) {
+  return request({
+    url: '/customer/claim',
+    method: 'post',
+    data: param
+  })
+}

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

 import request from '@/utils/request'
 // 导入客户列表
-let importData= function importData(param) {
-  return request({
-    url: '/customer/importData',
-    method: 'POST',
-    data: param
-  })
+let importData = function importData(param) {
+	return request({
+		url: '/customer/importData',
+		method: 'POST',
+		data: param
+	})
 }
 // 查询条件字段
-let searchDic= function searchDic(param) {
-  return request({
-    url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
-    method: 'get',
+let searchDic = function searchDic(param) {
+	return request({
+		url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
+		method: 'get',
 
-  })
+	})
 }
 // 专项债项目查询
-let bondProjectPage= function bondProjectPage(param) {
-  return request({
-    url: '/radar/bondProjectPage',
-    method: 'post',
-    data: param
-  })
+let bondProjectPage = function bondProjectPage(param) {
+	return request({
+		url: '/radar/bondProjectPage',
+		method: 'post',
+		data: param
+	})
 }
 // 专项债项目详情查询
-let specialDebtProjectDetail= function specialDebtProjectDetail(param) {
-  return request({
-    url: '/enterpriseProject/specialDebtProjectDetail',
-    method: 'post',
-    data: param
-  })
+let specialDebtProjectDetail = function specialDebtProjectDetail(param) {
+	return request({
+		url: '/enterpriseProject/specialDebtProjectDetail',
+		method: 'post',
+		data: param
+	})
 }
 // 专项债项目详情查询
-let specialDebtPage= function specialDebtPage(param) {
-  return request({
-    url: '/enterpriseProject/specialDebtPage',
-    method: 'post',
-    data: param
-  })
+let specialDebtPage = function specialDebtPage(param) {
+	return request({
+		url: '/enterpriseProject/specialDebtPage',
+		method: 'post',
+		data: param
+	})
 }
+// 土地交易查询
+let landMarketPage = function landMarketPage(param) {
+	return request({
+		url: '/radar/landMarketPage',
+		method: 'post',
+		data: param
+	})
+}
+// 土地交易详情查询
+let landDetail = function landDetail(param) {
+	return request({
+		url: '/enterpriseProject/landDetail',
+		method: 'post',
+		data: param
+	})
+}
+// 拟建查询
+let establishmentPage = function establishmentPage(param) {
+	return request({
+		url: '/radar/establishmentPage',
+		method: 'post',
+		data: param
+	})
+}
+// 拟建详情查询
+let approvalInfoDetail = function approvalInfoDetail(param) {
+	return request({
+		url: '/enterpriseProject/approvalInfoDetail',
+		method: 'post',
+		data: param
+	})
+}
+// 拟建详情立项审批列表查询
+let approvalExaminePage = function approvalExaminePage(param) {
+	return request({
+		url: '/enterpriseProject/approvalExaminePage',
+		method: 'post',
+		data: param
+	})
+}
+// 拟建详情民间推介列表查询
+let approvalMarketingPage = function approvalMarketingPage(param) {
+	return request({
+		url: '/enterpriseProject/approvalMarketingPage',
+		method: 'post',
+		data: param
+	})
+}
+
+// 招标计划查询
+let jskBidPlanPage = function jskBidPlanPage(param) {
+	return request({
+		url: '/radar/jskBidPlanPage',
+		method: 'post',
+		data: param
+	})
+}
+// 招标计划资金来源下拉
+let getCapitalSourceSelect = function getCapitalSourceSelect(param) {
+	return request({
+		url: '/radar/jskBidPlan/getCapitalSourceSelect',
+		method: 'post',
+		data: param
+	})
+}
+// 招标计划详情
+let bidPlanDetail = function bidPlanDetail(param) {
+	return request({
+		url: '/enterpriseProject/bidPlanDetail',
+		method: 'post',
+		data: param
+	})
+}
+// 标讯pro
+let jskBidNewsPage = function jskBidNewsPage(param) {
+	return request({
+		url: '/radar/jskBidNewsPage',
+		method: 'post',
+		data: param
+	})
+}
+
+// 标讯pro详情
+
+let bidNoticeProDetail = function bidNoticeProDetail(param) {
+	return request({
+		url: '/enterpriseProject/bidNoticeProDetail',
+		method: 'post',
+		data: param
+	})
+}
+
 
 
 
-export default {importData,searchDic,bondProjectPage,specialDebtProjectDetail,specialDebtPage}
\ No newline at end of file
+export default {
+	importData,
+	searchDic,
+	bondProjectPage,
+	specialDebtProjectDetail,
+	specialDebtPage,
+	landMarketPage,
+	landDetail,
+	establishmentPage,
+	approvalInfoDetail,
+	approvalExaminePage,
+	approvalMarketingPage,
+	jskBidPlanPage,
+	getCapitalSourceSelect,
+	bidPlanDetail,
+	jskBidNewsPage,
+	bidNoticeProDetail
+}
\ No newline at end of file

dsk-operate-ui/src/assets/styles/project.scss

@@ -686,6 +686,7 @@
           >img{
             margin-left: 16px;
             cursor: pointer;
+            width: 20px;
           }
         }
       }
@@ -1050,7 +1051,7 @@
         transform: rotateX(180deg);
         width: 9px;
         height: 11px;
-        margin: 4px 2px 0 10px;
+        margin: 6px 2px 0 10px;
       }
     }
   }
@@ -1125,3 +1126,7 @@
 .el-popper[x-placement^=bottom]{
   margin-top: 0 !important;
 }
+.el-dialog__body{
+  padding-top: 14px;
+  padding-bottom: 18px;
+}

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

@@ -182,6 +182,9 @@ select {
 	cursor: pointer;
 	margin-right: 24px;
 }
+.select-popper .color_text{
+	color: #0381fa;
+}
 
 .select-popper .select-popper-img {
 	width: 24px;
@@ -303,6 +306,14 @@ select {
 .el-dropdown-land {
 	margin-right: 24px;
 }
+.el-dropdown-land .color_text{
+	    color: #1890ff;
+	    background-color: #FFFFFF;
+}
+.el-dropdown-menu .color_text{
+	color: #1890ff;
+	background-color: #FFFFFF;
+}
 
 .el-dropdown-land .el-icon-caret-bottom {
 	color: #333333;

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

@@ -171,8 +171,24 @@ export default {
       this.initChart()
       this.getDT(1)
     })
+    window.addEventListener("resize", this.resizeEcharts);
+  },
+  beforeDestroy(){
+    window.removeEventListener("resize", this. resizeEcharts);
+  },
+  activated() {
+    this.resizeEcharts()
   },
   methods: {
+    resizeEcharts (){
+      const self = this
+      setTimeout(function(){ //图表跟随页面大小变化宽度
+        self.myChart.resize()
+        self.myChart1.resize()
+        self.myChart2.resize()
+        self.myChart3.resize()
+      }, 10)
+    },
     initChart(){
       //客户级别
       this.option = {

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

@@ -35,7 +35,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input clearable @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
                 <span :id="'focus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -171,9 +171,10 @@ export default {
     margin-right: 19px;
   }
   ::v-deep .el-input__inner{
-    border: 1px solid #EFEFEF;
+    border: 1px solid #D9D9D9;
     height: 32px;
     line-height: 32px;
+    padding-right: 27px;
   }
   ::v-deep .el-form-item{
     margin-right: 8px !important;
@@ -227,9 +228,10 @@ export default {
           flex: 1;
         }
         ::v-deep .el-input__inner {
-          border-right: 0;
           border-radius: 2px 0 2px 0;
           width: 180px;
+          border: 1px solid #D9D9D9;
+          border-right: 0;
         }
       }
       .fromTime{
@@ -260,7 +262,7 @@ export default {
     ::v-deep .el-select__tags{
       .el-tag{
         &:first-child{
-          width: 100%;
+          //width: 100%;
         }
       }
     }

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

@@ -39,9 +39,9 @@
       width="464px">
       <div class="poptitle">
         <img src="@/assets/images/economies/icon.png">
-        <span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
+        <span>{{ companyInfo.companyName }}</span>
       </div>
-      <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="75px">
+      <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
         <el-form-item label="姓名：" prop="name">
           <el-input v-model="addRorm.name" placeholder="请输入"></el-input>
         </el-form-item>
@@ -81,7 +81,7 @@ export default {
   components: {
     Tables
   },
-  props: ['customerIds'],
+  props: ['customerIds','companyInfo'],
   data() {
     return {
       ifEmpty:false,
@@ -100,7 +100,7 @@ export default {
         {label: '备注', prop: 'remark'},
       ],
       addRorm: {
-        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
+        customerId:this.customerIds,
         name:'',
         role:'',
         workUnit:'',

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

@@ -48,7 +48,7 @@
             <!-- 合作情况 -->
             <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
             <!-- 决策链条 -->
-            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" />
+            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
             <!-- 跟进记录 -->
             <Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
           </template>

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

@@ -17,11 +17,14 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
+      <template slot="deciWritName" slot-scope="scope">
+        <div v-html="scope.row.deciWritName"></div>
+      </template>
       <template slot="content" slot-scope="scope">
-        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
-          {{ scope.row.content }}
+        <div :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
+          <div v-html="scope.row.content"></div>
           <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
-        </span>
+        </div>
       </template>
     </tables>
 
@@ -48,13 +51,13 @@ export default {
         {label: '许可决定日期', prop: 'deciTime', width: '100'},
         {label: '决定文书号', prop: 'deciWritNo', width: '200'},
         {label: '许可编号', prop: 'permitNo', width: '100'},
-        {label: '决定文书名称', prop: 'deciWritName', width: '190'},
+        {label: '决定文书名称', prop: 'deciWritName', width: '190', slot: true},
         {label: '许可内容', prop: 'content', width: '300', slot: true},
         {label: '有效期自', prop: 'valiBegin', width: '100'},
         {label: '有效期至', prop: 'valiEnd', width: '100'},
         {label: '行政许可类别', prop: 'permitType', width: '100'},
         {label: '许可机关', prop: 'office', width: '180'},
-        {label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
+        {label: '行政许可机关统一社会信用代码', prop: 'officeCreditCode', width: '200'},
         {label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
         {label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
         {label: '来源', prop: 'dataSource', width: '80'}
@@ -81,7 +84,12 @@ export default {
       let res = await creditXzxkPage(param)
       this.tableLoading = false
       if(res.code==200){
-        this.tableData = res.rows
+        if(res.rows&&res.rows.length>0){
+          this.tableData = res.rows.map(item => {
+            item.smallContent = item.content.replace(/<.*?>/ig,"")
+            return item
+          })
+        }
       }
       this.tableDataTotal = res.total
     },
@@ -92,14 +100,29 @@ export default {
       })
     },
     isOverHiddenFlag(data, showList, row, column, value) {
-      if(value && String(value).length > this.getLenth(data)) {
+      if(value && this.getByteLen(value) > 88) {
         return !showList.some(item => item.row==row&&item.column==column)
       }else {
         return false
       }
     },
-    getLenth(data) {
-      return Math.floor(data / 12) * 5
+    /*getLenth(data) {
+      return Math.floor(data / 6) * 2  //宽度（300） / 一个字符的宽度（6） * 行数（2）
+    },*/
+    getByteLen(val) {
+      var len = 0
+      for (var i = 0; i < val.length; i++) {
+        var a = val.charAt(i)
+        if (a.match(/[^\x00-\xff]/ig) != null){
+          len += 2
+        }else{
+          len += 1
+        }
+      }
+      /*if(val.match(/ /g)){
+        len =len+Math.floor(val.match(/ /g).length/2)
+      }*/
+      return len
     }
   }
 }

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

@@ -65,7 +65,7 @@
         </div>
       </div>
       <div class="company-menu">
-        <el-button @click="handleClaim" v-if="ifClaim" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
+        <el-button @click="handleClaim" v-if="ifClaim==1" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
         <el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
       </div>
 
@@ -121,6 +121,19 @@
       </div>
       <!-- 分条件：滚动与不滚动 -->
     </div>
+    <el-dialog
+      title=""
+      :visible.sync="dialogVisible"
+      :modal="false"
+      custom-class='dialog-renlin'
+      :show-close="false"
+      width="244px">
+      <span>认领成功，是否完善客户信息？</span>
+      <div slot="footer" class="dialog-footer">
+        <span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
+        <span class="dialog-footer-btn2" @click="renHide()">稍后</span>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -128,6 +141,7 @@
 import { changePath } from '@/assets/js/common'
 var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
 import "@/assets/lib/swiper/swiper-bundle.css"
+import { claim } from "@/api/common"
 export default {
   name: 'Infoheader',
   props: ['companyId', 'companyInfo', 'statistic'],
@@ -136,7 +150,7 @@ export default {
       newStatic: null,
       labelList: [], //企业标签
       claimLoading: false,
-      ifClaim: false, //是否认领
+      ifClaim: 0, //是否认领
       showMore: false,
       showState: false,
       graphList: [
@@ -151,6 +165,7 @@ export default {
       //风险扫描
       labelArr:['失信联合惩戒企业','司法纠纷','注销'], //负向经营状态
       enterpriseLabel:[],//企业标签
+      dialogVisible: false
     }
   },
   created() {
@@ -163,16 +178,18 @@ export default {
   methods: {
     //认领
     async handleClaim(){
-      let _this = this
-      _this.claimLoading = true
-      setTimeout(function (){
-        _this.claimLoading = false
-        _this.$confirm(`认领成功，是否完善客户信息`, '提示', {
-          type: 'warning'
-        }).then(async () => {
-          console.log('操作跳转！')
-        })
-      }, 1000)
+      if(this.companyInfo.uipId){
+        this.claimLoading = true
+        let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
+        let res = await claim(param)
+        this.tableLoading = false
+        if(res.code==200){
+          this.dialogVisible=true
+          this.ifClaim = true
+        }
+      }else{
+        this.$message.warning('对不起，当前不能认领')
+      }
     },
     companySwiper(){
       new Swiper('.swiper-info', {
@@ -208,8 +225,8 @@ export default {
       this.companySwiper()  //swiper滚动板块
     },
     //获取认领状态
-    async getClaimStatus(){
-      this.ifClaim = false
+    getClaimStatus(){
+      this.ifClaim = this.companyInfo.regCapital
     },
     handleWidth(){
       if(this.companyInfo.introduction){
@@ -261,6 +278,14 @@ export default {
       if(it.id==302 && it.val){
         changePath(this, 'administrative')
       }
+    },
+    renlin(){
+      this.dialogVisible=false;
+      // this.$router.push({path:'/home',query: {id:'1'}})
+      // 跳转地址
+    },
+    renHide(){
+      this.dialogVisible=false;
     }
   },
   watch: {
@@ -619,4 +644,47 @@ export default {
       margin-left: 4px;
     }
   }
+  ::v-deep  .dialog-renlin{
+    margin-top:40vh !important;
+    .el-dialog__body{
+      padding: 0;
+      text-align: center;
+      padding-bottom: 24px;
+    }
+    .el-dialog__footer{
+      padding: 0px;
+      padding-bottom: 24px;
+      .dialog-footer{
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        .dialog-footer-btn1{
+          cursor: pointer;
+          width: 72px;
+          height: 28px;
+          background: #0081FF;
+          border-radius: 2px 2px 2px 2px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #FFFFFF;
+          line-height: 28px;
+          text-align: center;
+          margin-right: 8px;
+        }
+        .dialog-footer-btn2{
+          cursor: pointer;
+          width: 72px;
+          height: 28px;
+          border-radius: 2px 2px 2px 2px;
+          border: 1px solid #CCCCCC;
+          line-height: 28px;
+          text-align: center;
+          font-size: 12px;
+          font-weight: 400;
+          color: rgba(35,35,35,0.8);
+        }
+      }
+    }
+  }
 </style>

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

@@ -51,9 +51,9 @@ export default {
       },
       forData: [
         {label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
-        {label: '决定日期', prop: 'punishBegin', width: '95'},
+        {label: '决定日期', prop: 'punishBegin', width: '105'},
         {label: '处罚结果', prop: 'punishResult', width: '264'},
-        {label: '处罚文书号', prop: 'fileNum', width: '200'},
+        {label: '处罚文书号', prop: 'fileNum', width: '240'},
         {label: '处罚机关', prop: 'office', width: '264'},
         {label: '处罚结束日期', prop: 'punishEnd', width: '100'},
       ],

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

@@ -123,8 +123,8 @@ export default {
   data() {
     return {
       queryParams: {
-        provinceId: '',
-        cityId: '',
+        provinceIds: [],
+        cityIds: [],
         uipExecutiveLevel: '',
         uipBusinessType: [],
         bratingSubjectLevel: [],
@@ -192,10 +192,23 @@ export default {
       tableDataTotal:0,
     }
   },
+  watch:{
+    searchState:{
+      handler(newVal, olVal) {
+        if (newVal) {
+          setTimeout(() => {
+            document.addEventListener('click', this.handleSearch1);
+          }, 0);
+        } else {
+          document.removeEventListener('click', this.handleSearch1);
+        }
+      }
+    }
+  },
   created() {
     if(this.companyInfo){
-      this.queryParams.provinceId = this.companyInfo.provinceId
-      this.queryParams.cityId = this.companyInfo.cityId
+      this.queryParams.provinceIds.push(this.companyInfo.provinceId)
+      this.queryParams.cityIds.push(this.companyInfo.cityId)
       this.handleQuery()
       this.getScreen()
     }

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

@@ -22,7 +22,7 @@ export default {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
       // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
-      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
+      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}`
     }
   },
   mounted() {

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

@@ -355,6 +355,9 @@ export default {
       if(this.queryParams.order){
         params.order=this.queryParams.order
       }
+      if(this.queryParams.keyword){
+        params.keyword=this.queryParams.keyword
+      }
 
       urbanInvestmentPage(params).then(res => {
         this.tableLoading = false

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

@@ -30,7 +30,7 @@
             </div>
           </div>
         </el-card>
-        <el-card class="box-card noborder">
+        <el-card class="box-card noborder" id="charts">
           <div class="cardtitles i">项目经营分析
             <div class="labels">
               <div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
@@ -222,6 +222,13 @@ export default {
       item.createTime = this.gettime(item.createTime)
       item.nextVisitTime = this.gettime(item.nextVisitTime)
     })
+    window.addEventListener("resize", this.resizeEcharts);
+  },
+  beforeDestroy(){
+    window.removeEventListener("resize", this. resizeEcharts);
+  },
+  activated() {
+    this.resizeEcharts()
   },
   methods: {
     getDT(type){
@@ -298,6 +305,12 @@ export default {
       }
       this.initDT(datas,labels)
     },
+    resizeEcharts (){
+      const self = this
+      setTimeout(function(){
+        self.myChart.resize()
+      }, 10)
+    },
     initDT(datas,labels){
       this.chartDom = document.getElementById("xmjyfx")
       this.myChart = echarts.init(this.chartDom)
@@ -436,6 +449,11 @@ export default {
         ]
       }
       this.option && this.myChart.setOption(this.option)
+      let _this = this
+      // document.getElementById('charts').onresize = function () {
+      //   _this.myChart.resize() ; // 如果有多个图标变动，可写多个
+      //
+      // }
     },
     gettime(time){
       if(time == null || time == "")

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

@@ -56,6 +56,13 @@
         </div>
         <div class="recordlist" v-if="showtype=='gjdt'">
           <div class="rec_detail" v-for="(item,index) in recordlist.rows">
+            <div class="delform" v-if="isdel && delID == item.id">
+              <div class="words">是否删除该条记录</div>
+              <div>
+                <div class="btnsmall btn_primary h28" @click="delele">确定</div>
+                <div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
+              </div>
+            </div>
 
             <div class="rec_time">
               <i class="el-icon-time"></i>
@@ -114,14 +121,6 @@
           </div>
         </div>
       </div>
-
-      <div class="delform" v-if="isdel">
-        <div class="words">是否删除该条记录</div>
-        <div>
-          <div class="btnsmall btn_primary h28" @click="delele">确定</div>
-          <div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
-        </div>
-      </div>
     </el-card>
   </div>
 </template>
@@ -362,13 +361,21 @@
 </script>
 
 <style lang="scss" scoped>
+  .el-card{
+    overflow: initial;
+  }
+  .rec_detail{
+    position: relative;
+  }
 .wc{
   position: absolute;
   right: 0;
   bottom: 0;
 }
 .delform{
-  position: fixed; left:50%; top:50%; transform:translate(-50%,-50%)
+  right: 0;
+  top: -122px;
+  position: absolute;
 }
 .tables{
   margin-top: -26px;

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

@@ -3,52 +3,51 @@
 		<div class="bottomlist">
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list"  >
-					<p class="list-titel">
-						 绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
-						 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
+					<p class="list-titel" v-html="textList.projectName">
+						 <!-- <div  v-else-if="item.projectName" ></div> -->
 					</p>
 					<div class="content-label">
-						<span class="list-label">市政工程</span>
+						<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
+							{{textList.province}}
+							<template v-if="textList.city">
+								 -{{textList.city}}
+							</template>
+							<template v-if="textList.district">
+								  -{{textList.district}}
+							</template>
+							
+						</span>
+						<span class="list-label list-label-lx" v-if="textList.objectType">{{textList.objectType}}</span>
+						<span class="list-label list-label-lx" v-if="textList.buildingProjectType">{{textList.buildingProjectType}}</span>
+						
 					</div>
-					
 					<div  class="list-content">
 						<p class="list-content-text">
 							<span>招采单位：</span>
-							<span class="blue">江西合胜合招标咨询有限公司</span>
+							<span>{{textList.Name||'--'}}万元</span>
 						</p>
-						<p class="list-content-text">
-							<span>代理单位：</span>
-							<span class="blue">江西合胜合招标咨询有限公司</span>
-						</p>
-						
-					</div>
-					<div  class="list-content">
 						<p class="list-content-text">
 							<span>预算金款：</span>
-							<span>123,456,78万元</span>
+							<span>{{textList.planTenderAmount||'--'}}万元</span>
 						</p>
 						<p class="list-content-text">
-							<span>联系方式：</span>
-							<span >招采单位 张工 123456789</span>
+							<span>资金来源：</span>
+							<span >{{textList.projecetCapitalSource||'--'}}</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 >2022-04-21</span>
+							<span >{{textList.issueTime||'--'}}</span>
 						</p>
 						<p class="list-content-text">
-							<span>开标时间：</span>
-							<span >2022-04-21</span>
+							<span>预计招标时间：</span>
+							<span >{{textList.planTenderDateStart||'--'}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>来源网站：</span>
-							<span >赤峰市阿鲁科尔沁旗人民政府</span>
+							<span >{{textList.sourceName||'--'}}</span>
 						</p>
 					</div>
 					
@@ -62,9 +61,11 @@
 			<div class="list-content-img"  @mouseenter="showimg=false" @mouseleave="showimg=true">
 				<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 				<img v-else src="@/assets/images/bxpro/original.png">
-				<span>原文链接</span>
+				<span>
+					<a :href="textList.url">原文链接</a>
+				</span>
 			</div>
-			<div class="main3-box">
+			<div class="main3-box" v-html="textList.content">
 				
 				
 			
@@ -76,6 +77,7 @@
 </template>
 
 <script>
+	import api from '@/api/radar/radar.js';
 	import "@/assets/styles/public.css";
 	export default {
 
@@ -83,21 +85,25 @@
 		data() {
 			return {
 				id: '',
-				tableData: [{
-					id: 0,
-					name: '20重庆债14(2005938)',
-					time: '2020-09-18',
-					gm: '285.24',
-					zj: '否',
-				}],
+				textList: {},
 				showimg:true
 			}
 		},
 		created() {
-			console.log(this.$route.params)
-			this.id = this.$route.params.id
+			this.id = this.$route.params.id;
+			this.bidPlanDetail();
 		},
 		methods: {
+			bidPlanDetail() {
+				api.bidPlanDetail({
+					id: this.id
+				}).then(res => {
+					// console.log(res);
+					this.textList = res.data;
+				}).catch(error => {
+					
+				});
+			},
 
 		}
 	}
@@ -186,11 +192,21 @@
 					padding: 3px 7px;
 					font-size: 12px;
 
+				}
+				.list-label {
+					background: #F3F3FF;
+					color: #8491E8;
+					border-radius: 1px 1px 1px 1px;
+					padding: 3px 7px;
+					font-size: 12px;
+					margin-right: 12px;
+					font-weight: 400;
+				
 				}
 				.list-label-zb{
 					font-weight: 400;
-					color: #5A88F9;
-					background: #E7EDFC;
+					color: #8491E8;
+					background: #F3F3FF;
 				}
 				.list-label-lx{
 					font-weight: 400;

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

@@ -4,25 +4,36 @@
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list"  >
 					<p class="list-titel">
-						 绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
+						 {{textList.projectName}}
 						 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
 					</p>
 					<div class="content-label">
-						<span class="list-label">市政工程</span>
+						<span class="list-label list-label-lx" v-if="textList.projectCategories">{{textList.projectCategories}}</span>
+						<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
+							{{textList.province}}
+							<template v-if="textList.city">
+								 -{{textList.city}}
+							</template>
+							<template v-if="textList.district">
+								  -{{textList.district}}
+							</template>
+							
+						</span>
+						
 					</div>
 					
 					<div  class="list-content">
-						<p class="list-content-text">
+						<p class="list-content-text"  v-if="textList.examineStatus">
 							<span>办件结果：</span>
-							<span >芜湖旭日机械制造有限公司</span>
+							<span >{{textList.examineStatus}}</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text"v-if="textList.money">
 							<span>总投资：</span>
-							<span>芜湖旭日</span>
+							<span>{{textList.money}}万</span>
 						</p>
-						<p class="list-content-text">
+						<p class="list-content-text"v-if="textList.handleTime">
 							<span>审批日期：</span>
-							<span>12345.62万</span>
+							<span>{{textList.handleTime}}</span>
 						</p>
 						
 					</div>
@@ -37,43 +48,51 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">项目法人</label>
-					<span>序号</span>
+					<span>{{textList.companyName||'--'}}</span>
 					<label class="label">总投资（万元）</label>
-					<span>序号</span>
+					<span>{{textList.money||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">项目类型</label>
-					<span class="span-one">序号</span>
+					<span class="span-one">{{textList.projectCategories||'--'}}</span>
 
 				</p>
 				
 				<p>
 					<label class="label">项目属地</label>
-					<span>序号</span>
+					<span>
+						{{textList.province}}
+						<template v-if="textList.city">
+							 -{{textList.city}}
+						</template>
+						<template v-if="textList.district">
+							  -{{textList.district}}
+						</template>
+					</span>
 					<label class="label">审批类型</label>
-					<span>序号</span>
+					<span>{{textList.projectType||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">建设规模</label>
-					<span>序号</span>
+					<span>{{textList.buildScale||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">计划开工日期</label>
-					<span>序号</span>
+					<span>{{textList.planStartTime||'--'}}</span>
 					<label class="label">计划完成日期</label>
-					<span>序号</span>
+					<span>{{textList.planEndTime||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">项目联系方式</label>
-					<span>序号</span>
+					<span>{{textList.money||'--'}}</span>
 					<label class="label">行业分类</label>
-					<span>序号</span>
+					<span>{{textList.projectIndustry||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">项目详情地址</label>
-					<span>序号</span>
+					<span>{{textList.buildAddre||'--'}}</span>
 					<label class="label">项目代码</label>
-					<span>序号</span>
+					<span>{{textList.projectCode||'--'}}</span>
 				</p>
 				
 			
@@ -84,7 +103,7 @@
 		  <div class="common-title">立项审批</div>
 		  <div class="table-item">
 		    <el-table
-		      :data="tableData"
+		      :data="tableData1"
 		      element-loading-text="Loading"
 		      border
 		      fit
@@ -92,33 +111,39 @@
 		    >
 		      <el-table-column  label="审批事项" width="270">
 		        <template slot-scope="scope">
-		         企业投资项目备案
+		           {{ scope.row.examineContent||'--'}}
 		        </template>
 		      </el-table-column>
 		      <el-table-column  label="审批结果" width="187" >
 				  <template slot-scope="scope">
-				   通过
+				   {{ scope.row.examineStatus||'--'}}
 				  </template>
 			  </el-table-column>
 		      <el-table-column label="审批部门"  >
 				  <template slot-scope="scope">
-				   老河口市发展和改革局
+				   {{ scope.row.examineOffice||'--'}}
 				  </template>
 				  
 				</el-table-column>
-		      <el-table-column  label="审批问号" width="328" >
+		      <el-table-column  label="审批文号" width="328" >
 				  <template slot-scope="scope">
-				     --
+				    {{ scope.row.licenseNum||'--'}}
 				    </template>
 				    
 				</el-table-column>
 		      <el-table-column prop="zj" label="审批日期" width="240" >
 				<template slot-scope="scope">
-				    2022-08-28
+				   {{ scope.row.handleTime||'--'}}
 				</template>
 				    
 			   </el-table-column>
 		    </el-table>
+			<div class="pagination clearfix" v-show="total1>10">
+				<el-pagination background :page-size="pageSize1" :current-page="pageNum1"
+					@current-change="handleCurrentChange1" layout="prev, pager, next" :total="total1">
+				</el-pagination>
+			</div>
+			
 		  </div>
 		</div>
 		
@@ -126,41 +151,51 @@
 		  <div class="common-title">立项推介</div>
 		  <div class="table-item">
 		    <el-table
-		      :data="tableData"
+		      :data="tableData2"
 		      element-loading-text="Loading"
 		      border
 		      fit
 		      highlight-current-row
 		    >
-		      <el-table-column  label="立项推介" >
+		      <el-table-column  label="民间资本名称" >
 		        <template slot-scope="scope">
-		         -
+		           {{ scope.row.companyName||'--'}}
 		        </template>
 		      </el-table-column>
 		      <el-table-column  label="引入资本规模（万元）" width="232" >
 				  <template slot-scope="scope">
-				   --
+				   {{ scope.row.introduceMoney||'--'}}
 				  </template>
 			  </el-table-column>
 		      <el-table-column label="引入资本时间"  width="243" >
 				  <template slot-scope="scope">
-				   2019-12-24
+				   {{ scope.row.introduceMoneyTime||'--'}}
 				  </template>
 				  
 				</el-table-column>
 		      <el-table-column  label="推介时间" width="243" >
 				  <template slot-scope="scope">
-				  2019-12-24
+				 {{ scope.row.recommendTime||'--'}}
 				    </template>
 				    
 				</el-table-column>
 		      <el-table-column prop="zj" label="是否完成推介" width="243" >
 				<template slot-scope="scope">
-				    否
+					<template v-if="scope.row.isRecommend!=''&&scope.row.isRecommend!=null">
+						{{ scope.row.isRecommend?'是':'否'}}
+					</template>
+					<template v-else>
+						--
+					</template>
 				</template>
 				    
 			   </el-table-column>
 		    </el-table>
+			<div class="pagination clearfix" v-show="total2>10">`
+				<el-pagination background :page-size="pageSize2" :current-page="pageNum2"
+					@current-change="handleCurrentChange2" layout="prev, pager, next" :total="total2">
+				</el-pagination>
+			</div>
 		  </div>
 		</div>
 		
@@ -169,28 +204,93 @@
 </template>
 
 <script>
-	import "@/assets/styles/public.css";
+	import api from '@/api/radar/radar.js';
 	export default {
 
 		name: 'EstablishmentDetails',
 		data() {
 			return {
 				id: '',
-				tableData: [{
-					id: 0,
-					name: '20重庆债14(2005938)',
-					time: '2020-09-18',
-					gm: '285.24',
-					zj: '否',
-				}]
+				textList: {},
+				pageNum1:1,
+				pageSize1:10,
+				tableData1:[],
+				total1:0,
+				
+				pageNum2:1,
+				pageSize2:10,
+				tableData2:[],
+				total2:0,
 			}
 		},
 		created() {
-			console.log(this.$route.params)
-			this.id = this.$route.params.id
+			this.id = this.$route.params.id;
+			this.approvalInfoDetail();
+			this.approvalExaminePage();
+			this.approvalMarketingPage();
+			
 		},
 		methods: {
-
+			approvalInfoDetail() {
+				api.approvalInfoDetail({
+					id: this.id
+				}).then(res => {
+					// console.log(res);
+					this.textList = res.data;
+				}).catch(error => {
+		
+				});
+			},
+			handleCurrentChange1(pageNum1) {
+				this.pageNum1 = pageNum1;
+				this.search(pageNum1, this.pageSize1);
+			},
+			approvalExaminePage(pageNum1, pageSize1) {
+				if (!pageNum1) {
+					this.pageNum1 = 1;
+				}
+				if (!pageSize1) {
+					this.pageSize1 = 20;
+				}
+				var data = {
+					id: this.id,
+					pageNum: this.pageNum1,
+					pageSize: this.pageSize1
+				}
+				api.approvalExaminePage(data).then(res => {
+					// console.log(res);
+					this.tableData1 = res.rows;
+			
+				}).catch(error => {
+			
+				});
+			},
+			handleCurrentChange2(pageNum2) {
+				this.pageNum2 = pageNum2;
+				this.search(pageNum2, this.pageSize2);
+			},
+			approvalMarketingPage(pageNum2, pageSize2) {
+				if (!pageNum2) {
+					this.pageNum2 = 1;
+				}
+				if (!pageSize2) {
+					this.pageSize2 = 20;
+				}
+				var data = {
+					id: this.id,
+					pageNum: this.pageNum2,
+					pageSize: this.pageSize2
+				}
+				api.approvalMarketingPage(data).then(res => {
+					// console.log(res);
+					this.tableData2 = res.rows;
+			
+				}).catch(error => {
+			
+				});
+			}
+			
+		
 		}
 	}
 </script>
@@ -268,16 +368,27 @@
 			}
 
 			.content-label {
-				margin-top: 7px;
+				margin-top: 12px;
+				margin-bottom: 8px;
 
 				.list-label {
 					background: #F3F3FF;
 					color: #8491E8;
 					border-radius: 1px 1px 1px 1px;
-
 					padding: 3px 7px;
 					font-size: 12px;
-
+					margin-right: 12px;
+				
+				}
+				.list-label-zb{
+					font-weight: 400;
+					color: #8491E8;
+					background: #F3F3FF;
+				}
+				.list-label-lx{
+					font-weight: 400;
+					color: #41A1FD;
+					background: #E4F3FD;
 				}
 			}
 
@@ -552,6 +663,14 @@
 		.main5 {
 			.table-item {
 				margin-top: 22px;
+				.pagination {
+					padding: 14px;
+				
+					.el-pagination {
+						float: right;
+					}
+				}
+				
 			}
 		}
 	}

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

@@ -4,35 +4,35 @@
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list">
 					<p class="list-titel">
-						绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
+						{{textList.projectName}}
 					</p>
 
 					<div class="list-content">
 						<p class="list-content-text">
 							<span>受让人：</span>
-							<span class="blue">芜湖旭日机械制造有限公司</span>
+							<span class="blue">{{textList.company||"--"}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>成交金额：</span>
-							<span>12345.62万元</span>
+							<span>{{textList.transactionPrice||"--"}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>总面积：</span>
-							<span>12345.62万</span>
+							<span>{{textList.acreage||"--"}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>合同签订：</span>
-							<span>2014-05-12</span>
+							<span>{{textList.contractSignTime||"--"}}</span>
 						</p>
 					</div>
 					<div class="list-content">
 						<p class="list-content-text">
 							<span>土地用途：</span>
-							<span>城镇村道路用地</span>
+							<span>{{textList.landUse||"--"}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>供应方式：</span>
-							<span>挂牌出让</span>
+							<span>{{textList.supplyLandWay||"--"}}</span>
 						</p>
 					</div>
 
@@ -46,71 +46,79 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">行政区</label>
-					<span>1.36倍</span>
+					<span>
+						   {{textList.province}}
+						<template v-if="textList.city">
+							-{{textList.city}}
+						</template>
+						<template v-if="textList.area">
+							-{{textList.area}}
+						</template>
+					</span>
 					<label class="label">电子监督号</label>
-					<span>1.36倍</span>
+					<span>{{textList.electronicNumber||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">项目名称</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.projectName||"--"}}</span>
 
 				</p>
 				<p>
 					<label class="label">项目位置</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.landAddr||"--"}}</span>
 
 				</p>
 				<p>
 					<label class="label">面积</label>
-					<span>1.36倍</span>
+					<span>{{textList.buildArea||"--"}}</span>
 					<label class="label">土地来源</label>
-					<span>1.36倍</span>
+					<span>{{textList.landSource||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">土地用途</label>
-					<span>1.36倍</span>
+					<span>{{textList.landUse||"--"}}</span>
 					<label class="label">供地方式</label>
-					<span>1.36倍</span>
+					<span>{{textList.supplyLandWay||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">土地使用年限</label>
-					<span>1.36倍</span>
+					<span>{{textList.landUseYear||"--"}}</span>
 					<label class="label">行业分类</label>
-					<span>1.36倍</span>
+					<span>{{textList.industry||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">土地级别</label>
-					<span>1.36倍</span>
+					<span>{{textList.landLevel||"--"}}</span>
 					<label class="label">成交价格（万元）</label>
-					<span>1.36倍</span>
+					<span>{{textList.transactionPrice||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">土地使用权人</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.landUseCompany||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">约定容积率</label>
-					<span>1.36倍</span>
+					<span>{{textList.volumeRate||"--"}}</span>
 					<label class="label">批准单位</label>
-					<span>1.36倍</span>
+					<span>{{textList.authority||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">约定交地日起</label>
-					<span>1.36倍</span>
+					<span>{{textList.conventionLandTime||"--"}}</span>
 					<label class="label">合同签订日期</label>
-					<span>1.36倍</span>
+					<span>{{textList.contractSignTime||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">约定开工时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.conventionBeginTime||"--"}}</span>
 					<label class="label">约定竣工时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.conventionEndTime||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">实际开工时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.realBeginTime||"--"}}</span>
 					<label class="label">实际峻工时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.realEndTime||"--"}}</span>
 				</p>
 			</div>
 		</div>
@@ -119,21 +127,21 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">地块名称</label>
-					<span>1.36倍</span>
+					<span>{{textList.landName||"--"}}</span>
 					<label class="label">建筑面积</label>
-					<span>1.36倍</span>
+					<span>{{textList.buildArea||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">容积率</label>
-					<span>1.36倍</span>
+					<span>{{textList.volumeRate||"--"}}</span>
 					<label class="label">绿化率</label>
-					<span>1.36倍</span>
+					<span>{{textList.greeningRate||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">建筑密度</label>
-					<span>1.36倍</span>
+					<span>{{textList.buildingDensity||"--"}}</span>
 					<label class="label">建筑限高</label>
-					<span>1.36倍</span>
+					<span>{{textList.buildingHeight||"--"}}</span>
 				</p>
 			</div>
 		</div>
@@ -142,39 +150,39 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">招拍挂起始时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectName||"--"}}</span>
 					<label class="label">招拍挂截止时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectName||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">报名起始时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.auctionBeginTime||"--"}}</span>
 					<label class="label">报名截止日期</label>
-					<span>1.36倍</span>
+					<span>{{textList.auctionEndTime||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">起始价</label>
-					<span>1.36倍</span>
+					<span>{{textList.moneyBegin||"--"}}</span>
 					<label class="label">竞买保证金</label>
-					<span>1.36倍</span>
+					<span>{{textList.bondmoney||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">加价幅度</label>
-					<span>1.36倍</span>
+					<span>{{textList.addMoneyRange||"--"}}</span>
 					<label class="label">投资强度</label>
-					<span>1.36倍</span>
+					<span>{{textList.investmentIntensity||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">成交价</label>
-					<span>1.36倍</span>
+					<span>{{textList.transactionPrice||"--"}}</span>
 					<label class="label">受让人</label>
-					<span>1.36倍</span>
+					<span>{{textList.company||"--"}}</span>
 				</p>
 				<p>
 					<label class="label">成交公示日期</label>
-					<span>1.36倍</span>
+					<span>{{textList.transactionPublicityTime||"--"}}</span>
 					<label class="label">合同编号</label>
-					<span>1.36倍</span>
+					<span>{{textList.contractNum||"--"}}</span>
 				</p>
 			</div>
 		</div>
@@ -183,27 +191,34 @@
 </template>
 
 <script>
-	import "@/assets/styles/public.css";
+	import api from '@/api/radar/radar.js';
 	export default {
 
 		name: 'LandDetails',
 		data() {
 			return {
 				id: '',
-				tableData: [{
-					id: 0,
-					name: '20重庆债14(2005938)',
-					time: '2020-09-18',
-					gm: '285.24',
-					zj: '否',
-				}]
+				textList: {}
+
 			}
 		},
 		created() {
-			console.log(this.$route.params)
-			this.id = this.$route.params.id
+			this.id = this.$route.params.id;
+			this.landDetail();
 		},
 		methods: {
+			landDetail() {
+				api.landDetail({
+					id: this.id
+				}).then(res => {
+					// console.log(res);
+					this.textList = res.data;
+					console.log(this.textList);
+
+				}).catch(error => {
+
+				});
+			},
 
 		}
 	}

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

@@ -4,24 +4,26 @@
 			<ul class="bottomlist-content">
 				<li class="bottomlist-list">
 					<p class="list-titel">
-						绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
+						{{textList.projectName}}
 					</p>
 
 					
 					<div class="list-content">
 						<p class="list-content-text">
 							<span>发布日期：</span>
-							<span>2014-05-12</span>
+							<span>{{textList.pubdate||'--'}}</span>
 						</p>
 						<p class="list-content-text">
 							<span>开标时间：</span>
-							<span class='text-red'>2014-05-12 9:00</span>
+							<span class='text-red'>{{textList.endTimeDate||'--'}}</span>
 						</p>
 					</div>
 					<div class="list-content-img"  @mouseenter="showimg=false" @mouseleave="showimg=true">
 						<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 						<img v-else src="@/assets/images/bxpro/original.png">
-						<span>原文链接</span>
+						<span>
+							<a :href="textList.url">原文链接</a>
+						</span>
 					</div>
 
 				</li>
@@ -59,80 +61,93 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">工程类型</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectType||'--'}}</span>
 					<label class="label">工程类别</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectPurposes||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">项目投资额(万元)</label>
-					<span >1.36倍</span>
+					<span >{{textList.projectInvestmentAmount||'--'}}</span>
 					<label class="label">招标控制价/合同 估算价(万元)</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectContractAmount||'--'}}</span>
 
 				</p>
 				<p>
 					<label class="label">建安费暂估(万元)</label>
-					<span >1.36倍</span>
+					<span >{{textList.projectSafeAmount||'--'}}</span>
 					<label class="label">勘察费暂估(万元)</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectSurveyAmount||'--'}}</span>
 				
 				</p>
 				
 				<p>
 					<label class="label">设计费暂估(万元)</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectDesignAmount||'--'}}</span>
 					<label class="label">投标保证金(万元)</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectEnsureAmount||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">计划工期</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectDuration||'--'}}</span>
 					<label class="label">项目属地</label>
-					<span>1.36倍</span>
+					<span>
+					       {{textList.province}}
+							<template v-if="textList.city">
+								 -{{textList.city}}
+							</template>
+							<template v-if="textList.area">
+								  -{{textList.area}}
+							</template>
+					</span>
 				</p>
 				<p>
 					<label class="label">发布时间</label>
-					<span>1.36倍</span>
+					<span>{{textList.pubdate||'--'}}</span>
 					<label class="label">开标时间</label>
-					<span class="color1">1.36倍</span>
+					<span class="color1">{{textList.endTimeDate||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">评标办法</label>
-					<span>1.36倍</span>
+					<span>{{textList.bidAssessmentWay||'--'}}</span>
 					<label class="label">项目级别</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectLevel||'--'}}</span>
 				</p>
 				
 				<p>
 					<label class="label">建设规模</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.bulidRange||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">招标范围</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.bidRange||'--'}}</span>
 				</p>
 				
 				<p>
 					<label class="label">保证金缴纳方式</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectEnsureAmountPayType||'--'}}</span>
 					<label class="label">开标地点</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectOpenAddr||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">建设地点</label>
-					<span>1.36倍</span>
+					<span>{{textList.projectAddr||'--'}}</span>
 					<label class="label">资金来源</label>
-					<span>1.36倍</span>
+					<span>{{textList.capitalSource||'--'}}</span>
 				</p>
 				
 				<p>
 					<label class="label">评标委员会</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">
+						<template v-if="textList.bidMettingHasProjectUnit=0">未知</template>
+						<template v-else-if="textList.bidMettingHasProjectUnit=1">无</template>
+						<template v-else-if="textList.bidMettingHasProjectUnit=2">有</template>
+					     <template v-else>--</template>
+					</span>
 				
 				</p>
 				<p>
 					<label class="label">履约保证金 (形式 及金额)</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.prformanceWayAndMoney||'--'}}</span>
 				</p>
 			</div>
 		</div>
@@ -141,15 +156,15 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">资质要求</label>
-					<span class="span-one">1.36倍</span>
+					<span class="span-one">{{textList.qualiLimit||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">业绩要求</label>
-					<span  class="span-one">1.36倍</span>
+					<span  class="span-one">{{textList.projectLimit||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">项目负责人要求</label>
-					<span  class="span-one">1.36倍</span>
+					<span  class="span-one">{{textList.personLimit||'--'}}</span>
 				</p>
 			</div>
 		</div>
@@ -158,21 +173,21 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">招标人</label>
-					<span class="color2">1.36倍</span>
+					<span class="color2">{{textList.tenderee||'--'}}</span>
 					<label class="label">代理机构</label>
-					<span class="color2">1.36倍</span>
+					<span class="color2">{{textList.agency||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">招标人联系方式</label>
-					<span>1.36倍</span>
+					<span>{{textList.tendereeTel||'--'}}</span>
 					<label class="label">招标人联系地址</label>
-					<span>1.36倍</span>
+					<span>{{textList.tendereeAddress||'--'}}</span>
 				</p>
 				<p>
 					<label class="label">代理机构联系方式</label>
-					<span>1.36倍</span>
+					<span>{{textList.agencyTel||'--'}}</span>
 					<label class="label">代理机构联系地址</label>
-					<span>1.36倍</span>
+					<span>{{textList.agencyAddress||'--'}}</span>
 				</p>
 				
 			</div>
@@ -183,27 +198,33 @@
 
 <script>
 	import "@/assets/styles/public.css";
+	import api from '@/api/radar/radar.js';
 	export default {
 
 		name: 'bxprozbggDetails',
 		data() {
 			return {
 				id: '',
-				tableData: [{
-					id: 0,
-					name: '20重庆债14(2005938)',
-					time: '2020-09-18',
-					gm: '285.24',
-					zj: '否',
-				}],
+				textList: {},
 				showimg:true,
 			}
 		},
 		created() {
 			console.log(this.$route.params)
-			this.id = this.$route.params.id
+			this.id = this.$route.params.id;
+			this.bidNoticeProDetail();
 		},
 		methods: {
+			bidNoticeProDetail() {
+				api.bidNoticeProDetail({
+					id: this.id
+				}).then(res => {
+					// console.log(res);
+					this.textList = res.data;
+				}).catch(error => {
+					
+				});
+			},
 
 		}
 	}

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

@@ -5,29 +5,29 @@
 	  	    <div class="label">项目名称</div>
 	  	    <div class="content_right">
 	  	        <el-input class="ename_input" 
-	  			placeholder="请输入项目名称关键字" v-model="jskBidQueryDto.projectName" ></el-input>
+	  			placeholder="请输入项目名称关键字" v-model="jskBidPlanDto.projectName" ></el-input>
 	  	    </div>
 	  	</div>
 		<div class="content_item">
 		    <div class="label">招标单位</div>
 		    <div class="content_right">
 		        <el-input class="ename_input" 
-				placeholder="请输入项目名称关键字" v-model="jskBidQueryDto.tenderee" ></el-input>
+				placeholder="请输入招标单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
 		    </div>
 		</div>
 		<div class="content_item">
 		    <div class="label">工程规模</div>
 		    <div class="content_right">
 		        <el-input class="ename_input" 
-				placeholder="请输入项目名称关键字" v-model="jskBidQueryDto.projectScale" ></el-input>
+				placeholder="请输入工程规模关键字" v-model="jskBidPlanDto.projectScale" ></el-input>
 		    </div>
 		</div>
 		<div class="content_item">
 		    <div class="label">更多筛选</div>
 		    <div class="content_right">
 		       <div class="select-popper" >
-		         <span :class="{color_text:jskBidQueryDto.province.length ||jskBidQueryDto.city.length ||jskBidQueryDto.county.length,}">
-					 项目属地{{jskBidQueryDto.province.length ||jskBidQueryDto.city.length ||jskBidQueryDto.county.length? jskBidQueryDto.province.length + jskBidQueryDto.city.length +jskBidQueryDto.county.length +"项": ""}}
+		         <span :class="{color_text:jskBidPlanDto.province.length ||jskBidPlanDto.city.length ||jskBidPlanDto.area.length,}">
+					 项目属地{{jskBidPlanDto.province.length ||jskBidPlanDto.city.length ||jskBidPlanDto.area.length? jskBidPlanDto.province.length + jskBidPlanDto.city.length +jskBidPlanDto.area.length +"项": ""}}
 		           <i class="el-icon-caret-bottom"></i>
 		         </span>
 		         <el-cascader
@@ -42,46 +42,46 @@
 		         ></el-cascader>
 		       </div>
 			   <div class="select-popper">
-			     <span :class="{ color_text: jskBidQueryDto.objectType.length }">
-			       标的物类型{{jskBidQueryDto.objectType.length? jskBidQueryDto.objectType.length + "项": ""}}
+			     <span :class="{ color_text: jskBidPlanDto.objectType.length }">
+			       标的物类型{{jskBidPlanDto.objectType.length? jskBidPlanDto.objectType.length + "项": ""}}
 			       <i class="el-icon-caret-bottom"></i>
 			     </span>
-			     <el-select v-model="jskBidQueryDto.objectType" class="select-multiple" multipleplaceholder="请选择">
-			       <el-option v-for="(item, i) in objectTypeList" :key="i":label="item" :value="item">
+			     <el-select v-model="jskBidPlanDto.objectType" class="select-multiple" multiple placeholder="请选择">
+			       <el-option v-for="(item, i) in bidPlanObjectTypeList" :key="i":label="item" :value="item">
 			       </el-option>
 			     </el-select>
 			   </div>
 			   <div class="select-popper">
-			     <span :class="{ color_text: jskBidQueryDto.projectType.length }">
-			       项目类型{{jskBidQueryDto.projectType.length? jskBidQueryDto.projectType.length + "项": ""}}
+			     <span :class="{ color_text: jskBidPlanDto.projectType.length }">
+			       项目类型{{jskBidPlanDto.projectType.length? jskBidPlanDto.projectType.length + "项": ""}}
 			       <i class="el-icon-caret-bottom"></i>
 			     </span>
-			     <el-select v-model="jskBidQueryDto.projectType" class="select-multiple" multipleplaceholder="请选择">
+			     <el-select v-model="jskBidPlanDto.projectType" class="select-multiple" multiple placeholder="请选择">
 			       <el-option v-for="(item, i) in projectTypeList" :key="i":label="item" :value="item">
 			       </el-option>
 			     </el-select>
 			   </div>
 			   <div class="select-popper">
-			     <span :class="{ color_text: jskBidQueryDto.tenderWay.length }">
-			       招标方式{{jskBidQueryDto.tenderWay.length? jskBidQueryDto.tenderWay.length + "项": ""}}
+			     <span :class="{ color_text: jskBidPlanDto.tenderWay.length }">
+			       招标方式{{jskBidPlanDto.tenderWay.length? jskBidPlanDto.tenderWay.length + "项": ""}}
 			       <i class="el-icon-caret-bottom"></i>
 			     </span>
-			     <el-select v-model="jskBidQueryDto.tenderWay" class="select-multiple" multipleplaceholder="请选择">
+			     <el-select v-model="jskBidPlanDto.tenderWay" class="select-multiple" multiple placeholder="请选择">
 			       <el-option v-for="(item, i) in tenderWayList" :key="i":label="item" :value="item">
 			       </el-option>
 			     </el-select>
 			   </div>
 			   <el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
-			   	<span class="el-dropdown-link" :class="jskBidQueryDto.startPlanTenderAmount ||jskBidQueryDto.endPlanTenderAmount ? 'color_text': ''">
-			   		成交金额{{jskBidQueryDto.startPlanTenderAmount ||jskBidQueryDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
+			   	<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
+			   		成交金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
 			   	</span>
 			   	<el-dropdown-menu slot="dropdown">
-			   		<el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidQueryDto.startPlanTenderAmount == item.value[0] &&jskBidQueryDto.endPlanTenderAmount == item.value[1] &&
+			   		<el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidPlanDto.startPlanTenderAmount == item.value[0] &&jskBidPlanDto.endPlanTenderAmount == item.value[1] &&
 			                      !startPlanTenderAmount &&!endPlanTenderAmount? 'color_text': '' " :key="i" :command="item.value">{{ item.label }}</el-dropdown-item>
 			   			<el-dropdown-item command="" style="padding: 0; text-indent: 20px">
 			   				<div @mouseenter="planTenderAmountShowPopper = true" @mouseleave="planTenderAmountShowPopper = false">
-			   					<span :class="(startPlanTenderAmount || endPlanTenderAmount) &&jskBidQueryDto.startPlanTenderAmount ==startPlanTenderAmount &&
-			                               jskBidQueryDto.endPlanTenderAmount == endPlanTenderAmount? 'color_text': '' ">
+			   					<span :class="(startPlanTenderAmount || endPlanTenderAmount) &&jskBidPlanDto.startPlanTenderAmount ==startPlanTenderAmount &&
+			                               jskBidPlanDto.endPlanTenderAmount == endPlanTenderAmount? 'color_text': '' ">
 			   						自定义<i class="el-icon-arrow-right"></i>
 			   					</span>
 			   					<div class="jabph_popper_box" style="position: absolute"v-if="planTenderAmountShowPopper">
@@ -106,11 +106,11 @@
 			   </el-dropdown>
 			   
 			   <div class="select-popper">
-			     <span :class="{ color_text: jskBidQueryDto.projectCapitalSource.length }">
-			       资金来源{{jskBidQueryDto.projectCapitalSource.length? jskBidQueryDto.projectCapitalSource.length + "项": ""}}
+			     <span :class="{ color_text: jskBidPlanDto.projectCapitalSource.length }">
+			       资金来源{{jskBidPlanDto.projectCapitalSource.length? jskBidPlanDto.projectCapitalSource.length + "项": ""}}
 			       <i class="el-icon-caret-bottom"></i>
 			     </span>
-			     <el-select v-model="jskBidQueryDto.projectCapitalSource" class="select-multiple" multipleplaceholder="请选择">
+			     <el-select v-model="jskBidPlanDto.projectCapitalSource" class="select-multiple" multiple placeholder="请选择">
 			       <el-option v-for="(item, i) in projectCapitalSourceList" :key="i":label="item" :value="item">
 			       </el-option>
 			     </el-select>
@@ -149,28 +149,30 @@
 	  		</div>
 	  		  
 	  	</div>
-	  	<ul class="bottomlist-content">
-	  		<li class="bottomlist-list"  >
+	  	<ul class="bottomlist-content" v-if="tableData.length>0">
+	  		<li class="bottomlist-list" v-for="item in tableData">
 	  			<p class="list-titel">
-	  				 <router-link  :to="'/radar/Bidding/details/'+ 1" tag="a" class="list-titel-a"  >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
+	  				 <router-link  :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"  ></router-link>
 	  				 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
 	  			</p>
 	  			<div class="content-label">
-	  				<span class="list-label">市政工程</span>
+	  				<span class="list-label" v-if="item.projectType">{{item.projectType}}</span>
+					<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
+					<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
 	  			</div>
 	  			
 	  			<div  class="list-content">
 	  				<p class="list-content-text">
 	  					<span>招采单位：</span>
-	  					<span class="blue">芜湖旭日机械制造有限公司</span>
+	  					<span class="blue">{{item.tenderee||'--'}}</span>
 	  				</p>
 	  				<p class="list-content-text">
 	  					<span>合同预估金额（万元）：</span>
-	  					<span>芜湖旭日</span>
+	  					<span>{{item.planTenderAmount||'--'}}</span>
 	  				</p>
 	  				<p class="list-content-text">
 	  					<span>资金来源：</span>
-	  					<span>12345.62万</span>
+	  					<span>{{item.projectCapitalSource||'--'}}</span>
 	  				</p>
 	  				
 	  				
@@ -178,23 +180,23 @@
 				<div  class="list-content">
 					<p class="list-content-text">
 						<span>发布时间：</span>
-						<span >2022-04-21</span>
+						<span >{{item.issueTimestamp||'--'}}</span>
 					</p>
 					<p class="list-content-text">
 						<span>预计招标时间：</span>
-						<span>2022-04-21</span>
+						<span>{{item.issueTimestamp||'--'}}</span>
 					</p>
 					<p class="list-content-text">
 						<span>来源网站：</span>
-						<span  class="blue">12345.62万</span>
+						<span  >{{item.issueTimestamp||'--'}}</span>
 					</p>
 					
 					
 				</div>
 				<div  class="list-content list-addree">
 					<p class="list-content-text">
-						<span>工程规模：</span>
-						<span >城镇村道路用地</span>
+						<span class="content-text-gc">工程规模：</span>
+						<span class="content-text-p">{{item.projectScale||'--'}}</span>
 					</p>
 					
 				</div>
@@ -204,7 +206,7 @@
 	  	<div class="pagination clearfix"  v-show="total>0">
 	  		  <el-pagination
 	  		    background
-	  		    :page-size="pageSize"
+	  		    :page-size="limit"
 	  		    :current-page="page"
 	  		    @current-change="handleCurrentChange"
 	  		    layout="prev, pager, next"
@@ -218,10 +220,13 @@
 
 <script>
 import jsk_data from '../../../../../public/jsk.json';
+import {encodeStr} from "@/assets/js/common.js"
+import api from '@/api/radar/radar.js';
 export default {
   name: 'Bidding',
   data() {
     return {
+	  encodeStr,
       addressList: [],
       addressType: [],
       props: {
@@ -229,66 +234,10 @@ export default {
         expandTrigger: "hover",
         value: "id",
       },
-	  objectTypeList: [
-	    "施工",
-	    "勘察设计",
-	    "勘察",
-	    "设计",
-	    "监理",
-	    "工程总承包",
-	    "测绘",
-	    "施工图审查",
-	    "造价咨询",
-	    "招标代理",
-	    "规划编制",
-	    "方案编制",
-	    "检测",
-	    "审计",
-	    "项目管理",
-	    "全过程工程咨询",
-	    "ppp",
-	    "其他"
-	  ],//标的物类型
-	  projectTypeList: [
-	    "工程总承包",
-	    "测绘",
-	    "施工图审查",
-	    "造价咨询",
-	    "招标代理",
-	    "规划编制",
-	    "方案编制",
-	    "检测",
-	    "审计",
-	    "项目管理",
-	    "全过程工程咨询",
-	    "ppp",
-	    "其他"
-	  ],//项目类型
-	  tenderWayList: [
-	    "工程总承包",
-	    "测绘",
-	    "施工图审查",
-	    "造价咨询",
-	    "招标代理",
-	    "规划编制",
-	    "方案编制",
-	    "检测",
-	    "审计",
-	    "项目管理",
-	    "全过程工程咨询",
-	    "ppp",
-	    "其他"
-	  ],//招标方式
-	  projectCapitalSourceList: [
-	    "规划编制",
-	    "方案编制",
-	    "检测",
-	    "审计",
-	    "项目管理",
-	    "全过程工程咨询",
-	    "ppp",
-	    "其他"
-	  ],//资金来源
+	  bidPlanObjectTypeList: [],//标的物类型
+	  projectTypeList: [],//项目类型
+	  tenderWayList: [],//招标方式
+	  projectCapitalSourceList: [],//资金来源
 	  planTenderAmount: [{
 	  		value: "不限",
 	  		label: "不限",
@@ -315,13 +264,13 @@ export default {
 	  	},
 	  ],
 
-      jskBidQueryDto: {
+      jskBidPlanDto: {
 	    projectName:'',
 		tenderee:'',
 		projectScale:'',
         province: [],
         city: [],
-        county: [],
+        area: [],
 		objectType:[],
 		projectType:[],
 		tenderWay:[],
@@ -338,40 +287,40 @@ export default {
 	  conditionsArr: [],
 	  
 	  tableData:[],
-	  total:6000,
+	  total:0,
 	  page:1,
-	  pageSize:20
+	  limit:20
     };
   },
   computed: {
     checkJskBidQueryDto() {
         let arr = [];
 		let data = {};
-      if(this.jskBidQueryDto.projectName){
+      if(this.jskBidPlanDto.projectName){
         data = {
-						title: "项目名称:",
-						keyid: "projectName",
-						value: this.jskBidQueryDto.projectName,
-						key: "projectName"
+				title: "项目名称:",
+				keyid: "projectName",
+				value: this.jskBidPlanDto.projectName,
+				key: "projectName"
 					}
 		arr.push(data)
       }
      
-      if(this.jskBidQueryDto.tenderee){
+      if(this.jskBidPlanDto.tenderee){
         data = {
-						title: "招标单位:",
-						keyid: "tenderee",
-						value: this.jskBidQueryDto.tenderee,
-						key: "tenderee"
+				title: "招标单位:",
+				keyid: "tenderee",
+				value: this.jskBidPlanDto.tenderee,
+				key: "tenderee"
 					}
 		arr.push(data)
       }
-	  if(this.jskBidQueryDto.projectScale){
+	  if(this.jskBidPlanDto.projectScale){
 	    data = {
-	  						title: "工程规模:",
-	  						keyid: "projectScale",
-	  						value: this.jskBidQueryDto.projectScale,
-	  						key: "projectScale"
+				title: "工程规模:",
+				keyid: "projectScale",
+				value: this.jskBidPlanDto.projectScale,
+				key: "projectScale"
 	  					}
 	  	arr.push(data)
 	  }
@@ -384,38 +333,38 @@ export default {
         }
         arr.push(data)
       }
-	  if (this.jskBidQueryDto.objectType.length > 0) {
+	  if (this.jskBidPlanDto.objectType.length > 0) {
 	    data = {
 	      title: "标的物类型:",
 	      keyid: "objectType",
-	      value: this.jskBidQueryDto.objectType,
+	      value: this.jskBidPlanDto.objectType,
 	      key: "objectType"
 	    }
 	    arr.push(data)
 	  }
-	  if (this.jskBidQueryDto.projectType.length > 0) {
+	  if (this.jskBidPlanDto.projectType.length > 0) {
 	    data = {
 	      title: "项目类型:",
 	      keyid: "projectType",
-	      value: this.jskBidQueryDto.projectType,
+	      value: this.jskBidPlanDto.projectType,
 	      key: "projectType"
 	    }
 	    arr.push(data)
 	  }
-	  if (this.jskBidQueryDto.tenderWay.length > 0) {
+	  if (this.jskBidPlanDto.tenderWay.length > 0) {
 	    data = {
 	      title: "招标方式:",
 	      keyid: "tenderWay",
-	      value: this.jskBidQueryDto.tenderWay,
+	      value: this.jskBidPlanDto.tenderWay,
 	      key: "tenderWay"
 	    }
 	    arr.push(data)
 	  }
-	  if (this.jskBidQueryDto.projectCapitalSource.length > 0) {
+	  if (this.jskBidPlanDto.projectCapitalSource.length > 0) {
 	    data = {
 	      title: "资金来源:",
 	      keyid: "projectCapitalSource",
-	      value: this.jskBidQueryDto.projectCapitalSource,
+	      value: this.jskBidPlanDto.projectCapitalSource,
 	      key: "projectCapitalSource"
 	    }
 	    arr.push(data)
@@ -426,12 +375,24 @@ export default {
     },
   },
   mounted() {
-    if (this.$route.query.projectName) {
-        this.projectName = this.$route.query.projectName;
-      }
-      this.addressListfn();
+   this.init();
+      
   },
   methods: {
+	getCapitalSourceSelect(){
+	  	api.getCapitalSourceSelect().then(res=>{
+	  		this.projectCapitalSourceList = res.data;
+	  	}).catch(error=>{
+	  	});
+	},
+	searchDic(){
+	  	api.searchDic().then(res=>{
+	  		this.bidPlanObjectTypeList= res.bidPlanObjectType,//标的物类型
+	  		this.projectTypeList= res.projectType,//项目类型
+	  		this.tenderWayList= res.tenderWay;//招标方式
+	  	}).catch(error=>{
+	  	});
+	},
     keywordClick(val) {
       this.projectName = val
     },
@@ -446,17 +407,21 @@ export default {
       if (!page && !limit) {
         this.reloadPage();
       }
-      var data = JSON.parse(JSON.stringify(this.jskBidQueryDto));
+      var data = JSON.parse(JSON.stringify(this.jskBidPlanDto));
       data.province = data.province.join(",");
       data.city = data.city.join(",");
-      data.county = data.county.join(",");
+      data.area = data.area.join(",");
+	  data.objectType=data.objectType.join(",");
+	  data.projectCapitalSource=data.projectCapitalSource.join(",");
+	  data.projectType=data.projectType.join(",");
+	  data.tenderWay=data.tenderWay.join(",");
       let params = {
         page: {
           page: this.page,
           limit: this.limit,
           field: this.field,
         },
-        jskBidQueryDto: data,
+        jskBidPlanDto: data,
       };
       if(this.projectName){
         params.projectName = this.projectName
@@ -468,8 +433,16 @@ export default {
       }else{
         delete params.keywordNot
       }
+	  api.jskBidPlanPage(params).then(res=>{
+		  console.log(res);
+	  	if (res.code==200) {
+	  		this.tableData=res.data.list;
+	  		this.total=res.data.total;
+	  	}
+	  }).catch(error=>{
+	  	
+	  });
       
-      this.$emit("search",params)
       
     },
     reloadPage() {
@@ -493,14 +466,14 @@ export default {
       let arr = this.$refs.address.getCheckedNodes();
       let province = [],
         city = [],
-        county = [];
+        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 && county.push(arr[i].value);
+            !arr[i].hasChildren && area.push(arr[i].value);
             !arr[i].hasChildren && this.domicile.push(arr[i].label);
           }
         } else {
@@ -508,11 +481,11 @@ export default {
           this.domicile.push(arr[i].label);
         }
       }
-      var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
+      var obj = JSON.parse(JSON.stringify(this.jskBidPlanDto));
       obj.province = province;
       obj.city = city;
-      obj.county = county;
-      this.jskBidQueryDto = obj;
+      obj.area = area;
+      this.jskBidPlanDto = obj;
     },
     addressListfn() {
       var str = [];
@@ -567,10 +540,10 @@ export default {
 			return this.$message.warning("最小值必须小于最大值,请重新输入！");
 		}
 		this.planTenderAmountShowPopper = false;
-		var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
+		var obj = JSON.parse(JSON.stringify(this.jskBidPlanDto));
 		obj.startPlanTenderAmount = this.startPlanTenderAmount;
 		obj.endPlanTenderAmount = this.endPlanTenderAmount;
-		this.jskBidQueryDto = obj;
+		this.jskBidPlanDto = obj;
 		this.$refs.planTenderAmountShowPopper.hide();
 	},
 	planTenderAmountCancel() {
@@ -580,7 +553,7 @@ export default {
 	planTenderAmounthandleCommand(command) {
 		if (command) {
 			this.$refs.planTenderAmountShowPopper.hide();
-			var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
+			var obj = JSON.parse(JSON.stringify(this.jskBidPlanDto));
 			this.startPlanTenderAmount = "";
 			this.endPlanTenderAmount = "";
 			if (command == "不限") {
@@ -590,7 +563,7 @@ export default {
 				obj.startPlanTenderAmount = command[0];
 				obj.endPlanTenderAmount = command[1];
 			}
-			this.jskBidQueryDto = obj;
+			this.jskBidPlanDto = obj;
 		}
 	},
     reset() {
@@ -601,6 +574,8 @@ export default {
     init(){
       this.search();
       this.addressListfn();
+	  this.searchDic();
+      this.getCapitalSourceSelect();
     },
    
   },
@@ -752,11 +727,20 @@ export default {
 					background: #F3F3FF;
 					color: #8491E8;
 					border-radius: 1px 1px 1px 1px;
-				
 					padding: 3px 7px;
 					font-size: 12px;
+					margin-right: 16px;
 					
 				}
+				.list-label-wl{
+					background: #e8f7f0;
+					color: #38c8bf;
+					
+				}
+				.list-label-lx{
+					background: #e4f3fd;
+					color: #41a1fd;
+				}
 			}
 			
 			
@@ -770,7 +754,7 @@ export default {
 					margin-top: 7px;
 					display: flex;
 					justify-content: start;
-					align-items: center;
+					align-items:flex-start ;
 					margin-right: 27px;
 					font-size: 14px;
 					
@@ -784,6 +768,12 @@ export default {
 						color: rgba(35,35,35,0.8);
 						line-height: 15px
 					}
+					.content-text-gc{
+						width: 72px;
+					}
+					.content-text-p{
+						width: 1200px;
+					}
 					.blue{
 						color: #0081FF !important;
 						cursor: pointer;

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

@@ -12,7 +12,7 @@
 			    <div class="label">项目业主</div>
 			    <div class="content_right">
 			        <el-input class="ename_input" 
-					placeholder="请输入招标采购单位名称" v-model="establishmentDto.companyName" ></el-input>
+					placeholder="请输入项目业主名称或关键词" v-model="establishmentDto.companyName" ></el-input>
 			    </div>
 			</div>
 			<div class="content_item">
@@ -26,14 +26,14 @@
 			    <div class="label">建设地点</div>
 			    <div class="content_right">
 			        <el-input class="ename_input" 
-					placeholder="请输入审批部门名称或关键词" v-model="establishmentDto.buildAddre" ></el-input>
+					placeholder="请输入建设地点名称关键词" v-model="establishmentDto.buildAddre" ></el-input>
 			    </div>
 			</div>
 			<div class="content_item">
 			    <div class="label">建设规模</div>
 			    <div class="content_right">
 			        <el-input class="ename_input" 
-					placeholder="请输入审批部门名称或关键词" v-model="establishmentDto.buildScale" ></el-input>
+					placeholder="请输入建设规模名称关键词" v-model="establishmentDto.buildScale" ></el-input>
 			    </div>
 			</div>
 			<div class="content_item">
@@ -49,16 +49,7 @@
 				   			</el-option>
 				   		</el-select>
 				   	</div>
-					<div class="select-popper">
-						<span :class="{ color_text: establishmentDto.projectType.length }">
-							项目类型{{establishmentDto.projectType.length? establishmentDto.projectType.length + "项": ""}}
-							<i class="el-icon-caret-bottom"></i>
-						</span>
-						<el-select v-model="establishmentDto.projectType" class="select-multiple" multiple placeholder="请选择">
-							<el-option v-for="(item, i) in projectTypeOptions" :key="i" :label="item" :value="item">
-							</el-option>
-						</el-select>
-					</div>
+					
 					<div class="select-popper">
 						<span :class="{ color_text: establishmentDto.industry.length }">
 							所属行业{{establishmentDto.industry.length? establishmentDto.industry.length + "项": ""}}
@@ -194,77 +185,63 @@
 				</div>
 				  
 			</div>
-			<ul class="bottomlist-content">
-				<li class="bottomlist-list"  >
+			<ul class="bottomlist-content" v-if="tableData.length>0">
+				<li class="bottomlist-list" v-for="item in tableData">
 					<p class="list-titel">
-						 <router-link  :to="'/radar/Establishment/details/'+ 1" tag="a" class="list-titel-a"  >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
-						 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
+						 <router-link  :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
 					</p>
-					<div class="content-label">
-						<span class="list-label">市政工程</span>
-					</div>
+					
 					
 					<div  class="list-content">
-						<p class="list-content-text">
-							<span>项目业主：</span>
-							<span class="blue">芜湖旭日机械制造有限公司</span>
-						</p>
-						<p class="list-content-text">
-							<span>审批部门：</span>
-							<span>芜湖旭日</span>
+						<p class="list-content-text"v-if="item.companyName">
+							<span>建设/申请单位：</span>
+							<span class="blue">{{item.companyName}}</span>
 						</p>
-						<p class="list-content-text">
-							<span>审批结果：</span>
-							<span>12345.62万</span>
+						<p class="list-content-text"v-if="item.handleTime">
+							<span>发布日期：</span>
+							<span>{{item.handleTime}}</span>
 						</p>
-						<p class="list-content-text">
-							<span>审批结果：</span>
-							<span>2014-05-12</span>
+						<p class="list-content-text"v-if="item.examineStatus">
+							<span>办件结果：</span>
+							<span>{{item.examineStatus}}</span>
 						</p>
-						<p class="list-content-text">
-							<span>总投资：</span>
-							<span>62654</span>
+						<p class="list-content-text"v-if="item.industry">
+							<span>行业分类：</span>
+							<span>{{item.industry}}</span>
 						</p>
-						<p class="list-content-text">
-							<span>计划开工日期：</span>
-							<span>62654</span>
-						</p>
-						<p class="list-content-text">
-							<span>计划完工日期：</span>
-							<span>626</span>
-						</p>
-						<p class="list-content-text">
-							<span>是否为向民间推介项目：</span>
-							<span>62654</span>
+						<p class="list-content-text"v-if="item.buildNature">
+							<span>建设性质：</span>
+							<span>{{item.buildNature}}</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 ">
-						<p class="list-content-text">
-							<span>批准日期：</span>
-							<span>62654</span>
-						</p>
-						<p class="list-content-text">
-							<span>建设规模：</span>
-							<span >许巷路西</span>
-						</p>
+					<div  class="list-content list-addree">
+						<template v-if="item.province||item.city||item.district">
+							<img src="@/assets/images/addree.png" alt="">
+							<p class="list-content-text">
+								<span>行政区划：</span>
+								<span >
+									 {{item.province}}
+								   <template v-if="item.city">
+									  -{{item.city}}
+								   </template>
+								   <template v-if="item.district">
+								   	  -{{item.district}}
+								   </template>
+								</span>
+							</p>
+						</template>
+						
+						
+						
 					</div>
 				</li>
 			</ul>
 			<div class="pagination clearfix"  v-show="total>0">
 				  <el-pagination
 				    background
-				    :page-size="pageSize"
+				    :page-size="limit"
 				    :current-page="page"
 				    @current-change="handleCurrentChange"
 				    layout="prev, pager, next"
@@ -281,13 +258,15 @@
 
 <script>
 	import jsk_data from '../../../../../public/jsk.json';
-	
+	import {encodeStr} from "@/assets/js/common.js"
+	import api from '@/api/radar/radar.js';
 	export default {
 		name: 'Establishment',
 		components: {
 		},
 		data() {
 			return {
+				encodeStr,
 				//是否为向民间推介项目
 				isProjectOptions: [{
 						value: 0,
@@ -330,8 +309,6 @@
 					},
 				],
 
-				page: 1,
-				limit: 20,
 				moneyOptions: [{
 						value: "不限",
 						label: "不限",
@@ -420,13 +397,11 @@
 					"其他"
 				],
 				establishmentDto: {
-					examineStatus: [],
 					province: [],
 					city: [],
 					district: [],
 					projectType: [],
 					industry: [],
-					buildNature: [],
 				},
 				conditionTitles: {
 					keyword: "关键词:",
@@ -449,9 +424,9 @@
 				conditionsArr: [],
 				
 				tableData:[],
-				total:6000,
+				total:0,
 				page:1,
-				pageSize:20
+				limit:20
 			};
 		},
 		
@@ -544,9 +519,6 @@
 									case 'industry':
 										title = "所属行业:";
 										break;
-									case 'buildNature':
-										title = "建设性质:";
-										break;
 									case 'isProject':
 										title = "是否为向民间推介项目:";
 										break;
@@ -577,47 +549,41 @@
 			},
 		},
 		mounted() {
-			if (this.$route.query.keyword) {
-				var obj = JSON.parse(JSON.stringify(this.establishmentDto));
-				obj.keyword = this.$route.query.keyword;
-				this.establishmentDto = obj;
-			}
-			// this.addressListfn();
-			// this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
-			// 	 				if (res && res.status == 200) {
-			// 	 					this.projectTypeOptions = res.data.projectType;
-			// 						this.industryOptions = res.data.establishmentIndustry
-			// 	 				}
-			// 	 			}).catch(error=>{
-			// 	 　　
-			//  });
-
-			//  if(this.industryOptions.length==0){
-			// 	 this.$axios
-			// 	   .post("/nationzj/project/recently/typeList", {
-			// 	     timeout: "49999",
-			// 	     headers: {
-			// 	       "Content-Type": "application/json;charset=UTF-8",
-			// 	     },
-			// 	   })
-			// 	   .then((res) => {
-			// 	     if (res.data.code == 200) {
-			// 	       this.industryOptions = res.data.data.establishmentIndustryList;
-
-			// 	     }
-			// 	   })
-			// 	   .catch((err) => {});
-			//  }
+			this.init();
+			
 
 
 		},
 		methods: {
+			searchDic(){
+				api.searchDic().then(res=>{
+					this.projectTypeOptions = res.data.projectType;
+					this.industryOptions = res.data.establishmentIndustry
+				}).catch(error=>{
+					
+				});
+							 
+			},
 		
 			refresh(value) {
 				if (value) {
 					this.$router.go(0)
 				}
 			},
+			reloadPage() {
+				this.pageFlag = false;
+				this.$nextTick(() => {
+					this.pageFlag = true;
+				});
+			},
+			handleCurrentChange(page) {
+				this.page = page;
+				this.search(page, this.limit);
+			},
+			fieldCommand(command) {
+				this.field = command;
+				this.search();
+			},
 			search(page, limit, exportFlag) {
 				if (!page) {
 					this.page = 1;
@@ -637,6 +603,10 @@
 				if (data.isProject && data.isProject === 0) {
 					data.isProject = parseInt(data.isProject);
 				}
+				if(!this.ckhasValue(data)){
+					data={};
+				}
+				
 				let params = {
 					page: {
 						page: this.page,
@@ -645,105 +615,19 @@
 					},
 					establishmentDto: data,
 				};
-				if (exportFlag) {
-					if (!this.goThrough('', this.permissions.export)) {
-						this.goThrough('', this.permissions.export);
-					} else {
-						this.$refs.ExportData.exportCount('BUSINESS_SEARCH_NIJIAN', params) //商机-拟建项目
-					}
-				} else {
-					this.$emit("search", params)
-				}
-			},
-			//关闭支付弹窗
-			cancelVipPay(val) {
-				this.openVip.open = false
-				if (val) {
-					this.resolve(val);
-				}
-			},
-			cancelLogin(val) {
-				this.loginData.loginShow = false;
-				if (val) {
-					this.resolve(val);
-				}
-			},
-			resolve(value) {
-				if (value) {
-					this.$router.go(0)
-				}
-			},
-			selectedHeightfn() {
-				if (this.selectedHeight == 64) {
-					this.selectedHeight = 'auto'
-				} else {
-					this.selectedHeight = 64;
-				}
-			},
-			copyText() {
-				var value = "";
-				if (this.establishmentDto.startMoney && !this.establishmentDto.endMoney) {
-					this.establishmentDto.startMoney > 9999 ?
-						value = this.establishmentDto.startMoney / 10000 + "亿元以上" :
-						value = this.establishmentDto.startMoney + "万元以上"
-
-				}
-				if (!this.establishmentDto.startMoney && this.establishmentDto.endMoney) {
-					this.establishmentDto.endMoney > 9999 ?
-						value = this.establishmentDto.endMoney / 10000 + "亿元以上" :
-						value = this.establishmentDto.endMoney + "万元以上"
-				}
-				if (this.establishmentDto.startMoney && this.establishmentDto.endMoney) {
-					value = (this.establishmentDto.startMoney > 9999 ? this.establishmentDto.startMoney / 10000 + "亿-" :
-						this.establishmentDto.startMoney + '万-') + (this.establishmentDto.endMoney > 9999 ? this
-						.establishmentDto.endMoney / 10000 + "亿" : this.establishmentDto.endMoney + '万')
-				}
-				if (value) {
-					var data = {
-						title: "总投资:",
-						keyid: "money",
-						value: value,
-						key: "money"
+				
+				api.establishmentPage(params).then(res=>{
+					if (res.code==200) {
+						this.tableData=res.data.list;
+						this.total=res.data.total;
 					}
-					var arr1 = [];
-					arr1.push(data);
-					this.conditionsArr = this.conditionsArr.concat(arr1)
-				}
-				let arr = this.conditionsArr
-				let newArr = []
-				for (var i = 0; i < arr.length; i++) {
-					newArr.push(arr[i].title + (arr[i].value == 'yes' ? '' : arr[i].value))
-				}
-				let val = newArr.join(";")
-				let _this = this
-				_this.$copyText(val).then(function(e) {
-					_this.$message({
-						message: "已复制到剪切板，您可以粘贴至对话框！",
-						type: "success"
-					})
-				}, function(e) {
-					_this.$message({
-						message: "已复制到剪切板，您可以粘贴至对话框！",
-						type: "success"
-					})
-				}).catch(err => {
-					console.log(err)
-				})
-			},
-			reloadPage() {
-				this.pageFlag = false;
-				this.$nextTick(() => {
-					this.pageFlag = true;
+				}).catch(error=>{
+					
 				});
+				
 			},
-			handleCurrentChange(page) {
-				this.page = page;
-				this.search(page, this.limit);
-			},
-			handleSizeChange(limit) {
-				this.limit = limit;
-				this.search(this.page, limit);
-			},
+			
+			
 			deleteDomicile() {
 				this.$refs.address.handleClear();
 			},
@@ -1145,10 +1029,7 @@
 					});
 				}
 			},
-			fieldCommand(command) {
-				this.field = command;
-				this.search();
-			},
+			
 			clearHandleTime() {
 				this.handleTime = "";
 				this.handleTimeValue = "";
@@ -1182,32 +1063,59 @@
 			init() {
 				this.search();
 				this.addressListfn();
-				this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
-					if (res && res.status == 200) {
-						this.projectTypeOptions = res.data.projectType;
-						this.industryOptions = res.data.establishmentIndustry
-					}
-				}).catch(error => {
-
-				});
-				if (this.industryOptions.length == 0) {
-					this.$axios
-						.post("/nationzj/project/recently/typeList", {
-							timeout: "49999",
-							headers: {
-								"Content-Type": "application/json;charset=UTF-8",
-							},
-						})
-						.then((res) => {
-							if (res.data.code == 200) {
-								this.industryOptions = res.data.data.establishmentIndustryList;
-
-							}
-						})
-						.catch((err) => {});
-				}
+				this.searchDic();
 
 			},
+			ckhasValue(param){
+				 var ckhasValue;
+				 if(param){
+					ckhasValue=this.hasValueThroughObj(0,param);
+				 }else{
+					ckhasValue=false;
+				 }
+				 return ckhasValue;
+			 },
+			 hasValueThroughObj(times,param,excludeKeys,excludeValues){
+			
+				   if(times==0){
+				            this.hasValue=false;
+				        }
+				        var excludeKeys=['yitihuaSource'];
+				        var excludeValues=['and','or','{}','[]','','null','undefined'];
+				      　if(Array.isArray(param)){
+				            for(let i=0;i<param.length;i++){
+				                var objParam = param[i];
+				                Object.keys(objParam).map(key => {
+				                    if(Array.isArray(objParam[key])||objParam[key] instanceof Object){
+				                        this.hasValueThroughObj(1,objParam[key],excludeKeys,excludeValues);
+				                    }else{
+				                        if(objParam instanceof Object) {
+				                            if (!excludeKeys.includes(key)&&!excludeValues.includes(objParam[key])) {
+			
+				                                this.hasValue =true;
+				                                // return hasValue;
+				                            }
+				                        }
+				                    }
+				              })
+				            }
+				      　}else{
+				      　    if(param instanceof Object) {
+				               Object.keys(param).map(key => {
+				                    if(Array.isArray(param[key])||param[key] instanceof Object){
+				                        this.hasValueThroughObj(1,param[key],excludeKeys,excludeValues);
+				                    }else{
+				                        if (!excludeKeys.includes(key)&&!excludeValues.includes(param[key])) {
+			
+				                           this.hasValue =true;
+				                            // return hasValue;
+				                        }
+				                    }
+				                })
+				            }
+				        }
+				        return this.hasValue;
+			},
 		},
 	};
 </script>

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

@@ -224,49 +224,58 @@
 					</div>
 					  
 				</div>
-				<ul class="bottomlist-content">
-					<li class="bottomlist-list">
+				
+				<ul class="bottomlist-content" v-if="tableData.length>0">
+					<li class="bottomlist-list" v-for="item in tableData">
 						<p class="list-titel">
-							 <router-link :to="'/radar/Land/details/'+ 1" tag="a" class="list-titel-a">绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
+							 <router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
 						</p>
 						
 						<div  class="list-content">
 							<p class="list-content-text">
 								<span>受让人：</span>
-								<span class="blue">芜湖旭日机械制造有限公司</span>
+								<span class="blue">{{item.companyName||'--'}}</span>
 							</p>
 							<p class="list-content-text">
 								<span>成交金额：</span>
-								<span>12345.62万元</span>
+								<span>{{item.transactionPrice||'--'}}</span>
 							</p>
 							<p class="list-content-text">
 								<span>总面积：</span>
-								<span>12345.62万</span>
+								<span>{{item.acreage||'--'}}</span>
 							</p>
 							<p class="list-content-text">
 								<span>合同签订：</span>
-								<span>2014-05-12</span>
+								<span>{{item.contractSignTime||'--'}}</span>
 							</p>
 						</div>
 						<div  class="list-content">
 							<p class="list-content-text">
 								<span>土地用途：</span>
-								<span >城镇村道路用地</span>
+								<span >{{item.landUse||'--'}}</span>
 							</p>
 							<p class="list-content-text">
 								<span>供应方式：</span>
-								<span >挂牌出让</span>
+								<span >{{item.supplyLandWay||'--'}}</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>
+								<span>行政区划：</span>
+								<span >
+									 {{item.province}}
+								   <template v-if="item.city">
+									  -{{item.city}}
+								   </template>
+								   <template v-if="item.area">
+								   	  -{{item.area}}
+								   </template>
+								</span>
 							</p>
 							<p class="list-content-text">
 								<span>土地坐落：</span>
-								<span >锡山区云林街道春雷路东南、许巷路西</span>
+								<span >{{item.landAddr||'--'}}</span>
 							</p>
 						</div>
 					</li>
@@ -288,11 +297,14 @@
 </template>
 
 <script>
+	import {encodeStr} from "@/assets/js/common.js"
+	import api from '@/api/radar/radar.js';
 	import jsk_data from '../../../../../public/jsk.json';
 	export default {
 		name: 'Land',
 		data() {
 			return {
+				encodeStr,
 				conditionTitles: {
 					keyword: "关键词:",
 					landAddr: "土地坐落:",
@@ -544,45 +556,18 @@
 			},
 		},
 		mounted() {
-			if (this.$route.query.keyword) {
-				var obj = JSON.parse(JSON.stringify(this.landMarketDto));
-				obj.keyword = this.$route.query.keyword;
-				this.landMarketDto = obj;
-			}
-			this.addressListfn();
-			
-			// this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
-			// 	if (res && res.status == 200) {
-			// 		this.landMarketIndustryList = res.data.landMarketIndustry;
-			// 		this.landUseOptions = res.data.landUse
-			// 	}
-			// }).catch(error => {
-
-			// });
-
-			// if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
-			// 	this.$axios.post("/nationzj/project/recently/typeList", {
-			// 			timeout: "49999",
-			// 			headers: {
-			// 				"Content-Type": "application/json;charset=UTF-8",
-			// 			},
-			// 		})
-			// 		.then((res) => {
-			// 			if (res.data.code == 200) {
-			// 				this.landUseOptions = res.data.data.landUseList;
-			// 				this.landMarketIndustryList = res.data.data.landMarketIndustryList;
-
-			// 			}
-			// 		})
-			// 		.catch((err) => {});
-			// }
-
-
+			this.init();
 		},
-
 		methods: {
-
-
+			searchDic(){
+				api.searchDic().then(res=>{
+					this.landMarketIndustryList = res.landMarketIndustry;
+					this.landUseOptions = res.data.landUse
+				}).catch(error=>{
+					
+				});
+							 
+			},
 			refresh(value) {
 				if (value) {
 					this.$router.go(0)
@@ -613,7 +598,15 @@
 					},
 					landMarketDto: data,
 				};
-					this.$emit("search", params)
+				api.landMarketPage(params).then(res=>{
+					if (res.code==200) {
+						this.tableData=res.data.list;
+						this.total=res.data.total;
+					}
+				}).catch(error=>{
+					
+				});
+				
 
 			},
 			//关闭支付弹窗
@@ -918,30 +911,7 @@
 			init() {
 				this.search();
 				this.addressListfn();
-				this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
-					if (res && res.status == 200) {
-						this.landMarketIndustryList = res.data.landMarketIndustry;
-						this.landUseOptions = res.data.landUse
-					}
-				}).catch(error => {
-
-				});
-				if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
-					this.$axios.post("/nationzj/project/recently/typeList", {
-							timeout: "49999",
-							headers: {
-								"Content-Type": "application/json;charset=UTF-8",
-							},
-						})
-						.then((res) => {
-							if (res.data.code == 200) {
-								this.landUseOptions = res.data.data.landUseList;
-								this.landMarketIndustryList = res.data.data.landMarketIndustryList;
-
-							}
-						})
-						.catch((err) => {});
-				}
+				this.searchDic();
 			},
 		},
 	};

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

@@ -345,29 +345,29 @@
 		  <el-table :data="tableData"  element-loading-text="Loading" border fit highlight-current-row>
 				<el-table-column  label="序号" width="60">
 				  <template slot-scope="scope">
-					 1
+					 <span>{{(page - 1) *20 + scope.$index + 1}}</span>
 				  </template>
 				</el-table-column>
 				<el-table-column  label="发布日期" width="160" >
 							  <template slot-scope="scope">
-							   通过
+							   {{ scope.row.pubdate||'--'}}
 							  </template>
 				 </el-table-column>
 				<el-table-column label="项目名称"    >
 						<template slot-scope="scope">
-							  <router-link  :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a"  >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
+							  <router-link  :to="'/radar/bxprozbgg/details/'+ scope.row.id" tag="a" class="list-titel-a"  v-html="scope.row.projectName"></router-link>
 						</template>
 							  
 				</el-table-column>
 				<el-table-column  label="工程用途" width="200" >
 							  <template slot-scope="scope">
-								 --
+								 {{ scope.row.projectPurposes||'--'}}
 								</template>
 								
 				</el-table-column>
 				<el-table-column prop="zj" label="项目金额" width="200" >
 							<template slot-scope="scope">
-								2022-08-28
+								{{ scope.row.projectAmount||'--'}}
 							</template>
 								
 				 </el-table-column>
@@ -399,6 +399,8 @@
 <script>
    import jsk_data from '../../../../../public/jsk.json';
    import Keyword from "@/components/Keyword";
+   import {encodeStr} from "@/assets/js/common.js"
+   import api from '@/api/radar/radar.js';
   export default {
     name: "bxprozbgg",
     components: {
@@ -760,290 +762,9 @@
 			gm: '285.24',
 			zj: '否',
 		}],
-		total:6000,
+		total:0,
 		page:1,
 		pageSize:20,
-		
-        permissions:{
-          "search": [
-            {
-              "label": "工程类别",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "工程类型",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "评标办法",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "保证金缴纳",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "项目投资额",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "合同估算价",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "建安费暂估",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "堪察费暂估",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "设计费暂估",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "投标保证金",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "招标人",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            },
-            {
-              "label": "代理机构",
-              "url": "",
-              "children": [],
-              "field": "",
-              "permission": true,
-              "isShowIcon": false,
-              "trigger": ""
-            }
-
-          ],
-          "page": {
-            "url": "",
-            "maxPage": 500,
-            "trigger": "LIMIT",
-            "isShowIcon": false,
-            "backgroundColor": ""
-          },
-          "sort": [
-            {
-              "label": "默认排序",
-              "permission": true,
-              "isShowIcon": false,
-              "field": "",
-              "url": "",
-              "trigger": ""
-            },
-            {
-              "label": "发布时间从晚到早",
-              "permission": true,
-              "isShowIcon": false,
-              "field": "desc",
-              "url": "",
-              "trigger": ""
-            },
-            {
-              "label": "开标截至时间从晚到早",
-              "permission": true,
-              "isShowIcon": false,
-              "field": "asc",
-              "url": "",
-              "trigger": ""
-            },
-            {
-              "label": "开标截至时间从早到晚",
-              "permission": true,
-              "isShowIcon": false,
-              "field": "asc",
-              "url": "",
-              "trigger": ""
-            }
-          ],
-          "export": {
-            "label": "导出数据",
-            "url":"",
-            "trigger":"",
-            "permission": true,
-            "isShowIcon": true
-          },
-          "response": [
-            {
-              "label": "项目名称",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "合同估算价",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "项目投资额",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "设计费暂估",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "建安费暂估",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "勘察费暂估",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "保证金",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "招标人",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "代理机构",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "资质要求",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "业绩要求",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "人员要求",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            },
-            {
-              "label": "一键获取",
-              "url":"",
-              "keys":[],
-              "trigger":"",
-              "permission": true,
-              "isShowIcon": false,
-              "children": []
-            }
-          ]
-        }
 
       }
     },
@@ -1159,8 +880,9 @@
       },
     },
     created() {
-      // this.dropDownType();
-      // this.clickProvince(0,1);
+      this.searchDic();
+      this.clickProvince(0,1);
+	  this.bxproggSearch();
     },
     mounted() {
     },
@@ -1195,23 +917,20 @@
             projectTerritory = [...city, ...district]
             this.projectTerritory = projectTerritory
             this.deleteProjectTerritorylist()
-            this.changeDown(false)
           }
       },
 
       //下拉
-      dropDownType(){
-        this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
-          if (res && res.status == 200) {
-            this.projectTypeList = res.data.bidAchievementType;
-            this.projectPurposesList = res.data.bidProjectType;
-            this.projectLevelList = res.data.bidProjectLevel;
-            this.bidAssessmentWayList = res.data.bidAssessmentWay;
-            this.projectEnsureAmountPayTypeList = res.data.bidAmountPayType;
-          }
-        }).catch(error=>{
-
-        });
+      searchDic(){
+		  api.searchDic().then(res=>{
+		  	this.projectTypeList = res.data.bidAchievementType;
+		  	this.projectPurposesList = res.data.bidProjectType;
+		  	this.projectLevelList = res.data.bidProjectLevel;
+		  	this.bidAssessmentWayList = res.data.bidAssessmentWay;
+		  	this.projectEnsureAmountPayTypeList = res.data.bidAmountPayType;
+		  }).catch(error=>{
+		  	
+		  });
       },
 
       // 关键词推荐
@@ -1814,11 +1533,7 @@
         data.projectEnsureAmountPayType = data.projectEnsureAmountPayType.join(",");
         data.projectLevel = data.projectLevel.join(",");
         // data.hasFile = this.checked ? 'yes' : 'false';
-        if(this.checkList.length > 0){
-          for(var i in this.checkList){
-            data[this.checkList[i]] = 1
-          }
-        }
+       
         let params = {
           page: {
             page: this.page,
@@ -1831,20 +1546,16 @@
         params.keyword = this.keyword;
         params.keywordNot = this.keywordNot;
         this.currentPage = params.page.page;
+		api.jskBidNewsPage(params).then(res=>{
+			if (res.code==200) {
+				this.tableData=res.data.list;
+				this.total=res.data.total;
+			}
+		}).catch(error=>{
+			
+		});
         
-        NProgress.start();
-          this.$axios.post(TENDER_PRO_URL.jskBidPro, params, {
-            headers: {
-              "Content-Type": "application/json",
-            },
-          })
-            .then((res) => {
-              NProgress.done();
-              if (res.data.code == 200) {
-                this.tableData = res.data.data.list;
-                this.total = res.data.data.total;
-              }
-            });
+       
         
       },
       reset(){
@@ -1852,15 +1563,7 @@
         // this.clickProvince(0,1);
         this.bxproggSearch();
       },
-      changeDown(isHeight){
-        if(isHeight){
-          this.isHeight = false
-          this.maxHeight = 'auto'
-        }else{
-          this.isHeight = true
-          this.maxHeight = '42px'
-        }
-      },
+     
       provinceChange(e){
         let obj=''
         obj= this.province.find(function(i){
@@ -1878,11 +1581,6 @@
           }
         });
       },
-     
-      //登录弹窗隐藏
-      cancelLogin(val) {
-        this.loginData.loginShow = false;
-      },
       exportData(row,name) {
         let params={
           fromUrl:document.referrer,

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

 <template>
-  <div class="app-container qyzx-details">
-    <div class="content main1">
-      <div class="title"><img src="@/assets/images/financing/head_icon.png" />{{textList.projectName}}</div>
-      <p>{{textList.projectScale}}</p>
-    </div>
-    <div class="content main2">
-      <div class="common-title">项目筹资</div>
-      <div class="main2-box">
-        <div class="list">
-          <div class="item color1">
-            <div class="item-left">
-              <h4>{{textList.projectTotalInvestment}}<span>万元</span></h4>
-              <p>项目总投资额</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon1.png" />
-          </div>
-          <div class="item color2">
-            <div class="item-left">
-              <h4>{{textList.projectCapital}}<span>万元</span></h4>
-              <p>项目资本金</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon2.png" />
-          </div>
-          <div class="item color3">
-            <div class="item-left">
-              <h4>{{textList.econData_013}}<span>万元</span></h4>
-              <p>专项债融资</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon3.png" />
-          </div>
-          <div class="item color4">
-            <div class="item-left">
-              <h4>{{textList.specialBondCapital}}<span>万元</span></h4>
-              <p>专项债用作资本金</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon4.png" />
-          </div>
-        </div>
-        <div class="list">
-          <div class="item color4">
-            <div class="item-left">
-              <h4>{{textList.otherFunds}}<span>万元</span></h4>
-              <p>其他资金</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon5.png" />
-          </div>
-          <div class="item color3">
-            <div class="item-left">
-              <h4>{{textList.specialBondIssue_number}}<span>万元 / 10只</span></h4>
-              <p>专项债融资额/专项债只数</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon6.png" />
-          </div>
-          <div class="item color4">
-            <div class="item-left">
-              <h4>{{textList.otherFinancing}}<span>万元</span></h4>
-              <p>其他融资</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon7.png" />
-          </div>
-          <div class="item color2">
-            <div class="item-left">
-              <h4>{{textList.govSupportFunds}}<span>万元</span></h4>
-              <p>政府安排资金</p>
-            </div>
-            <img class="img" src="@/assets/images/financing/icon8.png" />
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="content main3">
-      <div class="common-title">项目保障</div>
-      <div class="main3-box">
-        <p>
-          <label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-          <span>{{textList.econData_007}}</span>
-        </p>
-        <p>
-          <label class="label">项目总收益/项目总地方债券融资本息</label>
-          <span>{{textList.econData_008}}</span>
-        </p>
-        <p>
-          <label class="label">项目总收益/项目总投资</label>
-          <span>{{textList.econData_009}}</span>
-        </p>
-        <p>
-          <label class="label">项目总收益/项目总地方债券融资本金</label>
-          <span>{{textList.econData_010}}</span>
-        </p>
-        <p>
-          <label class="label">项目总收益/项目总债务融资本金</label>
-          <span>{{textList.econData_011}}</span>
-        </p>
-        <p>
-          <label class="label">项目预测总收益</label>
-          <span>{{textList.projectForecastTotalRevenue}}</span>
-        </p>
-      </div>
-    </div>
-    <div class="content main4">
-      <div class="common-title">项目当事人</div>
-      <div class="main4-box">
-        <label class="label">项目主体</label>
-        <span>{{textList.projectEntity}}</span>
-        <label class="label">主管部门</label>
-        <span>{{textList.chargeDepartment}}</span>
-        <label class="label">实施单位</label>
-        <span>{{textList.piu}}</span>
-      </div>
-    </div>
-    <div class="content main5">
-      <div class="common-title">专项债</div>
-      <div class="table-item">
-        <el-table
-          :data="tableData"
-          element-loading-text="Loading"
-          border
-          fit
-          highlight-current-row
-        >
-          <el-table-column prop="name" label="债券简称">
-            <template slot-scope="scope">
-              <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.name}}</router-link>
-            </template>
-          </el-table-column>
-          <el-table-column prop="name" label="招标日期" width="220" />
-          <el-table-column prop="gm" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="gm" label="用于项目规模(亿)" width="260" />
-          <el-table-column prop="zj" label="是否资本金" width="200" />
-        </el-table>
-      </div>
-    </div>
-  </div>
+	<div class="app-container qyzx-details">
+		<div class="content main1">
+			<div class="title">
+				<img src="@/assets/images/financing/head_icon.png" />
+				<span>{{textList.projectName}}</span>
+			</div>
+			<p>{{textList.projectScale}}</p>
+		</div>
+		<div class="content main2">
+			<div class="common-title">项目筹资</div>
+			<div class="main2-box">
+				<div class="list">
+					<div class="item color1">
+						<div class="item-left">
+							<h4>{{textList.projectTotalInvestment||'--'}}<span>万元</span></h4>
+							<p>项目总投资额</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon1.png" />
+					</div>
+					<div class="item color2">
+						<div class="item-left">
+							<h4>{{textList.projectCapital||'--'}}<span>万元</span></h4>
+							<p>项目资本金</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon2.png" />
+					</div>
+					<div class="item color3">
+						<div class="item-left">
+							<h4>{{textList.econData_013||'--'}}<span>万元</span></h4>
+							<p>专项债融资</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon3.png" />
+					</div>
+					<div class="item color4">
+						<div class="item-left">
+							<h4>{{textList.specialBondCapital||'--'}}<span>万元</span></h4>
+							<p>专项债用作资本金</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon4.png" />
+					</div>
+				</div>
+				<div class="list">
+					<div class="item color4">
+						<div class="item-left">
+							<h4>{{textList.otherFunds||'--'}}<span>万元</span></h4>
+							<p>其他资金</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon5.png" />
+					</div>
+					<div class="item color3">
+						<div class="item-left">
+							<h4>{{textList.specialBondIssue_number||'--'}}<span>万元 / 10只</span></h4>
+							<p>专项债融资额/专项债只数</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon6.png" />
+					</div>
+					<div class="item color4">
+						<div class="item-left">
+							<h4>{{textList.otherFinancing||'--'}}<span>万元</span></h4>
+							<p>其他融资</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon7.png" />
+					</div>
+					<div class="item color2">
+						<div class="item-left">
+							<h4>{{textList.govSupportFunds||'--'}}<span>万元</span></h4>
+							<p>政府安排资金</p>
+						</div>
+						<img class="img" src="@/assets/images/financing/icon8.png" />
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="content main3">
+			<div class="common-title">项目保障</div>
+			<div class="main3-box">
+				<p>
+					<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
+					<span>{{textList.econData_007||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">项目总收益/项目总地方债券融资本息</label>
+					<span>{{textList.econData_008||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">项目总收益/项目总投资</label>
+					<span>{{textList.econData_009||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">项目总收益/项目总地方债券融资本金</label>
+					<span>{{textList.econData_010||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">项目总收益/项目总债务融资本金</label>
+					<span>{{textList.econData_011||'--'}}</span>
+				</p>
+				<p>
+					<label class="label">项目预测总收益</label>
+					<span>{{textList.projectForecastTotalRevenue||'--'}}</span>
+				</p>
+			</div>
+		</div>
+		<div class="content main4">
+			<div class="common-title">项目当事人</div>
+			<div class="main4-box">
+				<label class="label">项目主体</label>
+				<span>{{textList.projectEntity||'--'}}</span>
+				<label class="label">主管部门</label>
+				<span>{{textList.chargeDepartment||'--'}}</span>
+				<label class="label">实施单位</label>
+				<span>{{textList.piu||'--'}}</span>
+			</div>
+		</div>
+		<div class="content main5">
+			<div class="common-title">专项债</div>
+			<div class="table-item">
+				<el-table :data="tableData" element-loading-text="Loading" border fit highlight-current-row>
+					<el-table-column prop="name" label="债券简称">
+						<template slot-scope="scope">
+							<router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a"
+								class="a-link">{{ scope.row.bondAbbreviation}}</router-link>
+						</template>
+					</el-table-column>
+					<el-table-column prop="tenderDate" label="招标日期" width="220" />
+					<el-table-column prop="actualBondIssueScale" label="专项债规模（亿）" width="260" />
+					<el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
+					<el-table-column prop="zj" label="是否资本金" width="200" />
+					<el-table-column label="是否资本金" width="200">
+						<template slot-scope="scope">
+							<span v-if="scope.row.isUsedCapital==1">是</span>
+							<span v-else-if="scope.row.isUsedCapital==2">否</span>
+							<span v-else>--</span>
+						</template>
+					</el-table-column>
+				</el-table>
+				<div class="pagination clearfix" v-show="total>0">
+					<el-pagination background :page-size="pageSize" :current-page="pageNum"
+						@current-change="handleCurrentChange" layout="prev, pager, next" :total="total">
+					</el-pagination>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
-import {encodeStr} from "@/assets/js/common.js"
-import api from '@/api/radar/radar.js';
-export default {
-  name: 'debtProjectDetails',
-  data() {
-    return {
-      id:'',
-      tableData:[
-      ],
-	  "pageNum":1,
-	  "pageSize":10
-	  total:0,
-	  textList:''
-    }
-  },
-  created() {
-    this.id=this.$route.params.id;
-	
-	api.specialDebtProjectDetail({id:this.id}).then(res=>{
-		console.log(res);
-		
-	 }).catch(error=>{
-	 	
-	 });
-  },
-  methods: {
-	specialDebtPage(){
-		
+	import {
+		encodeStr
+	} from "@/assets/js/common.js"
+	import api from '@/api/radar/radar.js';
+	export default {
+		name: 'debtProjectDetails',
+		data() {
+			return {
+				id: '',
+				tableData: [],
+				"pageNum": 1,
+				"pageSize": 10,
+				total: 0,
+				textList: {}
+			}
+		},
+		created() {
+			this.id = this.$route.params.id;
+			this.specialDebtPage();
+			this.specialDebtProjectDetail();
+		},
+		methods: {
+			specialDebtProjectDetail() {
+				api.specialDebtProjectDetail({
+					id: this.id
+				}).then(res => {
+					// console.log(res);
+					this.textList = res.data;
+					console.log(this.textList);
+
+				}).catch(error => {
+
+				});
+			},
+			handleCurrentChange(pageNum) {
+				this.pageNum = pageNum;
+				this.search(pageNum, this.pageSize);
+			},
+			specialDebtPage(pageNum, pageSize) {
+				if (!pageNum) {
+					this.pageNum = 1;
+				}
+				if (!pageSize) {
+					this.pageSize = 20;
+				}
+				var data = {
+					id: this.id,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize
+				}
+				api.specialDebtPage(data).then(res => {
+					// console.log(res);
+					this.tableData = res.rows;
+					this.total = res.total;
+					console.log(this.tableData);
+
+				}).catch(error => {
+
+				});
+			}
+		}
 	}
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-  .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;
-        p{
-          margin: 0;
-          display: inline-flex;
-          width: 50%;
-          border-top: 1px solid #E6E9F0;
-          border-left: 1px solid #E6E9F0;
-        }
-        p:nth-child(2n){
-          border-right: 1px solid #E6E9F0;
-        }
-        p:nth-child(5){
-          border-bottom: 1px solid #E6E9F0;
-        }
-        p:last-child{
-          border-bottom: 1px solid #E6E9F0;
-        }
-        .label{
-          width: 60%;
-          background: #F0F3FA;
-          display: inline-block;
-          height: 40px;
-          font-weight: 400;
-          border-right: 1px solid #E6E9F0;
-          line-height: 40px;
-          font-size: 12px;
-          color: rgba(35,35,35,0.8);
-          padding-left: 12px;
-        }
-        span{
-          width: 40%;
-          display: inline-block;
-          height: 40px;
-          line-height: 40px;
-          padding-left: 12px;
-          font-size: 12px;
-        }
-      }
-    }
-    .main4{
-      .main4-box{
-        margin-top: 22px;
-		display: flex;
-        .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>
+	.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 {
+				display: inline-flex;
+				color: #232323;
+				font-size: 16px;
+				line-height: 28px;
+				font-weight: bold;
+				margin-bottom: 8px;
+				text-align: left;
+				padding: 0px;
+				border: none;
+
+				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;
+
+				p {
+					margin: 0;
+					display: inline-flex;
+					width: 50%;
+					border-top: 1px solid #E6E9F0;
+					border-left: 1px solid #E6E9F0;
+				}
+
+				p:nth-child(2n) {
+					border-right: 1px solid #E6E9F0;
+				}
+
+				p:nth-child(5) {
+					border-bottom: 1px solid #E6E9F0;
+				}
+
+				p:last-child {
+					border-bottom: 1px solid #E6E9F0;
+				}
+
+				.label {
+					width: 60%;
+					background: #F0F3FA;
+					display: inline-block;
+					height: 40px;
+					font-weight: 400;
+					border-right: 1px solid #E6E9F0;
+					line-height: 40px;
+					font-size: 12px;
+					color: rgba(35, 35, 35, 0.8);
+					padding-left: 12px;
+				}
+
+				span {
+					width: 40%;
+					display: inline-block;
+					height: 40px;
+					line-height: 40px;
+					padding-left: 12px;
+					font-size: 12px;
+				}
+			}
+		}
+
+		.main4 {
+			.main4-box {
+				margin-top: 22px;
+				display: flex;
+
+				.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;
+
+				.pagination {
+					padding: 14px;
+
+					.el-pagination {
+						float: right;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file

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

@@ -5,9 +5,11 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.dsk.acc.openapi.client.util.CommonUtils;
+import com.dsk.common.constant.CacheConstants;
 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.core.redis.RedisCache;
 import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.EncodeIdUtil;
 import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
@@ -23,6 +25,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @ClassName enterpriseService
@@ -42,12 +45,16 @@ public class EnterpriseService {
     @Autowired
     ICustomerService iCustomerService;
 
+    @Autowired
+    private RedisCache redisCache;
+
     public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
         Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
         Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
         if (200 != companyCode) throw new RuntimeException();
         Map companyData = MapUtils.getMap(companyMap, "data", null);
         companyData.put("claimStatus", 0);
+        companyData.put("uipId", null);
 
         Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
         Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
@@ -55,10 +62,12 @@ public class EnterpriseService {
 
         Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
         String uipId = MapUtils.getString(uipData, "uipId", null);
+
         if (ObjectUtil.isEmpty(uipId)) {
             return R.ok(companyData);
         }
 
+        companyData.put("uipId", uipId);
         ArrayList<String> uipIds = new ArrayList<>();
         uipIds.add(uipId);
         List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
@@ -80,13 +89,6 @@ public class EnterpriseService {
         return BeanUtil.toBean(map, R.class);
     }
 
-    public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
     public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
         return BeanUtil.toBean(map, R.class);
@@ -108,34 +110,6 @@ public class EnterpriseService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageBidNoticeInfo", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeProvince(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectBidProvinceByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeTenderStage(EnterpriseBidNoticePageBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectTenderStageByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
-    public R bidNoticeDeatil(EnterpriseBidNoticeDetailBody body) throws Exception {
-        Map<String, String> headerMap = new HashMap<>();
-        headerMap.put("Api-Version", "1.0");
-        Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/bid/detail", BeanUtil.beanToMap(body, false, false), headerMap);
-        return BeanUtil.toBean(map, R.class);
-    }
-
     public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
         return dskOpenApiUtil.responsePage(map);
@@ -210,7 +184,21 @@ public class EnterpriseService {
     }
 
     public R uipGroupData() throws Exception {
+        String redisKey = CacheConstants.DATA_UIPGROUPDATA;
+
+        Map<String, Object> cacheMap = redisCache.getCacheMap(redisKey);
+        if (MapUtils.isNotEmpty(cacheMap)) {
+            return R.ok(cacheMap);
+        }
+
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        if (200 != code) throw new RuntimeException();
+
+        Map data = MapUtils.getMap(map, "data", null);
+        redisCache.setCacheMap(redisKey, data);
+        redisCache.expire(redisKey, 24, TimeUnit.HOURS);
+
         return BeanUtil.toBean(map, R.class);
     }
 

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -266,6 +266,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            <if test="customerId != null">customer_id,</if>
             <if test="evaluationBidWay != null">evaluation_bid_way,</if>
             <if test="bidOpenTime != null">bid_open_time,</if>
             <if test="bidOpenPlace != null">bid_open_place,</if>