Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

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

-
+.el-card{
+  overflow: initial;
+}
 .app-container{
   padding: 0;
 }
@@ -1210,19 +1212,15 @@
   //}
 }
 
-//.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;
-//  }
-//
-//}
+.fixed-table {
+  overflow: visible;
+
+  .el-table__header-wrapper {
+    position: sticky;
+    top: 56px;
+    z-index: 9;
+  }
+  .el-table__fixed-header-wrapper {
+    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 id="tables" v-if="!isSkeleton&&tableData.total > 0"   class="fixed-table"
+          <el-table id="tables" v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
                     :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -43,7 +43,7 @@
               prop="date"
               label="企业名称"
               fixed="left"
-              width="441">
+              width="316">
             <template slot-scope="scope">
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
@@ -323,30 +323,19 @@
     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
-      // }
+      let e1 = document.getElementById("tables").offsetTop
+      let e2 = document.getElementsByClassName("navbar")[0].getBoundingClientRect().height
+      let mheight = e1+e2 +2
+      let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
+      let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
+      if (scrollTop>mheight){
+        let top = scrollTop-mheight
+        el.style.top = top+'px'
+      }else{
+        el.style.top = 0
+      }
     },
     sq1(item,sq){
       this.$nextTick(()=>{
@@ -631,7 +620,7 @@
   .tables{
     position: relative;
     min-height: calc(100vh - 134px);
-    overflow: auto;
+    /*overflow: auto;*/
     .empty{
       position: absolute;
       top: 50%;

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

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
             :data="tableData.rows"
             stripe border
             style="width: 100%">
@@ -35,7 +35,7 @@
               prop="date"
               label="企业名称"
               fixed="left"
-              width="441">
+              width="316">
             <template slot-scope="scope">
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
@@ -246,7 +246,26 @@ export default {
     this.getCustomerList()
     this.getDictType()
   },
+  mounted() {
+    window.addEventListener("scroll",this.scrolling)
+  },
+  beforeDestroy() {
+    window.removeEventListener("scroll", this.scrolling);
+  },
   methods:{
+    scrolling() {
+      let e1 = document.getElementById("tables").offsetTop
+      let e2 = document.getElementsByClassName("navbar")[0].getBoundingClientRect().height
+      let mheight = e1+e2 +2
+      let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
+      let scrollTop = document.documentElement.scrollTop ||document.body.scrollTop;
+      if (scrollTop>mheight){
+        let top = scrollTop-mheight
+        el.style.top = top+'px'
+      }else{
+        el.style.top = 0
+      }
+    },
     sq1(item,sq){
       this.$nextTick(()=>{
         item.sq1 = sq

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

 <template>
   <div class="Tables">
     <div class="table-item">
-      <el-table v-if="tableDataTotal>0"
+      <el-table v-if="tableDataTotal>0" class="fixed-table"
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"

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

@@ -12,7 +12,7 @@
           <div class="p2">抱歉，你还未添加相关数据，快去添加吧</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds == false">新增联系人</div>
         </div>
-        <el-table v-else
+        <el-table class="fixed-table" v-else
           :data="tableData"
           stripe border
           style="width: 100%"

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

@@ -22,7 +22,7 @@
           <div class="p2">建议调整关键词或添加相关企业，重新搜索</div>
           <div class="btn btn_primary h36 w102" @click="opennew" v-if="isDisableds==false">新增相关企业</div>
         </div>
-        <el-table  v-else-if="!isSkeleton"
+        <el-table  v-else-if="!isSkeleton" class="fixed-table"
           :data="tableData.rows"
           style="width: 100%"
           :default-sort = "{prop: 'depth', order: 'descending'}"

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

@@ -80,7 +80,7 @@
             上传文档
           </el-upload></div>
         </div>
-        <el-table  v-else-if="!isSkeleton"
+        <el-table  v-else-if="!isSkeleton" class="fixed-table"
           :data="fileDatas.rows"
           style="width: 100%"
           :default-sort = "{prop: 'creatTime', order: 'descending'}"