Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

src/views/demo/workmanagement/device/Aerocraft/index.vue

@@ -134,7 +134,7 @@ const delDate = (record) => {
 const exportDevice = () => {
   ExportDevice().then(res => {
     const elink = document.createElement('a');
-    elink.download = '飞行器信息.xlsx';
+    elink.download = '飞行器信息.txt';
     elink.style.display = 'none';
     elink.href = URL.createObjectURL(res);
     document.body.appendChild(elink);

src/views/demo/workmanagement/device/Airport/DeviceWarning/index.vue

@@ -49,8 +49,13 @@ const [registerTable, { reload, expandAll, getForm}] = useTable({
   // 显示表格设置工具
   showTableSetting: true,
   bordered: true,
-  beforeFetch(data) {
+  beforeFetch(params) {
-    return data
+    if(params.time){
+      params.startTime = params.time[0]
+      params.endTime = params.time[1]
+    }
+    params.time = null
+    return params
   },
   afterFetch(data) {
   },