@@ -2,7 +2,7 @@
<div class="basic-container"
:style="styleName"
:class="{'basic-container--block':block}">
- <el-card class="basic-container__card">
+ <el-card class="basic-container__card" :body-style="{'height':'100%','overflow':'auto','box-sizing':'border-box'}">
<slot></slot>
</el-card>
</div>
@@ -39,6 +39,7 @@ export default {
.basic-container {
padding: 10px 6px;
box-sizing: border-box;
+ height: 100%;
&--block {
height: 100%;
.basic-container__card {
@@ -47,6 +48,7 @@ export default {
}
&__card {
width: 100%;
&:first-child {
padding-top: 0;
@@ -23,7 +23,7 @@
</transition>
<!-- 主体视图层 -->
<div
- style="height:100%;overflow-y:auto;overflow-x:hidden;"
+ style="height:calc(100% - 30px);overflow-y:auto;overflow-x:hidden;"
id="avue-view"
v-show="!isSearch"
>
@@ -759,4 +759,10 @@ export default {
min-width: 100%;
display: inline-block;
+
+.boxswai{
+ box-sizing: border-box;
+ padding-bottom: 10px;
+}
</style>
@@ -1005,4 +1005,10 @@ export default {
.rightBox {
flex: 1;
@@ -1,5 +1,5 @@
<template>
- <basic-container class="h-basic-full">
+ <basic-container>
<div class="box-dashed flex jc-sb">
<div class="flex">
<div class="retain-box">
@@ -1,6 +1,6 @@
<basic-container>
- <div>
+ <div class="h-100p">
<el-tabs
v-model="activeType"
:before-leave="beforeLeave"
@@ -248,6 +248,7 @@
@onCheckAll="treeChang3"
:leftloading="logleftloading"
:rightloading="logrightloading"
+ scrollbarStyle="height:calc(100vh - 500px)"
></tree-tree>
</el-tab-pane>
@@ -303,7 +304,7 @@
<el-table
:data="contractUserList"
border
- max-height="440"
+ height="420"
style="width: 100%"
<el-table-column
@@ -13,7 +13,7 @@
></el-input>
<!-- <el-button type="info" class="mg-l-20">导入划分</el-button> -->
- <div style="position: relative; height: calc(100% - 65px);">
+ <div>
<el-scrollbar>
<div v-loading="treeLoad">
<el-tree
@@ -512,4 +512,10 @@ export default {
font-size: 18px;
color: rgba(119, 40, 245, 0.85);