guoxiangbin
/
ocr-web
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

fix:内容修改 #319

Merged
yaoshuli merged 1 commits from fix/change_task into test 1 year ago
Conversation 0 Commits 1 Files Changed 10
10 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File

26
public/notice.svg
Unescape View File

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>警示</title> <title>形状</title>
<defs> <g id="登录" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect id="path-1" x="0" y="0" width="64" height="64"></rect> <g id="登录_1.2未输入密码提示" transform="translate(-537.000000, -488.000000)" fill="#FF4E4F">
</defs> <g id="编组-11" transform="translate(510.000000, 165.000000)">
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="登录" transform="translate(0.000000, 44.000000)">
<g id="PrevailCloud-Design-图标集" transform="translate(-664.000000, -6389.000000)"> <g id="Group-10" transform="translate(27.000000, 276.000000)">
<g id="警示" transform="translate(664.000000, 6389.000000)"> <g id="警示" transform="translate(0.000000, 3.000000)">
<mask id="mask-2" fill="white"> <path d="M7,0.875 C3.61757813,0.875 0.875,3.61757813 0.875,7 C0.875,10.3824219 3.61757813,13.125 7,13.125 C10.3824219,13.125 13.125,10.3824219 13.125,7 C13.125,3.61757813 10.3824219,0.875 7,0.875 Z M6.5625,4.046875 C6.5625,3.98671875 6.61171875,3.9375 6.671875,3.9375 L7.328125,3.9375 C7.38828125,3.9375 7.4375,3.98671875 7.4375,4.046875 L7.4375,7.765625 C7.4375,7.82578125 7.38828125,7.875 7.328125,7.875 L6.671875,7.875 C6.61171875,7.875 6.5625,7.82578125 6.5625,7.765625 L6.5625,4.046875 Z M7,10.0625 C6.63769531,10.0625 6.34375,9.76855469 6.34375,9.40625 C6.34375,9.04394531 6.63769531,8.75 7,8.75 C7.36230469,8.75 7.65625,9.04394531 7.65625,9.40625 C7.65625,9.76855469 7.36230469,10.0625 7,10.0625 Z" id="形状"></path>
<use xlink:href="#path-1"></use> </g>
</mask> </g>
<g id="蒙版"></g> </g>
<path d="M32,4 C47.463973,4 60,16.536027 60,32 C60,47.463973 47.463973,60 32,60 C16.536027,60 4,47.463973 4,32 C4,16.536027 16.536027,4 32,4 Z M32,9 C19.2974508,9 9,19.2974508 9,32 C9,44.7025492 19.2974508,55 32,55 C44.7025492,55 55,44.7025492 55,32 C55,19.2974508 44.7025492,9 32,9 Z" id="形状结合" fill="#FF4E4F" mask="url(#mask-2)"></path>
<path d="M32,41.8150625 C33.5403559,41.8150625 34.7890611,43.0637676 34.7890611,44.6041236 C34.7890611,46.1444795 33.5403559,47.3931847 32,47.3931847 C30.4596441,47.3931847 29.2109389,46.1444795 29.2109389,44.6041236 C29.2109389,43.0637676 30.4596441,41.8150625 32,41.8150625 Z M33,16.6068153 C33.5522847,16.6068153 34,17.0545306 34,17.6068153 L34,36.7882606 C34,37.3405453 33.5522847,37.7882606 33,37.7882606 L31,37.7882606 C30.4477153,37.7882606 30,37.3405453 30,36.7882606 L30,17.6068153 C30,17.0545306 30.4477153,16.6068153 31,16.6068153 L33,16.6068153 Z" id="形状结合备份" fill="#FF4E4F" mask="url(#mask-2)"></path>
</g> </g>
</g> </g>
</g> </g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

26
src/assets/icons/notice.svg
Unescape View File

