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/radar/radar.js

@@ -7,4 +7,13 @@ let importData= function importData(param) {
     data: param
   })
 }
-export default {importData}
+// 查询条件字段
\ No newline at end of file
+let searchDic= function searchDic(param) {
+  return request({
+    url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
+    method: 'get',
+
+  })
+}
+
+export default {importData,searchDic}
\ No newline at end of file

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

@@ -49,7 +49,13 @@ function changePath(that, pathName){
   }
 }
 
+//保留小数N位
+function saveFixed(field, num=2){
+  return parseFloat(field.toFixed(num))
+}
+
 export {
   encodeStr,
-  changePath
+  changePath,
+  saveFixed
 }

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

@@ -181,6 +181,7 @@
       margin-top: 2px;
       &:hover{
         background: url("../../assets/images/project/add_1.png") no-repeat center center;
+        background-size: 100%;
       }
     }
     .tips{
@@ -890,6 +891,7 @@
       float: left;
       margin-right: 8px;
       margin-top: -2px;
+      width: 24px;
     }
   }
 }

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

@@ -45,8 +45,8 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input v-model="form.value" :placeholder="form.placeholder"></el-input>
-                <span @click="changeSelect">搜索</span>
+                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
             <!-- 多选 -->
@@ -117,6 +117,9 @@ export default {
   methods: {
     changeSelect(){
       this.$emit('handle-search')
+    },
+    clickFocus(e){
+      document.getElementById(e).classList.toggle('span-ba')
     }
   }
 }
@@ -183,13 +186,18 @@ export default {
           border-left: 0;
           cursor: pointer;
         }
+        .span-ba{
+          color: #ffffff;
+          background: #0081FF;
+          border: 1px solid #0081FF;
+        }
         ::v-deep .el-input{
           flex: 1;
         }
         ::v-deep .el-input__inner {
           border-right: 0;
           border-radius: 2px 0 2px 0;
-          width: 259px;
+          width: 180px;
         }
       }
       .fromTime{
@@ -208,6 +216,22 @@ export default {
     ::v-deep .form-content-width{
       width: 170px;
     }
+    ::v-deep .selectTag{
+      .el-select__tags{
+        .el-tag{
+          &:first-child{
+            width: 90px;
+          }
+        }
+      }
+    }
+    ::v-deep .el-select__tags{
+      .el-tag{
+        &:first-child{
+          width: 100%;
+        }
+      }
+    }
   }
 }
 </style>

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/component/noData.vue

+<template>
+  <div class="no-data">
+    <div class="no-data-box">
+      <img :src="noData" alt="暂时没有找到相关数据" />
+      <span>暂时没有找到相关数据</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "NoData",
+  props: {
+
+  },
+  data() {
+    return {
+      noData: require("@/assets/images/detail/noData.png")
+    }
+  },
+  methods:{
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    min-height: 140px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 54px;
+        height: 69px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+</style>

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

@@ -21,11 +21,11 @@
       @sort-change="sortChange"
     >
       <template slot="agency" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency" v-html="scope.row.agency"></router-link>
         <div v-else v-html="scope.row.agency || '--'"></div>
       </template>
       <template slot="projectInfo" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
+        <router-link :to="`/radar/Tender/details/${scope.row.projectInfo.bid}`" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
         <div v-else v-html="scope.row.projectInfo.dealTitle || '--'"></div>
         <div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
       </template>

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

@@ -19,7 +19,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="name" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name" v-html="scope.row.name"></router-link>
+        <router-link :to="`/radar/BidRecord/details/${scope.row.id}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name" v-html="scope.row.name"></router-link>
         <div v-else v-html="scope.row.name || '--'"></div>
       </template>
       <template slot="source" slot-scope="scope">
@@ -80,7 +80,9 @@ export default {
       this.tableDataTotal = res.total
     },
     handlePic(url){
-      window.open(url, "_blank")
+      if(url){
+        window.open(url, "_blank")
+      }
     }
   }
 }

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

@@ -27,7 +27,7 @@
         <template slot="dealTitle" slot-scope="scope">
           <div class="flex-box">
             <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.fileUrlL" @click="handlePic(scope.row.fileUrlL)"/>
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
+            <router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
             <span v-else v-html="scope.row.dealTitle || '--'"></span>
           </div>
         </template>
