Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

ems-ui/src/components/Block/BlockTable/index.vue

@@ -2,14 +2,13 @@
   <block :title="title" :on-resize="onResize">
     <template v-slot:main>
       <el-table
-          :style="{width: '95%'  }"
+          :style="{width: '95%',maxHeight: '95%'  }"
           :data="tableData"
           style="width: 100%">
         <slot name="columns"></slot>
       </el-table>
     </template>
   </block>
-
 </template>
 
 <script>