修改

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

@@ -39,21 +39,21 @@
       <el-col :span="6">
         <div class="search">
           <div class="head_title">快速查找</div>
-          <el-input placeholder="输入企业名称查询" v-model="key">
+          <el-input placeholder="输入企业名称查询" v-model="key" id="focus">
             <i slot="prefix" class="el-icon-search"></i>
             <el-button slot="append" @click="handleSearch">搜索</el-button>
           </el-input>
-          <div class="search_btn" @click="handleAdd"><i class="el-icon-plus"></i>新建项目</div>
+          <div class="search_btn" @click="handleAdd"><i class="el-icon-plus"></i>添加客户</div>
         </div>
       </el-col>
     </el-row>
     <div class="content content_wap1">
       <div class="head_title">业主单位合作情况</div>
       <el-row>
-        <el-col :span="14">
+        <el-col :span="14" v-if="hzqkTotal != 0">
           <div id="hzqk-echarts" style="height: 300px;"></div>
         </el-col>
-        <el-col :span="10">
+        <el-col :span="10" v-if="hzqkTotal != 0">
           <div class="box-right">
             <el-table
               :data="hzqkList"
@@ -73,6 +73,10 @@
             </el-table>
           </div>
         </el-col>
+        <div class="empty" v-if="hzqkTotal === 0">
+          <img class="img" src="@/assets/images/project/empty.png">
+          <div class="p1">抱歉，没找到相关数据</div>
+        </div>
       </el-row>
     </div>
     <div class="content content_wap2">
@@ -135,22 +139,22 @@
             <p class="list-content-text">
               <span>关联企业：</span>
               <span>
-                <router-link :to="{path:`/enterprise/${encodeStr(item.companyId)}`,query:{customerId:item.customerId,path:'business'}}" tag="a">{{item.companyName || '--'}}</router-link>
+                <router-link :to="{path:`/enterprise/${encodeStr(item.companyId)}`,query:{customerId:item.customerId,path:'business'}}" tag="a" class="a-link">{{item.companyName || '--'}}</router-link>
               </span>
             </p>
-            <p class="list-content-text">
+            <p class="list-content-text" v-if="item.nickName">
               <span>跟进人：</span>
               <span>{{item.nickName || '--'}}</span>
             </p>
-            <p class="list-content-text">
+            <p class="list-content-text" v-if="item.name">
               <span>拜访对象：</span>
               <span>{{item.name || '--'}}</span>
             </p>
-            <p class="list-content-text">
+            <p class="list-content-text" v-if="item.visitTime">
               <span>本次拜访时间：</span>
               <span>{{item.visitTime || '--'}}</span>
             </p>
-            <p class="list-content-text">
+            <p class="list-content-text" v-if="item.nextVisitTime">
               <span>下次拜访时间：</span>
               <span>{{item.nextVisitTime || '--'}}</span>
             </p>
@@ -208,16 +212,17 @@
       pageSize:10,
       recordlist:[],
       timeList:['今日','近三天','近七天','自定义'],
-      datatype:'',
+      datatype:0,
       defaultValue:new Date(),
       pickerValue: [],
       params:{
-        startTime:'',
-        endTime:''
+        startTime:this.formatDate(new Date()),
+        endTime:this.formatDate(new Date())
       },
       data:{
         open:false
-      }
+      },
+      hzqkTotal:1
     }
   },
   created() {
@@ -245,7 +250,6 @@
         this.statistics=res.data;
       })
       cooperationTop().then(res=>{
-        // console.log(res.data)
         this.hzqkList=res.data;
         let list=[];
         for(let i=0; i<res.data.length; i++){
@@ -255,6 +259,8 @@
         }
         if(list.length > 0){
           this.initChart(list)
+        }else {
+          this.hzqkTotal=list.length
         }
       })
       creditLevel().then(res=>{
@@ -271,6 +277,7 @@
         pageNum:this.pageNum,//页码
         pageSize:this.pageSize,
       }
+      console.log(this.params)
       if(this.params.startTime){
         param.startTime=this.params.startTime
       }
@@ -472,7 +479,7 @@
         let endTime = new Date()
         switch (value) {
           case '今日':
-            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 3)
+            startTime = new Date()
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
             break;
           case '近三天':
@@ -528,6 +535,9 @@
     handleAdd(){
       this.data.open=true
     },
+    clickFocus(){
+      document.getElementById('focus').classList.toggle('span-ba')
+    }
   }
 }
 </script>
@@ -635,8 +645,20 @@
           background: #F5F5F5;
           color: #0081FF;
         }
