Browse Source

2026-01-08

1、增加"工艺参数"按钮,放在生产准备里
2、点击后,请求地址:https.....加工中心编号/合约号码
master
fengyuan_yang 3 days ago
parent
commit
606fd68d10
  1. 37
      src/views/modules/yieldReport/com_produce_report_normal.vue
  2. 3
      static/config/index-prod.js
  3. 3
      static/config/index-qa.js
  4. 3
      static/config/index-uat.js
  5. 2
      static/config/index.js

37
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -188,9 +188,12 @@
<el-button type="primary" size="small" @click="startProduceModal" :disabled="buttonTags.produceFlag" icon="el-icon-video-play"> <el-button type="primary" size="small" @click="startProduceModal" :disabled="buttonTags.produceFlag" icon="el-icon-video-play">
开始生产 开始生产
</el-button> </el-button>
<el-button type="primary" size="small" @click="sopPreviewModal" icon="el-icon-document" style="grid-column: 1 / -1;">
<el-button type="primary" size="small" @click="sopPreviewModal" icon="el-icon-document">
SOP预览 SOP预览
</el-button> </el-button>
<el-button type="primary" size="small" @click="openProcessDataPage" icon="el-icon-setting">
工艺参数
</el-button>
</div> </div>
</div> </div>
@ -3243,6 +3246,7 @@ export default {
rowCount: '', rowCount: '',
rollCount: '', rollCount: '',
carrierNo: '', carrierNo: '',
batchNo: '', //
}, },
currentRollOps: { currentRollOps: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -4236,6 +4240,7 @@ export default {
this.scheduleData.rowCount = data.row.rowCount; this.scheduleData.rowCount = data.row.rowCount;
this.scheduleData.rollCount = data.row.rollCount; this.scheduleData.rollCount = data.row.rollCount;
this.scheduleData.carrierNo = data.row.carrierNo; this.scheduleData.carrierNo = data.row.carrierNo;
this.scheduleData.batchNo = data.row.batchNo;
// //
this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' ' this.titleCon = '机台工作台' + ' - ' + data.row.itemDesc + ' '
+ data.row.resourceDesc + ' (' + this.operatorData.operatorName + ')'; + 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
// SOP // SOP
sopPreviewModal() { sopPreviewModal() {

3
static/config/index-prod.js

@ -11,4 +11,7 @@
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = 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';
})(); })();

3
static/config/index-qa.js

@ -11,4 +11,7 @@
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = 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';
})(); })();

3
static/config/index-uat.js

@ -11,4 +11,7 @@
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = 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';
})(); })();

2
static/config/index.js

@ -12,5 +12,7 @@
window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分) window.SITE_CONFIG['version'] = ''; // 版本号(年月日时分)
window.SITE_CONFIG['cdnUrl'] = 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';
})(); })();
Loading…
Cancel
Save