From 824ce738a924749ab169b9bbdfb1f995e17201fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Thu, 30 Oct 2025 14:36:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加盐雾试验、力学性能、样品、生产和外标签预览组件 实现标签图片下载和打印功能 调整钢卷管理页面布局和功能 优化大屏展示的全屏处理逻辑 --- .../KLPService/Renderer/ProductInfo.vue | 3 + klp-ui/src/main.js | 3 +- klp-ui/src/views/dashboard/demo.vue | 87 +++++- klp-ui/src/views/wms/coil/box.vue | 10 +- klp-ui/src/views/wms/coil/history.vue | 7 +- klp-ui/src/views/wms/coil/index.vue | 5 +- .../panels/LabelRender/ForgeTagPreview.vue | 120 ++++++++ .../panels/LabelRender/OuterTagPreview.vue | 261 ++++++++++++++++++ .../LabelRender/ProductionTagPreview.vue | 119 ++++++++ .../LabelRender/SaltSprayTagPreview.vue | 112 ++++++++ .../panels/LabelRender/SampleTagPreview.vue | 122 ++++++++ .../wms/coil/panels/LabelRender/index.vue | 140 ++++++++++ klp-ui/src/views/wms/coil/panels/base.vue | 37 ++- klp-ui/src/views/wms/coil/product.vue | 5 +- 14 files changed, 1006 insertions(+), 25 deletions(-) create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/ForgeTagPreview.vue create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue create mode 100644 klp-ui/src/views/wms/coil/panels/LabelRender/index.vue diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue index 5f679b1e..beac18ec 100644 --- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue +++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue @@ -43,6 +43,9 @@ export default { required: true }, }, + mounted() { + console.log(this.productId, this.productMap); + }, data() { return { showDetail: false, diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js index 3a08ff6b..7934c796 100644 --- a/klp-ui/src/main.js +++ b/klp-ui/src/main.js @@ -7,6 +7,7 @@ import * as echarts from 'echarts' import dataV from '@jiaminghi/data-view'; import Element from 'element-ui' +import '@/modules/dashboardBig/assets/scss/style.scss'; import './assets/styles/element-variables.scss' import vueFlvPlayer from 'vue-flv-player' @@ -14,8 +15,6 @@ import vueFlvPlayer from 'vue-flv-player' import '@/assets/styles/index.scss' // global css import '@/assets/styles/klp.scss' // klp css -import '@/modules/dashboardBig/assets/scss/style.scss'; - import App from './App' import store from './store' import router from './router' diff --git a/klp-ui/src/views/dashboard/demo.vue b/klp-ui/src/views/dashboard/demo.vue index 970c21a4..9209df19 100644 --- a/klp-ui/src/views/dashboard/demo.vue +++ b/klp-ui/src/views/dashboard/demo.vue @@ -1,5 +1,8 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/box.vue b/klp-ui/src/views/wms/coil/box.vue index 8b3a918d..2a5cc919 100644 --- a/klp-ui/src/views/wms/coil/box.vue +++ b/klp-ui/src/views/wms/coil/box.vue @@ -264,11 +264,11 @@ export default { itemType: item.itemType, itemId: item.itemId, itemStyle: { color: this.getTechColor(index) }, - children: [{ - name: `卷数: ${item.coilCount}`, - value: item.coilCount, - itemStyle: { color: this.getTechColor(index + 1).replace('rgb', 'rgba').replace(')', ', 0.7)') } - }] + // children: [{ + // name: `卷数: ${item.coilCount}`, + // value: item.coilCount, + // itemStyle: { color: this.getTechColor(index + 1).replace('rgb', 'rgba').replace(')', ', 0.7)') } + // }] })) }; } else { diff --git a/klp-ui/src/views/wms/coil/history.vue b/klp-ui/src/views/wms/coil/history.vue index f8eb31c8..d1325508 100644 --- a/klp-ui/src/views/wms/coil/history.vue +++ b/klp-ui/src/views/wms/coil/history.vue @@ -1,5 +1,5 @@ + + diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue new file mode 100644 index 00000000..4f04a20d --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/OuterTagPreview.vue @@ -0,0 +1,261 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue new file mode 100644 index 00000000..98211007 --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/ProductionTagPreview.vue @@ -0,0 +1,119 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue new file mode 100644 index 00000000..704bc599 --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SaltSprayTagPreview.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue new file mode 100644 index 00000000..1c9bb07b --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/SampleTagPreview.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue new file mode 100644 index 00000000..ce7f7694 --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/LabelRender/index.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index c27e9266..da536bc3 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -56,9 +56,10 @@ {{ scope.row.itemType == 'product' ? '成品' : '原料' }} +