From 225ff308a9a06cca35573940c051252835e1276f Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 15:18:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/App.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 778df71..681e786 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,7 @@
</script>
<style>
/* @import url("../static/img/alifont/iconfont.css"); */
-@import url("//at.alicdn.com/t/c/font_4179845_lomzsmcvwfg.css");
+@import url("//at.alicdn.com/t/c/font_4179845_jbljsur8ub.css");
* {
margin: 0;
@@ -105,6 +105,32 @@
border-radius: 6px;
}
+ /* el-tree-table鎶樺彔锛堝睍寮�銆佹敹缂╋級鍥炬爣瀹氫綅 */
+ .el-table [class*="el-table__row--level-1"] .el-table__expand-icon {
+ font-size: 18px;
+ font-weight: bold;
+ position: absolute;
+ right: -40px;
+ top: 16px;
+ z-index: 999;
+ }
+ .el-table [class*="el-table__row--level-2"] .el-table__expand-icon {
+ font-size: 18px;
+ font-weight: bold;
+ position: absolute;
+ right: -240px;
+ top: 16px;
+ z-index: 999;
+ }
+ .el-table [class*="el-table__row--level-3"] .el-table__expand-icon {
+ font-size: 18px;
+ font-weight: bold;
+ position: absolute;
+ right: -440px;
+ top: 16px;
+ z-index: 999;
+ }
+
table {
border-collapse: collapse;
}
@@ -120,6 +146,7 @@
/**婊氬姩鏉$殑瀹藉害*/
::-webkit-scrollbar {
width: 8px;
+ height: 8px;
}
::-webkit-scrollbar-thumb {
background-color: #bdbfc4;
@@ -164,7 +191,7 @@
border: 0;
}
/* 鍏ㄥ眬妯℃�佹鏍峰紡 */
-.el-dialog__header {
+.el-dialog__header,.el-message-box__header {
box-sizing: border-box;
height: 56px;
border-bottom: 1px solid rgb(238, 238, 238);
@@ -182,8 +209,24 @@
margin-left: 32px;
margin-right: 8.5px;
}
+
+.el-message-box__header::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 30.24px;
+ background: rgb(0, 95, 201);
+ border-radius: 10px;
+ margin-left: 20px;
+ margin-right: 8.5px;
+}
+
.el-dialog__header .el-dialog__title {
font-size: 16px !important;
+}
+
+.el-dialog__footer{
+ padding-right: 40px;
}
.el-dialog__footer .el-button * {
@@ -197,6 +240,17 @@
padding: 0 14px;
}
+.el-message-box__btns .el-button * {
+ font-size: 14px !important;
+}
+
+.el-message-box__btns .el-button{
+ height: 36px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 14px;
+}
+
.el-button--primary {
background: #004ea2;
}
--
Gitblit v1.9.3