Merge remote-tracking branch 'origin/master'

web/src/style/element_visiable.scss

@@ -57,6 +57,7 @@
 }
 
 .gva-search-box {
+    flex-shrink: 0;
     .el-collapse {
         border: none;
         .el-collapse-item__header,
@@ -89,9 +90,13 @@
 }
 
 .gva-table-box {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
     padding: 24px;
     background-color: #fff;
     border-radius: 2px;
+    overflow: hidden;
 }
 
 .gva-pagination {
@@ -218,4 +223,4 @@
 
 .el-select .el-input .el-select__caret.el-icon {
     height: 38px;
-}
+}
\ No newline at end of file

web/src/style/main.scss

@@ -645,6 +645,9 @@ li {
         min-height: 100%;
         margin-left: $width-aside;
         position: relative;
+        display: flex;
+        flex-direction: column;
+        overflow: hidden;
     }
     .hideside {
         .main-cont.el-main {
@@ -680,11 +683,19 @@ li {
         }
     }
 }
-
+.admin-box-content{
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
 .admin-box {
-    min-height: calc(100vh - 200px);
+    flex: 1;
     padding: 12px 16px;
-    margin: 100px 2px 20px;
+    margin: 0 2px 20px;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
     .el-table--border {
         border-radius: 4px;
         margin-bottom: 14px;
@@ -1218,8 +1229,10 @@ $mainHight: 100vh;
 }
 
 .gva-btn-list {
+    flex-shrink: 0;
     margin-bottom: 12px;
     display: flex;
+    overflow: hidden;
     .el-button+.el-button {
         margin-left: 12px;
     }
@@ -1227,4 +1240,4 @@ $mainHight: 100vh;
 
 .justify-content-flex-end {
     justify-content: flex-end;
-}
+}
\ No newline at end of file

web/src/view/layout/index.vue

@@ -79,7 +79,7 @@
           </div>
         </transition>
         <router-view v-if="reloadFlag" v-slot="{ Component }" v-loading="loadingFlag" element-loading-text="正在加载中" class="admin-box">
-          <div>
+          <div class="admin-box-content">
             <transition mode="out-in" name="el-fade-in-linear">
               <keep-alive :include="routerStore.keepAliveRouters">
                 <component :is="Component" />
@@ -88,7 +88,7 @@
           </div>
         </router-view>
         <BottomInfo />
-        <setting />
+        <!--<setting />-->
       </el-main>
     </el-container>
 

web/src/view/qshPartol/qshPartol.vue

@@ -32,7 +32,8 @@
         </div>
         <el-table
         ref="multipleTable"
-        style="width: 100%"
+        style="flex:1"
+        height="100%"
         tooltip-effect="dark"
         :data="tableData"
         row-key="ID"