diff --git a/frontend/src/api/device/device.ts b/frontend/src/api/device/device.ts index c129d7d..ecaa914 100644 --- a/frontend/src/api/device/device.ts +++ b/frontend/src/api/device/device.ts @@ -30,7 +30,9 @@ export const deletePqDev = (params: string[]) => { export const exportPqDev=(params: Device.ReqPqDevParams)=>{ return http.download(`/pqDev/export`, params) } - +export const downloadTemplate = () => { + return http.download(`/pqDev/downloadTemplate`) +} //导入被检设备 export const importPqDev=(params: Device.ReqPqDevParams)=>{ return http.post(`/pqDev/import`, params) diff --git a/frontend/src/components/ImportExcel/index.vue b/frontend/src/components/ImportExcel/index.vue index 8575576..138f2c5 100644 --- a/frontend/src/components/ImportExcel/index.vue +++ b/frontend/src/components/ImportExcel/index.vue @@ -32,7 +32,7 @@ - + @@ -47,6 +47,7 @@ import { ElNotification, UploadRequestOptions, UploadRawFile } from "element-plu export interface ExcelParameterProps { title: string; // 标题 + showCover?: boolean; // 是否显示”数据覆盖“选项 fileSize?: number; // 上传文件的大小 fileType?: File.ExcelMimeType[]; // 上传文件的类型 tempApi?: (params: any) => Promise; // 下载模板的Api @@ -76,14 +77,14 @@ const acceptParams = (params: ExcelParameterProps) => { // Excel 导入模板下载 const downloadTemp = () => { if (!parameter.value.tempApi) return; - useDownload(parameter.value.tempApi, `${parameter.value.title}模板`); + useDownload(parameter.value.tempApi, `${parameter.value.title}模板`,{},true); }; // 文件上传 const uploadExcel = async (param: UploadRequestOptions) => { let excelFormData = new FormData(); excelFormData.append("file", param.file); - excelFormData.append("isCover", isCover.value as unknown as Blob); + isCover.value && excelFormData.append("isCover", isCover.value as unknown as Blob); await parameter.value.importApi!(excelFormData); parameter.value.getTableList && parameter.value.getTableList(); dialogVisible.value = false; diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue index 96ace5e..8c2374b 100644 --- a/frontend/src/views/machine/device/index.vue +++ b/frontend/src/views/machine/device/index.vue @@ -41,7 +41,7 @@ import DevicePopup from '@/views/machine/device/components/devicePopup.vue' import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue' import deviceDataList from '@/api/device/deviceData' import { useDictStore } from '@/stores/modules/dict' -import {getPqDevList, deletePqDev, exportPqDev, importPqDev} from '@/api/device/device.ts' +import {getPqDevList, deletePqDev, exportPqDev, downloadTemplate,importPqDev} from '@/api/device/device.ts' import { reactive, ref } from 'vue' import { ElMessageBox } from 'element-plus' @@ -161,8 +161,9 @@ const deviceImportExcel = ref | null>(null) const importFile=async ()=>{ const params = { - title: '设备', - tempApi: exportPqDev, + title: '被检设备', + showCover: false, + tempApi: downloadTemplate, importApi: importPqDev, getTableList: proTable.value?.getTableList, }