@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> <svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>警示</title> <title>形状</title>
<defs> <g id="登录" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<rect id="path-1" x="0" y="0" width="64" height="64"></rect> <g id="登录_1.2未输入密码提示" transform="translate(-537.000000, -488.000000)" fill="#FF4E4F">
</defs> <g id="编组-11" transform="translate(510.000000, 165.000000)">
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="登录" transform="translate(0.000000, 44.000000)">
<g id="PrevailCloud-Design-图标集" transform="translate(-664.000000, -6389.000000)"> <g id="Group-10" transform="translate(27.000000, 276.000000)">
<g id="警示" transform="translate(664.000000, 6389.000000)"> <g id="警示" transform="translate(0.000000, 3.000000)">
<mask id="mask-2" fill="white"> <path d="M7,0.875 C3.61757813,0.875 0.875,3.61757813 0.875,7 C0.875,10.3824219 3.61757813,13.125 7,13.125 C10.3824219,13.125 13.125,10.3824219 13.125,7 C13.125,3.61757813 10.3824219,0.875 7,0.875 Z M6.5625,4.046875 C6.5625,3.98671875 6.61171875,3.9375 6.671875,3.9375 L7.328125,3.9375 C7.38828125,3.9375 7.4375,3.98671875 7.4375,4.046875 L7.4375,7.765625 C7.4375,7.82578125 7.38828125,7.875 7.328125,7.875 L6.671875,7.875 C6.61171875,7.875 6.5625,7.82578125 6.5625,7.765625 L6.5625,4.046875 Z M7,10.0625 C6.63769531,10.0625 6.34375,9.76855469 6.34375,9.40625 C6.34375,9.04394531 6.63769531,8.75 7,8.75 C7.36230469,8.75 7.65625,9.04394531 7.65625,9.40625 C7.65625,9.76855469 7.36230469,10.0625 7,10.0625 Z" id="形状"></path>
<use xlink:href="#path-1"></use> </g>
</mask> </g>
<g id="蒙版"></g> </g>
<path d="M32,4 C47.463973,4 60,16.536027 60,32 C60,47.463973 47.463973,60 32,60 C16.536027,60 4,47.463973 4,32 C4,16.536027 16.536027,4 32,4 Z M32,9 C19.2974508,9 9,19.2974508 9,32 C9,44.7025492 19.2974508,55 32,55 C44.7025492,55 55,44.7025492 55,32 C55,19.2974508 44.7025492,9 32,9 Z" id="形状结合" fill="#FF4E4F" mask="url(#mask-2)"></path>
<path d="M32,41.8150625 C33.5403559,41.8150625 34.7890611,43.0637676 34.7890611,44.6041236 C34.7890611,46.1444795 33.5403559,47.3931847 32,47.3931847 C30.4596441,47.3931847 29.2109389,46.1444795 29.2109389,44.6041236 C29.2109389,43.0637676 30.4596441,41.8150625 32,41.8150625 Z M33,16.6068153 C33.5522847,16.6068153 34,17.0545306 34,17.6068153 L34,36.7882606 C34,37.3405453 33.5522847,37.7882606 33,37.7882606 L31,37.7882606 C30.4477153,37.7882606 30,37.3405453 30,36.7882606 L30,17.6068153 C30,17.0545306 30.4477153,16.6068153 31,16.6068153 L33,16.6068153 Z" id="形状结合备份" fill="#FF4E4F" mask="url(#mask-2)"></path>
</g> </g>
</g> </g>
</g> </g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
src/layout/components/Header/RecycleModal.vue
Unescape View File

@ -527,7 +527,7 @@ function setBatch(value, isUpdate?) {
} }
defineExpose({ defineExpose({
showModal, showModal,closeModal
}) })
const notPassModalRef = ref(null) const notPassModalRef = ref(null)

6
src/layout/components/Header/index.vue
Unescape View File

