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

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

@@ -28,7 +28,6 @@ public class EnterpriseProjectApprovalProjectPageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3计划开工时间倒序，4计划开工时间正序，13计划完工时间倒序，14计划完工时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -32,7 +32,6 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3时间倒序，4时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
     /**

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

@@ -27,7 +27,6 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
     /*
      * 排序字段：1金额倒序，2金额正序，3发布时间倒序，4发布时间正序，15预计招标时间倒序，16预计招标时间正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 

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

@@ -33,7 +33,6 @@ public class EnterpriseProjectLandTransactionPageBody extends BasePage {
     /*
      * 1金额倒序，2金额正序，3时间倒序，4时间正序，11面积倒序，12面积正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -27,7 +27,6 @@ public class EnterpriseProjectSpecialDebtProjectPageBody extends BasePage {
     /*
      * 排序字段：1总投资金额倒序，2总投资金额正序，17项目资本金倒序，18项目资本金正序，19专项债用作资本金倒序，20专项债用作资本金正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
 }

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

@@ -23,7 +23,6 @@ public class EnterpriseUipSearchBody extends BasePage {
     /*
      * 1供应商倒序，2供应商正序，3拟建项目倒序，4拟建项目正序，5招标公告倒序，6招标公告正序,7土地倒序，8土地正序
      */
-    @NotNull(message = "排序条件不能为空")
     private Integer sort;
 
     /**

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

@@ -72,4 +72,9 @@ public class UrbanInvestmentPlatformDto extends BasePage {
      * 字段 desc asc
      */
     private String order;
+
+    /**
+     * 含下属区：1 本级：2
+     */
+    private Integer type =1;
 }

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

@@ -32,6 +32,7 @@ let uipGroupData= function uipGroupData(param) {
   return request({
     url: '/enterprise/uipGroupData',
     method: 'post',
+	data: param
   })
 }
 // 查甲方列表

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

@@ -175,10 +175,11 @@ export function enterprise(param) {
 }
 
 //城投平台-企业查询选项
-export function uipGroupData() {
+export function uipGroupData(param) {
   return request({
     url: '/enterprise/uipGroupData',
-    method: 'POST'
+    method: 'POST',
+    data: param
   })
 }
 

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

@@ -15,5 +15,13 @@ let searchDic= function searchDic(param) {
 
   })
 }
+// 专项债项目查询
+let bondProjectPage= function bondProjectPage(param) {
+  return request({
+    url: '/radar/bondProjectPage',
+    method: 'post',
+    data: param
+  })
+}
 
-export default {importData,searchDic}
\ No newline at end of file
+export default {importData,searchDic,bondProjectPage}
\ No newline at end of file

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 @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @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>

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

@@ -53,10 +53,10 @@ export default {
         {label: '行业分类', prop: 'industry', width: '100'},
         {label: '供地方式', prop: 'supplyLandWay', width: '100'},
         {label: '土地坐落', prop: 'landAddr', minWidth: '130'},
-        {label: '成交金额（万元）', prop: 'transactionPrice', sortable: 'custom', descending: '3', ascending: '4', width: '140'},
+        {label: '成交金额（万元）', prop: 'transactionPrice', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
         {label: '总面积（㎡）', prop: 'acreage', sortable: 'custom', descending: '11', ascending: '12', width: '130'},
         {label: '批准单位', prop: 'authority', width: '130'},
-        {label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '1', ascending: '2', width: '130'}
+        {label: '签订日期', prop: 'contractSignTime', sortable: 'custom', descending: '3', ascending: '4', width: '130'}
       ],
       formData: [
         { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},

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

@@ -81,6 +81,7 @@ export default {
         this.tableLoading = false
       })
     },
+    // 公告
     noticesTypes(){
       noticesType({cid: this.queryParams.cid}).then(res => {
         let data = res.data
@@ -94,12 +95,13 @@ export default {
         }
       })
     },
