From 1fd657dba7a5f3346996f6353572e75f2900861d Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Mon, 8 Apr 2024 23:41:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dictionary/index.ts | 2 +- src/assets/icons/breakcount.svg | 12 + src/assets/icons/count.svg | 12 + src/assets/icons/done.svg | 14 + src/assets/icons/error_tag.svg | 33 ++ src/assets/icons/reimg.svg | 12 + src/assets/icons/reject.svg | 12 + src/assets/icons/resolve.svg | 12 + src/assets/icons/wait.svg | 16 + src/components/DataHeader/index.vue | 22 +- .../components/Header/ShortcutModal.vue | 13 +- src/views/final/aside/Aside.vue | 1 + src/views/home/aside/Aside.vue | 1 + src/views/home/aside/comp/AdvanceFilter.vue | 6 + src/views/home/content/Content.vue | 2 +- src/views/task/aside/Aside.vue | 1 + src/views/task/content/Content.vue | 468 ++++++++++-------- src/views/worksheet/aside/Aside.vue | 1 - 18 files changed, 396 insertions(+), 244 deletions(-) create mode 100644 src/assets/icons/breakcount.svg create mode 100644 src/assets/icons/count.svg create mode 100644 src/assets/icons/done.svg create mode 100644 src/assets/icons/error_tag.svg create mode 100644 src/assets/icons/reimg.svg create mode 100644 src/assets/icons/reject.svg create mode 100644 src/assets/icons/resolve.svg create mode 100644 src/assets/icons/wait.svg diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts index 175ac21..bc25a36 100644 --- a/src/api/dictionary/index.ts +++ b/src/api/dictionary/index.ts @@ -317,7 +317,7 @@ export async function getBackList() { * 业务字典查询接口 * @returns */ -export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 200 }) { +export async function getBusinessList(field: string, page: PageParam = { pageNo: 1, pageSize: 10000 }) { const res = await http.request({ url: `/ocr/dictionary/getDictionaryByField`, method: 'get', diff --git a/src/assets/icons/breakcount.svg b/src/assets/icons/breakcount.svg new file mode 100644 index 0000000..378463b --- /dev/null +++ b/src/assets/icons/breakcount.svg @@ -0,0 +1,12 @@ + + + 小结重复数 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/count.svg b/src/assets/icons/count.svg new file mode 100644 index 0000000..28b9a56 --- /dev/null +++ b/src/assets/icons/count.svg @@ -0,0 +1,12 @@ + + + 任务总数 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/done.svg b/src/assets/icons/done.svg new file mode 100644 index 0000000..56f77c6 --- /dev/null +++ b/src/assets/icons/done.svg @@ -0,0 +1,14 @@ + + + 已审批 + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/error_tag.svg b/src/assets/icons/error_tag.svg new file mode 100644 index 0000000..f4c65d7 --- /dev/null +++ b/src/assets/icons/error_tag.svg @@ -0,0 +1,33 @@ + + + 标签 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/reimg.svg b/src/assets/icons/reimg.svg new file mode 100644 index 0000000..b885e3f --- /dev/null +++ b/src/assets/icons/reimg.svg @@ -0,0 +1,12 @@ + + + 图片重复数 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/reject.svg b/src/assets/icons/reject.svg new file mode 100644 index 0000000..8151d9e --- /dev/null +++ b/src/assets/icons/reject.svg @@ -0,0 +1,12 @@ + + + 不通过 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/resolve.svg b/src/assets/icons/resolve.svg new file mode 100644 index 0000000..276ae52 --- /dev/null +++ b/src/assets/icons/resolve.svg @@ -0,0 +1,12 @@ + + + 通过 + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/wait.svg b/src/assets/icons/wait.svg new file mode 100644 index 0000000..5a2daef --- /dev/null +++ b/src/assets/icons/wait.svg @@ -0,0 +1,16 @@ + + + 待审批 + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue index 6c6b559..6993706 100644 --- a/src/components/DataHeader/index.vue +++ b/src/components/DataHeader/index.vue @@ -1,7 +1,7 @@ @@ -668,6 +679,7 @@ function switchBatch() { width: 100vw; height: 100vh; margin: 0px !important; + max-height: 100%; } ::v-deep(.n-tabs-tab__label) { font-size: 14px; @@ -751,7 +763,23 @@ function switchBatch() { height: 892px; // 62+82+16 // height: 100%; - overflow-y: scroll; + // overflow-y: scroll; + &::-webkit-scrollbar-track { + background-color: #fff; /* 轨道背景颜色 */ + display: none; + } + &::-webkit-scrollbar-thumb { + background-color: rgba(0, 0, 0, 0.25); /* 滑块颜色 */ + :hover { + background-color: rgba(0, 0, 0, 0.4); + } + border-radius: 5px; /* 滑块边角半径 */ + width: 5px; + height: 5px; + } + &::-webkit-scrollbar-thumb:hover { + background-color: #555; /* 悬停时的滑块颜色 */ + } &-header { display: flex; @@ -840,7 +868,7 @@ function switchBatch() { z-index: 3; width: 30px; height: 30px; - background: rgba(255, 255, 255, 0.20); + background: rgba(255, 255, 255, 0.2); border-radius: 6px; backdrop-filter: blur(10px); display: flex; @@ -849,7 +877,7 @@ function switchBatch() { cursor: pointer; } - .big-mark{ + .big-mark { width: 100%; height: 151px; background: linear-gradient( diff --git a/src/views/worksheet/aside/Aside.vue b/src/views/worksheet/aside/Aside.vue index db97734..fb45b75 100644 --- a/src/views/worksheet/aside/Aside.vue +++ b/src/views/worksheet/aside/Aside.vue @@ -235,7 +235,6 @@ const ApprovalOver = (packageId)=>{ padding: 12px 16px; width: 100%; overflow: hidden; - .warpper { display: flex; justify-content: space-between;