批量导入被检设备

frontend/src/api/device/device/index.ts

@@ -31,33 +31,33 @@ export const deletePqDev = (params: string[]) => {
 
 // //导入被检设备(比对)
 // export const importPqDev=(params: Device.ReqPqDevParams)=>{
-//     return http.upload(`/pqDev/import`, params)
+//    return http.upload(`/pqDev/import`, params)
 // }
 //   //导入比对式被检设备
 //   export const importContrastPqDev=(params: Device.ReqPqDevParams)=>{
-//     return http.upload(`/pqDev/importContrast`, params)
+//    return http.upload(`/pqDev/importContrast`, params)
 //   }
-  
-  //导出灿能二楼设备
-  export const exportCNDev=(params: Device.ReqPqDevParams)=>{
-    return http.download(`/pqDev/exportCNDev`, params)
-  }
-  
-  // 下载灿能二楼设备导入文件模板
-  export const downloadCNDevTemplate = () => {
-    return http.download(`/pqDev/downloadCNDevTemplate`)
-  }
-  
-  //导入灿能二楼设备
-  export const importCNDev=(params: Device.ReqPqDevParams)=>{
-    return http.upload(`/pqDev/importCNDev`, params)
-  }
+
+//导出灿能二楼设备
+export const exportCNDev = (params: Device.ReqPqDevParams) => {
+  return http.download(`/pqDev/exportCNDev`, params)
+}
+
+// 下载灿能二楼设备导入文件模板
+export const downloadCNDevTemplate = () => {
+  return http.download(`/pqDev/downloadCNDevTemplate`)
+}
+
+//导入灿能二楼设备
+export const importCNDev = (params: Device.ReqPqDevParams) => {
+  return http.uploadExcel(`/pqDev/importCNDev`, params)
+}
 //根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
 export const getPqDev = () => {
   return http.post(`/devType/list`)
 }
 
 //被检设备归档
-export const documentedPqDev=(ids:string[])=>{
+export const documentedPqDev = (ids: string[]) => {
   return http.post(`/pqDev/documented`, ids)
 }

frontend/src/api/index.ts

@@ -42,7 +42,7 @@ class RequestHttp {
         config.loading ?? (config.loading = true)
         config.loading && showFullScreenLoading()
         if (config.headers && typeof config.headers.set === 'function') {
-          config.headers.set('Authorization', 'Bearer '+userStore.token)
+          config.headers.set('Authorization', 'Bearer ' + userStore.token)
         }
         return config
       },
@@ -63,7 +63,7 @@ class RequestHttp {
         // 登陆失效
         if (data.code == ResultEnum.OVERDUE) {
           userStore.setToken('')
-            userStore.setUserInfo({name: ''})
+          userStore.setUserInfo({ name: '' })
           router.replace(LOGIN_URL)
           ElMessage.error(data.message)
           return Promise.reject(data)
@@ -115,9 +115,24 @@ class RequestHttp {
   }
 
   upload(url: string, params?: object, _object = {}): Promise<BlobPart> {
-    return this.service.post(url, params, { ..._object, headers: { 'Content-Type': 'multipart/form-data' } })
+    return this.service.post(url, params, {
+      ..._object,
+      headers: { 'Content-Type': 'multipart/form-data' }
+    })
   }
 
+  /**
+   * 针对excel的上传，默认返回的是blob类型，Excel没问题时返回json特殊处理
+   */
+  uploadExcel(url: string, params?: object, _object = {}): Promise<BlobPart> {
+    return this.service.post(url, params, {
+      ..._object,
+      headers: { 'Content-Type': 'multipart/form-data' },
+      responseType: 'blob',
+    })
+  }
+
+
 }
 
 export default new RequestHttp(config)