From 1ed4250bc0f62becc1fe88b172944e8783021e50 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 9 Jan 2023 17:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/assets/less/common.less                 |  3 ---
 jero-web/src/mixins/header.js                        |  9 +++++++--
 .../components/listOfRegulations.vue                 | 12 +++++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less
index b8e04592a..8683c2b46 100644
--- a/jero-web/src/assets/less/common.less
+++ b/jero-web/src/assets/less/common.less
@@ -136,7 +136,4 @@
 }
 .ant-tooltip-arrow::before {
   background-color: #fff;
-}
-.customizetable .ant-table-thead > tr > th {
-  padding: 12px 8px;
 }
\ No newline at end of file
diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js
index 75982d9b0..701975eba 100644
--- a/jero-web/src/mixins/header.js
+++ b/jero-web/src/mixins/header.js
@@ -94,7 +94,7 @@ const ResizeHeaderOne = function(val, name) {
     // 处理多级表头
     col = getRenderCoL(key, val)
     let content = [].concat(children)
-    if (col) {
+    if (col ) {
       const handlerVNode = h(DragHandler, {
         props: {
           width: col.width,
@@ -106,10 +106,15 @@ const ResizeHeaderOne = function(val, name) {
         handlerVNode
       )
     }
+    console.log(restProps)
+    let className = ''
+    if ((restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan == 1) || (restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan > 0)){
+      className = ' second'
+    }
     return h('th', {
       key,
       props: { col },
-      ...Object.assign({}, restProps, { class: (restProps.class || '') + ' nio-header-th' })
+      ...Object.assign({}, restProps, { class:  (restProps.class || '') + ' nio-header-th' + className})
     }, content)
   }
 }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index cc31da797..fe26a1264 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2672,12 +2672,18 @@
     width: 100% !important;
   }
 
-  .tableList .ant-table-thead > tr > th {
-    padding: 0px 16px !important;
+  //.customizetable .ant-table-thead > tr > th {
+  //  height: 46px !important;
+    //padding: 8px 8px !important;
     //font-weight: bold;
     //background: #f3f6f6;
+  //}
+  .ant-table-row-cell-ellipsis{
+     padding: 0!important;
+  }
+  .second{
+    padding: 0!important;
   }
-
   //.tableList .ant-table-tbody > tr > td{
   //  color: #040B29 ;
   //}