@@ -45,20 +45,10 @@ import {bidCooperatePage} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
 
 export default {
-  props: {
-    'data': {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    'title': {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
+  props: [
+    'data',
+    'title'
+  ],
   components: {
     HeadDetailForm
   },
@@ -106,7 +96,9 @@ export default {
       this.amountTotal = res.totalAmount
     },
     handlePic(url){
-      window.open(url, "_blank")
+      if(url){
+        window.open(url, "_blank")
+      }
     },
     cancel() {
       this.$emit('cancel')

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

@@ -27,7 +27,8 @@
         <template slot="projectAllName" slot-scope="scope">
           <div class="flex-box">
             <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.sourceUrl" @click="handlePic(scope.row.sourceUrl)"/>
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>
+            <div class="a-link" @click="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
+<!--            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
             <span v-else v-html="scope.row.projectAllName || '--'"></span>
           </div>
         </template>
@@ -45,26 +46,11 @@ import {clientProjectPage} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
 
 export default {
-  props: {
-    'data': {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    'company-id': {
-      type: Number,
-      default: () => {
-        return 0
-      }
-    },
-    'title': {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
+  props: [
+    'data',
+    'company-id',
+    'title'
+  ],
   components: {
     HeadDetailForm
   },
@@ -114,7 +100,9 @@ export default {
       this.amountTotal = res.totalAmount
     },
     handlePic(url){
-      window.open(url, "_blank")
+      if(url){
+        window.open(url, "_blank")
+      }
     },
     cancel() {
       this.$emit('cancel')

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

@@ -27,7 +27,8 @@
         <template slot="projectAllName" slot-scope="scope">
           <div class="flex-box">
             <img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.sourceUrl" @click="handlePic(scope.row.sourceUrl)"/>
-            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>
+            <div class="a-link" @click="handlePic(scope.row.sourceUrl)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
+<!--            <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>-->
             <span v-else v-html="scope.row.projectAllName || '--'"></span>
           </div>
         </template>
@@ -45,26 +46,11 @@ import { supplierProjectPage } from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
 
 export default {
-  props: {
-    'data': {
-      type: Object,
-      default: () => {
-        return {}
-      }
-    },
-    'company-id': {
-      type: Number,
-      default: () => {
-        return 0
-      }
-    },
-    'title': {
-      type: String,
-      default: () => {
-        return ''
-      }
-    }
-  },
+  props: [
+    'data',
+    'company-id',
+    'title'
+  ],
   components: {
     HeadDetailForm
   },
@@ -114,7 +100,9 @@ export default {
       this.amountTotal = res.totalAmount
     },
     handlePic(url){
-      window.open(url, "_blank")
+      if(url){
+        window.open(url, "_blank")
+      }
     },
     cancel() {
       this.$emit('cancel')

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

@@ -21,12 +21,13 @@
       @sort-change="sortChange"
     >
       <template slot="companyName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.projectUnitId)}`" tag="a" class="a-link" v-if="scope.row.projectUnitId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
         <div v-else v-html="scope.row.companyName || '--'"></div>
       </template>
       <template slot="projectAllName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectId&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>
-        <div v-else v-html="scope.row.projectAllName || '--'"></div>
+        <div class="a-link" @click="handleDetail(scope.row.projectInfo)" v-if="scope.row.projectInfo&&scope.row.projectInfo.sourceUrl&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName" style="cursor: pointer"></div>
+<!--        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName"></router-link>-->
+        <div v-else v-html="scope.row.projectInfo&&scope.row.projectInfo.projectAllName || '--'"></div>
         <div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
       </template>
     </tables>
@@ -95,6 +96,11 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true
+    },
+    handleDetail(row){
+      if(row.sourceUrl){
+        window.open(row.sourceUrl, "_blank")
+      }
     }
   }
 }

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

@@ -21,11 +21,12 @@
       @sort-change="sortChange"
     >
       <template slot="projectAllName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName " v-html="scope.row.projectAllName"></router-link>
+        <div class="a-link" @click="handleDetail(scope.row)" v-if="scope.row.sourceUrl&&scope.row.projectAllName" v-html="scope.row.projectAllName" style="cursor: pointer"></div>
+<!--        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectAllName " v-html="scope.row.projectAllName"></router-link>-->
         <div v-else v-html="scope.row.projectAllName  || '--'"></div>
       </template>
       <template slot="companyName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName">{{ scope.row.companyName }}</router-link>
         <div v-else>{{ scope.row.companyName || '--' }}</div>
       </template>
     </tables>
@@ -101,6 +102,11 @@ export default {
         this.tableData = res.rows
       }
       this.tableDataTotal = res.total
+    },
+    handleDetail(row){
+      if(row.sourceUrl){
+        window.open(row.sourceUrl, "_blank")
+      }
     }
   }
 }

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

@@ -21,12 +21,13 @@
       @sort-change="sortChange"
     >
       <template slot="companyName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.companyId&&scope.row.companyName" v-html="scope.row.companyName"></router-link>
+        <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>
       <template slot="projectAllName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectId&&scope.row.projectAllName" v-html="scope.row.projectAllName"></router-link>
-        <div v-else v-html="scope.row.projectAllName || '--'"></div>
+        <div class="a-link" @click="handleDetail(scope.row.projectInfo)" v-if="scope.row.projectInfo&&scope.row.projectInfo.sourceUrl&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName" style="cursor: pointer"></div>
+<!--        <router-link to="" tag="a" class="a-link" v-if="scope.row.projectInfo.projectId&&scope.row.projectInfo.projectAllName" v-html="scope.row.projectInfo.projectAllName"></router-link>-->
+        <div v-else v-html="scope.row.projectInfo&&scope.row.projectInfo.projectAllName || '--'"></div>
         <div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
       </template>
     </tables>
@@ -95,6 +96,11 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true
+    },
+    handleDetail(row){
+      if(row.sourceUrl){
+        window.open(row.sourceUrl, "_blank")
+      }
     }
   }
 }

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

@@ -3,10 +3,10 @@
     <div class="financial-header">
       <div class="common-title">财务简析</div>
       <div class="flex-box header-box">
-        <div class="header-item">总资产<div class="header-item-amount" v-if="financialDetail.totalAssets"><span>{{financialDetail.totalAssets || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header01_ico.png"></div>
-        <div class="header-item">净资产<div class="header-item-amount" v-if="financialDetail.belongNetAssets"><span>{{financialDetail.belongNetAssets || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header02_ico.png"></div>
-        <div class="header-item">营业收入<div class="header-item-amount" v-if="financialDetail.operatingIncome"><span>{{financialDetail.operatingIncome || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header03_ico.png"></div>
-        <div class="header-item">授信余额<div class="header-item-amount" v-if="financialDetail.creditBalance"><span>{{financialDetail.creditBalance || ''}}</span>亿元</div><img src="@/assets/images/detail/financial/financial_header04_ico.png"></div>
+        <div class="header-item">总资产<div class="header-item-amount"><template v-if="financialDetail.totalAssets"><span>{{saveFixed(financialDetail.totalAssets)}}</span>亿元</template><template v-else>--</template></div><img src="@/assets/images/detail/financial/financial_header01_ico.png"></div>
+        <div class="header-item">净资产<div class="header-item-amount"><template v-if="financialDetail.belongNetAssets"><span>{{saveFixed(financialDetail.belongNetAssets)}}</span>亿元</template><template v-else>--</template></div><img src="@/assets/images/detail/financial/financial_header02_ico.png"></div>
+        <div class="header-item">营业收入<div class="header-item-amount"><template v-if="financialDetail.operatingIncome"><span>{{saveFixed(financialDetail.operatingIncome)}}</span>亿元</template><template v-else>--</template></div><img src="@/assets/images/detail/financial/financial_header03_ico.png"></div>
+        <div class="header-item">授信余额<div class="header-item-amount"><template v-if="financialDetail.creditBalance"><span>{{saveFixed(financialDetail.creditBalance)}}</span>亿元</template><template v-else>--</template></div><img src="@/assets/images/detail/financial/financial_header04_ico.png"></div>
       </div>
     </div>
     <div class="financial-zcqk">
@@ -14,27 +14,39 @@
       <ul class="zcqk-list">
         <li v-for="(item, index) in zcqkList" :key="index" :style="zcqkList.length==1?'border-right: 0;':''">
           <div class="zcqk-list-box" :style="(parity(zcqkList) && index==zcqkList.length-2) || (index == zcqkList.length-1)?'border-bottom: 0':''">
-            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{item.amount}}</i>亿元</span></div>
+            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{saveFixed(item.amount)}}</i>{{item.unit}}</span><span v-else>--</span></div>
             <div class="zcqk-list-intro">{{item.intro}}</div>
           </div>
         </li>
       </ul>
     </div>
+    <div class="financial-ylnl">
+      <div class="common-title">盈利能力</div>
+      <ul class="flex-box ylnl-list">
+        <li v-for="(item, index) in ylnlList" :key="index" :style="index===0?'border-left: 0;':''">
+          <div class="ylnl-amount"><template v-if="item.amount"><span>{{saveFixed(item.amount)}}</span>{{item.unit}}</template><template v-else>--</template></div>
+          <div class="ylnl-title">{{item.name}}</div>
+        </li>
+      </ul>
+    </div>
     <div class="financial-zwqk">
       <div class="common-title">负债情况及偿债能力</div>
       <div class="flex-box zwqk-box">
         <div class="zwqk-info">
           <div class="zwqk-title">总负债</div>
-          <div class="zwqk-amount"><span>{{financialDetail.totalLiabilities || '0'}}</span>亿元</div>
-          <div class="zwqk-pro">资产负债率 {{financialDetail.tdr+'%' || '--'}}</div>
+          <div class="zwqk-amount"><span>{{financialDetail.totalLiabilities?saveFixed(financialDetail.totalLiabilities):'0'}}</span>亿元</div>
+          <div class="zwqk-pro">资产负债率 {{financialDetail.tdr?saveFixed(financialDetail.tdr)+'%':'--'}}</div>
           <img src="@/assets/images/detail/financial/zwqk_bg_ico.png">
         </div>
-        <div id="myEcharts" style="width: 444px;height:250px; margin: 0 auto;"></div>
+        <div id="myEcharts" style="width: 444px;height:250px; margin: 0 auto;" v-if="echartsData.length>0"></div>
+        <div class="fin-no-data" v-else>
+          <no-data />
+        </div>
       </div>
       <div class="flex-box zwqk-list">
         <div class="list-item" v-for="(item, index) in zwqkList" :key="index">
           <div class="flex-box list-item-all">{{item.name}}<img :src="item.ico"></div>
-          <div class="list-item-amount"><template v-if="item.amount"><span>{{item.amount}}</span>{{item.unit}}</template><template v-else>--</template></div>
+          <div class="list-item-amount"><template v-if="item.amount"><span>{{saveFixed(item.amount)}}</span>{{item.unit}}</template><template v-else>--</template></div>
           <div class="list-item-pro">{{item.intro}}<span>{{item.introPro || '--'}}</span></div>
         </div>
       </div>
@@ -44,7 +56,7 @@
       <ul class="zcqk-list">
         <li v-for="(item, index) in zjqkList" :key="index" :style="zjqkList.length==1?'border-right: 0;':''">
           <div class="zcqk-list-box" :style="(parity(zjqkList) && index==zjqkList.length-2) || (index == zjqkList.length-1)?'border-bottom: 0':''">
-            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{item.amount}}</i>{{item.unit}}</span></div>
+            <div class="flex-box zcqk-list-line"><span class="flex-box"><img :src="item.ico">{{item.name}}</span><span v-if="item.amount"><i>{{saveFixed(item.amount)}}</i>{{item.unit}}</span></div>
             <div class="zcqk-list-intro">{{item.intro}}</div>
           </div>
         </li>
@@ -54,13 +66,19 @@
 </template>
 
 <script>
+import {saveFixed} from "@/assets/js/common"
 import { financial } from '@/api/detail/party-a/financial'
 import * as echarts from 'echarts'
+import NoData from '../component/noData'
 export default {
   name: 'Financial',
   props: ['companyId'],
+  components: {
+    NoData
+  },
   data() {
     return {
+      saveFixed,
       financialDetail: {},
       // 资产情况
       zcqkList: [
@@ -82,6 +100,12 @@ export default {
         { name: '对外担保金额', ico: require('@/assets/images/detail/financial/zwqk_ico4.png'), intro: '对外担保比例', introPro: '', amount: '', unit: '亿元'}
       ],
       echartsData: [],
+      ylnlList: [
+        { name: '营业收入', amount: '', unit: '亿元'},
+        { name: '净资产收益率', amount: '', unit: '%'},
+        { name: '归母净利润', amount: '', unit: '亿元'},
+        { name: '公益性&准公益性主营占比', amount: '', unit: '%'},
+      ],
       // 资金情况
       zjqkList: [
         { name: '经营现金流', ico: require('@/assets/images/detail/financial/zjqk_ico1.png'), intro: '该指标越高，说明经营活动的造血能力越强', amount: '', unit: '亿元'},
@@ -117,7 +141,7 @@ export default {
       this.tableLoading = true
       let res = await financial({cid:this.companyId})
       this.tableLoading = false
-      if(res.code==200){
+      if(res.code==200 && res.data){
         this.financialDetail = res.data
         //资产情况
         let { totalAssets, belongNetAssets, monetaryFunds, accountsReceivable, landAssets, otherReceivable, restrictedAssets, receivableFromGovRatio, govSubsidy } = this.financialDetail
@@ -131,7 +155,13 @@ export default {
         let zwPercentObj = { econData_006, econData_005, nonStandardRatio, guaranteeRatio }
         this.zwqkList.forEach((item, index) => {
           item.amount = zwAmountObj[Object.keys(zwAmountObj)[index]]
-          item.introPro = zwPercentObj[Object.keys(zwPercentObj)[index]]?zwPercentObj[Object.keys(zwPercentObj)[index]]+'%':''
+          item.introPro = zwPercentObj[Object.keys(zwPercentObj)[index]]?saveFixed(zwPercentObj[Object.keys(zwPercentObj)[index]])+'%':''
+        })
+        //盈利能力
+        let { operatingIncome, roe, belongNetProfit, econData_001 } = this.financialDetail
+        let ylnlObj = { operatingIncome, roe, belongNetProfit, econData_001 }
+        this.ylnlList.forEach((item, index) => {
+          item.amount = ylnlObj[Object.keys(ylnlObj)[index]]
         })
         //资金情况
         let { netOperatingCashFlow, cashRatio, netFinancingCashFlow, cashFlowRatio, netInvestmentCashFlow, cashDebtRatio } = this.financialDetail
@@ -285,7 +315,7 @@ export default {
             img{
               width: 84px;
               height: 115px;
-              right: -10px;
+              right: -4px;
               bottom: -18px;
             }
           }
@@ -367,6 +397,33 @@ export default {
         }
       }
     }
+    .financial-ylnl{
+      background: #FFFFFF;
+      padding: 24px 16px;
+      margin-top: 12px;
+      border-radius: 4px;
+      .ylnl-list{
+        justify-content: space-between;
+        li{
+          color: #232323;
+          width: 25%;
+          height: 72px;
+          padding-top: 18px;
+          font-size: 16px;
+          text-align: center;
+          border-left: 1px solid #EEEEEE;
+          .ylnl-amount{
+            font-size: 14px;
+            font-weight: bold;
+            padding-bottom: 4px;
+            span{
+              font-size: 18px;
+              margin-right: 4px;
+            }
+          }
+        }
+      }
+    }
     .financial-zwqk{
       background: #FFFFFF;
       padding: 24px 16px;
@@ -376,7 +433,8 @@ export default {
         padding-top: 20px;
         justify-content: normal;
         .zwqk-info{
-          width: 50%;
+          width: calc(50% - 11px);
+          margin-right: 11px;
           height: 248px;
           padding: 54px 24px 10px 24px;
           color: #4D4C4B;
@@ -421,6 +479,11 @@ export default {
             margin-top: 33px;
           }
         }
+        .fin-no-data{
+          width: calc(50% - 11px);
+          height: 250px;
+          margin-left: 11px;
+        }
       }
       .zwqk-list{
         justify-content: space-between;
@@ -435,6 +498,10 @@ export default {
           .list-item-all{
             align-items: normal;
             justify-content: space-between;
+            img{
+              width: 30px;
+              height: 30px;
+            }
           }
           .list-item-amount{
             height: 39px;

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

+import {encodeStr} from "@/assets/js/common"
 import HeadForm from "../component/HeadForm"
 import Tables from "../component/Tables"
 export default {
@@ -7,7 +8,7 @@ export default {
   },
   data() {
     return {
-
+      encodeStr
     }
   },
   mounted() {

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

@@ -21,7 +21,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
         <div v-else v-html="scope.row.projectName  || '--'"></div>
       </template>
       <template slot="province" slot-scope="scope">

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

@@ -20,7 +20,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/Bidding/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>
       <template slot="province" slot-scope="scope">

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

@@ -21,7 +21,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/debtProject/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/opport/landtransaction.vue

@@ -21,7 +21,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <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>
@@ -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/opport/proposed.vue

@@ -21,7 +21,7 @@
       @sort-change="sortChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/Establishment/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>
       <template slot="isProjcet" slot-scope="scope">

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

@@ -19,15 +19,15 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="projectName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
+        <router-link :to="`/radar/bxprozbgg/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>
       <template slot="tenderee" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.tendereeId&&scope.row.tenderee " v-html="scope.row.tenderee"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.tendereeId)}`" tag="a" class="a-link" v-if="scope.row.tendereeId&&scope.row.tenderee " v-html="scope.row.tenderee"></router-link>
         <div v-else v-html="scope.row.tenderee  || '--'"></div>
       </template>
       <template slot="agency" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency " v-html="scope.row.agency"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.agencyId)}`" tag="a" class="a-link" v-if="scope.row.agencyId&&scope.row.agency " v-html="scope.row.agency"></router-link>
         <div v-else v-html="scope.row.agency  || '--'"></div>
       </template>
       <template slot="province" slot-scope="scope">

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

@@ -19,7 +19,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="name" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name " v-html="scope.row.name"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name " v-html="scope.row.name"></router-link>
         <div v-else v-html="scope.row.name  || '--'"></div>
         <div class="tags" v-if="scope.row.status || scope.row.biddingAnnouncement">
           <span class="tag style1" v-if="scope.row.status">{{scope.row.status}}</span>

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

@@ -2,40 +2,45 @@
   <div class="flex-box app-container part-container">
     <div class="bid-zbph">
       <div class="common-title">招标偏好</div>
-      <div class="flex-box zbph-item">
-        <div>历史招标总数
-          <el-popover
-            placement="top-start"
-            trigger="hover"
-            content="统计企业历年来公开招标总数">
-            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
-          </el-popover>
-          <span class="zbph-item-num">{{dataAll.totalCount || '--'}}</span></div>
-        <div>近一年招标总数
-          <el-popover
-            placement="top-start"
-            trigger="hover"
-            content="统计企业近一年公开招标总数">
-            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
-          </el-popover>
-          <span class="zbph-item-num">{{dataAll.lastYearCount || '--'}}</span></div>
-        <div>历史招标总额（万元）
-          <el-popover
-            placement="top-start"
-            trigger="hover"
-            content="统计企业历年来公开招标项目总金额">
-            <img src="@/assets/images/detail/overview/zbph_question.png" slot="reference">
-          </el-popover>
-          <span class="zbph-item-num">{{dataAll.bidAmount?parseFloat(dataAll.bidAmount.toFixed(6)):'--'}}</span></div>
-      </div>
-      <div class="zbph-account">招标动态
-        <div class="labels">
-          <div :class="{'on':datatype==3}" @click="getDT(3)">周</div>
-          <div :class="{'on':datatype==2}" @click="getDT(2)">月</div>
-          <div :class="{'on':datatype==1}" @click="getDT(1)">年</div>
+      <template v-if="dataAll.totalCount||dataAll.lastYearCount||dataAll.bidAmount||this.dtdata.length>0">
+        <div class="flex-box zbph-item">
+          <div>历史招标总数
+            <el-popover
+              placement="top-start"
+              trigger="hover"
+              content="统计企业历年来公开招标总数">
+              <img src="@/assets/images/detail/overview/zbph_question.png" style="width: 12px; height: 12px;" slot="reference">
+            </el-popover>
+            <span class="zbph-item-num">{{dataAll.totalCount || '--'}}</span></div>
+          <div>近一年招标总数
+            <el-popover
+              placement="top-start"
+              trigger="hover"
+              content="统计企业近一年公开招标总数">
+              <img src="@/assets/images/detail/overview/zbph_question.png" style="width: 12px; height: 12px;" slot="reference">
+            </el-popover>
+            <span class="zbph-item-num">{{dataAll.lastYearCount || '--'}}</span></div>
+          <div>历史招标总额（万元）
+            <el-popover
+              placement="top-start"
+              trigger="hover"
+              content="统计企业历年来公开招标项目总金额">
+              <img src="@/assets/images/detail/overview/zbph_question.png" style="width: 12px; height: 12px;" slot="reference">
+            </el-popover>
+            <span class="zbph-item-num">{{dataAll.bidAmount?parseFloat(dataAll.bidAmount.toFixed(6)):'--'}}</span></div>
+        </div>
+        <div class="zbph-account">招标动态
+          <div class="labels">
+            <div :class="{'on':datatype==3}" @click="getDT(3)">周</div>
+            <div :class="{'on':datatype==2}" @click="getDT(2)">月</div>
+            <div :class="{'on':datatype==1}" @click="getDT(1)">年</div>
+          </div>
         </div>
+        <div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
+      </template>
+      <div class="bid-no-data" v-else>
+        <no-data />
       </div>
-      <div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
     </div>
     <div class="bid-ywwl">
       <div class="common-title">业务往来供应商TOP5</div>
@@ -79,9 +84,13 @@
 import {encodeStr} from "@/assets/js/common"
 import {bidDataGroup, supplierPage} from '@/api/detail/party-a/overview'
 import * as echarts from 'echarts'
+import NoData from '../../component/noData'
 export default {
   name: 'Bidding',
   props: ['companyId'],
+  components: {
+    NoData
+  },
   data() {
     return {
       encodeStr,
@@ -111,7 +120,11 @@ export default {
         this.dttime=res.data.groupCount.map(item=>{
           return item.span
         })
-        this.initDT(this.dtdata,this.dttime)
+        if(this.dtdata.length>0&&this.dttime.length>0){
+          this.$nextTick(() => {
+            this.initDT(this.dtdata,this.dttime)
+          })
+        }
       }
     },
     async handleSupplier() {
@@ -228,6 +241,9 @@ export default {
           }
         }
       }
+      .bid-no-data{
+        margin-top: 16px;
+      }
       .zbph-account{
         position: relative;
         font-weight: bold;
@@ -274,6 +290,8 @@ export default {
       .table-item{
         margin-top:15px;
         .ywwl-ico{
+          width: 36px;
+          height: 36px;
           margin-left: -6px;
         }
         ::v-deep .el-table .el-table__body-wrapper tr:nth-child(2n){

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

@@ -6,7 +6,10 @@
       <el-tab-pane label="按项目" name="1"></el-tab-pane>
     </el-tabs>
     <div class="flex-box clue-box">
-      <div class="clue-echarts"><div id="echartsClue" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
+      <div class="clue-echarts" v-if="viewData.length>0"><div id="echartsClue" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
+      <div class="busc-no-data" v-else>
+        <no-data />
+      </div>
       <div class="table-item">
         <el-table
           :data="viewData"
@@ -38,9 +41,13 @@
 import {projectTenderDataGroup} from '@/api/detail/party-a/overview'
 import * as echarts from 'echarts'
 import {changePath} from "@/assets/js/common"
+import NoData from '../../component/noData'
 export default {
   name: 'Busclue',
   props: ['companyId', 'statistic'],
+  components: {
+    NoData
+  },
   data() {
     return {
       viewData:[],
@@ -64,13 +71,17 @@ export default {
   methods: {
     async handleQuery(){
       let res = await projectTenderDataGroup({cid: this.companyId, type: this.activeIndex})
-      if(res.code==200){
+      if(res.code==200 && res.data.length>0){
         let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
         this.viewData = data.map(item => {
           let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'}
           return it
         })
-        this.getDT()
+        if(this.viewData.length>0){
+          this.$nextTick(() => {
+            this.getDT()
+          })
+        }
       }
     },
     getDT(val){
@@ -149,10 +160,13 @@ export default {
       width: 100%;
       justify-content: space-between;
       align-items: normal;
-      margin-top: 4px;
+      margin-top: 8px;
       .clue-echarts{
         width: calc(50% - 8px);
       }
+      .busc-no-data{
+        width: calc(50% - 8px);
+      }
       .table-item{
         width: calc(50% - 8px);
         ::v-deep .el-table--border .el-table__cell{

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

 <template>
   <div class="app-container operations-container">
     <div class="common-title">公司经营</div>
-    <div class="part-swiper">
+    <div class="part-swiper" v-if="operList.length>0">
       <div class="swiper-containers swiper-oper" :style="operList.length<=6?'margin-left:0px; width: 100%;':''">
         <ul class="swiper-wrapper">
           <li class="swiper-slide" v-for="(item, index) in operList" :key="index">
@@ -18,6 +18,9 @@
       <div class="swiper-button-prev swiper-oper-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
       <div class="swiper-button-next swiper-oper-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
     </div>
+    <div class="part-swiper" v-else>
+      <no-data />
+    </div>
     <div class="flex-box operations-list">
       <div class="list-item" v-for="(item, index) in gsjyList" :key="index">
         <div class="flex-box list-item-all"><img :src="item.ico">{{item.name}}</div>
@@ -31,9 +34,13 @@
 import {bondCreditRating} from '@/api/detail/party-a/overview'
 var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
 import "@/assets/lib/swiper/swiper-bundle.css"
+import NoData from '../../component/noData'
 export default {
   name: 'Overview',
   props: ['companyId', 'financial'],
+  components: {
+    NoData
+  },
   data() {
     return {
       operList: [],

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

@@ -2,16 +2,26 @@
   <div class="flex-box app-container part-container">
     <div class="tender-list">
       <div class="common-title">招标公告</div>
-      <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
-        <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
-        <span class="tender-time">{{item.contact}} {{item.issueTime}}</span>
+      <template v-if="zbggList.length>0">
+        <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
+          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
+          <span class="tender-time">{{item.contact}} {{item.issueTime}}</span>
+        </div>
+      </template>
+      <div class="tender-no-data" v-else>
+        <no-data />
       </div>
     </div>
     <div class="tender-list">
       <div class="common-title">企业动态</div>
-      <div class="tender-item" v-for="(item, index) in trendList" :key="index">
-        <div class="flex-box tender-title"><div class="text-cl1" :title="tendTitle(item.details)">{{tendTitle(item.details)}}</div><span :class="item.parentDimension=='新增分支机构'?'style2':item.parentDimension=='新增施工工法'?'style3':'style1'">{{item.parentDimension}}</span></div>
-        <span class="tender-time">{{item.createTime}}</span>
+      <template v-if="trendList.length>0">
+        <div class="tender-item" v-for="(item, index) in trendList" :key="index">
+          <div class="flex-box tender-title"><div class="text-cl1" :title="tendTitle(item.details)">{{tendTitle(item.details)}}</div><span :class="item.parentDimension=='新增分支机构'?'style2':item.parentDimension=='新增施工工法'?'style3':'style1'">{{item.parentDimension}}</span></div>
+          <span class="tender-time">{{item.createTime}}</span>
+        </div>
+      </template>
+      <div class="tender-no-data" v-else>
+        <no-data />
       </div>
     </div>
   </div>
@@ -19,10 +29,13 @@
 
 <script>
 import {bidNoticePage, dynamicPage} from "@/api/detail/party-a/overview"
-
+import NoData from '../../component/noData'
 export default {
   name: 'Tender',
   props: ['companyId'],
+  components: {
+    NoData
+  },
   data() {
     return {
       zbggParams: {
@@ -34,7 +47,7 @@ export default {
       //招标公告数据
       zbggList:[],
       trendParams: {
-        companyId: '2453',
+        companyId: this.companyId,
         pageNum: 1,
         pageSize: 5
       },
@@ -143,5 +156,9 @@ export default {
         }
       }
     }
+    .tender-no-data{
+      height: 420px;
+      margin-top: 20px;
+    }
   }
 </style>

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

@@ -29,7 +29,7 @@ export default {
       queryParams: {
         cid: this.companyId,
         pageNum: 1,
-        pageSize: 20
+        pageSize: 100
       },
       forData: [
         {label: '姓名', prop: 'name'},

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

@@ -20,7 +20,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="stockName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName " v-html="scope.row.stockName"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName " v-html="scope.row.stockName"></router-link>
         <div v-else v-html="scope.row.stockName  || '--'"></div>
         <div class="tags" v-if="scope.row.businessStatus">
           <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>

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

@@ -19,7 +19,7 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="investName" slot-scope="scope">
-        <router-link to="" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
         <div v-else v-html="scope.row.investName  || '--'"></div>
         <div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
           <span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>

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

@@ -686,7 +686,7 @@ export default {
     color: #FFFFFF;
     .img{
       background: url("../../../assets/images/project/add_2.png") no-repeat center center;
-
+      background-size: 100%;
     }
   }
 }

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

@@ -23,7 +23,7 @@
               <img src="@/assets/images/project/empty.png">
               <div class="p1">暂无数据展示</div>
               <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
-              <div class="btn btn_primary h36 w102" @click="opennew">新增联系人</div>
+              <div class="btn btn_primary h36 w102" @click="opennew">新增相关企业</div>
             </div>
           </template>
           <el-table-column
@@ -108,7 +108,7 @@
           <img src="@/assets/images/economies/icon.png">
           <span>新建相关企业-{{types}}</span>
         </div>
-        <el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" >
+        <el-form class="popform i":model="queryParam" label-width="85px" :rules="rules" ref="ruleForm" >
           <el-form-item label="企业名称：" prop="companyName" class="row">
             <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
@@ -154,25 +154,7 @@
         nowedit:-1,//当前正在编辑的文本
         tipslit:[],//项目标签
         tipsvalue:"",//标签填写内容
-        tableData: [
-          {
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-          }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-          }
-        ],
+        tableData: [],
         typelist:['对接深度：','合作阶段：','竞争力度：'],
         typename:"",
         rules:{
@@ -224,6 +206,8 @@
       },
       addqy(){
         addXGQY(this.queryParam).then(res=>{
+          this.hzhbVisible=false
+          this.dialogVisible=false
           if(res.code == 200){
             this.$message.success('添加成功！')
             this.getlist()

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

@@ -10,8 +10,8 @@
         <el-tab-pane label="公司全部项目" name="second"></el-tab-pane>
 
         <div class="searchInput">
-          <el-input type="text" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
-          <div class="btn">搜索</div>
+          <el-input type="text" v-model="searchParam.projectName" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
+          <div class="btn" @click="getList(1)">搜索</div>
         </div>
         <div class="sellist">
           <div class="selli">
@@ -283,6 +283,7 @@ export default {
       }else{
         this.searchParam.userId = null
       }
+      this.searchParam.ownerCompany = this.searchParam.projectName
       getProjectlist(this.searchParam).then(result=>{
         if(result.code == 200){
           this.datalist = result.rows
@@ -315,6 +316,7 @@ export default {
           pageNum:1,
           pageSize:10,
       }
+      this.getList(1)
     },
     //地区
     async prvinceTree() {

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

@@ -50,13 +50,13 @@
 				// tablist
 				personnelList: [{
 						key: 'debtProject',
-						status: false,
+						status: true,
 						value: '企业专项债项目',
 
 					},
 					{
 						key: 'Land',
-						status: true,
+						status: false,
 						value: '土地交易',
 
 					},
@@ -92,7 +92,7 @@
 					},
 
 				],
-				personnelHerf:'Land'
+				personnelHerf:'debtProject'
 			}
 		},
 		created() {},

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);
     }