*

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

@@ -1202,3 +1202,27 @@
 .el-select .el-input__inner{
   padding-left: 16px;
 }
+.el-tooltip__popper.is-dark {
+  opacity: 0.5;
+  //background: rgba(0, 0, 0, 0.5);
+  //.el-tooltip__popper[x-placement^=top] .popper__arrow {
+  //  border-top-color:rgba(0, 0, 0, 0.5);
+  //}
+}
+
+//.fixed-table {
+//  overflow: initial;
+//
+//  .el-table__header-wrapper {
+//    position: sticky;
+//    top: 0;
+//    z-index: 9;
+//  }
+//
+//   .el-table__fixed-header-wrapper {
+//     position: sticky;
+//     top: 0;
+//    z-index: 9;
+//  }
+//
+//}

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

@@ -26,7 +26,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0"
+          <el-table id="tables" v-if="!isSkeleton&&tableData.total > 0"   class="fixed-table"
                     :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -48,8 +48,12 @@
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
+                  <el-tooltip class="item" effect="dark" content="写跟进" placement="top">
                     <div  @click="toDetail(scope.row,'gjjl')"><img class="i" src="@/assets/images/project/edit_1.png"><img class="o" src="@/assets/images/project/edit_11.png"></div>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="编辑信息" placement="top">
                     <div  @click="toDetail(scope.row,'business')"><img class="i" src="@/assets/images/project/edit_2.png"><img class="o" src="@/assets/images/project/edit_22.png"></div>
+                  </el-tooltip>
                 </div>
               </div>
             </template>
@@ -246,16 +250,16 @@
 </template>
 
 <script>
-  import { getToken } from "@/utils/auth";
-  import "@/assets/styles/project.scss"
-  import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
-  import {getEnterprise,getDictType,} from '@/api/main'
+  import { getToken } from '@/utils/auth'
+  import '@/assets/styles/project.scss'
+  import { addCustomer, getCustomerList, importData } from '@/api/custom/custom'
+  import { getDictType, getEnterprise } from '@/api/main'
   import prvinceTree from '@/assets/json/provinceTree'
   import batchimport from '../../project/projectList/component/batchImport'
   import skeleton from '../../project/projectList/component/skeleton'
-  import axios from 'axios'
-  import {encodeStr} from "@/assets/js/common"
-export default {
+  import { encodeStr } from '@/assets/js/common'
+
+  export default {
   name: 'CustomList',
   components:{batchimport,skeleton},
   data() {
@@ -313,7 +317,37 @@ export default {
     this.getDictType()
     this.prvinceTree()
   },
+    mounted() {
+      window.addEventListener("scroll",this.scrolling)
+    },
+    beforeDestroy() {
+      window.removeEventListener("scroll", this.scrolling);
+    },
+  // mounted(){
+  //   // tables
+  //   // var box = document.getElementById('tables').offsetTop // 获取元素
+  //   var box = document.getElementsByClassName("el-table")[0].offsetTop
+  //   console.log(box)
+  //   if (box) {
+  //     let topheight = box.offsetTop
+  //     console.log(topheight)
+  //   }
+  // },
   methods:{
+    scrolling() {
+      let el = document.getElementById("tables").offsetTop
+      console.log(el)
+      // let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
+      // let el1 = document.getElementsByClassName("el-table__header")[0]
+      // console.log(el1.offsetTop)
+      // let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+      // if (scrollTop > el1.offsetTop) {
+      //   let top = scrollTop - el1.offsetTop - 13
+      //   el.style.top = top + 'px'
+      // } else {
+      //   el.style.top = 0
+      // }
+    },
     sq1(item,sq){
       this.$nextTick(()=>{
         item.sq1 = sq
@@ -368,7 +402,7 @@ export default {
           }else{
             item.sq2 = false
           }
-          console.log(item)
+          // console.log(item)
       })
       })
     },
@@ -596,7 +630,7 @@ export default {
   }
   .tables{
     position: relative;
-    height: calc(100vh - 134px);
+    min-height: calc(100vh - 134px);
     overflow: auto;
     .empty{
       position: absolute;

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

@@ -40,7 +40,9 @@
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
+                  <el-tooltip class="item" effect="dark" content="重新认领" placement="top">
                     <div  @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div>
+                  </el-tooltip>
                 </div>
               </div>
             </template>

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

 <template>
   <div class="Tables">
     <div class="table-item">
-      <el-table
+      <el-table v-if="tableDataTotal>0"
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"
@@ -61,11 +61,12 @@
 
         </template>
         <template slot="empty">
-          <div style="padding: 30px 0">
-            <no-data />
-          </div>
         </template>
       </el-table>
+
+      <div style="padding: 30px 0" v-else>
+        <no-data />
+      </div>
     </div>
     <div class="pagination-box" v-if="show_page && tableDataTotal>queryParams.pageSize">
       <el-pagination background :current-page="current_page" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />

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

@@ -5,20 +5,27 @@
 
       <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
       <div class="tables" v-else>
-        <el-table
-          :data="tableData"
-          stripe border
-          style="width: 100%"
-          :default-sort = "{prop: 'role', order: 'ascending'}"
-        >
-          <template slot="empty">
-            <div class="empty">
+
+        <div class="empty" v-if="total==0">
           <img src="@/assets/images/project/empty.png">
           <div class="p1">暂无数据展示</div>
           <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
         </div>
-          </template>
+        <el-table v-else
+          :data="tableData"
+          stripe border
+          style="width: 100%"
+          :default-sort = "{prop: 'role', order: 'ascending'}"
+        >
+          <!--<template slot="empty">-->
+            <!--<div class="empty">-->
+              <!--<img src="@/assets/images/project/empty.png">-->
+              <!--<div class="p1">暂无数据展示</div>-->
+              <!--<div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>-->
+              <!--<div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>-->
+            <!--</div>-->
+          <!--</template>-->
           <el-table-column
             prop="name"
             label="姓名"

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

@@ -16,19 +16,17 @@
       </div>
       <div class="document tables">
         <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
-        <el-table  v-else
-          :data="tableData.rows"
-          style="width: 100%"
-          :default-sort = "{prop: 'depth', order: 'descending'}"
-        >
-          <template slot="empty">
-            <div class="empty">
+        <div class="empty" v-if="tableData.total == 0">
           <img src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds==false">新增相关企业</div>
         </div>
-          </template>
+        <el-table  v-else-if="!isSkeleton"
+          :data="tableData.rows"
+          style="width: 100%"
+          :default-sort = "{prop: 'depth', order: 'descending'}"
+        >
           <el-table-column
             prop="companyName"
             label="企业名称"

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

@@ -61,13 +61,7 @@
       </div>
       <div class="document tables">
         <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
-        <el-table  v-else
-          :data="fileDatas.rows"
-          style="width: 100%"
-          :default-sort = "{prop: 'creatTime', order: 'descending'}"
-        >
-          <template slot="empty">
-            <div class="empty">
+        <div class="empty" v-if="fileDatas.total==0">
           <img src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，没找到相关数据</div>
           <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
@@ -86,6 +80,12 @@
             上传文档
           </el-upload></div>
         </div>
+        <el-table  v-else-if="!isSkeleton"
+          :data="fileDatas.rows"
+          style="width: 100%"
+          :default-sort = "{prop: 'creatTime', order: 'descending'}"
+        >
+          <template slot="empty">
           </template>
           <el-table-column
             prop="name"