From 1640fed81e82550e360333ee7f39d28d82c6369d Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 27 Jan 2025 16:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=8D=B7=E9=94=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/style.css                    |  2 +-
 src/assets/style/style.less                   |  2 +-
 .../Transaction/TransactionTable.vue          | 52 +++++++++++++++----
 src/component/HomePage/ExportModel.vue        |  6 ++-
 src/tool/https.js                             |  1 -
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index e345e798..7f2c6859 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1693,7 +1693,7 @@ textarea:focus {
   background: #fff;
   top: 0;
   flex-wrap: wrap;
-  --width: 70%;
+  --width: 65%;
 }
 .collection_modal_body .input_border .input_box,
 .design_detail_modal_component .input_border .input_box,
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index 2fe437c3..59419bf7 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -1831,7 +1831,7 @@ textarea:focus{
 		background: #fff;
 		top: 0;
 		flex-wrap: wrap;
-		--width:70%;
+		--width:65%;
 		.input_box{
 			position: relative;
 			z-index: 2;
diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue
index 91220970..905030d6 100644
--- a/src/component/Administrator/Transaction/TransactionTable.vue
+++ b/src/component/Administrator/Transaction/TransactionTable.vue
@@ -175,6 +175,7 @@ import {
 import { formatTime } from "@/tool/util";
 import { useStore } from "vuex";
 import { Https } from "@/tool/https";
+import {getCookie,clonAllCookie} from '@/tool/cookie'
 export default defineComponent({
     components: {},
     setup() {
@@ -458,19 +459,48 @@ export default defineComponent({
             );
         };
 		//导出报表
-        let downloadTransaction = () => {
+        let downloadTransaction = async () => {
+			return
             filter.tableLoading = true;
-            // let data = setHistoryListData();
-			let data = ''
-            Https.axiosPost(Https.httpUrls.queryTransactionDownload, data,{type: 'application/vnd.ms-excel;charset=utf-8'}).then(
-                (rv: any) => {
-					console.log(rv);
+            let data = setHistoryListData();
+			// ?uniqueId=5956dc1e-3ae6-48bb-8c19-b7d9b4ba2332-1-83&userId=83&timeZone=Asia%2FShanghai&type=Generate
+
+			let jsonData:any = setHistoryListData()
+			
+			let str = JSON.stringify(jsonData)
+			let url = 'https://develop.api.aida.com.hk/api/inquiry/queryTransaction/download' + `?params=${encodeURIComponent(str)}`
+			// const response:any = await axios.get(Https.httpUrls.queryTransactionDownload, {
+			// 	responseType: 'blob',  // 重要：确保设置响应类型为 'blob'
+			// 	params:{params:str}
+			// }).then((rv)=>{
+			// 	console.log(rv);
+			// })
+				fetch(url,{
+					headers: {
+      					'Authorization': `${getCookie('token')}`,  // 添加 Bearer token 验证
+   				 	}
+				})
+				.then(response => {
+					console.log(response);
 					
-                    if (rv) {
-						console.log(rv);
-                    }
-                }
-            );
+				// return response.blob(); // 将响应转为 Blob 类型
+				})
+				.then((blob:any) => {
+					// 创建一个 URL 对象链接 Blob 数据
+					console.log(blob);
+
+					const objectURL = URL.createObjectURL(blob);
+					// 创建一个临时的 <a> 标签
+					const link = document.createElement('a');
+					link.href = objectURL;
+					link.download = 'download';  // 设置下载的文件名
+					// 触发点击事件，下载文件
+					link.click();
+					// 清理
+					URL.revokeObjectURL(objectURL);  // 释放 objectURL
+				})
+				.catch(error => {
+				});
         };
         let lastGeTrialList = (str: string) => {
             clearHistoryList();
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 2c9fbc1a..66a90b83 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -555,8 +555,10 @@ export default defineComponent({
         let createCanvas = (oldExportCanvas) => {
             showUpgradePlan.value = true;
 			clearTimeout(submitCanvasContent)
-			document.addEventListener("keydown", setCanvasKeyDown);
-			document.addEventListener("keyup", clearCanvasKeyDown);
+			setCanvasKeyDown()
+			clearCanvasKeyDown()
+			// document.addEventListener("keydown", setCanvasKeyDown);
+			// document.addEventListener("keyup", clearCanvasKeyDown);
 			normalCanvasState.value = []
 			reverseCanvasState.value = []
 			allBoardData.value.likeDesignCollectionList =
diff --git a/src/tool/https.js b/src/tool/https.js
index 5871ec69..5db5d63d 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -62,7 +62,6 @@ axios.interceptors.response.use((res) =>{
 	// 	message.warning(res.data.errMsg)
     //     return Promise.reject(res.data);
 	// }else 
-	console.log(res);
 	if (res.data) {
 		if (res.data.errCode === 0) {
             // message.error(res.data.errMsg)