diff --git a/public/neDataImput/import_amf_imeiWhitelist_template.xlsx b/public/neDataImput/import_amf_imeiWhitelist_template.xlsx index 8716464a..b4e3749e 100644 Binary files a/public/neDataImput/import_amf_imeiWhitelist_template.xlsx and b/public/neDataImput/import_amf_imeiWhitelist_template.xlsx differ diff --git a/public/neDataImput/import_amf_whitelist_template.xlsx b/public/neDataImput/import_amf_whitelist_template.xlsx index 26b66e5a..f59e18ff 100644 Binary files a/public/neDataImput/import_amf_whitelist_template.xlsx and b/public/neDataImput/import_amf_whitelist_template.xlsx differ diff --git a/public/neDataImput/import_mme_imeiWhitelist_template.xlsx b/public/neDataImput/import_mme_imeiWhitelist_template.xlsx index 44957994..7c91df6e 100644 Binary files a/public/neDataImput/import_mme_imeiWhitelist_template.xlsx and b/public/neDataImput/import_mme_imeiWhitelist_template.xlsx differ diff --git a/src/views/ne/neConfig/hooks/useArrayImport.ts b/src/views/ne/neConfig/hooks/useArrayImport.ts index 5163fb38..419a0dc4 100644 --- a/src/views/ne/neConfig/hooks/useArrayImport.ts +++ b/src/views/ne/neConfig/hooks/useArrayImport.ts @@ -2,7 +2,7 @@ import { addNeConfigData, editNeConfigData } from '@/api/ne/neConfig'; import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; import { readSheet } from '@/utils/execl-utils'; import { message } from 'ant-design-vue'; -import { reactive, toRaw } from 'vue'; +import { reactive } from 'vue'; import saveAs from 'file-saver'; /** @@ -22,23 +22,25 @@ export default function useArrayImport({ imeiWhitelist: { filename: 'import_amf_imeiWhitelist_template', fileetx: '.xlsx', - itemKey: 'imeiPrefixValue', + itemKey: 'index', item: (row: Record) => { + const index = row['Index'] || 0; return { imeiPrefixValue: `${row['IMEI Prefix']}`, - index: 0, + index: parseInt(index), }; }, }, whitelist: { filename: 'import_amf_whitelist_template', fileetx: '.xlsx', - itemKey: 'imsiValue', + itemKey: 'index', item: (row: Record) => { + const index = row['Index'] || 0; return { imsiValue: `${row['IMSI Value']}`, imeiValue: `${row['IMEI Value/Prefix']}`, - index: 0, + index: parseInt(index), }; }, }, @@ -47,11 +49,12 @@ export default function useArrayImport({ white_list: { filename: 'import_mme_imeiWhitelist_template', fileetx: '.xlsx', - itemKey: 'imei', + itemKey: 'index', item: (row: Record) => { + const index = row['Index'] || 0; return { imei: `${row['IMEI']}`, - index: 0, + index: parseInt(index), }; }, }, @@ -125,7 +128,7 @@ export default function useArrayImport({ importState.loading = true; for (const row of rows) { const rowItem = importState.item(row); - const rowKey = rowItem[importState.itemKey]; + const rowKey = rowItem[importState.itemKey] || -1; let result: any = null; // 检查index是否定义 const has = arrayState.columnsData.find(