+    // 身份
     noticesRoles(){
       noticesRole({cid: this.queryParams.cid}).then(res => {
         let data = res.data
         if(data.length > 0){
           for (var i=0;i<data.length;i++){
-            this.formData[1].options.push({
+            this.formData[2].options.push({
               name: data[i].role + '（' + data[i].count + '）',
               value: data[i].role,
             })
@@ -107,12 +109,13 @@ export default {
         }
       })
     },
+    // 案由
     noticesCaseReasons(){
       noticesCaseReason({cid: this.queryParams.cid}).then(res => {
         let data = res.data
         if(data.length > 0){
           for (var i=0;i<data.length;i++){
-            this.formData[2].options.push({
+            this.formData[1].options.push({
               name: data[i].caseReason + '（' + data[i].count + '）',
               value: data[i].caseReason,
             })

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

@@ -62,7 +62,7 @@ export default {
         { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
         { type: 1, fieldName: 'role', value: '', placeholder: '身份', options: []},
         { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '搜索关键字'}
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入执行案号'}
       ],
       //列表
       tableLoading:false,

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

@@ -65,7 +65,7 @@ export default {
         { type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
         { type: 1, fieldName: 'pureRole', value: '', placeholder: '身份', options: []},
         { type: 2, fieldName: 'time', value: '', placeholder: '',startTime: 'dateFrom',endTime: 'dateTo'},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入关键词'},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '请输入案号'},
       ],
       //列表
       tableLoading:false,

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

@@ -20,7 +20,7 @@
     >
       <template slot="punishReason" slot-scope="scope">
         <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)?'cell-span':'']" :style="{'-webkit-line-clamp': 5}">
-          {{ scope.row.punishReason }}
+          <div v-html="scope.row.punishReason"></div>
           <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.punishReason)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">更多</span></span>
         </span>
       </template>

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

@@ -17,8 +17,9 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
-      <template slot="projectName" slot-scope="data">
-        <router-link to="" tag="a" class="a-link">{{ data.row.projectName }}</router-link>
+      <template slot="projectName" slot-scope="scope">
+        <router-link :to="`/radar/Land/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <div v-else v-html="scope.row.projectName  || '--'"></div>
       </template>
     </tables>
 

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

@@ -97,8 +97,9 @@
       @handle-current-change="handleCurrentChange"
       @sort-change="sortChange"
     >
-      <template slot="companyName" slot-scope="data">
-        <router-link to="" tag="a" class="a-link">{{ data.row.companyName }}</router-link>
+      <template slot="companyName" slot-scope="scope">
+        <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName " v-html="scope.row.companyName"></router-link>
+        <div v-else v-html="scope.row.companyName  || '--'"></div>
       </template>
     </tables>
 

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

@@ -21,7 +21,8 @@ export default {
   created() {
     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 = `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}`
     }
   },
   mounted() {

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -4,8 +4,8 @@
 	  	<div class="content_item">
 	  	    <div class="label">项目名称</div>
 	  	   <div class="content_right item_ckquery_list">
-	  	       <el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="keys" @input="projectNamebtn('keys',keys,'关键字:')">
-	  	   		<div slot="append" class="btn-search" @click="">搜索</div>
+	  	       <el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="keys" >
+	  	   		<div slot="append" class="btn-search" @click="search">搜索</div>
 	  	   	</el-input>
 	  	      
 	  	   </div>
@@ -151,7 +151,7 @@
 	  			<el-table-column  label="公司名称" width="430" >
 	  						 <template slot-scope="scope">
 								 <div class="renling">
-									 <router-link  :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a"  >{{scope.row.companyName}}</router-link>
+									 <router-link  :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
 									 <div class="renling-btn">
 									 	<img src="@/assets/images/owner/renling1.png" alt="">					 
 									 	<span v-if="scope.row.claimStatus" class="renling-hui">
@@ -237,10 +237,10 @@
 						 </el-table-column>
 						 <el-table-column  label="实控人" width="290" >
 						 			<template slot-scope="scope">
-										<router-link v-if="scope.row.actualController"  :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a"  >
+										<!-- <router-link v-if="scope.row.actualController"  :to="'/radar/bxprozbgg/details/'+ 1" tag="a" class="list-titel-a"  >
 												{{scope.row.actualController}}
-										</router-link>
-						 				  <template v-else>
+										</router-link> -->
+						 				  <template >
 											  {{scope.row.actualController||"--"}}
 										  </template>
 						 			</template>
@@ -461,12 +461,14 @@
 </template>
 
 <script>
+import {encodeStr} from "@/assets/js/common.js"
 import jsk_data from '../../../../../public/jsk.json';
 import api from '@/api/enterpriseData/enterpriseData.js';
 export default {
   name: 'Owner',
   data() {
     return {
+	encodeStr,
 	  keys:'',
       addressList: [],
       addressType: [],
@@ -586,7 +588,6 @@ export default {
   	}).catch(error=>{
 		
   	});
-  	
   },
   mounted() {
    
@@ -774,10 +775,11 @@ export default {
 		});
 	},
 	claimbtn(item){
+		console.log(item.companyName);
 		var params={
 			companyId:item.companyId,
 			uipId:item.uipId,
-			companyName:item.companyName,
+			companyName:item.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,''),
 			// creditLevel:item.bratingSubjectLevel,
 			// legalPerson:item.legalPerson,
 			// registerCapital:item.registerCapital,
@@ -875,6 +877,7 @@ export default {
 	},
 	renlin(){
 		this.dialogVisible=false;
+		// this.$router.push({path:'/home',query: {id:'1'}})
 		// 跳转地址
 	},
 	

dsk-operate-ui/src/views/macro/economies/component/comparison.vue

@@ -12,8 +12,8 @@
         </el-form>
       </div>
       <div class="flex-box query-ability">
-        <span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
-        <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        <!--<span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>-->
+        <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
     <div class="table-item">
@@ -289,10 +289,17 @@ export default {
   },
   created() {
     this.dataRegion();
+    console.log(this.dataQuery)
     // this.getData();
     getYears({}).then(res => {
       this.yearOptions=res.data.reverse();
       this.queryParams.year = this.yearOptions[0].year;
+      if(this.dataQuery.pId){
+        const params = { year: this.queryParams.year,type:3,provinceId:this.dataQuery.provinceId }
+        this.value1Flag=true
+        this.addressValue1=this.dataQuery.province
+        this.getData(params,1)
+      }
     })
   },
   computed: {
@@ -387,7 +394,7 @@ export default {
             this.value5Flag=true
             break;
         }
-        const params = { pageNum: this.pageIndex, pageSize: this.pageSize, year: this.queryParams.year,type:3 }
+        const params = { year: this.queryParams.year,type:3 }
         let code=[];
         for (var i in this.regionData) {
           code=this.regionData[i].path
@@ -517,6 +524,12 @@ export default {
           fontWeight: 'bold'
         }
       }
+    },
+    handleMessage(){
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
     }
   }
 }

dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue

@@ -12,7 +12,7 @@
         </el-form>
       </div>
       <div class="flex-box query-ability">
-        <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+        <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
     <div class="content">
@@ -129,7 +129,6 @@ export default {
         this.initChart()
       })
     },
-
     initChart() {
       let myChart = echarts.init(document.getElementById("echarts"))
       let option ={
@@ -172,6 +171,12 @@ export default {
       }
       myChart.setOption(option);
     },
+    handleMessage(){
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
+    }
 
   }
 }

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -6,14 +6,14 @@
           <span class="common-title">经济数据</span>
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
-              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择年度" @change="getData">
+              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getData">
                 <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
               </el-select>
             </el-form-item>
           </el-form>
         </div>
         <div class="flex-box query-ability">
-          <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
       <div class="table-item">
@@ -124,6 +124,12 @@ export default {
       this.pageIndex = 1;
       this.getData()
     },
+    handleMessage(){
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
+    }
   }
 }
 </script>

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -77,8 +77,8 @@
           <span class="common-title">主要指标</span>
         </div>
         <div class="flex-box query-ability">
-          <span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
-          <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box" @click="childMethod"><img src="@/assets/images/ability_vs.png">地区经济对比</span>
+          <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
       <div class="table-item">
@@ -638,6 +638,17 @@ export default {
           fontWeight: 'bold'
         }
       }
+    },
+    handleMessage(){
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
+    },
+    childMethod() {
+      let data=this.dataQuery
+      data.pId=this.dataQuery.provinceId
+      this.$parent.handleClick('four',data);
     }
   }
 }

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

@@ -44,15 +44,25 @@ export default {
       this.provinceId=res.data.currentProvince.id;
       if(!this.dataQuery.provinceId){
         this.dataQuery.provinceId=this.provinceId
+        this.dataQuery.province=this.province
       }
     })
