二楼使用设备导入导出

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

@@ -25,16 +25,27 @@ export const deletePqDev = (params: string[]) => {
   return http.post(`/pqDev/delete`, params)
 }
 
-//导出被检设备
-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)=>{
+export const importContrastPqDev=(params: Device.ReqPqDevParams)=>{
-  return http.upload(`/pqDev/import`, 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)
 }
 
 //根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
@@ -42,7 +53,6 @@ export const getPqDev = () => {
   return http.post(`/devType/list`)
 }
 
-
 //被检设备归档
 export const documentedPqDev=(ids:string[])=>{
   return http.post(`/pqDev/documented`, ids)

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

@@ -10,7 +10,7 @@
       <template #tableHeader='scope'>
         <el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.device="'export'" type='primary' :icon='Upload' plain @click='downloadFile()'>导出</el-button>
-        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()' v-if='modeStore.currentMode === "比对式"'>导入</el-button>
+        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -39,10 +39,10 @@ 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, downloadTemplate, importPqDev,getPqDev } from '@/api/device/device/index.ts'
+import {getPqDevList, deletePqDev, getPqDev, exportCNDev, downloadCNDevTemplate, importCNDev} from '@/api/device/device/index.ts'
 import { ElMessageBox } from 'element-plus'
 import { computed, onBeforeMount, onMounted, reactive, ref } from 'vue'
-import { useModeStore , useAppSceneStore} from '@/stores/modules/mode'; // 引入模式 store
+import { useModeStore , useAppSceneStore} from '@/stores/modules/mode';
 defineOptions({
       name: 'device'
   })
@@ -198,7 +198,7 @@ const downloadFile = async () => {
 
     ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>{
       const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
-      useDownload(exportPqDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
+      useDownload(exportCNDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
     })
 }
 
@@ -209,8 +209,9 @@ const importFile = async () => {
   const params = {
     title: '被检设备',
     showCover: false,
-    tempApi: downloadTemplate,
+    tempApi: downloadCNDevTemplate,
-    importApi: importPqDev,
+    importApi: importCNDev,
+    // importApi: modeStore.currentMode === "比对式"? importContrastPqDev: importCNDev,
     getTableList: proTable.value?.getTableList,
   }
   deviceImportExcel.value?.acceptParams(params)