diff --git a/src/assets/icons/magnifying-2.svg b/src/assets/icons/magnifying-2.svg index ae5e01c..9e57e6f 100644 --- a/src/assets/icons/magnifying-2.svg +++ b/src/assets/icons/magnifying-2.svg @@ -1 +1,22 @@ - \ No newline at end of file + + + 放大 + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/RichEditor/Quill.vue b/src/components/RichEditor/Quill.vue index 0e03ce6..f0a9d5b 100644 --- a/src/components/RichEditor/Quill.vue +++ b/src/components/RichEditor/Quill.vue @@ -10,7 +10,8 @@ const emit = defineEmits(['close']) const quillEditor = ref() const cardStyle = { - 'width': '500px', + 'width': '560px', + 'height': '397px', '--n-padding-bottom': '17px', '--n-padding-left': '24px', } @@ -22,6 +23,7 @@ const options = reactive({ toolbar: [ ['bold', 'italic', 'underline', 'strike'], // toggled buttons [{ align: '' }, { align: 'center' }, { align: 'right' }, { align: 'justify' }], + [{ 'color': [] },], ], }, theme: 'snow', @@ -64,7 +66,7 @@ const saveHandler = debounce(() => { ref="quillEditor" v-model:content="note" :options="options" - style="height: 350px" + style="height: 258px" class="quillEditor" content-type="html" @ready="initHandler" @@ -90,7 +92,7 @@ const saveHandler = debounce(() => { font-family: PingFang SC, PingFang SC-Medium; color: #333333; margin-bottom: 24px; - font-weight: 500; + font-weight: 550; } .ql-toolbar.ql-snow { @@ -101,9 +103,16 @@ const saveHandler = debounce(() => { margin-top: -10px; background: #f8f8f8; border: 1px solid #d8d8d8; + margin-top:-4px ; } .ql-container.ql-snow { border: 1px solid #d8d8d8; } +::v-deep(.n-card__content){ + padding-left:24px !important ; + padding-right:24px !important; + margin-top: -8px!important; + +} diff --git a/src/views/home/aside/Aside.vue b/src/views/home/aside/Aside.vue index 1f19857..d1f5dfe 100644 --- a/src/views/home/aside/Aside.vue +++ b/src/views/home/aside/Aside.vue @@ -436,4 +436,10 @@ useKeydown('s', () => setShowSearch(true)) width: 0px; } } +::v-deep(.n-form-item-label__text){ +color: #333333; +} +::v-deep(.n-form){ + margin-top: -2px; +} diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index 2fd9a38..34b22b9 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -267,7 +267,7 @@ defineExpose({
@@ -424,7 +424,7 @@ onMounted(() => { { :draggable="true" class="cursor-move draggable-li" > - + {{ item.name }} {
+
+ +
+ diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 315be96..86e3475 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -954,7 +954,7 @@ defineExpose({
@@ -1072,9 +1072,9 @@ defineExpose({ " > @@ -1084,7 +1084,7 @@ defineExpose({ class="avatar" round /> - {{ item.upname }} + {{ item.upname }} @@ -1215,8 +1215,8 @@ defineExpose({ } .avatar { - width: 20px; - height: 20px; + width: 15px; + height: 15px; margin-right: 5px; } } @@ -1296,6 +1296,7 @@ defineExpose({ background-color: #fff; border-radius: 6px; backdrop-filter: blur(10px); + } } diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue index 8ee497d..8330471 100644 --- a/src/views/home/content/modal/LoginSuccessModal.vue +++ b/src/views/home/content/modal/LoginSuccessModal.vue @@ -117,7 +117,7 @@ defineExpose({ background-image: url(../../../../assets/images/approval_modal_bg.png); background-repeat: no-repeat; background-size: 100%; - width: 510px; + width: 470px; height: 361px; box-shadow: none !important; margin-left: 30px !important; @@ -126,7 +126,7 @@ defineExpose({ position: absolute; left: calc(50% - 286px); .wrapper-hearder { - margin-top: 80px; + margin-top: 68px; margin-left: 18px; .wrapper-title { text-align: center; @@ -150,13 +150,13 @@ defineExpose({ .wrapper-content { flex: 1; border-radius: 8px; - margin: 24px 50px 16px 48px; + margin: 75px 50px 16px 48px; .flex_box { display: flex; flex-flow: row nowrap; align-items: center; justify-content: space-between; - margin: 58.5px 0 0 20px; + margin: -18.5px 0 0 20px; .item { .num_box { font-size: 20px; @@ -226,15 +226,14 @@ defineExpose({ width: 153px; height: 46px; background: linear-gradient(135deg, #3258e8, #786efc); - border: 1px solid; - border-image: linear-gradient(123deg, #d7dffe 2%, #d7d5ff 88%) 1 1; + border: 1px solid #d7d5ff; border-radius: 24px; box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3); cursor: pointer; margin: 20px auto 0; position: relative; - bottom: -35px; + bottom: -20px; left: 20px; font-size: 22px; @@ -243,8 +242,6 @@ defineExpose({ text-align: center; color: #ffffff; line-height: 46px; - - border: none; font-style: italic; } // .footer { diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index f835425..983bfc9 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -689,7 +689,7 @@ function forget() { margin-right: 12px !important; } ::v-deep(.n-button__content){ - font-size: 16px !important; + font-size: 15px !important; line-height: 20px; font-family: PingFang SC, PingFang SC-Medium; }