From 86a1ea0694cec9160a425cdce9218c75b1a74b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Fri, 23 Jan 2026 18:05:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=95=80?= =?UTF-8?q?=E9=94=8C=E5=8D=B7=E6=A0=87=E7=AD=BE=E7=BB=84=E4=BB=B6=E5=B9=B6?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=97=A7=E6=A0=87=E7=AD=BE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增GalvanisedTag.vue组件用于显示镀锌卷标签 - 在LabelRender中替换SampleTagPreview为新的GalvanisedTag组件 - 调整标签类型判断逻辑,将镀锌卷的labelType从'3'改为'4' - 移除不再使用的旧标签组件引用和注释代码 --- .../zinc/components/real-time-monitoring.vue | 1 - .../coil/panels/LabelRender/GalvanizedTag.vue | 480 ++++++++++++++++++ .../wms/coil/panels/LabelRender/index.vue | 26 +- 3 files changed, 497 insertions(+), 10 deletions(-) create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue diff --git a/klp-ui/src/views/lines/zinc/components/real-time-monitoring.vue b/klp-ui/src/views/lines/zinc/components/real-time-monitoring.vue index 9001b849..27dfdbc6 100644 --- a/klp-ui/src/views/lines/zinc/components/real-time-monitoring.vue +++ b/klp-ui/src/views/lines/zinc/components/real-time-monitoring.vue @@ -343,7 +343,6 @@ export default { console.error('加载图表历史数据失败:', e) } }, - // 初始化WebSocket连接(替换uniapp的WebSocketManager为原生WebSocket) initSocket() { const vm = this let isDestroyed = false diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue new file mode 100644 index 00000000..f1a7302e --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/GalvanizedTag.vue @@ -0,0 +1,480 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue index 754b9232..ece9d2f5 100644 --- a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -14,9 +14,15 @@ :paperWidthMm="180" :paperHeightMm="100" /> - + +
下载标签图片 @@ -33,18 +39,20 @@ import { PDFDocument } from 'pdf-lib'; import MaterialTag from './MaterialTag.vue'; import OuterTagPreview from './OuterTagPreview.vue'; -import SampleTagPreview from './SampleTagPreview.vue'; -import ForgeTagPreview from './ForgeTagPreview.vue'; -import SaltSprayTagPreview from './SaltSprayTagPreview.vue'; +import GalvanisedTag from './GalvanisedTag.vue'; +// import SampleTagPreview from './SampleTagPreview.vue'; +// import ForgeTagPreview from './ForgeTagPreview.vue'; +// import SaltSprayTagPreview from './SaltSprayTagPreview.vue'; export default { name: 'LabelRender', components: { MaterialTag, OuterTagPreview, - SampleTagPreview, - ForgeTagPreview, - SaltSprayTagPreview, + GalvanisedTag, + // SampleTagPreview, + // ForgeTagPreview, + // SaltSprayTagPreview, }, data() { return { @@ -76,7 +84,7 @@ export default { } else if (itemType == 'product' && itemName == '热轧卷板') { this.labelType = '3'; } else if (itemType == 'product' && itemName == '镀锌卷') { - this.labelType = '3'; + this.labelType = '4'; } else if (itemType == 'product' && itemName == '冷轧卷') { this.labelType = '3'; } else {