From cbec6e3f120344f6f2d69808aaabb447bb52a693 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 22 八月 2024 09:45:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index 7e3d089..a0ecc55 100644
--- a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
+++ b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
@@ -303,10 +303,10 @@
printFlowCardId.value = row.flowCardId;
printLayer.value = row.layer
dialogTableVisible1.value = true;
-// setTimeout(() => {
-// printFlowCard1(); // 鏇挎崲鎴愪綘瑕佹墽琛岀殑鍑芥暟鍚�
-// //dialogTableVisible1.value = false;
-// }, 1000);
+setTimeout(() => {
+ printFlowCard1(); // 鏇挎崲鎴愪綘瑕佹墽琛岀殑鍑芥暟鍚�
+ //dialogTableVisible1.value = false;
+}, 1000);
}
const printFlowCard = () => {
@@ -320,6 +320,8 @@
let content = doc.createElement("div");
content.id = printId;
+ alert(/Chrome/.test(userAgent) && !/Edge/.test(userAgent));
+
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
console.log("style1:"+style.innerHTML)
--
Gitblit v1.8.0