+    console.log(this.dataQuery)
+    if(this.dataQuery.activeName){
+      this.activeName=this.dataQuery.activeName;
+    }
+
     // let name = sessionStorage.getItem('currentTab')
     // if (name != "undefined" && name){
     //   this.activeName = name;
     // }
   },
   methods: {
-    handleClick() {
+    handleClick(key,item) {
+      console.log(item)
+      if(key === 'four'){
+        this.activeName='four'
+      }
       // sessionStorage.setItem('currentTab', this.activeName)
     }
   }

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

@@ -155,7 +155,6 @@ export default {
     }
   },
   created() {
-    console.log(this.$route.params)
     this.id=this.$route.params.id;
     this.getDetails()
 
@@ -171,7 +170,6 @@ export default {
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:'2e59fca0-21a6-47db-975d-5481e1c52f45_74'}
       // const params = { pageNum: this.pageIndex, pageSize: this.pageSize,specialBondUuid:this.details.specialBondUuid}
       bondPage(params).then(res => {
-        console.log(res.data)
         this.tableData=res.data.list;
         this.tableDataTotal=res.data.totalCount;
       })

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

@@ -139,7 +139,6 @@ export default {
         let arr=this.tableData.sort((old,New)=>{
           return  New.value - old.value
         })
-        console.log(arr)
         let data=[]
         for(let i=0; i<10; i++){
           data.push(arr[i])

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

@@ -24,8 +24,8 @@
           </el-form>
         </div>
         <div class="flex-box query-ability">
-          <router-link to="/macro/economies" tag="a" class="a-link"><span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span></router-link>
-          <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <router-link to="/macro/economies?activeName=four" tag="a" class="a-link"><span class="flex-box"><img src="@/assets/images/ability_vs.png">地区经济对比</span></router-link>
+          <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
       <div class="table-item">
@@ -279,6 +279,12 @@
         this.pageIndex = 1
         this.querySubmit()
       },
+      handleMessage(){
+        this.$message({
+          message: '功能正在开发中',
+          type: 'warning'
+        });
+      }
     }
   }
 </script>

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