+        .el-input__inner:focus{
+          border-color: #3181fa;
+        }
+        &.span-ba{
+          border: 1px solid #0081FF;
+          span{
+            color: #ffffff;
+            background: #0081FF;
+            border: 1px solid #0081FF;
+          }
+        }
       }
 
+
       .search_btn{
         width: 100%;
         height: 36px;
@@ -765,6 +787,28 @@
       }
     }
 
+    .content_wap1{
+      .empty{
+        margin: 0 auto;
+        height: 300px;
+        text-align: center;
+        .img{
+          width: 108px;
+          height: 108px;
+          margin-bottom: 24px;
+          margin-top: 50px;
+        }
+        .p1{
+          color: #333333;
+          font-size: 16px;
+        }
+        .p2{
+          color: #999999;
+          font-size: 14px;
+          margin-top: 8px;
+        }
+      }
+    }
     .content_wap3{
       background: #ffffff;
       .query-box{
@@ -889,7 +933,7 @@
       margin: 0 auto;
       height: 400px;
       text-align: center;
-      border-top: 1px solid #EFEFEF;
+      /*border-top: 1px solid #EFEFEF;*/
       padding-bottom: 50px;
       .img{
         width: 108px;

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

@@ -22,6 +22,9 @@
         <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>
+      <template slot="transactionPrice" slot-scope="scope">
+        <div v-html="scope.row.transactionPrice =='0.00' ? '--' : scope.row.transactionPrice"></div>
+      </template>
     </tables>
 
   </div>
@@ -55,7 +58,7 @@ export default {
         {label: '行业分类', prop: 'industry', width: '120'},
         {label: '供地方式', prop: 'supplyLandWay', width: '120'},
         {label: '土地坐落', prop: 'landAddr', width: '150'},
-        {label: '成交金额（万元）', prop: 'transactionPrice', width: '130'},
+        {label: '成交金额（万元）', prop: 'transactionPrice', width: '130',slot: true},
         {label: '总面积（㎡）', prop: 'acreage', width: '120'},
         {label: '批准单位', prop: 'authority', width: '120'},
         {label: '签订日期', prop: 'contractSignTime', width: '120'}

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

+<template>
+    <div class="BIfx">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="宏观市场分析" name="first">
+          <img class="img" src="@/assets/images/BI/hgscfx.png"/>
+        </el-tab-pane>
+        <el-tab-pane label="立项设计" name="second">
+          <img class="img" src="@/assets/images/BI/lxsj.png"/>
+        </el-tab-pane>
+        <el-tab-pane label="专项债项目" name="third">
+          <img class="img" src="@/assets/images/BI/zxz.png"/>
+        </el-tab-pane>
+        <el-tab-pane label="中标公告" name="fourth">
+          <img class="img" src="@/assets/images/BI/zbgg.png"/>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: 'BI',
+    data() {
+      return {
+        activeName:'first'
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .BIfx{
+    background: #ffffff;
+    padding: 16px;
+    margin-top: 12px;
+    ::v-deep .el-tabs{
+      .el-tabs__nav-wrap::after {
+        position: static !important;
+      }
+      .el-tabs__header{
+        margin: 0;
+        .el-tabs__item{
+          padding: 0 16px;
+          font-size: 16px;
+        }
+        .is-active{
+          font-weight: bold;
+        }
+      }
+      .el-tabs__content{
+        width: 100%;
+      }
+    }
+    .img{
+      width: 100%;
+      margin-top: 30px;
+    }
+  }
+</style>

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

@@ -6,6 +6,7 @@
         <el-tab-pane label="全国商机项目分析" name="second"></el-tab-pane>
         <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
         <el-tab-pane label="全国建筑企业分析" name="fourth"></el-tab-pane>
+        <el-tab-pane label="BI统计分析" name="five"></el-tab-pane>
       </el-tabs>
     </div>
 
@@ -13,6 +14,7 @@
     <Sjxmfx v-if="activeName === 'second'"></Sjxmfx>
     <Zhongbiao v-if="activeName === 'third'"></Zhongbiao>
     <Jzqyfx v-if="activeName === 'fourth'"></Jzqyfx>
+    <BI v-if="activeName === 'five'"></BI>
   </div>
 </template>
 
@@ -21,10 +23,11 @@
   import Sjxmfx from './component/sjxmfx'
   import Jzqyfx from './component/jzqyfx'
   import Zhongbiao from './component/zhongbiao'
+  import BI from './component/BI'
 export default {
   name: 'NationalEconomies',
   components: {
-    Economic,Sjxmfx,Jzqyfx,Zhongbiao
+    Economic,Sjxmfx,Jzqyfx,Zhongbiao,BI
   },
   data() {
     return {