From 76d7d384741f5d1e7f2cd8564aba13974d983ee1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 18:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/layouts/TableLayout.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index d64e0ae..4957763 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -1,11 +1,12 @@
-<template>
+ <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">
@@ -59,9 +60,13 @@
height: 100%;
display: flex;
flex-direction: column;
+ margin-top: 10px;
.not-allow-wrap {
padding-top: 0;
}
+}
+.danger-column{
+ color: red;
}
// 澶撮儴
.table-header {
@@ -87,6 +92,7 @@
display: flex;
flex-wrap: wrap;
padding: 0 16px;
+ margin-bottom: 10px;
.form-wrap {
padding: 16px 16px 0 16px;
width: 100%;
@@ -103,10 +109,9 @@
}
// 鍒楄〃鍜屽垎椤�
.table-content {
- margin-top: 10px;
padding: 0 16px;
.table-wrap {
- padding: 16px 16px 0 16px;
+ padding: 16px 16px 60px 16px;
background: #fff;
// 宸ュ叿鏍�
.toolbar {
@@ -152,8 +157,17 @@
}
// 鍒嗛〉
.table-pagination {
- padding: 16px 0;
+ margin-left: -16px;
+ padding: 16px 0px 16px 25px;
text-align: left;
+ display: block;
+ z-index: 100;
+ width: -webkit-fill-available;
+ /* width: 80%; */
+ /* position: fixed;
+ bottom: 30px;
+ background-color: white;
+ margin-right: 50px; */
}
}
}
--
Gitblit v1.9.3