@@ -3,7 +3,7 @@
     <div class="zb-content content1">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
-          <span class="common-title">近五年全国招标数量</span>
+          <span class="common-title">全国招标数量分析</span>
         </div>
       </div>
       <div class="text">{{value}}全国项目招标数量达到{{totalCount}}万个，招标数量前五的地区分别是
@@ -80,10 +80,10 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对近一年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对近{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
-        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近一年全国公开的招标项目，未公开的不含在内</p>
+        <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为近{{year}}年全国公开的招标项目，未公开的不含在内</p>
       </div>
       <div class="main2">
         <div class="selectYear">
@@ -119,7 +119,7 @@ export default {
   name: 'NationalEconomies',
   data() {
     return {
-      year:'',
+      year:'2023',
       yearOptions: [
         { label: '近五年', value: '近五年' },
         { label: '近三年', value: '近三年' },

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

@@ -6,7 +6,7 @@
           <span class="common-title">全国建筑企业概览</span>
         </div>
       </div>
-      <div class="text">截止{{currentdate}}，全国共有建筑工程施工总承包资质的企业{{total}}家，其中特级资质企业{{glDetail.tjCount}}家，占比{{glDetail.tjRate}}%；一级资质企业{{glDetail.tjCount}}家，占比{{glDetail.oneRate}}%；二级资质企业{{glDetail.twoCount}}家，占比{{glDetail.twoRate}}%；三级资质企业{{glDetail.threeCount}}家，占比{{glDetail.threeRate}}%</div>
+      <div class="text">截止{{currentdate}}，全国共有{{glDetail.major}}资质的企业{{total}}家，其中特级资质企业{{glDetail.tjCount}}家，占比{{glDetail.tjRate}}%；一级资质企业{{glDetail.tjCount}}家，占比{{glDetail.oneRate}}%；二级资质企业{{glDetail.twoCount}}家，占比{{glDetail.twoRate}}%；三级资质企业{{glDetail.threeCount}}家，占比{{glDetail.threeRate}}%</div>
       <div class="main1">
         <div style="height: 300px;">
           <div class="left">

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

@@ -136,7 +136,7 @@
           <span class="common-title">主要指标</span>
         </div>
         <div class="flex-box query-ability">
-          <span class="flex-box"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
+          <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
         </div>
       </div>
       <div class="table-item">
@@ -288,7 +288,7 @@ export default {
   },
   methods: {
     getType(){
-      uipGroupData().then(res => {
+      uipGroupData({}).then(res => {
         this.typeList=res.data;
       })
     },
@@ -527,6 +527,12 @@ export default {
       this.pageIndex = 1;
       this.querySubmit()
     },
+    handleMessage(){
+      this.$message({
+        message: '功能正在开发中',
+        type: 'warning'
+      });
+    }
   },
 }
 </script>

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

@@ -229,7 +229,7 @@
 				],
 				projectTypeText: ['不限'],
 				arrList:[],
-				total:6000,
+				total:0,
 				page:1,
 				pageSize:20
 				
@@ -449,8 +449,26 @@
 			handleCurrentChange(val){
 				
 			},
-			search(){
-				
+			search(page, limit,exportFlag) {
+			  if (!page) {
+				this.page = 1;
+			  }
+			  if (!limit) {
+				this.limit = 20;
+			  }
+			  if (!page && !limit) {
+				this.reloadPage();
+			  }
+			  let params = {
+				  page:{
+					 "page":this.page,
+					  "limit":this.limit,
+					  "field":"",
+					  "order":"desc" 
+				  },
+				  specialBondProjectDto:{}
+			  };
+			  
 			},
 			reset(){
 				

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

@@ -144,7 +144,7 @@ public class EnterpriseService {
 
     public R getUipId(String companyName) throws Exception {
         Map<String, Object> params = new HashMap<>();
-        params.put("companyName",companyName);
+        params.put("companyName", companyName);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/getUipId", params);
         return BeanUtil.toBean(map, R.class);
     }
@@ -186,7 +186,7 @@ public class EnterpriseService {
     }
 
     public R uipGroupData() throws Exception {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
         return BeanUtil.toBean(map, R.class);
     }