From c19e349f8c93ff63b56fa550ab38d68d67c6905b Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 14 Aug 2024 11:29:49 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/basicInformation/organization/index.less | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/gz-customerSystem/src/views/basicInformation/organization/index.less b/gz-customerSystem/src/views/basicInformation/organization/index.less
index 2a12d91..5b8d9c6 100644
--- a/gz-customerSystem/src/views/basicInformation/organization/index.less
+++ b/gz-customerSystem/src/views/basicInformation/organization/index.less
@@ -22,7 +22,7 @@
&-tree {
flex: 1;
- overflow: hidden;
+ overflow: hidden;
}
}
@@ -57,6 +57,28 @@
}
.dataSync {
+ &-page {
+ background-color: #fff;
+ margin: 8px 8px 0px 16px;
+ padding: 12px 16px 16px 16px;
+ height: calc(100vh - 211px);
+ overflow-y: scroll;
+ }
+
+ &-addBtn {
+ // width: 150px;
+ // display: flex;
+ // justify-content: center;
+ cursor: pointer;
+ }
+
+ &-btnApply {
+ padding: 5px 12px;
+ display: flex;
+ justify-content: center;
+ cursor: pointer;
+ }
+
&-excel {
background-color: #fff;
position: absolute;
@@ -67,27 +89,27 @@
display: flex;
align-items: center;
justify-content: space-between;
- box-shadow: 4px 0px 5px 0px rgba(0, 0, 0, 0.25);
+ box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.25);
}
}
-.arco-form-label-item .arco-form-item-tooltip{
+.arco-form-label-item .arco-form-item-tooltip {
color: #1A6FB8;
}
//大厅来访
-.must{
+.must {
font-size: 12px;
- color: rgb(245, 63, 63);
- background-color: rgb(255, 236, 232);
- line-height: 20px;
- padding: 0px 4px;
- border-radius: 2px;
- margin-left: 8px;
+ color: rgb(245, 63, 63);
+ background-color: rgb(255, 236, 232);
+ line-height: 20px;
+ padding: 0px 4px;
+ border-radius: 2px;
+ margin-left: 8px;
}
-.arco-btn-primary:not(.arco-btn-disabled){
+.arco-btn-primary:not(.arco-btn-disabled) {
background-color: @main-color;
}
--
Gitblit v1.8.0