diff --git a/mock/user/user.ts b/mock/user/user.ts index 22854ed..ff5816e 100644 --- a/mock/user/user.ts +++ b/mock/user/user.ts @@ -23,7 +23,7 @@ const adminInfo = { value: 'task-main', }, { - label: 'AI工单', + label: '图审审批管理', value: 'worksheet-main', }, ], diff --git a/src/api/home/main.ts b/src/api/home/main.ts index bd661e2..5f70458 100644 --- a/src/api/home/main.ts +++ b/src/api/home/main.ts @@ -180,6 +180,19 @@ export async function oneClickCheck(params: Partial = { search_histo params }) } +/** + * 解散任务包 + * @param + * @returns + */ + export async function deletePackage(params) { + + return http.request({ + url: `/ocr/ocrTaskPackage/deletePackage`, + method: 'get', + params + }) +} /** * 任务完成——创建任务包前——获取图片列表 * @param diff --git a/src/router/modules/worksheet.ts b/src/router/modules/worksheet.ts index 8a46a38..d80eb8d 100644 --- a/src/router/modules/worksheet.ts +++ b/src/router/modules/worksheet.ts @@ -1,5 +1,5 @@ -import type { RouteRecordRaw } from 'vue-router' import { Layout } from '@/router/constant' +import type { RouteRecordRaw } from 'vue-router' /** * @param name 路由名称, 必须设置,且不能重名 @@ -19,7 +19,7 @@ const routes: Array = [ redirect: '/worksheet', component: Layout, meta: { - title: 'AI工单', + title: '图审审批管理', permissions: ['worksheet-main'], svgname: 'worksheet', svgsize: 22, @@ -30,7 +30,7 @@ const routes: Array = [ path: 'worksheet', name: 'worksheet-main', meta: { - title: 'AI工单', + title: '图审审批管理', }, component: () => import('@/views/worksheet/index.vue'), }, diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue index ae1e823..3b9a219 100644 --- a/src/views/final/comp/NewFilterModal.vue +++ b/src/views/final/comp/NewFilterModal.vue @@ -150,7 +150,7 @@ function unformatValue(searchfield: string, searchvalue: any) { function createCondition() { formValue.conditions.push({ type: null, - operator: null, + operator: 'eq', result: null, }) } @@ -227,7 +227,7 @@ function leaveHandler() { formValue.conditions = [ { type: null, - operator: null, + operator: 'eq', result: null, }, ] @@ -269,7 +269,7 @@ defineExpose({ - + - + -1) { + if (loginRejectMessge.value.indexOf("用户名") > -1||loginRejectMessge.value.indexOf("账号") > -1) { return new Error(loginRejectMessge.value); } }, diff --git a/src/views/task/content/Content.vue b/src/views/task/content/Content.vue index 0dbd088..7b4e457 100644 --- a/src/views/task/content/Content.vue +++ b/src/views/task/content/Content.vue @@ -12,7 +12,12 @@ import NotPassed from '@/components/Approval/NotPassed.vue' import { getAllfieldList, getfieldList } from '@/api/home/filter' import { TASK_STATUS_OBJ } from '@/enums/index' -import { audit, dubiousfileyd, getSimilarityList, getTaskDetailInfo } from '@/api/task/task' +import { + audit, + dubiousfileyd, + getSimilarityList, + getTaskDetailInfo, +} from '@/api/task/task' import { useTask } from '@/store/modules/task' import { useUser } from '@/store/modules/user' import { isEmpty } from '@/utils' @@ -190,8 +195,6 @@ function doAudit(param: any) { setBatch(false) reloadList(param, '通过') } - - else { message.error(res.message) } }) } @@ -232,12 +235,21 @@ async function getTableData() { const fieldList = (res as any)?.data res = await getfieldList(reviewType, useInfo.id) const userFieldList = (res as any)?.data.userFieldFixed + const blueList = [ + '拜访终端名称', + '定位信息', + '拜访日期', + '定位距离', + '拜访小结', + '拜访项目类别', + ] fieldList.map((v) => { if (userFieldList.includes(v.name)) { const item = { label: v.fieldDesc, value: taskDetailInfo.value.ocrPicture[v.name], key: v.name, + blue: blueList.includes(v.fieldDesc), } listData.push(item) } @@ -247,13 +259,11 @@ async function getTableData() { async function getImgList() { if (!isEmpty(taskDetailInfo.value.ocrPicture.id)) { - const { data, total } = await getSimilarityList( - { - ...taskpagination, - ...sortBy, - pictureId: taskDetailInfo.value.ocrPicture.id, - }, - ) + const { data, total } = await getSimilarityList({ + ...taskpagination, + ...sortBy, + pictureId: taskDetailInfo.value.ocrPicture.id, + }) taskDetailPictureList.value = data totalCount.value = total } @@ -336,24 +346,11 @@ function reloadList(param, text) {
任务ID:{{ taskDetailInfo.fromtaskname }} - - + +
-
+
批量审批 @@ -384,11 +381,7 @@ function reloadList(param, text) { -->
- +
@@ -398,9 +391,19 @@ function reloadList(param, text) { 返回 - + - +
@@ -440,22 +443,24 @@ function reloadList(param, text) {
- - + +
- +
- +
@@ -469,18 +474,22 @@ function reloadList(param, text) { - {{ TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] }} + {{ + TASK_STATUS_OBJ[taskDetailInfo?.userapprove?.statshis] + }} 审批状态 - + - {{ - totalCount - }} + {{ totalCount }} 相似匹配 @@ -516,16 +525,16 @@ function reloadList(param, text) { />
-
+
@@ -537,8 +546,18 @@ function reloadList(param, text) { />
- - + +
@@ -549,7 +568,10 @@ function reloadList(param, text) { {{ item.submitDateTimestamp ? formatToDateHMS(Number(item.submitDateTimestamp)) : '-' }}
-
+
{{ item.similarityScore }}%
@@ -562,7 +584,11 @@ function reloadList(param, text) { - + @@ -577,7 +603,6 @@ function reloadList(param, text) { @reject="rejectHandler" @approval="approvalHandler" /> -
@@ -589,7 +614,7 @@ function reloadList(param, text) { color: #666666; } ::v-deep(.n-tabs-tab--active .n-tabs-tab__label) { - color: #507AFD; + color: #507afd; font-size: 16px; font-weight: 500; } @@ -608,49 +633,48 @@ function reloadList(param, text) { } } -.icon-wrap{ +.icon-wrap { display: flex; align-items: center; justify-content: center; width: 30px; height: 30px; - background: rgba(80,122,253,.1); + background: rgba(80, 122, 253, 0.1); border-radius: 8px; margin-left: 10px; cursor: pointer; } -.img-info{ - .icon-status{ +.img-info { + .icon-status { width: 32px; height: 32px; } - .label{ + .label { font-size: 11px; font-family: PingFang SC, PingFang SC-Medium; font-weight: 500; color: #ffffff; } - .value{ + .value { font-size: 15px; font-family: PingFang SC, PingFang SC-Semibold; font-weight: 600; color: #ffffff; } - .num{ + .num { font-size: 18px; font-family: PingFang SC, PingFang SC-Semibold; font-weight: 600; color: #ffffff; } - .unit{ + .unit { font-size: 11px; } - } .wrapper { display: flex; @@ -713,13 +737,13 @@ function reloadList(param, text) { display: flex; align-items: center; - .btn-approval{ + .btn-approval { width: 68px; height: 28px; cursor: pointer; } - .btn-left{ + .btn-left { margin-left: 16px; } } @@ -764,7 +788,12 @@ function reloadList(param, text) { .big-mark{ width: 100%; height: 151px; - background: linear-gradient(180deg,rgba(0,0,0,0.00) 0%, rgba(0,0,0,0.00) 29%, rgba(3,0,0,0.73)); + background: linear-gradient( + 180deg, + rgba(0, 0, 0, 0) 0%, + rgba(0, 0, 0, 0) 29%, + rgba(3, 0, 0, 0.73) + ); position: absolute; left: 0; bottom: 0; @@ -818,7 +847,7 @@ function reloadList(param, text) { left: 16px; bottom: 16px; - .time-item{ + .time-item { display: flex; align-items: center; font-size: 14px; @@ -828,12 +857,12 @@ function reloadList(param, text) { margin-bottom: 4px; } - .time-item2{ + .time-item2 { margin-bottom: 0; } - .svg-time{ - margin-right: 5px + .svg-time { + margin-right: 5px; } } @@ -849,20 +878,20 @@ function reloadList(param, text) { justify-content: center; } - .check{ + .check { position: absolute; z-index: 3; left: 2%; top: 2%; } - .status{ + .status { position: absolute; z-index: 3; left: 0; top: 0; - .img-status{ + .img-status { width: 133px; height: 129px; } @@ -871,12 +900,12 @@ function reloadList(param, text) { .right { flex: 0.5; - background: #F6F9FD; + background: #f6f9fd; border-radius: 8px; margin-left: 20px; padding: 24px; - .right-card{ + .right-card { padding: 3px; } @@ -905,10 +934,14 @@ function reloadList(param, text) { // overflow: hidden; margin: 0px 16px 27px 0px; - .small-mark{ + .small-mark { width: 100%; height: 36px; - background: linear-gradient(180deg,rgba(0,0,0,0.01), rgba(0,0,0,0.44) 88%); + background: linear-gradient( + 180deg, + rgba(0, 0, 0, 0.01), + rgba(0, 0, 0, 0.44) 88% + ); border-radius: 0px 8px 8px 8px; position: absolute; left: 0; @@ -916,7 +949,7 @@ function reloadList(param, text) { z-index: 0; } - .tag-status{ + .tag-status { width: 46px; height: 22px; position: absolute; @@ -929,7 +962,7 @@ function reloadList(param, text) { z-index: 3; left: 3px; bottom: 3px; - .time-item{ + .time-item { display: flex; align-items: center; font-size: 10px; @@ -940,12 +973,12 @@ function reloadList(param, text) { line-height: 12px; } - .time-item2{ + .time-item2 { margin-bottom: 0; } - .svg-time{ - margin-right: 5px + .svg-time { + margin-right: 5px; } } @@ -985,12 +1018,12 @@ function reloadList(param, text) { font-size: 14px; } - .percent-unit{ + .percent-unit { font-size: 8px; - margin-top: 4px + margin-top: 4px; } - .percent-red{ + .percent-red { background: #ff4e4f; } } diff --git a/src/views/task/content/TaskTable.vue b/src/views/task/content/TaskTable.vue index a0d4a18..cda8791 100644 --- a/src/views/task/content/TaskTable.vue +++ b/src/views/task/content/TaskTable.vue @@ -1,4 +1,6 @@