@ -169,14 +169,16 @@ const quillModalRef = ref(null)
const mousetrap = inject('mousetrap') as any const mousetrap = inject('mousetrap') as any
function handleKeydown(){ function handleKeydown(){
const modal = unref(quillModalRef)! as any const modal = unref(quillModalRef)! as any
modal.closeModal() modal.closeModal()
const modal1 = unref(shortcutModal)! as any const modal1 = unref(shortcutModal)! as any
modal1.closeModal() modal1.closeModal()
const modal2 = unref(recycleModalRef)! as any
modal2.closeModal()
const modal3 = unref(SearchModalRef)! as any const modal3 = unref(SearchModalRef)! as any
modal3.closeModal() modal3.closeModal()
const modal2 = unref(recycleModalRef)! as any
modal2.closeModal()
} }
onMounted(() => { onMounted(() => {
getMessage() getMessage()

6
src/views/login/components/Forget.vue
Unescape View File

@ -291,6 +291,7 @@ function forget() {
class="item-input" class="item-input"
placeholder="请输入企业编码" placeholder="请输入企业编码"
maxlength="20" maxlength="20"
clearable
> >
<template #prefix> <template #prefix>
<svg-icon size="20" name="enterprise" /> <svg-icon size="20" name="enterprise" />
@ -303,6 +304,7 @@ function forget() {
class="item-input" class="item-input"
placeholder="请输入用户名" placeholder="请输入用户名"
maxlength="16" maxlength="16"
clearable
> >
<template #prefix> <template #prefix>
<svg-icon size="20" name="account" /> <svg-icon size="20" name="account" />
@ -315,6 +317,7 @@ function forget() {
class="item-input" class="item-input"
placeholder="请输入手机号" placeholder="请输入手机号"
maxlength="11" maxlength="11"
clearable
> >
<template #prefix> <template #prefix>
<img <img
@ -324,6 +327,7 @@ function forget() {
@click="close" @click="close"
/> />
</template> </template>
</n-input> </n-input>
</n-form-item> </n-form-item>
<n-form-item class="form-item" path="phonecode"> <n-form-item class="form-item" path="phonecode">
@ -530,6 +534,8 @@ function forget() {
// 样式适配 // 样式适配
::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) { ::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) {
color: #c9c9c9; color: #c9c9c9;
width: 20px;
height: 20px;
} }
::v-deep(.n-input .n-input__input-el) { ::v-deep(.n-input .n-input__input-el) {
height: 2.75rem !important; height: 2.75rem !important;

21
src/views/login/components/Login.vue
Unescape View File

@ -418,8 +418,8 @@ function forget() {
</n-button> </n-button>
<!-- </n-form-item> --> <!-- </n-form-item> -->
<n-form-item class="default-color"> <n-form-item class="default-color">
<div class="flex justify-between w-full"> <div class="flex justify-between w-full" style="margin-top:14px">
<div class="flex-initial"> <div class="flex-initial" >
<n-checkbox v-model:checked="autoLogin"> <n-checkbox v-model:checked="autoLogin">
<span class="forgetSpan">记住账号</span> <span class="forgetSpan">记住账号</span>
</n-checkbox> </n-checkbox>
@ -513,7 +513,7 @@ function forget() {
</n-button> </n-button>
<!-- </n-form-item> --> <!-- </n-form-item> -->
<n-form-item class="default-color"> <n-form-item class="default-color">
<div class="flex justify-between w-full"> <div class="flex justify-between w-full" style="margin-top:14px">
<div class="flex-initial save-btn"> <div class="flex-initial save-btn">
<n-checkbox v-model:checked="autoLogin"> <n-checkbox v-model:checked="autoLogin">
<span class="forgetSpan">记住账号</span> <span class="forgetSpan">记住账号</span>
@ -608,6 +608,7 @@ function forget() {
border-radius: 4px; border-radius: 4px;
// margin-bottom: 1rem; // margin-bottom: 1rem;
font-size: 1rem; font-size: 1rem;
} }
.btn { .btn {
@ -635,6 +636,7 @@ function forget() {
font-family: PingFang SC, PingFang SC-Regular; font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular; font-weight: Regular;
color: #507afd; color: #507afd;
margin-right: -0.7rem;
} }
.code { .code {
@ -660,7 +662,7 @@ function forget() {
font-weight: Regular; font-weight: Regular;
text-align: center; text-align: center;
color: #999999; color: #999999;
line-height: 1rem;
} }
::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) { ::v-deep(.n-base-clear > .n-base-clear__clear > .n-base-icon > svg) {
color: #c9c9c9; color: #c9c9c9;
@ -683,4 +685,15 @@ function forget() {
min-height: 0 !important; min-height: 0 !important;
// margin-bottom: .5rem; // 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;
}
</style> </style>

8
src/views/login/index.vue
Unescape View File

@ -91,9 +91,13 @@ function close() {
</div> </div>
</div> </div>
</div> </div>
<n-modal v-model:show="show" :mask-closable="false"> <n-modal v-if="ifLogin" v-model:show="show" :mask-closable="false">
<Login v-if="ifLogin" @close="close" @forget="ifLogin = !ifLogin" /> <Login v-if="ifLogin" @close="close" @forget="ifLogin = !ifLogin" />
<Forget v-else @close="close" @forget="ifLogin = !ifLogin" />
</n-modal>
<n-modal v-if="!ifLogin" v-model:show="show" :mask-closable="false">
<Forget @close="close" @forget="ifLogin = !ifLogin" />
</n-modal> </n-modal>
<img class="item-footer" src="../../assets/images/login/footer.png" alt="" /> <img class="item-footer" src="../../assets/images/login/footer.png" alt="" />
</div> </div>

2
src/views/task/content/Content.vue
Unescape View File

@ -785,7 +785,7 @@ function cancel() {
/> />
<n-tooltip <n-tooltip
v-else v-else
placement="bottom" placement="top"
> >
<template #trigger> <template #trigger>
<SvgIcon <SvgIcon

4
src/views/task/modal/ImgDetailModal.vue
Unescape View File

@ -184,6 +184,7 @@ defineExpose({
<n-scrollbar style="max-height: 100%"> <n-scrollbar style="max-height: 100%">
<div <div
style=" style="
width: 380px;
font-size: 22px; font-size: 22px;
font-weight: 500; font-weight: 500;
color: #0d0b22; color: #0d0b22;
@ -337,7 +338,7 @@ defineExpose({
height: 0.5px; height: 0.5px;
width: 1200px; width: 1200px;
position: absolute; position: absolute;
top: 85px; top: 80px;
left: 0px; left: 0px;
} }
.bottomline{ .bottomline{
@ -497,6 +498,7 @@ padding-top: 24px;
height: 100%; height: 100%;
margin: 3px 0 8px 0; margin: 3px 0 8px 0;
max-width: 359px; max-width: 359px;
font-weight: 550;
} }
.tags { .tags {
padding-left: 22px; padding-left: 22px;

2
src/views/worksheet/content/Content.vue
Unescape View File

@ -675,7 +675,7 @@ defineExpose({
/> />
<n-tooltip <n-tooltip
v-else v-else
placement="bottom" placement="top"
> >
<template #trigger> <template #trigger>
<SvgIcon <SvgIcon

Write Preview
Loading…
Cancel
Save