From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/styles/public.less | 245 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 243 insertions(+), 2 deletions(-)
diff --git a/gz-customerSystem/src/styles/public.less b/gz-customerSystem/src/styles/public.less
index dd5b52c..c9929ba 100644
--- a/gz-customerSystem/src/styles/public.less
+++ b/gz-customerSystem/src/styles/public.less
@@ -1,8 +1,10 @@
@import './theme.less';
+
@font-face {
font-family: siYuanHeiTi;
src: url('../assets/font/SourceHanSansCN-Regular-2.otf');
}
+
@font-face {
font-family: AlibabaPuHuiTi;
src: url('../assets/font/Alibaba_PuHuiTi_2.0_55_Regular_85_Bold.ttf');
@@ -94,9 +96,11 @@
height: 8px;
background-color: #dfdfdf;
}
+
::-webkit-scrollbar-track {
background-color: @bg-color;
}
+
::-webkit-scrollbar-thumb {
border-radius: 8px;
background-color: #dfdfdf;
@@ -124,7 +128,7 @@
}
// table 标题不缩略
-.ant-table-thead > tr > th {
+.ant-table-thead>tr>th {
white-space: inherit;
}
@@ -250,11 +254,12 @@
.public-a-no {
cursor: no-drop;
- color: #d9d9d9;
+ color: #d9d9d9;
}
.public-span {
position: relative;
+
&::before {
content: '';
position: absolute;
@@ -505,6 +510,173 @@
}
}
+//来访登记当事人
+.public-personCard {
+ display: flex;
+ padding: 8px;
+
+ &-card {
+ position: relative;
+ width: 66px;
+ height: 66px;
+ border-radius: 10px;
+ font-size: 30px;
+ line-height: 66px;
+ text-align: center;
+ color: #ffffff;
+ margin-right: 16px;
+
+ &-blue {
+ background: @main-color;
+
+ .public-personCard-card-check,
+ .public-personCard-card-bottomRight {
+ color: #1890ff;
+ }
+ }
+
+ &-orange {
+ background: linear-gradient(135deg, #ff5500, rgba(255, 85, 0, 0.65) 100%);
+
+ .public-personCard-card-check,
+ .public-personCard-card-bottomRight {
+ color: #ff5500;
+ }
+ }
+
+ &:hover {
+ .public-personCard-card-check {
+ height: 32px;
+ }
+ }
+
+ &-check {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ font-size: 12px;
+ height: 0;
+ transition: height 0.5s;
+ line-height: 32px;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.9);
+ overflow: hidden;
+ }
+
+ &-bottomRight {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ background-color: rgba(255, 255, 255, 0.9);
+ overflow: hidden;
+ height: 18px;
+ font-size: 12px;
+ line-height: 14px;
+ border-top-left-radius: 10px;
+ padding: 2px 4px;
+ }
+ }
+
+ &-card-mini {
+ position: relative;
+ width: 24px;
+ height: 24px;
+ border-radius: 5px;
+ font-size: 12px;
+ line-height: 24px;
+ text-align: center;
+ color: #ffffff;
+
+ &-blue {
+ background: linear-gradient(138deg, #1890ff 0%, rgba(24, 144, 255, 0.75) 100%);
+
+ .public-personCard-card-check,
+ .public-personCard-card-bottomRight {
+ color: #1890ff;
+ }
+ }
+
+ &-orange {
+ background: linear-gradient(135deg, #ff5500, rgba(255, 85, 0, 0.65) 100%);
+
+ .public-personCard-card-check,
+ .public-personCard-card-bottomRight {
+ color: #ff5500;
+ }
+ }
+
+ &:hover {
+ .public-personCard-card-check {
+ height: 32px;
+ }
+ }
+
+ &-check {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ font-size: 12px;
+ height: 0;
+ transition: height 0.5s;
+ line-height: 32px;
+ text-align: center;
+ background-color: rgba(255, 255, 255, 0.9);
+ overflow: hidden;
+ }
+
+ &-bottomRight {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ background-color: rgba(255, 255, 255, 0.9);
+ overflow: hidden;
+ height: 18px;
+ font-size: 12px;
+ line-height: 14px;
+ border-top-left-radius: 10px;
+ padding: 2px 4px;
+ }
+ }
+
+ &-content {
+ flex: 1;
+ overflow: hidden;
+ }
+
+ &-title {
+ display: flex;
+ align-items: center;
+ }
+
+ &-tag {
+ font-size: 12px;
+ line-height: 20px;
+ border-radius: 2px;
+ padding: 0 4px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
+ &-blue {
+ background: #e6f7ff;
+ color: #1890ff;
+ border: 1px solid #91d5ff;
+ }
+
+ &-grey {
+ background: #fafafa;
+ color: rgba(0, 0, 0, 0.85);
+ border: 1px solid #d9d9d9;
+ }
+
+ &-orange {
+ background: #fff2e8;
+ color: #fa541c;
+ border: 1px solid #ffbb96;
+ }
+ }
+}
+
// 警告颜色
.public-danger {
color: @error-color;
@@ -575,3 +747,72 @@
color: #ffcf5c;
font-size: 22px;
}
+
+//字节弹窗
+.arco-modal {
+ border-radius: 0;
+ width: 900px;
+
+ .arco-modal-header {
+ padding: 0 16px;
+
+ .arco-modal-title {
+ text-align: left;
+ font-size: 16px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ color: #1d2129;
+ }
+ }
+
+ .arco-modal-content {
+ padding: 16px;
+ max-height: 700px;
+ }
+
+ .arco-modal-close-icon {
+ width: 20px;
+ height: 20px;
+ background: #86909C;
+ border-radius: 50%;
+ top: 14px;
+ right: 16px;
+
+ .arco-icon {
+ color: #fff;
+ width: 16px;
+ height: 16px;
+ left: 2px;
+ top: 2px;
+ }
+
+ &:hover {
+ .arco-icon {
+ color: #86909C;
+ }
+ }
+ }
+}
+
+//弹窗底部按钮
+.dialogFooter {
+ width: 100%;
+ margin-top: 16px;
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+
+ .dialogPrimary {
+ margin-right: 16px;
+ }
+
+ .dialogBack {}
+}
+
+.arco-btn-primary:not(.arco-btn-disabled) {
+ background-color: @main-color;
+
+ &:hover {
+ background-color: @main-color;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0