From 606fd68d10867ccff14a39b8fcc33f098a003302 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 9 Jan 2026 13:39:20 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-08=201=E3=80=81=E5=A2=9E=E5=8A=A0"?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0"=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=9C=A8=E7=94=9F=E4=BA=A7=E5=87=86=E5=A4=87?= =?UTF-8?q?=E9=87=8C=202=E3=80=81=E7=82=B9=E5=87=BB=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=EF=BC=9Ahttps.....?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7/?= =?UTF-8?q?=E5=90=88=E7=BA=A6=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yieldReport/com_produce_report_normal.vue | 37 ++++++++++++++++++- static/config/index-prod.js | 3 ++ static/config/index-qa.js | 3 ++ static/config/index-uat.js | 3 ++ static/config/index.js | 2 + 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index f690d43..4dff2ae 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -188,9 +188,12 @@ 开始生产 - + SOP预览 + + 工艺参数 + @@ -3243,6 +3246,7 @@ export default { rowCount: '', rollCount: '', carrierNo: '', + batchNo: '', // 合约号码 }, currentRollOps: { site: this.$store.state.user.site, @@ -4236,6 +4240,7 @@ export default { this.scheduleData.rowCount = data.row.rowCount; this.scheduleData.rollCount = data.row.rollCount; this.scheduleData.carrierNo = data.row.carrierNo; + this.scheduleData.batchNo = data.row.batchNo; //设置弹窗的标题 this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' ' + data.row.resourceDesc + ' （' + this.operatorData.operatorName + '）'; @@ -5133,6 +5138,36 @@ export default { }); }, + // 打开工艺参数页面 + openProcessDataPage() { + // 检查是否有选择的派工单 + if (JSON.stringify(this.currentRow) == '{}') { + this.$message.error('请先选择派工单'); + return false; + } + + // 获取加工中心编码和合约号码 + const workcenterNo = this.scheduleData.workCenterNo; + const batchNo = this.scheduleData.batchNo; + + if (!workcenterNo) { + this.$message.error('加工中心编码不能为空'); + return false; + } + + if (!batchNo) { + this.$message.error('合约号码不能为空'); + return false; + } + + // 从配置文件获取URL并拼接参数 + const baseUrl = window.SITE_CONFIG['processDataUrl'] || 'http://10.2.1.159:3010/#/public/processData'; + const targetUrl = `${baseUrl}/${workcenterNo}/${batchNo}`; + + // 在新窗口打开 + window.open(targetUrl, '_blank'); + }, + // SOP预览相关方法 // 打开SOP预览弹出框 sopPreviewModal() { diff --git a/static/config/index-prod.js b/static/config/index-prod.js index fee941e..686854e 100644 --- a/static/config/index-prod.js +++ b/static/config/index-prod.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index-qa.js b/static/config/index-qa.js index 8051d4c..a02c0d6 100644 --- a/static/config/index-qa.js +++ b/static/config/index-qa.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index-uat.js b/static/config/index-uat.js index cff83ca..6da42e1 100644 --- a/static/config/index-uat.js +++ b/static/config/index-uat.js @@ -11,4 +11,7 @@ window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })(); diff --git a/static/config/index.js b/static/config/index.js index de3e455..07d08d6 100644 --- a/static/config/index.js +++ b/static/config/index.js @@ -12,5 +12,7 @@ window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version; + // 工艺参数URL配置 + window.SITE_CONFIG['processDataUrl'] = 'http://10.2.1.159:3010/#/public/processData'; })();