From b9c7727dc6fbb3789f063c0616ef9392311fecb2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 10:58:14 +0800
Subject: [PATCH] merge master
---
app/api/excel.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 5db60db..e8cc6ec 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -111,13 +111,16 @@
if merge_file is not None:
await websocket.send_json({
- "message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "stream",
- "file_name": f"{merge_file}.xlsx",
- "download_url": f"./api/document/download/{merge_file}.xlsx"
+ "files": [
+ {
+ "file_name": "Excel",
+ "file_url": f"./api/document/download/{merge_file}.xlsx?file_type=excel",
+ }
+ ]
})
await websocket.send_json({
- "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "message": "鍚堝苟鎴愬姛",
"type": "close",
})
# 鍒涘缓浼氳瘽璁板綍
@@ -130,8 +133,8 @@
"content": {
"message": "\u5408\u5e76\u6210\u529f",
"type": "message",
- "file_url": f"/api/document/download/{merge_file}.xlsx?file_type=excel",
- "file_name": f"{merge_file}"
+ "file_name": "Excel",
+ "file_url": f"/api/document/download/{merge_file}.xlsx?file_type=excel"
}
}
session_service = SessionService(db)
--
Gitblit v1.8.0