From 2ffa2054a2ed4367f493e1063e23572c8c0cf698 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 11:05:46 +0800
Subject: [PATCH] 钢化模块、掰片模块解决推送数据时的bug，修改文字样式，新增打印功能
---
UI-Project/src/views/UnLoadGlass/loadmachinerack.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue b/UI-Project/src/views/UnLoadGlass/loadmachinerack.vue
index ec9f524..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 = () => {
@@ -319,6 +319,8 @@
// 鍒涘缓鏃犲壇浣滅敤鐨勬墦鍗板鍣�(鍥犱笉纭畾椤甸潰鐨勬墦鍗板厓绱犳湁鏃犲叾瀹冩牱寮�)
let content = doc.createElement("div");
content.id = printId;
+
+ alert(/Chrome/.test(userAgent) && !/Edge/.test(userAgent));
// 鏍峰紡鎺у埗涓庢墦鍗版棤鍏崇殑鍏冪礌闅愯棌
let style = doc.createElement("style");
@@ -402,10 +404,10 @@
</script>
<template>
<div>
- <el-button style="margin-top: 5px;margin-left: 10px;" id="searchButton" type="primary"
+ <el-button style="margin-top: 10px;margin-left: 10px;margin-bottom: 10px;" id="searchButton" type="primary"
@click="dialogFormVisibleaDownGlass = true">钀芥灦璇︽儏
</el-button>
- <el-switch style="margin-top: 5px;margin-left: 10px;" v-model="autoPrint" class="mb-2" :inactive-text="$t('鑷姩鎵撳嵃')"
+ <el-switch style="margin-top: 10px;margin-left: 15px;margin-bottom: 10px;" v-model="autoPrint" class="mb-2" :inactive-text="$t('鑷姩鎵撳嵃')"
@change="handleChange"/>
<el-card style="flex: 1;" v-loading="loading">
<el-card style="flex: 1;margin-left: 4px;margin-top: 1px;" v-loading="loading">
--
Gitblit v1.8.0