From f7452b9d6295748c9840245d26df6514e8ed2c1d Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sun, 08 Sep 2024 15:30:00 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/index.less | 581 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 566 insertions(+), 15 deletions(-)
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index a8eb467..38205be 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -57,6 +57,7 @@
width: 100%;
border-color: #E5E6EB;
+ margin-bottom: 20px;
&-title {
color: #86909C;
@@ -72,9 +73,9 @@
}
&-personRemark {
- color: rgb(26, 111, 184);
+ color: #879AAB;
+ background-color: #EDEEF0;
padding: 0px 8px;
- border: 1px solid rgb(26, 111, 184);
border-radius: 4px;
font-size: 14px;
margin-left: 8px;
@@ -84,19 +85,37 @@
}
&-file {
- width: 12px;
+ width: 14px;
+ height: 14px;
margin-right: 4px;
- margin-top: -5px;
+ margin-top: 4px;
+ }
+
+ &-register {
+ width: 12px;
+ margin-left: 4px;
+ }
+
+ &-downUp {
+ width: 24px
}
}
.dataSync {
+ position: relative;
+
&-page {
background-color: #fff;
- margin: 8px 8px 0px 16px;
+ margin: 0px 8px 0px 16px;
padding: 12px 16px 16px 16px;
- height: calc(100vh - 211px);
+ height: calc(100vh - 228px);
overflow-y: scroll;
+ }
+
+ &-noScrollPage {
+ background-color: #fff;
+ margin: 0px 16px 0px 16px;
+ padding: 12px 16px 16px 16px;
}
&-addBtn {
@@ -124,6 +143,26 @@
box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.25);
z-index: 1;
}
+
+ &-hasTabPage {
+ background-color: #fff;
+ margin: 8px 16px 0px 16px;
+ padding: 12px 16px 64px 16px;
+
+ .arco-tabs-header-nav {
+ margin-left: 0 !important;
+ }
+ }
+
+ &-noBackTabPage {
+ margin: 0 16px 0px 16px;
+ height: calc(100vh - 219px);
+
+ .whiteBox {
+ background-color: #fff;
+ padding: 12px;
+ }
+ }
}
.applyDialog {
@@ -131,14 +170,14 @@
margin-bottom: 8px;
padding-left: 8px;
}
+}
- .dialogTag {
- line-height: 22px;
- padding: 0 8px;
- border-radius: 4px;
- margin-top: 4px;
- color: #fff;
- }
+.dialogTag {
+ line-height: 22px;
+ padding: 0 8px;
+ border-radius: 4px;
+ margin-top: 4px;
+ color: #fff;
}
.visitTableClass {
@@ -170,7 +209,7 @@
.arco-upload-list-type-text .arco-upload-list-item:first-of-type,
.arco-upload-list-type-picture-list .arco-upload-list-item:first-of-type {
- margin-top: 34px;
+ // margin-top: 34px;
}
@@ -206,7 +245,8 @@
padding: 0px 4px;
border-radius: 2px;
margin-left: 8px;
- }
+}
+
.mapPopconfirm {
width: 300px;
min-height: 90px;
@@ -247,6 +287,8 @@
color: #1A6FB8;
}
+ .mapVicinityIcon {}
+
.mapVicinityIcon {
background: url('../../assets/images/icon/selectIcon.png') no-repeat center center;
width: 14px;
@@ -255,3 +297,512 @@
border: 1px dashed #1A6FB8;
}
}
+
+.steps {
+ background-color: rgb(255, 255, 255);
+ margin: 0px 16px;
+ padding-top: 16px;
+ padding-left: 75px;
+}
+
+.container {
+ background-color: rgb(242, 243, 245);
+ height: calc(-293px + 100vh);
+ overflow-y: scroll;
+
+ &-top {
+ background-color: #fff;
+ margin: 8px 8px 8px 16px;
+ padding: 12px 0px 12px 16px;
+
+ }
+
+ &-bottom {
+ display: flex;
+ flex-direction: row;
+ column-gap: 8px;
+ margin: 0px 8px 0 16px;
+
+
+ &-left {
+ flex: 3 1 0%;
+ background-color: rgb(255, 255, 255);
+ padding: 12px 0px 12px 16px;
+
+ &-record {
+ border: 1px solid #D9D9D9;
+ border-radius: 8px;
+ margin-right: 16px;
+ margin-top: 8px;
+
+ &-top {
+ padding: 12px;
+ display: flex;
+ align-items: center;
+ background-color: #FAFAFA;
+ border-radius: 8px;
+ position: relative;
+
+
+ &-icon {
+ width: 12px;
+ height: 12px;
+ margin-right: 12px;
+ }
+
+ &-edit {
+ position: absolute;
+ right: 25px;
+ top: 15px;
+ width: 18px;
+ cursor: pointer;
+ }
+
+ &-remark {
+ border: 1px solid #FFD591;
+ padding: 0px 8px;
+ color: #FA8C16;
+ background-color: #FFF7E6;
+ border-radius: 4px;
+ margin-left: 8px;
+ }
+
+ &-hostOrg {
+ border: 1px solid #89C2E3;
+ padding: 0px 8px;
+ color: #1A6FB8;
+ background-color: #E8F8FF;
+ border-radius: 4px;
+ margin-left: 8px;
+
+ }
+ }
+
+ &-bottom {
+ margin: 16px 12px;
+
+ &-table {
+ border: 1px solid #d9d9d9;
+ width: 100%;
+ }
+ }
+ }
+ }
+
+ &-right {
+ flex: 1 1 0%;
+ background-color: rgb(255, 255, 255);
+ }
+ }
+}
+
+.Form {
+ padding: 12px 16px 16px 16px;
+ border: 1px dashed #1a6fb8;
+ border-radius: 10px;
+ margin-top: 16px;
+ margin-right: 16px;
+}
+
+.tabs-container {
+ .arco-tabs-header {
+ position: relative;
+ display: inline-block;
+ transition: transform .2s cubic-bezier(.34, .69, .1, 1);
+ white-space: nowrap;
+ transform: translateX(0px);
+ width: 300px;
+ flex: 1;
+ display: flex;
+ justify-content: space-evenly;
+ }
+
+ .arco-tabs-header-ink {
+ left: 83.988px;
+ width: 82px;
+ }
+}
+
+.progress {
+ margin: 16px 0px 0px 16px;
+}
+
+.myTabContent {
+ .arco-tabs-header-nav {
+ margin-left: 16px
+ }
+
+ .arco-tabs-header-nav-line.arco-tabs-header-nav-horizontal>.arco-tabs-header-scroll .arco-tabs-header-title:first-of-type {
+ margin-left: 0;
+ }
+
+ .arco-tabs-header-nav-line .arco-tabs-header-title {
+ margin: 0 16px 0 0;
+ }
+}
+
+.caseResult {
+ &-title {
+ padding-top: 4px;
+ margin-bottom: 8px;
+ }
+
+ &-tabs {
+ display: flex;
+ margin-bottom: 18px;
+ }
+
+ &-tips {
+ padding: 9px 16px;
+ background-color: #E8F3FF;
+ border-radius: 2px;
+ margin-top: 8px;
+ }
+
+ &-textarea {
+ border: 1px solid #1a6fb8;
+ border-radius: 2px;
+ padding: 0px 8px;
+ color: #1A6FB8;
+ width: fit-content;
+ margin: 4px 0px 8px 0px;
+ }
+}
+
+.tabs1 {
+ display: flex;
+ gap: 8px;
+ margin-bottom: 8px;
+}
+
+.MyDrawer {
+ position: absolute;
+ z-index: 9999;
+}
+
+.myTag {
+ border: 1px solid rgb(229, 230, 235);
+ border-radius: 2px;
+ display: inline-block;
+ padding: 3px 6px;
+ cursor: pointer;
+
+ &:hover {
+ border: 1px solid #1A6FB8;
+ color: #1A6FB8;
+ }
+}
+
+.gap {
+ height: 8px;
+ background-color: #F2F3F5;
+ margin: 16px -18px 0px -16px;
+}
+
+.reviewProgress {
+ .reviewCircle {
+ width: 14px;
+ height: 14px;
+ border: 2px solid #3491fa;
+ border-radius: 50%;
+ margin-top: 4px;
+ }
+
+ .reviewLine {
+ height: calc(100% - 19px);
+ width: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+
+ &::before {
+ content: '';
+ height: 100%;
+ width: 1px;
+ background-color: #e5e6eb;
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .deepTitle {
+ font-size: 14px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ text-align: LEFT;
+ color: #1d2129;
+ line-height: 22px;
+ }
+
+ .shallowTitle {
+ font-size: 14px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ text-align: LEFT;
+ color: #86909c;
+ line-height: 22px;
+ }
+}
+
+.Supervising {
+ background: #ffffff;
+ border: 1px solid #e5e6eb;
+ border-radius: 8px;
+ margin: 12px 16px 0px 16px;
+ padding: 12px 16px;
+
+ &-item {
+ display: flex;
+ margin-bottom: 4px;
+
+ &-file {
+ width: 16px;
+ height: 16px;
+ margin-top: 4px;
+ }
+
+ &-title {
+ color: #86909C;
+ }
+
+ }
+
+ &-info {
+ display: flex;
+
+ &-time {
+ margin-right: 8px;
+ }
+
+ &-detail {
+ color: #1A6FB8;
+ }
+ }
+
+ &-btn {
+ margin-top: 12px;
+ color: rgb(26, 111, 184);
+ border: 1px solid rgb(26, 111, 184);
+ background-color: rgb(255, 255, 255);
+ }
+
+}
+
+.modal {
+ display: flex;
+ justify-content: center;
+ margin-bottom: 24px;
+
+ &-mark {
+ color: rgb(26, 111, 184);
+ border: 1px solid rgb(26, 111, 184);
+ padding: 0px 8px;
+ margin-right: 8px;
+ border-radius: 4px;
+ }
+
+ &-title {
+ color: #1D2129;
+ font-size: 16px;
+ font-weight: 500;
+ }
+}
+
+.icon {
+
+ // width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px'
+ &-register {
+ width: 14px;
+ height: 14px;
+ margin-left: 8px;
+ margin-top: -2px;
+ }
+}
+
+.applyInfoClass {
+ width: 100%;
+ min-height: 82px;
+ background: #ffffff;
+ border-radius: 4px;
+ padding: 12px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ margin-bottom: 16px;
+ position: relative;
+
+ &-title {
+ display: flex;
+ align-items: center;
+
+ &-txt {
+ font-size: 16px;
+ font-family: PingFang SC, PingFang SC-400;
+ font-weight: 400;
+ text-align: LEFT;
+ color: #1d2129;
+ line-height: 24px;
+ margin-right: 8px;
+ }
+
+ &-tag {
+ &-1 {
+ height: 24px;
+ border: 1px solid #00b42a;
+ border-radius: 2px;
+ padding: 0 8px;
+ text-align: center;
+ color: #00b42a;
+ }
+
+ &-2 {
+ height: 24px;
+ border: 1px solid #3491FA;
+ border-radius: 2px;
+ padding: 0 8px;
+ text-align: center;
+ color: #3491FA;
+ }
+
+ &-3 {
+ height: 24px;
+ border: 1px solid #F53F3F;
+ border-radius: 2px;
+ padding: 0 8px;
+ text-align: center;
+ color: #F53F3F;
+ }
+ }
+ }
+
+ &-img {
+ position: absolute;
+ right: 16px;
+ cursor: pointer;
+ top: 28px;
+ z-index: 1;
+ }
+
+ .ant-row {
+ margin: 16px 0;
+ }
+}
+
+.auditView {
+ background: #ffffff;
+ margin: 0px 16px 8px 16px;
+ padding: 12px 0px 12px 16px;
+}
+
+.title {
+ display: flex;
+ align-items: center;
+ margin-bottom: 4px;
+
+}
+
+.gradient-box {
+ position: fixed;
+ right: 0;
+ top: 50%;
+ transform: translateY(-50%);
+ background: linear-gradient(to right, #6a1b9a, #e040fb);
+ display: flex;
+ align-items: center;
+ padding: 12px 8px;
+ border-radius: 12px 0px 0px 12px;
+}
+
+.aiBox {
+ flex: 1 1 0%;
+ background-color: rgb(242, 243, 245);
+ height: 100vh;
+ overflow-y: auto;
+
+ &-case {
+ display: flex;
+ margin: 16px;
+ gap: 10px;
+
+ &-logo {
+ width: 30px;
+ padding-top: 3px;
+
+ &-img {
+ width: 26px;
+ height: 26px;
+ }
+ }
+ }
+
+ &-list {
+
+ &-item {
+ display: flex;
+ background-color: #fff;
+ width: fit-content;
+ padding: 8px 12px;
+ border-radius: 8px;
+ margin-bottom: 8px;
+ margin-right: 16px;
+ align-items: center;
+
+
+ &-type {
+ border: 1px solid #1A6FB8;
+ padding: 0px 8px;
+ color: #1A6FB8;
+ border-radius: 4px;
+ width: 79px;
+ height: 24px;
+ }
+
+ &-name{
+ margin: 0px 16px 0px 8px;
+ max-width: 828px;
+ width: fit-content;
+ }
+
+ &-btn{
+ color: #1A6FB8;
+ width: 30px;
+ }
+ }
+ }
+}
+
+.marginLeft{
+ margin-left: 55px;
+
+
+ //fontWeight: '600', marginBottom: '16px'
+ &-title{
+ font-weight: 600;
+ margin-bottom: 16px;
+ }
+}
+
+.layerDetail{
+ margin-top: -8px;
+
+ &-title{
+ color: rgb(26, 111, 184);
+ margin-bottom: 16px;
+ }
+
+ &-name{
+ font-size: 16px;
+ margin-bottom: 16px;
+ max-width: 400px;
+ }
+
+ &-littleTitle{
+ margin-bottom: 16px;
+ }
+
+ &-content{
+ margin-bottom: 16px;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0