From 0e818b766656ea54f516c1bb3b5987c985de80a9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 18 十月 2024 16:56:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/App.vue |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/App.vue b/Source/plt-web/plt-web-ui/src/App.vue
index 0664619..b83a1ca 100644
--- a/Source/plt-web/plt-web-ui/src/App.vue
+++ b/Source/plt-web/plt-web-ui/src/App.vue
@@ -50,6 +50,7 @@
 }
 .dialog-footer{
   background-color: #ffffff;
+  z-index: 10000;
 }
 .avue-crud .avue-form {
   margin: 0px auto !important; // 琛ㄦ牸鍐呯殑琛ㄥ崟锛堟瘮濡�:鎼滅储鏍忥級 鍙栨秷涓嬭竟璺�
@@ -58,13 +59,29 @@
   margin-bottom: 0;
 }
 .avue-crud .avue-crud__menu{
-  min-height: 32px;
+  min-height: 26px;
 }
 .avue-crud .avue-crud__menu .el-button{
   margin-bottom: 5px;
 }
+.avue-crud .avue-crud__menu .el-button--text{
+  padding: 2px 6px;
+}
+.avue-crud table td{
+  line-height: 22px;
+}
+.el-table .cell{
+  line-height: 22px;
+}
+.el-table .cell .el-tag{
+  line-height: 20px;
+  height: 22px;
+}
 .avue-crud__pagination{
   padding: 15px 0 10px;
+}
+.el-form .el-col{
+  margin-bottom: 0;
 }
 .UITabs > .el-tabs__content{
   height:calc(100% - 56px);
@@ -99,7 +116,7 @@
   margin-bottom: 15px;
 }
 .el-form-item--mini.el-form-item, .el-form-item--small.el-form-item{
-  margin-bottom: 10px;
+  margin-bottom: 15px;
 }
 
 .tree-buttons .el-button{
@@ -108,4 +125,21 @@
 .el-dialog__footer{
   border-top: 1px solid #e9e7e7;
 }
+/***鎸夐挳妗�****/
+.headerCon {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 5px;
+  .el-button {
+    min-width: 60px;
+    padding-left: 9.5px;
+    margin-left: 0;
+    margin-right: 5px;
+    margin-bottom: 5px;
+  }
+}
+/***闅愯棌鏍戞噿鍔犺浇鏃惰妭鐐逛笂鐨刲oading锛岄槻姝㈣妭鐐规姈鍔�*****/
+.el-tree .el-tree-node__loading-icon{
+  display: none !important;
+}
 </style>

--
Gitblit v1.9.3