diff --git a/src/views/device/Instance/Import/file.vue b/src/views/device/Instance/Import/file.vue index 2d9c77b7..85ba7a97 100644 --- a/src/views/device/Instance/Import/file.vue +++ b/src/views/device/Instance/Import/file.vue @@ -19,11 +19,7 @@ :maxCount="1" :showUploadList="false" @change="uploadChange" - :accept=" - modelRef?.file?.fileType - ? `.${modelRef?.file?.fileType}` - : '.xlsx' - " + :accept="'.xlsx,.csv'" :before-upload="beforeUpload" :disabled="disabled" @drop="handleDrop" @@ -117,18 +113,19 @@ const downFile = async (type: string) => { }; const beforeUpload = (_file: any) => { - const fileType = modelRef.file?.fileType === 'csv' ? 'csv' : 'xlsx'; + // const fileType = modelRef.file?.fileType === 'csv' ? 'csv' : 'xlsx'; const isCsv = _file.type === 'text/csv'; const isXlsx = _file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; - if (!isCsv && fileType !== 'xlsx') { + if (!isCsv) { onlyMessage('请上传.csv格式文件', 'warning'); } - if (!isXlsx && fileType !== 'csv') { + if (!isXlsx) { onlyMessage('请上传.xlsx格式文件', 'warning'); } - return (isCsv && fileType !== 'xlsx') || (isXlsx && fileType !== 'csv'); + // return (isCsv && fileType !== 'xlsx') || (isXlsx && fileType !== 'csv'); + return isCsv || isXlsx; }; const handleDrop = () => {};