diff --git a/electron-vue-template/src/main/main.ts b/electron-vue-template/src/main/main.ts index 1f6d175..18356b8 100644 --- a/electron-vue-template/src/main/main.ts +++ b/electron-vue-template/src/main/main.ts @@ -211,7 +211,7 @@ function startSpringBoot() { } } - startSpringBoot(); + // startSpringBoot(); function stopSpringBoot() { if (!springProcess) return; try { @@ -348,9 +348,9 @@ app.whenReady().then(() => { } } - // setTimeout(() => { - // openAppIfNotOpened(); - // }, 100); + setTimeout(() => { + openAppIfNotOpened(); + }, 100); app.on('activate', () => { if (mainWindow && !mainWindow.isDestroyed()) { diff --git a/electron-vue-template/src/renderer/api/http.ts b/electron-vue-template/src/renderer/api/http.ts index a80d284..9893c66 100644 --- a/electron-vue-template/src/renderer/api/http.ts +++ b/electron-vue-template/src/renderer/api/http.ts @@ -1,13 +1,13 @@ export type HttpMethod = 'GET' | 'POST' | 'DELETE'; export const CONFIG = { CLIENT_BASE: 'http://localhost:8081', - RUOYI_BASE: 'http://8.138.23.49:8085', - //RUOYI_BASE: 'http://192.168.1.89:8085', - SSE_URL: 'http://8.138.23.49:8085/monitor/account/events' + // RUOYI_BASE: 'http://8.138.23.49:8085', + RUOYI_BASE: 'http://192.168.1.89:8085', + SSE_URL: 'http://192.168.1.89:8085/monitor/account/events' } as const; function resolveBase(path: string): string { - if (path.startsWith('/monitor/') || path.startsWith('/system/') || path.startsWith('/tool/banma') || path.startsWith('/tool/genmai')) { + if (path.startsWith('/monitor/') || path.startsWith('/system/') || path.startsWith('/tool/banma') || path.startsWith('/tool/genmai') || path.startsWith('/tool/mark')) { return CONFIG.RUOYI_BASE; } return CONFIG.CLIENT_BASE; diff --git a/electron-vue-template/src/renderer/api/mark.ts b/electron-vue-template/src/renderer/api/mark.ts new file mode 100644 index 0000000..ecfbc0e --- /dev/null +++ b/electron-vue-template/src/renderer/api/mark.ts @@ -0,0 +1,21 @@ +import { http } from './http' + +export const markApi = { + // 新建任务 + newTask(file: File) { + const formData = new FormData() + formData.append('file', file) + return http.upload<{ code: number, data: any, msg: string }>('/tool/mark/newTask', formData) + }, + + // 获取任务列表及筛选数据 + getTask() { + return http.get<{ code: number, data: { original: any, filtered: any[] }, msg: string }>('/tool/mark/task') + }, + + // 品牌商标筛查 + brandCheck(brands: string[]) { + return http.post<{ code: number, data: { total: number, filtered: number, passed: number, data: any[] }, msg: string }>('/tool/mark/brandCheck', brands) + } +} + diff --git a/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue b/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue index 32fb5cb..ffcc44e 100644 --- a/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue +++ b/electron-vue-template/src/renderer/components/amazon/AmazonDashboard.vue @@ -62,6 +62,26 @@ function handleSizeChange(size: number) { function handleCurrentChange(page: number) { currentPage.value = page } + +function handleNewTask() { + if (trademarkPanelRef.value && trademarkPanelRef.value.resetToIdle) { + trademarkPanelRef.value.resetToIdle() + } + trademarkData.value = [] + currentPage.value = 1 +} + +function handleCancelTask() { + if (trademarkPanelRef.value && typeof trademarkPanelRef.value.stopTrademarkQuery === 'function') { + trademarkPanelRef.value.stopTrademarkQuery() + } +} + +function handleRetryTask() { + if (trademarkPanelRef.value && typeof trademarkPanelRef.value.startTrademarkQuery === 'function') { + trademarkPanelRef.value.startTrademarkQuery() + } +}