From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/TableLayout.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 4957763..2aaed18 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -1,5 +1,5 @@
<template>
- <div class="table-layout">
+ <div class="table-layout" >
<!-- 澶撮儴 -->
<!-- <div v-if="withBreadcrumb" class="table-header">
<el-breadcrumb separator="/">
@@ -9,7 +9,7 @@
<!-- <div style="height:10px;"></div> -->
<Profile :roles="roles" :permissions="permissions">
<!-- 鎼滅储琛ㄥ崟閮ㄥ垎 -->
- <div class="table-search-form">
+ <div class="table-search-form" ref="tableSearchForm">
<div class="form-wrap">
<slot name="search-form"></slot>
</div>
@@ -56,8 +56,21 @@
<style lang="scss">
@import "@/assets/style/variables.scss";
+/*.el-container .el-main[data-v-5b01577c] {
+ width: 100%;
+ height: calc(100vh - 68px);
+ padding: 0;
+ position: relative;
+ display: flex
+;
+ flex-direction: column;
+ overflow-y: scroll;
+ overflow-x: hidden;
+ scrollbar-width: none;
+ -ms-overflow-style: none;
+}*/
.table-layout {
- height: 100%;
+ height: calc(100%-10px);
display: flex;
flex-direction: column;
margin-top: 10px;
@@ -124,6 +137,8 @@
}
// 琛ㄦ牸
.el-table {
+ //min-height: 300px;
+ overflow: auto;
th {
.cell {
color: #666;
@@ -157,17 +172,17 @@
}
// 鍒嗛〉
.table-pagination {
- margin-left: -16px;
+ margin-left: -18px;
padding: 16px 0px 16px 25px;
text-align: left;
display: block;
z-index: 100;
width: -webkit-fill-available;
/* width: 80%; */
- /* position: fixed;
- bottom: 30px;
+ position: fixed;
+ bottom: 25px;
background-color: white;
- margin-right: 50px; */
+ margin-right: 50px;
}
}
}
--
Gitblit v1.9.3