解决冲突

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

@@ -41,6 +41,7 @@ import { CirclePlus, Delete, EditPen, Download, Upload } from '@element-plus/ico
 import { useDictStore } from '@/stores/modules/dict'
 import { getPqDevList, deletePqDev, exportPqDev, downloadTemplate, importPqDev } from '@/api/device/device.ts'
 import { ElMessageBox } from 'element-plus'
+import { reactive, ref } from 'vue'
 
 const dictStore = useDictStore()
 // ProTable 实例
@@ -81,21 +82,12 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
       span: 2,
       render: () => {
         return (
-<<<<<<< HEAD
-            <div class='flx-flex-start'>
-              <TimeControl
-                  default={'月'}
-                  onUpdate-dates={handleDateChange}
-              />
-            </div>
-=======
           <div class='flx-flex-start'>
             <TimeControl
               default={'月'}
               onUpdate-dates={handleDateChange}
             />
           </div>
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
         )
       },
     },
@@ -157,7 +149,6 @@ const handleDelete = async (params: Device.ResPqDev) => {
 
 // 导出设备
 const downloadFile = async () => {
-<<<<<<< HEAD
     // 获取当前的搜索参数
     const searchParam = proTable.value?.searchParam || {};
 
@@ -167,15 +158,7 @@ const downloadFile = async () => {
 
     ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
     useDownload(exportPqDev,'被检设备导出数据', proTable.value?.searchParam, false,'.xlsx'),
-=======
-  // 获取当前的搜索参数
-  const searchParam = proTable.value?.searchParam || {}
-  // 将开始时间和结束时间添加到搜索参数中
-  searchParam.searchBeginTime = startDate.value
-  searchParam.searchEndTime = endDate.value
-  ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportPqDev, '被检设备导出数据', proTable.value?.searchParam, false, '.xlsx'),
->>>>>>> 91eea8cc8ab3fd2cf06e074f25c2adf40548a4b9
+
   )
 }