Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

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)

frontend/src/components/ImportExcel/index.vue

@@ -32,7 +32,7 @@
           </template>
         </el-upload>
       </el-form-item>
-      <el-form-item label="数据覆盖 :">
+      <el-form-item v-if="parameter.showCover" label="数据覆盖 :">
         <el-switch v-model="isCover" />
       </el-form-item>
     </el-form>
@@ -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<any>; // 下载模板的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;

frontend/src/views/machine/device/index.vue

@@ -39,7 +39,7 @@ import { type ProTableInstance, type ColumnProps } from '@/components/ProTable/i
 import DevicePopup from '@/views/machine/device/components/devicePopup.vue'
 import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/icons-vue'
 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'
 
@@ -159,8 +159,9 @@ const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
 
 const importFile=async ()=>{
   const params = {
-    title: '设备',
+    title: '被检设备',
-    tempApi: exportPqDev,
+    showCover: false,
+    tempApi: downloadTemplate,
     importApi: importPqDev,
     getTableList: proTable.value?.getTableList,
   }