diff --git a/vue/apps/web-antd/public/favicon.ico b/vue/apps/web-antd/public/favicon.ico index fcf9818..9abc07d 100644 Binary files a/vue/apps/web-antd/public/favicon.ico and b/vue/apps/web-antd/public/favicon.ico differ diff --git a/vue/apps/web-antd/src/api/cv/index.ts b/vue/apps/web-antd/src/api/cv/index.ts index effdfc5..5065750 100644 --- a/vue/apps/web-antd/src/api/cv/index.ts +++ b/vue/apps/web-antd/src/api/cv/index.ts @@ -1,4 +1,5 @@ export * from './iva'; export * from './license'; export * from './sca'; +export * from './sca2'; export * from './ticket'; diff --git a/vue/apps/web-antd/src/api/cv/license.ts b/vue/apps/web-antd/src/api/cv/license.ts index 5fdcb27..b67c000 100644 --- a/vue/apps/web-antd/src/api/cv/license.ts +++ b/vue/apps/web-antd/src/api/cv/license.ts @@ -4,7 +4,7 @@ import { pyRequestClient } from '#/api/request'; * 获取已分析的图片列表 */ export async function refreshLicenseImageList(page = 1, pageSize = 10) { - return pyRequestClient.get('/llm/getLicenseImageList', { + return pyRequestClient.get('/cv/getLicenseImageList', { params: { page, page_size: pageSize }, }); } @@ -13,7 +13,7 @@ export async function refreshLicenseImageList(page = 1, pageSize = 10) { * 上传图片分析任务 */ export async function createLicenseImageTask(formData: FormData) { - return pyRequestClient.post('/llm/createLicenseImageTask', formData, { + return pyRequestClient.post('/cv/createLicenseImageTask', formData, { headers: { 'Content-Type': 'multipart/form-data', }, diff --git a/vue/apps/web-antd/src/api/cv/sca2.ts b/vue/apps/web-antd/src/api/cv/sca2.ts new file mode 100644 index 0000000..09be397 --- /dev/null +++ b/vue/apps/web-antd/src/api/cv/sca2.ts @@ -0,0 +1,25 @@ +import { pyRequestClient } from '#/api/request'; + +/** + * 获取已分析的图片列表 + */ +export async function refreshImageListV2(name = '', page = 1, pageSize = 9) { + return pyRequestClient.get('/cv/getSilkwormCocoonAnalysisTasks', { + params: { name, page, page_size: pageSize }, + }); +} + +/** + * 上传图片分析任务 + */ +export async function createImageTaskV2(formData: FormData) { + return pyRequestClient.post( + '/cv/createSilkwormCocoonAnalysisTask', + formData, + { + headers: { + 'Content-Type': 'multipart/form-data', + }, + }, + ); +} diff --git a/vue/apps/web-antd/src/api/cv/ticket.ts b/vue/apps/web-antd/src/api/cv/ticket.ts index 20e9f62..8ecdff8 100644 --- a/vue/apps/web-antd/src/api/cv/ticket.ts +++ b/vue/apps/web-antd/src/api/cv/ticket.ts @@ -4,14 +4,14 @@ import { pyRequestClient } from '#/api/request'; * 获取已分析的图片列表 */ export async function refreshTicketImageList() { - return pyRequestClient.get('/llm/getTicketImageList'); + return pyRequestClient.get('/cv/getTicketImageList'); } /** * 上传图片分析任务 */ export async function createTicketImageTask(formData: FormData) { - return pyRequestClient.post('/llm/createTicketImageTaskV2', formData, { + return pyRequestClient.post('/cv/createTicketImageTaskV2', formData, { headers: { 'Content-Type': 'multipart/form-data', }, diff --git a/vue/apps/web-antd/src/router/routes/modules/aibot.ts b/vue/apps/web-antd/src/router/routes/modules/aibot.ts index 8190d92..40c9ad9 100644 --- a/vue/apps/web-antd/src/router/routes/modules/aibot.ts +++ b/vue/apps/web-antd/src/router/routes/modules/aibot.ts @@ -3,7 +3,7 @@ import type { RouteRecordRaw } from 'vue-router'; import { IFrameView } from '#/layouts'; import { $t } from '#/locales'; -const baseAddress = '10.0.4.22'; +const baseAddress = '10.10.12.101'; const routes: RouteRecordRaw[] = [ { diff --git a/vue/apps/web-antd/src/router/routes/modules/cv.ts b/vue/apps/web-antd/src/router/routes/modules/cv.ts index 3fa584c..ca27ac1 100644 --- a/vue/apps/web-antd/src/router/routes/modules/cv.ts +++ b/vue/apps/web-antd/src/router/routes/modules/cv.ts @@ -7,7 +7,7 @@ const routes: RouteRecordRaw[] = [ { meta: { icon: 'ic:round-remove-red-eye', - authority: ['iva', 'sca', 'ysa', 'ticket', 'license'], + authority: ['iva', 'sca', 'sca2', 'ysa', 'ticket', 'license'], keepAlive: true, order: 2, title: $t('计算机视觉'), @@ -37,6 +37,17 @@ const routes: RouteRecordRaw[] = [ }, component: () => import('#/views/cv/sca/index.vue'), }, + { + name: 'SCA2', + path: '/cv/sca2', + meta: { + authority: ['sca2'], + icon: 'mdi:ice-pop', + title: '蚕茧仪评分析V2', + keepAlive: false, + }, + component: () => import('#/views/cv/sca2/index.vue'), + }, { name: 'YSA', path: '/cv/ysa', diff --git a/vue/apps/web-antd/src/router/routes/modules/set.ts b/vue/apps/web-antd/src/router/routes/modules/set.ts index b4e252e..add1cf4 100644 --- a/vue/apps/web-antd/src/router/routes/modules/set.ts +++ b/vue/apps/web-antd/src/router/routes/modules/set.ts @@ -3,7 +3,7 @@ import type { RouteRecordRaw } from 'vue-router'; import { IFrameView } from '#/layouts'; import { $t } from '#/locales'; -const baseAddress = '10.0.4.22'; +const baseAddress = '10.10.12.101'; const routes: RouteRecordRaw[] = [ { diff --git a/vue/apps/web-antd/src/views/cv/iva/index.vue b/vue/apps/web-antd/src/views/cv/iva/index.vue index b8ba8cc..3999253 100644 --- a/vue/apps/web-antd/src/views/cv/iva/index.vue +++ b/vue/apps/web-antd/src/views/cv/iva/index.vue @@ -353,7 +353,12 @@ function onListItemClick(video: any) {
- diff --git a/vue/apps/web-antd/src/views/cv/license/index.vue b/vue/apps/web-antd/src/views/cv/license/index.vue index 02604ed..981c8b5 100644 --- a/vue/apps/web-antd/src/views/cv/license/index.vue +++ b/vue/apps/web-antd/src/views/cv/license/index.vue @@ -13,9 +13,8 @@ const selectedItem = ref(null); async function loadList() { error.value = null; - const res = - (await api.refreshLicenseImageList(page.value, pageSize.value)) || []; - list.value = res.items; + const res = await api.refreshLicenseImageList(page.value, pageSize.value); + list.value = res.items || []; total.value = res.total; } @@ -97,7 +96,7 @@ function refreshLineChart() { 文件大小: `${data.size} MB`, 分辨率: data.resolution, 证件类型: - data.type === -1 ? '未知证件' : data.type === 0 ? '身份证' : '银行卡', + data.type === -1 ? '未知证件' : (data.type === 0 ? '身份证' : '银行卡'), }; showInfoStr2.value = translateKeys(data.content, keyMap); } @@ -198,7 +197,6 @@ function handleFileChange(event: Event) { -
diff --git a/vue/apps/web-antd/src/views/cv/sca/CreateYSATaskModal.vue b/vue/apps/web-antd/src/views/cv/sca/CreateYSATaskModal.vue index dff3b61..bc4ce4c 100644 --- a/vue/apps/web-antd/src/views/cv/sca/CreateYSATaskModal.vue +++ b/vue/apps/web-antd/src/views/cv/sca/CreateYSATaskModal.vue @@ -1,7 +1,10 @@ + + diff --git a/vue/apps/web-antd/src/views/dashboard/workspace/index.vue b/vue/apps/web-antd/src/views/dashboard/workspace/index.vue index 084be65..3f57614 100644 --- a/vue/apps/web-antd/src/views/dashboard/workspace/index.vue +++ b/vue/apps/web-antd/src/views/dashboard/workspace/index.vue @@ -29,6 +29,13 @@ const cv: WorkbenchQuickNavItem[] = [ title: '蚕茧仪评分析', url: '/cv/sca', }, + { + color: '#3fb27f', + authority: ['sca2'], + icon: 'mdi:ice-pop', + title: '蚕茧仪评分析V2', + url: '/cv/sca2', + }, { color: '#3fb27f', authority: ['ysa'], @@ -55,7 +62,7 @@ const cv: WorkbenchQuickNavItem[] = [ icon: 'ion:bar-chart-outline', title: '标注平台入口', authority: ['user'], - url: 'http://171.212.101.199:13013/', + url: 'https://ai.ronsunny.cn:8094/', }, ]; const llm: WorkbenchQuickNavItem[] = [