微调

frontend/src/views/machine/device/components/devicePopup.vue

@@ -267,7 +267,7 @@
           {
             formContent.value.arrivedDate = dayjs(formContent.value.arrivedDate).format('YYYY-MM-DD');
           }
-          console.log('1111'+formContent.value.arrivedDate)
+          //console.log('1111'+formContent.value.arrivedDate)
           if (formContent.value.id) {
                 const result = await updatePqDev(formContent.value);
                 if(result.code != 'A0000'){

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

@@ -149,23 +149,15 @@ const handleDelete = async (params: Device.ResPqDev) => {
   proTable.value?.getTableList()
 }
 
-
-<<<<<<< HEAD
 // 导出设备
 const downloadFile = async () => {
   ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportPqDev, '被检设备导出数据', proTable.value?.searchParam, false,'.xls'),
+    useDownload(exportPqDev, '被检设备导出数据', proTable.value?.searchParam, false,'.xlsx'),
   )
 }
 
-
 //导入设备
-const importFile = () => {
+const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>(null)
-  ElMessageBox.confirm('确认批量导入被检设备?', '温馨提示', { type: 'warning' }).then(() =>
-    
-  )
-=======
-const deviceImportExcel = ref<InstanceType<typeof ImportExcel> | null>("deviceExcel")
 
 const importFile=async ()=>{
   const params = {
@@ -175,7 +167,6 @@ const importFile=async ()=>{
     getTableList: proTable.value?.getTableList,
   }
   deviceImportExcel.value?.acceptParams(params)
->>>>>>> f08f45fb9ca7088c9b959b5952cef55fd7f4eeb6
 }
 </script>