Merge remote-tracking branch 'origin/master'

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-operate-ui/src/api/radar/radar.js

@@ -23,5 +23,23 @@ let bondProjectPage= function bondProjectPage(param) {
     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
+  })
+}
+
+
 
-export default {importData,searchDic,bondProjectPage}
+export default {importData,searchDic,bondProjectPage,specialDebtProjectDetail,specialDebtPage}
\ No newline at end of file

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

@@ -153,7 +153,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/debtProject/details/:id(\\d+)',
+	      path: '/radar/debtProject/details/:id',
 	      component: () => import('@/views/radar/debtProject/details'),
 	      name: 'debtProjectDetails',
 	      meta: { title: '企业专项债详情', icon: 'radar' }
@@ -167,7 +167,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Land/details/:id(\\d+)',
+	      path: '/radar/Land/details/:id',
 	      component: () => import('@/views/radar/Land/details'),
 	      name: 'LandDetails',
 	      meta: { title: '土地交易详情', icon: 'radar' }
@@ -181,7 +181,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Establishment/details/:id(\\d+)',
+	      path: '/radar/Establishment/details/:id',
 	      component: () => import('@/views/radar/Establishment/details'),
 	      name: 'EstablishmentDetails',
 	      meta: { title: '拟建项目详情', icon: 'radar' }
@@ -195,7 +195,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/bxprozbgg/details/:id(\\d+)',
+	      path: '/radar/bxprozbgg/details/:id',
 	      component: () => import('@/views/radar/bxprozbgg/details'),
 	      name: 'bxprozbggDetails',
 	      meta: { title: '标讯pro项目详情', icon: 'radar' }
@@ -209,7 +209,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/Tender/details/:id(\\d+)',
+	      path: '/radar/Tender/details/:id',
 	      component: () => import('@/views/radar/Tender/details'),
 	      name: 'TenderDetails',
 	      meta: { title: '公招标讯详情', icon: 'radar' }
@@ -223,7 +223,7 @@ export const constantRoutes = [
 	  redirect: 'noredirect',
 	  children: [
 	    {
-	      path: '/radar/BidRecord/details/:id(\\d+)',
+	      path: '/radar/BidRecord/details/:id',
 	      component: () => import('@/views/radar/BidRecord/details'),
 	      name: 'BidRecordDetails',
 	      meta: { title: '开标记录详情', icon: 'radar' }

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

@@ -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/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-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/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" />重庆至黔江高速铁路项目一项目详情</div>
-      <p>本项目是厦渝高铁通道的重要组成部分，是成渝地区、海西经济区间高速客运交流的主通道;是成渝地区与华南、华东地区间客运交流的辅助通道;是以重庆主城为核心的城际客流的快速客运通道;
-        是整合区域旅游资源，促进沿线旅游资源开发的黄金旅游通道。线路起自重庆站，经巴南、南川、武隆、彭水，终至江，正线全长265公里，设8座，其中新建6座。
-        同步建设重庆东动车所动车出入段，重庆枢纽东环联络线。</p>
+      <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>
@@ -12,28 +10,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <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>535.00<span>亿</span></h4>
+              <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>535.00<span>亿</span></h4>
+              <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>535.00<span>亿</span></h4>
+              <h4>{{textList.specialBondCapital}}<span>万元</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -42,28 +40,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>535.00<span>亿</span></h4>
+              <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>535.00<span>亿 / 10只</span></h4>
+              <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>535.00<span>亿</span></h4>
+              <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>535.00<span>亿</span></h4>
+              <h4>{{textList.govSupportFunds}}<span>万元</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -76,27 +74,27 @@
       <div class="main3-box">
         <p>
           <label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-          <span>1.36倍</span>
+          <span>{{textList.econData_007}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本息</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_008}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总投资</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_009}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总地方债券融资本金</label>
-          <span>1.96倍</span>
+          <span>{{textList.econData_010}}</span>
         </p>
         <p>
           <label class="label">项目总收益/项目总债务融资本金</label>
-          <span>2.45倍</span>
+          <span>{{textList.econData_011}}</span>
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>2.45倍</span>
+          <span>{{textList.projectForecastTotalRevenue}}</span>
         </p>
       </div>
     </div>
@@ -104,11 +102,11 @@
       <div class="common-title">项目当事人</div>
       <div class="main4-box">
         <label class="label">项目主体</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{textList.projectEntity}}</span>
         <label class="label">主管部门</label>
-        <span>-</span>
+        <span>{{textList.chargeDepartment}}</span>
         <label class="label">实施单位</label>
-        <span>重庆铁路投资集团有限公司</span>
+        <span>{{textList.piu}}</span>
       </div>
     </div>
     <div class="content main5">
@@ -137,29 +135,37 @@
 </template>
 
 <script>
+import {encodeStr} from "@/assets/js/common.js"
+import api from '@/api/radar/radar.js';
 export default {
   name: 'debtProjectDetails',
   data() {
     return {
       id:'',
       tableData:[
-        {
-          id:0,
-          name:'20重庆债14(2005938)',
-          time:'2020-09-18',
-          gm:'285.24',
-          zj:'否',
-        }
-      ]
+      ],
+	  "pageNum":1,
+	  "pageSize":10,
+	  total:0,
+	  textList:''
     }
   },
   created() {
-    console.log(this.$route.params)
-    this.id=this.$route.params.id
+    this.id=this.$route.params.id;
+	
+	api.specialDebtProjectDetail({id:this.id}).then(res=>{
+		// console.log(res);
+		this.textList=res;
+		
+	 }).catch(error=>{
+	 	
+	 });
   },
   methods: {
+	specialDebtPage(){
 		
 	}
+  }
 }
 </script>
 
@@ -268,7 +274,7 @@ export default {
         margin-top: 22px;
         p{
           margin: 0;
-          display: inline-block;
+          display: inline-flex;
           width: 50%;
           border-top: 1px solid #E6E9F0;
           border-left: 1px solid #E6E9F0;
@@ -307,6 +313,7 @@ export default {
     .main4{
       .main4-box{
         margin-top: 22px;
+		display: flex;
         .label{
           width: 14%;
           background: #F0F3FA;

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>