From 9b74b477139659d69fcf321d160724aa1cd90ce0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:49:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/TableLayout.vue | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index d64e0ae..0ba9fbd 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -1,14 +1,15 @@
-<template>
- <div class="table-layout">
+ <template>
+ <div class="table-layout" >
<!-- 澶撮儴 -->
- <div v-if="withBreadcrumb" class="table-header">
+<!-- <div v-if="withBreadcrumb" class="table-header">
<el-breadcrumb separator="/">
<el-breadcrumb-item v-for="path in paths" :key="path">{{path}}</el-breadcrumb-item>
</el-breadcrumb>
- </div>
+ </div>-->
+ <!-- <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>
@@ -49,19 +50,39 @@
paths () {
return this.$route.meta.paths
}
+ },
+ mounted() {
+
}
}
</script>
<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;
.not-allow-wrap {
padding-top: 0;
}
+}
+.danger-column{
+ color: red;
}
// 澶撮儴
.table-header {
@@ -87,6 +108,7 @@
display: flex;
flex-wrap: wrap;
padding: 0 16px;
+ margin-bottom: 10px;
.form-wrap {
padding: 16px 16px 0 16px;
width: 100%;
@@ -103,10 +125,9 @@
}
// 鍒楄〃鍜屽垎椤�
.table-content {
- margin-top: 10px;
padding: 0 16px;
.table-wrap {
- padding: 16px 16px 0 16px;
+ padding: 16px 16px 60px 16px;
background: #fff;
// 宸ュ叿鏍�
.toolbar {
@@ -119,6 +140,8 @@
}
// 琛ㄦ牸
.el-table {
+ //min-height: 300px;
+ overflow: auto;
th {
.cell {
color: #666;
@@ -152,8 +175,17 @@
}
// 鍒嗛〉
.table-pagination {
- padding: 16px 0;
+ margin-left: 0px;
+ padding: 16px 0px;
text-align: left;
+ display: block;
+ z-index: 100;
+ width: -webkit-fill-available;
+ /* width: 80%; */
+ position: fixed;
+ bottom: 0px;
+ background-color: white;
+ margin-right: 50px;
}
}
}
--
Gitblit v1.9.3