From 1af455f86443fdd6d99d8d71d0930e5603cfb55b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 26 Aug 2021 10:43:08 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-934=20style=EF=BC=9A=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/bottomBox.vue      |  9 +++++++--
 .../components/common/bottomBox/tabs/endpointQuery.vue |  3 ---
 .../src/components/common/table/nzDataList.vue         |  7 ++++---
 .../components/common/table/settings/projectTable.vue  |  1 -
 .../common/table/special/endpointQueryTab.vue          |  3 ++-
 .../src/components/page/monitor/project/index.vue      |  1 +
 .../components/page/monitor/project/projectList.vue    | 10 +++++++---
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
index 9e1b8efd3..16db2f492 100644
--- a/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
+++ b/nezha-fronted/src/components/common/bottomBox/bottomBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sub-box">
+  <div class="sub-box bottom-box">
     <div class="resize-modal">
       <div class="sub-list-resize-copy">一</div>
     </div>
@@ -410,6 +410,11 @@ export default {
   vertical-align: bottom;
   bottom: 0;
 }
-
+.bottom-box .sub-container{
+  height: calc(100% - 64px);
+}
+.bottom-box .sub-container .nz-table2{
+  height: calc(100% - 20px);
+}
 /* end--二级顶部工具栏*/
 </style>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index 11e1a5a16..6daae9895 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -222,7 +222,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-  /deep/ .sub-container {
-    box-sizing: border-box;
-  }
 </style>
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 1fdab0803..e0df9b95d 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -5,7 +5,7 @@
       <!-- 顶部工具栏 -->
       <div class="main-modal"></div>
       <div class="main-container">
-        <div v-show="bottomBox.mainResizeShow" :style="from === fromRoute.project ? 'padding-right: 5px' : ''" class="top-tools">
+        <div v-show="bottomBox.mainResizeShow" class="top-tools">
           <div class="top-tool-left" style="min-width: 300px">
             <slot name="top-tool-left"></slot>
           </div>
@@ -25,10 +25,10 @@
         <div v-if="showLayout.indexOf('clickSearch') > -1" class="search-box">
           <slot name="search"></slot>
         </div>
-        <div v-show="bottomBox.mainResizeShow" :style="from === fromRoute.project ? 'padding-right: 5px' : ''" class="nz-table2">
+        <div v-show="bottomBox.mainResizeShow" class="nz-table2">
           <slot v-bind:mainResizeShow="bottomBox.mainResizeShow"></slot>
         </div>
-        <div v-show="bottomBox.mainResizeShow" v-if="showLayout.indexOf('pagination') > -1" :style="from === fromRoute.project ? 'width: calc(100% - 15px);bottom: 18px' : ''" class="pagination-bottom">
+        <div v-show="bottomBox.mainResizeShow" v-if="showLayout.indexOf('pagination') > -1" class="pagination-bottom">
           <slot name="pagination"></slot>
         </div>
       </div>
@@ -44,6 +44,7 @@
           @update="updateCustomTableTitle"
         ></element-set>
       </transition>
+
     </div>
     <transition name="el-zoom-in-bottom">
       <bottom-box v-if="bottomBox.showSubList"
diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue
index 064e04667..53899669f 100644
--- a/nezha-fronted/src/components/common/table/settings/projectTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue
@@ -4,7 +4,6 @@
     ref="dataTable"
     :data="tableData"
     :height="height"
-    style="width: calc(100% - 25px)"
     border
     @header-dragend="dragend"
     @sort-change="tableDataSort"
diff --git a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
index 727e628c5..12f60cb1f 100644
--- a/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
+++ b/nezha-fronted/src/components/common/table/special/endpointQueryTab.vue
@@ -5,7 +5,7 @@
       ref="dataTable"
       :data="currentTableData"
       v-loading="loading"
-      :height="'100%'"
+      :height="'calc(100% - 48px)'"
       border
       @header-dragend="dragend"
       @selection-change="selectChange"
@@ -558,6 +558,7 @@ export default {
   .query-page-option{
     width: 100%;
     background: #fff;
+    margin-top: 10px;
   }
   /deep/ .pagination{
     padding-top: 0;
diff --git a/nezha-fronted/src/components/page/monitor/project/index.vue b/nezha-fronted/src/components/page/monitor/project/index.vue
index f37b1d3b0..341807bb0 100644
--- a/nezha-fronted/src/components/page/monitor/project/index.vue
+++ b/nezha-fronted/src/components/page/monitor/project/index.vue
@@ -53,6 +53,7 @@ export default {
   background: #f6f6f6;
   .projectList{
     flex: 1;
+    margin-right: 10px;
   }
   .projectTopo{
     flex: 1;
diff --git a/nezha-fronted/src/components/page/monitor/project/projectList.vue b/nezha-fronted/src/components/page/monitor/project/projectList.vue
index 167160662..8bbec1ce2 100644
--- a/nezha-fronted/src/components/page/monitor/project/projectList.vue
+++ b/nezha-fronted/src/components/page/monitor/project/projectList.vue
@@ -37,7 +37,7 @@
       </template>
       <template v-slot:pagination>
         <div class="project-page">
-          <Pagination ref="Pagination" :page-obj="pageObj" :table-id="tableId" style="width: calc(100% - 15px);padding-bottom: 6px;" @pageNo='pageNo'
+          <Pagination ref="Pagination" :page-obj="pageObj" :table-id="tableId" @pageNo='pageNo'
                       @pageSize='pageSize'></Pagination>
         </div>
       </template>
@@ -160,15 +160,19 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
   .project-list{
     .project-page{
       margin: 0 0 0 20px;
       border: 1px solid $--right-box-border-color;
       border-top: none;
       /deep/ .pagination{
-        padding-top: 0;
+        padding: 5px 0;
       }
     }
+    /deep/ .pagination-bottom{
+      width: calc(100% - 30px);
+      bottom: 18px;
+    }
   }
 </style>