*

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

@@ -33,7 +33,7 @@
   box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.12);
   border-radius: 2px;
   position: absolute;
-  z-index: 3;
+  z-index: 20;
   text-align: center;
   .words{
     padding: 24px 0;

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

@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="flex">
-        <el-card class="box-card noborder left" style="position: relative">
+        <el-card class="box-card noborder left" style="position: relative;padding-bottom: 0">
           <div class="cardtitles">客户级别</div>
           <div class="chartsum">
             <div class="sum">23家</div>
@@ -67,7 +67,7 @@
 
         </el-card>
 
-        <el-card class="box-card noborder right">
+        <el-card class="box-card noborder right" style="padding-bottom: 0">
           <div class="cardtitles">客户跟进动态
             <div class="labels">
               <div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
@@ -259,11 +259,11 @@
           {
             name: '',
             type: 'bar',
-            barWidth: '12px',
+            barWidth: '18px',
             data: [100, 152, 200, 334, 390, 330, 220,256,178],
             itemStyle:{
               normal: {
-                barBorderRadius: [4, 4, 0, 0],
+                barBorderRadius: [9, 9, 0, 0],
                 color: '#165DFF'
               }
             }
@@ -316,11 +316,11 @@
           {
             name: '',
             type: 'bar',
-            barWidth: '12px',
+            barWidth: '18px',
             data: [110, 112, 190, 234, 310, 350, 220,276,198],
             itemStyle:{
               normal:{
-                barBorderRadius:[4,4,0,0],
+                barBorderRadius:[9,9,0,0],
                 color:'#14C9C9'
               },
             }
@@ -367,7 +367,7 @@
           left:'8%',
           top:'8%',
           right:'5%',
-          bottom:'10%',
+          bottom:'42px',
         },
         tooltip:{
           axisPointer:{ //悬浮于圆点展示标签

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

@@ -253,7 +253,6 @@ export default {
           weekdata1.length = time
           weekdata2.length = time
           weekdata3.length = time
-          console.log(time)
           for(var i=0;i<7;i++){
             if(i > time){
               weekdata1.push('')
@@ -304,8 +303,6 @@ export default {
         default:
           break;
       }
-      console.log(datas)
-      console.log(labels)
       this.initDT(datas,labels)
     },
     resizeEcharts (){
@@ -350,8 +347,8 @@ export default {
           // trigger: 'axis'
         },
         legend: {
-          right: '20px',
-          top:"30px",
+          right: '155px',
+          top:"2px",
           data: ['成交金额', '储备项目', '跟进动态'],
           itemHeight: 8, // 修改icon图形大小
           itemGap: 20

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

@@ -60,6 +60,12 @@
             prop="responsiblePerson"
             label="备注"
             width="">
+            <template slot-scope="scope">
+              <el-tooltip v-if="scope.row.responsiblePerson" class="item" effect="dark" :content="scope.row.responsiblePerson" placement="top">
+                <div class="showremark">{{scope.row.responsiblePerson}}</div>
+              </el-tooltip>
+              <div v-else>--</div>
+            </template>
           </el-table-column>
           <el-table-column v-if="isDisableds == false"
             prop="name"
@@ -328,6 +334,18 @@
 </script>
 
 <style lang="scss" scoped>
+  .showremark{
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    word-break: break-all;
+    cursor: pointer;
+    &:hover{
+      color: #0081FF;
+    }
+  }
   .searchInput .el-input{
     width: 68%;
   }

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

@@ -139,7 +139,7 @@
             </div>
             <div class="det-con" v-if="item.ownerCompany ">
               <span>业主单位：</span>
-              <span class="wordprimary">{{item.ownerCompany}}</span>
+              <span class="wordprimary" @click="toEnterprise(item)">{{item.ownerCompany}}</span>
             </div>
           </div>
           <el-divider v-if="index != datalist.length-1"></el-divider>
@@ -185,6 +185,7 @@
   import addproject from './component/addProject'
   import batchimport from './component/batchImport'
   import skeleton from './component/skeleton'
+  import {encodeStr} from "@/assets/js/common.js"
 export default {
   name: 'ProjectList',
   components:{addproject,batchimport,skeleton},
@@ -387,6 +388,13 @@ export default {
     toDetail(id,tag){
       this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} });
     },
+    toEnterprise(item){
+      if(item.ownerCompanyUipId){
+        this.$router.push({ path: '/enterprise/'+this.encodeStr(item.ownerCompanyUipId)});
+      }else{
+        this.$router.push({ path: '/company/'+this.encodeStr(item.ownerCompanyCid)});
+      }
+    },
     handleClick(){
       this.reset()
     },