From 6645e4598fe3c7256254be2d08137252bfc912ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Thu, 21 Nov 2024 16:39:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E8=B7=AF=EF=BC=9A=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=97=B6=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/dasadmin/src/views/backend/node/univer.vue | 4 ++++ ui/dasadmin/src/views/backend/node/utils.ts | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ui/dasadmin/src/views/backend/node/univer.vue b/ui/dasadmin/src/views/backend/node/univer.vue index 1e42ab09..308fec39 100644 --- a/ui/dasadmin/src/views/backend/node/univer.vue +++ b/ui/dasadmin/src/views/backend/node/univer.vue @@ -424,7 +424,11 @@ const saveMappingList = (data: any[]) => { if (res.success) { ElMessage.success('保存成功!') resetExcel() + }else{ + ElMessage.warning(res.msg ?? '保存失败!') } + }).catch(()=>{ + ElMessage.error('保存失败!') }) } const uploadRef = ref() diff --git a/ui/dasadmin/src/views/backend/node/utils.ts b/ui/dasadmin/src/views/backend/node/utils.ts index bab341df..3d8d563a 100644 --- a/ui/dasadmin/src/views/backend/node/utils.ts +++ b/ui/dasadmin/src/views/backend/node/utils.ts @@ -713,7 +713,7 @@ export const createUpLoadExcelData = (workbookData: any) => { continue } params[sheetkeyMap[fieldKey]] = sheets[item].cellData[key][fieldKey]?.v ?? '' - } + } sheetData.params = JSON.stringify(params) data.push(sheetData) } @@ -723,9 +723,7 @@ export const createUpLoadExcelData = (workbookData: any) => { } export const createSheetData = (data: any, protocol: string | number) => { - console.log('createSheetData') if (!protocol) return {} - const excelCellDataMap: any = {} const headerData = createHeaderData(protocol) const resultData: any = {} @@ -754,8 +752,7 @@ export const createSheetData = (data: any, protocol: string | number) => { }) }) resultData[item] = result - }) - + }) return resultData }