diff --git a/frontend/src/api/device/device/index.ts b/frontend/src/api/device/device/index.ts
index c5109c6..d2040b3 100644
--- a/frontend/src/api/device/device/index.ts
+++ b/frontend/src/api/device/device/index.ts
@@ -25,11 +25,33 @@ export const deletePqDev = (params: string[]) => {
   return http.post(`/pqDev/delete`, params)
 }
 
-export const downloadTemplate = () => {
-  return http.download(`/pqDev/downloadTemplate`)
-}
-
+// export const downloadTemplate = () => {
+//   return http.download(`/pqDev/downloadTemplate`)
+// }
 
+// //导入被检设备(比对)
+// export const importPqDev=(params: Device.ReqPqDevParams)=>{
+//     return http.upload(`/pqDev/import`, params)
+// }
+//   //导入比对式被检设备
+//   export const importContrastPqDev=(params: Device.ReqPqDevParams)=>{
+//     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、模板、通道数、额定电压、额定电流）；
 export const getPqDev = () => {
   return http.post(`/devType/list`)
diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index 203d886..983ef6a 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -980,7 +980,7 @@ const handleTest = async (val: string) => {
     const data = reactive({
       socketServe: socketClient.Instance,
     });
-    const url = 'ws://192.168.1.127:7777/hello?name=cdf';
+    const url = 'ws://localhost:7777/hello?name=cdf';
     socketClient.Instance.connect(url);
     data.socketServe = socketClient.Instance;
     data.socketServe.registerCallBack('aaa', (res: { code: number; }) => {
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index 52a3d91..47cc6f6 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -10,12 +10,8 @@
       <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>
-<<<<<<< HEAD
         <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('比对式')" v-if='modeStore.currentMode === "比对式"'>导入</el-button>
-=======
-        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
->>>>>>> ab02f8f1b34e2ceeee7cb83be9f6fc79b71116ad
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           删除
@@ -211,17 +207,17 @@ const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
 const importFile = async (pattern:string) => {
 
   if(pattern === '比对式'){
-    const params = {
-        title: '被检设备',
-        showCover: false,
-        tempApi: downloadTemplate,
-        importApi: importPqDev,
-        getTableList: proTable.value?.getTableList,
-    }
-    deviceImportExcel.value?.acceptParams(params)
+    // const params = {
+    //     title: '被检设备',
+    //     showCover: false,
+    //     tempApi: downloadTemplate,
+    //     importApi: importPqDev,
+    //     getTableList: proTable.value?.getTableList,
+    // }
+    // deviceImportExcel.value?.acceptParams(params)
   }else{
     const params = {
-      title: '被检设备',
+    title: '被检设备',
     showCover: false,
     tempApi: downloadCNDevTemplate,
     importApi: importCNDev,