From a197bccfbaffc654e00648aec7d9cea4bf80afc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com> Date: Fri, 7 Apr 2023 17:09:02 +0800 Subject: [PATCH] =?UTF-8?q?css=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/fonts/font.scss | 8 +- src/components/AMap/AMap.scss | 12 +- src/components/FilesUpload/FilesUplaod.scss | 138 +++++++----------- src/components/FilesUpload/Page.scss | 1 - src/components/Map/index.vue | 26 ++-- src/components/SelectIcon/index.scss | 2 +- src/components/Steps/steps-item.scss | 20 +-- src/components/Steps/steps.scss | 2 +- src/layouts/LayoutClassic/index.scss | 8 +- src/layouts/components/Main/index.scss | 2 +- src/styles/common.scss | 12 +- src/styles/element.scss | 37 +++-- .../company/components/unit-table.scss | 43 ++---- src/views/login/CompanyLogon/basic-form.scss | 32 ++-- src/views/login/CompanyLogon/index.scss | 38 +++-- src/views/login/CompanyLogon/registered.scss | 20 +-- src/views/login/CompanyLogon/unit-table.scss | 43 ++---- src/views/login/index.scss | 16 +- .../supervision/ProjectSupervision/annex.scss | 7 +- .../supervision/ProjectSupervision/duty.scss | 6 +- .../ProjectSupervision/dutyForm.scss | 22 ++- .../supervision/ProjectSupervision/index.scss | 6 +- .../ProjectSupervision/overview.scss | 58 +++----- 23 files changed, 229 insertions(+), 330 deletions(-) diff --git a/src/assets/fonts/font.scss b/src/assets/fonts/font.scss index 83771b7..1f03d6a 100644 --- a/src/assets/fonts/font.scss +++ b/src/assets/fonts/font.scss @@ -1,11 +1,13 @@ @font-face { - font-family: "siyuan"; - src: url("./SourceHanSansCN-Regular.otf"); + font-family: siyuan; + font-style: normal; + // src: url("./"); font-weight: normal; - font-style: normal; + src: url("./SourceHanSansCN-Regular.otf"); font-display: auto; } + // @font-face { // font-family: SourceHanSansCN-Regular_0; // src: url("./SourceHanSansCN-Regular_0.otf"); diff --git a/src/components/AMap/AMap.scss b/src/components/AMap/AMap.scss index 6f2763e..4802eda 100644 --- a/src/components/AMap/AMap.scss +++ b/src/components/AMap/AMap.scss @@ -1,24 +1,20 @@ $primary: #409eff; - .map-dialog { .header { h4 { font-size: 1em; font-weight: 600; } - .search-container { display: flex; align-items: center; - // justify-content: start; + // justify-content: start; .search-item { display: flex; - &:not(:first-child) { margin-left: 20px; } - .search, .address, .lon, @@ -26,15 +22,13 @@ $primary: #409eff; display: flex; align-items: center; margin-left: 5px; - > span { flex-shrink: 0; font-size: 13px; - color: #666; + color: #666666; } } } - .btn-search, .btn-submit { margin-left: 10px; @@ -44,7 +38,6 @@ $primary: #409eff; @media screen and (max-width: 720px) { .search-container { display: block; - .search-item { &:not(:first-child) { margin-top: 15px; @@ -54,7 +47,6 @@ $primary: #409eff; } } } - .map { height: 60vh; } diff --git a/src/components/FilesUpload/FilesUplaod.scss b/src/components/FilesUpload/FilesUplaod.scss index 03444bd..c76f02c 100644 --- a/src/components/FilesUpload/FilesUplaod.scss +++ b/src/components/FilesUpload/FilesUplaod.scss @@ -1,53 +1,46 @@ $primary: #008bff; - .files-uplaod { - display: flex; position: absolute; inset: 0; - left: 0; top: 0; right: 0; bottom: 0; - border-radius: 8px; + left: 0; + display: flex; overflow: hidden; + border-radius: 8px; } - .header { position: relative; display: flex; flex-shrink: 0; - justify-content: space-between; align-items: flex-end; - font-size: 14px; + justify-content: space-between; height: 45px; - color: #333333; padding-bottom: 10px; + font-size: 14px; + color: #333333; border-bottom: 1px solid #eff0f3; } - .header > p { - padding: 0 10px; display: flex; align-items: center; - color: #606266; + padding: 0 10px; margin-bottom: 0; line-height: 0; + color: #606266; } - .info, .error { margin-right: 4px; font-size: 18px; } - .info { color: $primary; } - .error { color: #c45656; } - .close { position: absolute; right: 15px; @@ -56,49 +49,44 @@ $primary: #008bff; color: #a8abb2; cursor: pointer; } - .upload-side { + flex-basis: 1; + flex-grow: 0; + flex-shrink: 0; width: 30%; - background-color: #eff0f3; color: #333333; user-select: none; - -webkit-user-select: none; - -moz-user-select: none; - flex-basis: 1; - flex-shrink: 0; - flex-grow: 0; + user-select: none; + user-select: none; + background-color: #eff0f3; } - .upload-area { flex-basis: 0; - flex-shrink: 0; flex-grow: 1; + flex-shrink: 0; } - .upload-title { - margin-top: 40px; - margin-bottom: 10px; display: flex; align-items: center; justify-content: center; - font-size: 24px; height: 40px; + margin-top: 40px; + margin-bottom: 10px; + font-size: 24px; font-weight: 400; } - .upload-title::before { - content: ""; - margin-right: 6px; + box-sizing: border-box; width: 22px; height: 22px; - border: 2px solid $primary; - box-sizing: border-box; - border-radius: 50%; - background-clip: content-box; + margin-right: 6px; + content: ""; background: linear-gradient($primary, $primary) no-repeat center / 14px 2px, linear-gradient($primary, $primary) no-repeat center / 2px 14px; + background-clip: content-box; + border: 2px solid $primary; + border-radius: 50%; } - .options-item { display: flex; align-items: center; @@ -106,151 +94,131 @@ $primary: #008bff; font-size: 14px; cursor: pointer; } - .options-item::before { - content: ""; - margin-left: 30px; - margin-right: 6px; + box-sizing: border-box; width: 14px; height: 14px; - box-sizing: border-box; - border-radius: 50%; + margin-right: 6px; + margin-left: 30px; + content: ""; border: 1px solid #aeaeae; + border-radius: 50%; } - .options-item:hover { background-color: #dcdde0; } - .options-item:hover::before { border: 1px solid $primary; box-shadow: inset 0 0 0 3px $primary; } - .options-item.active { background-color: #dcdde0; } - .options-item.active::before { border: 1px solid $primary; box-shadow: inset 0 0 0 3px $primary; } - .upload-area { display: flex; flex-direction: column; height: 100%; } - .upload-list { - padding: 10px; - padding-bottom: 0; flex: 1; height: calc(100% - 50px - 56px - 20px); + padding: 10px; + padding-bottom: 0; + user-select: none; + user-select: none; user-select: none; - -webkit-user-select: none; - -moz-user-select: none; } - .upload-footer { display: flex; flex-shrink: 0; + align-items: center; justify-content: space-between; - align-items: center; - padding: 0 10px; height: 50px; + padding: 0 10px; } - .file-info { - margin-right: 10px; - flex: 1; display: flex; - height: inherit; + flex: 1; align-items: center; - color: #333333; + height: inherit; + margin-right: 10px; font-size: 12px; + color: #333333; } - .size, .uploaded { - width: 45px; flex-shrink: 0; - white-space: nowrap; - text-overflow: ellipsis; + width: 45px; overflow: hidden; text-align: center; + text-overflow: ellipsis; + white-space: nowrap; } - .uploaded { + width: 110px; opacity: 0; transition: opacity 0.2s; - width: 110px; } - .uploaded.active { opacity: 1; } - .progress { - margin: 0 4px; flex: 1; height: 8px; - border-radius: 8px; + margin: 0 4px; background-color: #aeaeae; background-image: linear-gradient(to right, $primary var(--progress), #aeaeae var(--progress)); + border-radius: 8px; } - .success, .uploading, .remove { font-size: 16px; - cursor: pointer; color: #a8abb2; + cursor: pointer; } - .pictures { display: flex; - align-items: flex-start; flex-wrap: wrap; + align-items: flex-start; height: 100%; overflow: auto; } - .picture { position: relative; - margin: 4px 8px 4px 0; - padding: 4px; + flex-shrink: 0; width: 130px; height: 110px; - flex-shrink: 0; + padding: 4px; + margin: 4px 8px 4px 0; background-color: #eff0f3; } - .picture { .success, .uploading, .remove { position: absolute; - right: -6px; top: -6px; + right: -6px; } } - .image { display: block; width: 100%; height: 64px; object-fit: cover; } - .image-info { font-size: 12px; } - .image-info > p { - margin: 5px 0; width: 100%; - text-overflow: ellipsis; + margin: 5px 0; overflow-x: hidden; + text-overflow: ellipsis; white-space: nowrap; } diff --git a/src/components/FilesUpload/Page.scss b/src/components/FilesUpload/Page.scss index 84ea0de..2d5a72e 100644 --- a/src/components/FilesUpload/Page.scss +++ b/src/components/FilesUpload/Page.scss @@ -3,7 +3,6 @@ min-height: 100vh; transform: scale(1); } - .show-btn { position: fixed; bottom: 20px; diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue index 1bd1ae8..27d76ec 100644 --- a/src/components/Map/index.vue +++ b/src/components/Map/index.vue @@ -1,7 +1,7 @@