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

Merge pull request 'fix:样式修改' (#325) from fix/change_task into test

Browse Source 
Reviewed-on: #325
pull/326/head
yaoshuli 1 year ago
parent 753a542acc 348d90d94d
commit 4d6c0f00fb
18 changed files with 102 additions and 50 deletions
Show Stats Download Patch File Download Diff File

36
src/components/Approval/NotPassed.vue
Unescape View File

@ -148,7 +148,7 @@ async function selectChange(id) {
<div class="wrapper">
<div class="wrapper-header">
<span class="wrapper-left">选择不通过原因</span>
<SvgIcon size="22" class="icon" name="close-none-border" @click="closeModal" />
<SvgIcon size="16" class="icon" name="close-none-border" @click="closeModal" />
</div>
<n-form
ref="formRef"
@ -163,7 +163,18 @@ async function selectChange(id) {
v-model:value="formData.disposeTypeId"
filterable
:options="disposeOptions"
/>
>
<template #arrow>
<transition name="slide-left">
<SvgIcon
size="14"
color="#000000"
name="down"
class="close_box"
/>
</transition>
</template>
</n-select>
</n-form-item>
<n-form-item class="form-item" label="不通过原因" path="failCauseId">
@ -172,7 +183,18 @@ async function selectChange(id) {
filterable
:options="failCauseOptions"
@change="selectChange"
/>
>
<template #arrow>
<transition name="slide-left">
<SvgIcon
size="14"
color="#000000"
name="down"
class="close_box"
/>
</transition>
</template>
</n-select>
</n-form-item>
<n-form-item v-show="showOther" class="form-item-area" label="" path="">
<n-input
@ -187,10 +209,12 @@ async function selectChange(id) {
</div>
<template #footer>
<div class="wrapper-footer">
<n-button type="info" @click="handleSumbit">
<n-button style="background: #507afd;width: 60px;
height: 36px;" type="info" @click="handleSumbit">
确定
</n-button>
<n-button secondary class="btn" style="margin-left: 15px" @click="closeModal">
<n-button secondary class="btn" style="margin-left: 15px;width: 60px;
height: 36px;" @click="closeModal">
取消
</n-button>
</div>
@ -213,7 +237,7 @@ async function selectChange(id) {
&-left {
font-size: 18px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 500;
font-weight: 550;
color: #333333;
}

2
src/components/NotPassed.vue
Unescape View File

@ -170,7 +170,7 @@ async function selectChange(id) {
}
&-left {
font-weight: bold;
font-weight: 550;
font-size: 16px;
}

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

@ -253,7 +253,7 @@ onUnmounted(() => {
</div>
</div>
<!-- 个人中心 -->
<div class="layout-header-trigger layout-header-trigger-min">
<div style="margin-left: 16px;" class="layout-header-trigger layout-header-trigger-min">
<!-- <n-avatar :src="getImgUrl(useInfo.usericon)" round /> -->
<n-avatar
style="width: 36px; height: 36px"

15
src/views/final/comp/CustomTabelModal.vue
Unescape View File

@ -433,13 +433,13 @@ const indeterminate = computed(() => {
</n-grid-item>
</n-grid>
</div>
<div class="bottomline"></div>
<template #footer>
<div class="wrapper-footer">
<n-button type="info" @click="handleSumbit">
<n-button style="background-color: #507afd;width: 72px;height: 38px;" type="info" @click="handleSumbit">
确定
</n-button>
<n-button secondary style="margin-left: 15px" @click="closeModal">
<n-button secondary style="margin-left: 15px ;width: 72px;height: 38px;" @click="closeModal">
取消
</n-button>
</div>
@ -449,6 +449,15 @@ const indeterminate = computed(() => {
</template>
<style lang="less" scoped>
.bottomline{
background: #CAD2DD;
height: 1px;
width: 100%;
position: absolute;
left: 0;
bottom: 94px;;
opacity: 0.72;
}
.wrapper {
display: flex;
flex-direction: column;

2
src/views/final/comp/RejectModal.vue
Unescape View File

@ -110,7 +110,7 @@ onBeforeMount(async () => {
}
&-left {
font-weight: bold;
font-weight: 550;
font-size: 16px;
}

6
src/views/final/content/Content.vue
Unescape View File

@ -1198,4 +1198,10 @@ defineExpose({
:deep(.n-data-table .n-data-table-base-table-header) {
overflow: hidden;
}
:deep(.n-data-table.n-data-table--bordered .n-data-table-wrapper){
border:none
}
:deep(.n-data-table-th__title){
font-weight: 550;
}
</style>

9
src/views/final/content/ListContent.vue
Unescape View File

@ -668,7 +668,8 @@ defineExpose({
<div v-if="item.similarityscore != -1" class="percent">
<SvgIcon size="30" :name="item.similarityscore == 100 ? 'error_tag' : 'tag'" />
<div class="val">
{{ `${item.similarityscore}%` }}
{{ `${item.similarityscore}` }}
<span style="font-size:8px;margin-top:4px">%</span>
</div>
</div>
</div>
@ -1037,7 +1038,7 @@ defineExpose({
display: flex;
align-items: center;
justify-content: center;
font-size: 10px;
font-size: 14px;
font-family: PingFang SC, PingFang SC-Semibold;
font-weight: Semibold;
text-align: left;
@ -1074,4 +1075,8 @@ defineExpose({
height: 0.85rem;
}
}
::v-deep(.main){
padding-bottom: 0;
}
</style>

1
src/views/final/index.vue
Unescape View File

@ -81,6 +81,7 @@ onMounted(() => {
flex-direction: row;
box-sizing: border-box;
width: 100%;
padding-bottom: 16px;
}
</style>

5
src/views/home/aside/comp/AdvanceFilter.vue
Unescape View File

@ -304,7 +304,7 @@ defineExpose({
</template>
<n-spin :show="loading">
<div class="wrapper-left-popover">
<n-form ref="ruleformRef" :rules="rules" :model="ruleForm">
<n-form ref="ruleformRef" :model="ruleForm">
<n-form-item path="keyword">
<n-input
:style="{
@ -515,4 +515,7 @@ defineExpose({
::v-deep(.wrapper-left-popover .n-form-item) {
display: block !important;
}
::v-deep(.n-form-item-feedback-wrapper){
display: none;
}
</style>

6
src/views/home/content/Content.vue
Unescape View File

@ -794,7 +794,7 @@ defineExpose({
<div class="wrapper-header">
<div class="left">
<SvgIcon size="32" name="magnifying" />
<span class="font" style="margin-left: 19.2px">AI一键查重</span>
<span class="font" style="margin-left: 12px">AI一键查重</span>
</div>
<div class="flex-btn-icon">
<SvgIcon
@ -840,14 +840,14 @@ defineExpose({
@click="sortHandler('fromuptime')"
>
<span>时间排序</span>
<SvgIcon style="margin-left: 8px" name="sort" size="16" />
<SvgIcon style="margin-left: 8px" name="sort" size="12" />
</div>
<div
style="margin-left: 15px; cursor: pointer; color: #323233"
@click="sortHandler('pictureResult')"
>
<span>相似度排序</span>
<SvgIcon style="margin-left: 8px" name="sort" size="16" />
<SvgIcon style="margin-left: 8px" name="sort" size="12" />
</div>
</div>
<span style="font-size: 16px; color: #333">共

2
src/views/message/content/List.vue
Unescape View File

@ -328,7 +328,7 @@ console.log(tabList)
overflow-y: auto;
padding-bottom: 97px;
box-sizing: border-box;
height: calc(100vh - 88px - 76px);
height: calc(90vh - 88px - 76px);
padding-right: 24px;
.more {

8
src/views/task/aside/ListItem.vue
Unescape View File

@ -38,7 +38,7 @@ watch(
<div v-for="(item, index) in showFieldList" :key="index">
<div v-if="item.id === 'fromtaskname'" class="list-item-header">
<div class="id-wrap">
<SvgIcon :name="svgName" size="28" />
<SvgIcon :name="svgName" size="22" />
<span
class="list-item-header-name"
:class="{ 'list-item-header-selected': selected }"
@ -185,7 +185,7 @@ watch(
content: "";
width: 6px;
height: 6px;
background: #53c21d;
background: #07C984;
border-radius: 50%;
display: inline-block;
margin-left: 8px;
@ -197,7 +197,7 @@ watch(
content: "";
width: 6px;
height: 6px;
background: #398ade;
background: #FE9800;
border-radius: 50%;
display: inline-block;
margin-left: 8px;
@ -207,7 +207,7 @@ watch(
&-detail {
margin-left: 36px;
margin-bottom: 9px;
li {
font-size: 13px;
color: #666666;

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

@ -1552,7 +1552,7 @@ function cancel() {
height: calc((100vh - 88px - 72px) / 2);
.left {
flex: 0.6;
flex: 0.7;
background-size: auto 100%;
background-position: center;
background-repeat: no-repeat;

12
src/views/task/modal/BatchModal.vue
Unescape View File

@ -494,10 +494,10 @@ defineExpose({
<div class="wrapper">
<div class="wrapper-m32">
<SvgIcon name="task-batch" size="16" />
<span style="margin-left: 8px;color: #666;">任务审批</span>
<span style="margin-left: 8px;color: #333333;">任务审批</span>
</div>
<div class="wrapper-title wrapper-m32">
<span style="color: #333;">任务ID:{{ taskDetailInfo.fromtaskname }}</span>
<span style="color: #333;font-size: 20px;">任务ID:{{ taskDetailInfo.fromtaskname }}</span>
<SvgIcon size="22" class="forward" name="arrow-left" @click="backHandler" />
<SvgIcon size="22" class="back" name="arrow-right" @click="forwardHandler" />
</div>
@ -545,7 +545,9 @@ defineExpose({
</tbody>
</table>
</div>
<div class="title wrapper-m32">
<div style="
margin-top: 8px;
margin-bottom: 8px;" class="title wrapper-m32">
相似图片
</div>
@ -866,7 +868,7 @@ defineExpose({
&-title {
font-weight: bold;
font-size: 21px;
padding: 24px 0px 12px 0px;
padding: 24px 0px 16px 0px;
display: flex;
align-items: center;
@ -898,7 +900,7 @@ defineExpose({
text-align: left;
font-size: 14px;
font-family: PingFang SC, PingFang SC-Medium;
font-weight: 500;
font-weight: 550;
text-align: left;
color: #333333;
}

2
src/views/task/modal/ConfrimModal.vue
Unescape View File

@ -152,7 +152,7 @@ async function selectChange(id) {
}
&-left {
font-weight: bold;
font-weight: 550;
font-size: 16px;
}

2
src/views/worksheet/components/PictureInfo.vue
Unescape View File

@ -24,7 +24,7 @@ const propertys = computed(() => {
<template>
<div class="right">
<n-scrollbar style="max-height: 100%">
<n-ellipsis style="max-width: 350px">
<n-ellipsis style="max-width: 350px;font-weight:600">
任务ID：{{ taskDetailInfo.taskname }}
</n-ellipsis>
<div class="tags">

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

@ -662,7 +662,7 @@ defineExpose({
<div class="right">
<div v-show="!showActions" style="display: flex; align-items: center">
<div class="btn" style="margin: 0px 10px" @click="setBatch(true)">
<SvgIcon style="margin-right: 6px" size="14" name="tf" />
<SvgIcon style="margin-right: 6px" size="22" name="batch" />
批量审批
</div>
<div class="icon-wrap">
@ -693,9 +693,9 @@ defineExpose({
<div v-show="showActions" class="batch">
<n-button text @click="setBatch(false)">
<template #icon>
<SvgIcon name="revoke" />
<SvgIcon name="revoke" size="13" style="color: #666666;"/>
</template>
返回
<span style="font-size:14px;color: #666666;">返回</span>
</n-button>
<div style="cursor: pointer; margin-left: 16px" @click.stop="rejectHandler">
<SvgIcon width="64" height="28" name="a1" />
@ -876,7 +876,7 @@ defineExpose({
<div
v-if="imgbigshow"
style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0"
style="display: flex; justify-content: space-between; padding: 12px 0px 3px 0; margin-top: 9px"
>
<div>
<span
@ -1200,7 +1200,7 @@ defineExpose({
.footer-times {
width: 100%;
height: 210px;
height: 200px;
background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0) 29%, rgba(3, 0, 0, 0.73));
border-radius: 0px 8px 8px 8px;
position: absolute;
@ -1254,17 +1254,7 @@ defineExpose({
color: #fff;
}
.icon-wrap {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
background: rgba(80, 122, 253, 0.1);
border-radius: 8px;
margin-left: 10px;
cursor: pointer;
}
.img-info {
color: lime !important;
@ -1464,8 +1454,9 @@ defineExpose({
.check {
position: absolute;
z-index: 3;
left: 12px;
top: 12px;
left: 17px;
top: 19px;
}
.percent {
@ -1560,6 +1551,17 @@ defineExpose({
display: flex;
justify-content: space-evenly;
}
.icon-wrap {
display: flex;
align-items: center;
justify-content: center;
width: 30px;
height: 30px;
background: rgba(80, 122, 253, 0.1);
border-radius: 8px;
margin-left: 10px;
cursor: pointer;
}
::v-deep(.n-divider:not(.n-divider--vertical)) {
margin-top: 12px;
margin-bottom: 12px;

2
src/views/worksheet/modal/ConfrimModal.vue
Unescape View File

@ -147,7 +147,7 @@ async function selectChange(id) {
}
&-left {
font-weight: bold;
font-weight: 550;
font-size: 16px;
}

Write Preview
Loading…
Cancel
Save