diff --git a/public/notice.svg b/public/notice.svg index 543a225..d772a90 100644 --- a/public/notice.svg +++ b/public/notice.svg @@ -1,18 +1,16 @@ - - 警示 - - - - - - - - - - - - + + 形状 + + + + + + + + + + diff --git a/src/assets/icons/notice.svg b/src/assets/icons/notice.svg index 543a225..d772a90 100644 --- a/src/assets/icons/notice.svg +++ b/src/assets/icons/notice.svg @@ -1,18 +1,16 @@ - - 警示 - - - - - - - - - - - - + + 形状 + + + + + + + + + + diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index 230aa94..2fe0e94 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -527,7 +527,7 @@ function setBatch(value, isUpdate?) { } defineExpose({ - showModal, + showModal,closeModal }) const notPassModalRef = ref(null) diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index fdf19e7..71b2bcb 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -169,14 +169,16 @@ const quillModalRef = ref(null) const mousetrap = inject('mousetrap') as any function handleKeydown(){ + const modal = unref(quillModalRef)! as any modal.closeModal() const modal1 = unref(shortcutModal)! as any modal1.closeModal() - const modal2 = unref(recycleModalRef)! as any + const modal3 = unref(SearchModalRef)! as any + modal3.closeModal() + const modal2 = unref(recycleModalRef)! as any modal2.closeModal() - const modal3 = unref(SearchModalRef)! as any - modal3.closeModal() + } onMounted(() => { getMessage() diff --git a/src/views/login/components/Forget.vue b/src/views/login/components/Forget.vue index 77d88d1..76a5f60 100644 --- a/src/views/login/components/Forget.vue +++ b/src/views/login/components/Forget.vue @@ -291,6 +291,7 @@ function forget() { class="item-input" placeholder="请输入企业编码" maxlength="20" + clearable > + @@ -530,6 +534,8 @@ function forget() { // 样式适配 ::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) { color: #c9c9c9; + width: 20px; + height: 20px; } ::v-deep(.n-input .n-input__input-el) { height: 2.75rem !important; diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index e814082..ee5773f 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -418,8 +418,8 @@ function forget() { -
-
+
+
记住账号 @@ -513,7 +513,7 @@ function forget() { -
+
记住账号 @@ -608,6 +608,7 @@ function forget() { border-radius: 4px; // margin-bottom: 1rem; font-size: 1rem; + } .btn { @@ -635,6 +636,7 @@ function forget() { font-family: PingFang SC, PingFang SC-Regular; font-weight: Regular; color: #507afd; + margin-right: -0.7rem; } .code { @@ -660,7 +662,7 @@ function forget() { font-weight: Regular; text-align: center; color: #999999; - line-height: 1rem; + } ::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) { color: #c9c9c9; @@ -683,4 +685,15 @@ function forget() { min-height: 0 !important; // margin-bottom: .5rem; } +::v-deep(.n-input__prefix){ + margin-right: 12px !important; +} +::v-deep(.n-button__content){ + font-size: 16px !important; +} +::v-deep(.n-base-icon svg){ +color: #999999; +width: 1.1rem; +height: 1.1rem; +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6d3e13b..7f6a3cf 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -91,9 +91,13 @@ function close() {
- + - + + + + +
diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 935ba97..d9aeef9 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -785,7 +785,7 @@ function cancel() { />