GuoYuFu123 5 years ago
parent
commit
22db0cdacd

+ 3 - 2
src/framework/layout/Main.vue

@@ -3,8 +3,9 @@
         <page-header></page-header>
         <page-header></page-header>
 
 
         <div id='page-container' class='page-container'>
         <div id='page-container' class='page-container'>
-            <page-sidebar></page-sidebar>
-
+            <el-scrollbar tag="div" wrapClass="content-scrollbar">
+                <page-sidebar></page-sidebar>
+            </el-scrollbar>
             <div id='page-content-wrapper' class='page-content-wrapper'>
             <div id='page-content-wrapper' class='page-content-wrapper'>
                 <div class='page-bar'>
                 <div class='page-bar'>
                     <el-breadcrumb separator='/'>
                     <el-breadcrumb separator='/'>

+ 3 - 2
src/framework/style/layout.scss

@@ -45,7 +45,7 @@ body {
 
 
         .page-sidebar-wrapper {
         .page-sidebar-wrapper {
             width: $pageSidebarWidth;
             width: $pageSidebarWidth;
-            overflow: hidden;
+            overflow: auto;
             flex-grow: 0;
             flex-grow: 0;
             flex-shrink: 0;
             flex-shrink: 0;
         }
         }
@@ -356,7 +356,8 @@ body {
 //     }
 //     }
 // }
 // }
 .content-scrollbar {
 .content-scrollbar {
-    height: calc(100vh - 108px);
+    height: calc(100vh - 33px);
+    background: #364150;
     .el-scrollbar__bar {
     .el-scrollbar__bar {
         &.is-vertical {
         &.is-vertical {
             display: none;
             display: none;

+ 4 - 1
src/views/data_admin/buildAssets/Noverify.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
     <div class='page-table-template' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
     <div class='page-table-template' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
         <div class="btn-box">
         <div class="btn-box">
-            <el-button type='danger' @click='someDel'>批量删除</el-button>
+            <el-button type='danger' @click='someDel' :disabled="!allChecked.length">批量删除</el-button>
         </div>
         </div>
         <div class='data-table'>
         <div class='data-table'>
             <el-table
             <el-table
@@ -10,6 +10,7 @@
             border            
             border            
             v-loading='loading'
             v-loading='loading'
             @selection-change='handleSelectionChange'
             @selection-change='handleSelectionChange'
+            height="600px"
         >
         >
             <el-table-column type='selection' width='55' align='center'></el-table-column>
             <el-table-column type='selection' width='55' align='center'></el-table-column>
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width='150'></el-table-column>、
             <el-table-column header-align='center' align='center' prop='BuildName' label='建筑' width='150'></el-table-column>、
@@ -317,5 +318,7 @@ export default {
 <style scoped lang='less'>
 <style scoped lang='less'>
 .btn-box {
 .btn-box {
     padding: 10px;
     padding: 10px;
+    display: flex;
+    justify-content: flex-end;
 }
 }
 </style>
 </style>

+ 2 - 0
src/views/data_admin/buildUser/index.vue

@@ -160,5 +160,7 @@ export default {
 <style scoped lang='less'>
 <style scoped lang='less'>
 .condition {
 .condition {
     margin: 10px;
     margin: 10px;
+    display: flex;
+    justify-content: space-between;
 }
 }
 </style>
 </style>