Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729

assets/scss/common.scss

@@ -144,7 +144,7 @@ a {
 
   & .router-tab__container {
     overflow-y: auto;
-    height: calc(100vh - 105px);
+    min-height: calc(100vh - 105px);
     max-height: calc(100vh - 105px);
     padding: 20px;
   }

mixin/global.js

@@ -58,7 +58,7 @@ export default {
 		layoutInit() {
 			if (this.$refs.searchFilter) {
 				const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
-				this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
+				this.$refs.contents.style.minHeight = `calc(100% - ${searchFilterHeight + 20}px)`;
 			}
 		},
 		//init() {}

pages/ems/base/EnrgReadPlaceMngPage.vue

@@ -25,7 +25,7 @@
 								:textCols="12" :searchOption="true" :customClass="'input-large'" :iconShow="true" />
 						</v-col>
 
-						<BtnSearch @click="search" size="large" />
+						<BtnSearch @click="search" size="large" class="mr-2" />
 
 					</v-row>
 				</v-card>

pages/ems/base/ReadObjectMngPage.vue

@@ -59,7 +59,8 @@
 							:btnActionsFnc="btnActions"
 						/>
 					</div>
-					<div ref="gridParent" class="h100 px-5" style="height:calc(100% - 70px)">
+					<div class="h100 px-5" style="height:calc(100% - 70px)">
+						<div ref="gridParent" class="w100 h100">
 							<component
 								:ref="gridName"
 								:is="loadGrid ? 'Grid' : null"
@@ -70,6 +71,7 @@
 								:selectedRowDataWatchFlag="true"
 							/>
 						</div>
+					</div>
 				</v-card>
 			</v-col>
 			<v-col :cols="7" class="h100">