From 706d57aa682845cf1bc01cbfd1087c4c0f33093f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 12 十一月 2024 09:46:48 +0800
Subject: [PATCH] 优化
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 83 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 36 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index bf14582..013403d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -80,7 +80,7 @@
<el-button id="print" v-print="'#printMe'" type="primary">鎵撳嵃</el-button>
<div style="display: none">
<div id="printMe">
- <div style="text-align: center;margin-top: 64px">
+ <div style="text-align: center;margin-top: 70px">
<span style="font-size: 29px;">鐢甸┍绯荤粺鎬绘垚</span>
</div>
<div style="display: flex;margin-top: 2px;margin-left: 39px;font-size: 15px">
@@ -92,19 +92,19 @@
<span>棰濆畾鍔熺巼锛�</span><span>30kW</span><br>
</div>
<div style="margin-top: 4px">
- <span>棰濆畾鎵煩锛�</span><span>70N.m</span><br>
+ <span>棰濆畾杞煩锛�</span><span>70N.m</span><br>
</div>
<div style="margin-top: 4px">
<span>棰濆畾鐢靛帇锛�</span><span>336VDC</span><br>
</div>
<div style="margin-top: 4px">
- <span>棰濆伐浣滃埗锛�</span><span>S9</span><br>
+ <span>宸ヤ綔鍒讹細</span><span>S9</span><br>
</div>
<div style="margin-top: 4px">
<span>鎸佺画宸ヤ綔鐢垫祦锛�</span><span>115A</span><br>
</div>
<div style="margin-top: 4px">
- <span>鐩告暟锛�</span><span>3</span><br>
+ <span>鐩告暟锛�</span><span style="vertical-align: -0.5px;">3</span><br>
</div>
<div style="margin-top: 4px">
<span>闆朵欢鍙凤細</span><span>{{printMaterialCode}}</span><br>
@@ -125,13 +125,13 @@
<span>鏈�楂樿浆閫燂細</span><span>12000rpm</span><br>
</div>
<div style="margin-top: 4px">
- <span>闃叉姢绛夌骇锛�</span><span>IP67</span><br>
+ <span>闃叉姢绛夌骇锛�</span><span style="vertical-align: -0.5px;">I</span><span>P67</span><br>
</div>
<div style="margin-top: 4px">
<span>宄板�煎伐浣滅數娴侊細</span><span>230A</span><br>
</div>
<div style="margin-top: 4px">
- <span>缁濈紭绛夌骇锛�</span><span>H</span><br>
+ <span>缁濈紭绛夌骇锛�</span><span style="vertical-align: -0.5px;">H</span><br>
</div>
<div style="margin-top: 4px">
<span>鍑哄巶缂栧彿锛�</span><span>{{headContent.sfcCode}}</span><br>
@@ -144,7 +144,7 @@
<div style="text-align: center;margin-top: 101px;font-size: 20px">
- <div style="margin-top: 8px">
+ <div style="margin-top: 12px">
<span style="font-size: 22px">TZ180XSDSZX01</span><br>
</div>
@@ -166,7 +166,7 @@
</div>
</div>
- <div style="margin-top: 61px;display: flex;margin-left: 40px">
+ <div style="margin-top: 57px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
@@ -191,7 +191,7 @@
#
</span>
<span style="margin-left: -10px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
- SSW002.005
+ SSW001.001
</span>
<span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
#
@@ -211,7 +211,7 @@
</div>
</div>
- <div style="margin-top: 48px;display: flex;margin-left: 40px">
+ <div style="margin-top: 44px;display: flex;margin-left: 40px">
<div style="width: 30%;flex: 1">
<VueQr :size='80' :margin='0' :text='this.text'></VueQr>
</div>
@@ -242,7 +242,7 @@
#
</span>
<span style="margin-left: -10px;font-size: 16px;font-family: FZYaoti;letter-spacing: -0.7px">
- SSW002.005
+ SSW001.001
</span>
<span style="margin-left: -4px;font-size: 19px;font-family: FangSong;letter-spacing: -0.7px">
#
@@ -259,7 +259,7 @@
</div>
</div>
- <div style="text-align: center;margin-left: -190px;margin-top: 35px">
+ <div style="text-align: center;margin-left: -190px;margin-top: 41px">
<div style="margin-top: 4px">
<span>{{printMaterialCode}}</span><br>
</div>
@@ -391,6 +391,7 @@
pageNum: 1,
pageSize: 10,
sfcCode: null,
+ productNum: '',
},
// 鏌ヨ鍙傛暟
StationConfQueryParams: {
@@ -450,31 +451,34 @@
this.headContent.processesCode === "OP210" || this.headContent.processesCode === "OP220" ||
this.headContent.processesCode === "OP230"
){
- if(this.materialCode.length>25){
- let code = this.materialCode.substring(13,26);
- // this.headContent.sfcCode = code;
- this.queryParams.productNum = code;
- this.getList();
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
- this.cakeLamp.InPlace = 1
- const param = {
- processesCode: this.headContent.processesCode,
- productCode: this.workpieceInformation.productCode,
- sfcBarcode:code,
+ if(this.materialCode.substring(35,56).includes("SSW001.001#HHW001.001")){
+ if(this.materialCode.length>25){
+ let code = this.materialCode.substring(13,26);
+ // this.headContent.sfcCode = code;
+ this.queryParams.productNum = code;
+ this.getList();
+ this.cakeLamp.scanFinish = 1
+ this.cakeLamp.startWork = 1
+ this.cakeLamp.InPlace = 1
+ const param = {
+ processesCode: this.headContent.processesCode,
+ productCode: this.workpieceInformation.productCode,
+ sfcBarcode:code,
+ }
+ fistSetpNumber(param).then(response => {
+ console.log("fistSetpNumber------"+response.msg)
+ });
+ this.$message("鎵弿鐗╂枡缂栫爜"+this.materialCode);
+ this.materialCode="";
+ this.setFocus();
+ }else{
+ this.$message("鎵弿鐗╂枡缂栫爜閿欒锛�"+this.materialCode);
+ this.materialCode="";
+ this.setFocus();
}
- fistSetpNumber(param).then(response => {
- console.log("fistSetpNumber------"+response.msg)
- });
- this.$message("鎵弿鐗╂枡缂栫爜"+this.materialCode);
- this.materialCode="";
- this.setFocus();
- }else{
- this.$message("鎵弿鐗╂枡缂栫爜閿欒锛�"+this.materialCode);
- this.materialCode="";
- this.setFocus();
+ }else {
+ this.$message("鐗堟湰鍙锋牎楠岄敊璇紝璇锋鏌ワ紒"+this.materialCode);
}
-
}
}else{
if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
@@ -583,8 +587,10 @@
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
await listProductionOrdeLoopLine(this.queryParams).then(response => {
+ console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶')
let rowsData = response.rows[0];
if(rowsData){
+ console.log('杩涘叆鍒濆鍖栧姞杞絣ist鏂规硶'+response.rows[0])
if(this.headContent.processesCode === 'OP170'
||this.headContent.processesCode === 'OP180'||
this.headContent.processesCode === 'OP190'||
@@ -603,7 +609,11 @@
this.getListFormulaChild()
this.workpieceInformation.inboundTime = this.getCurrentTime()
this.printMaterialCode = rowsData.productCode
+ console.log(rowsData.productCode)
+ console.log(this.printMaterialCode)
this.text = 'P'+this.printMaterialCode+'#T'+this.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU'
+ console.log(this.text)
+
}else {
this.$message.error('绯荤粺娌℃湁姝ゅ伐鍗曪紝璇烽噸鏂版壂鐮侊紒');
}
@@ -618,6 +628,7 @@
if(response.msg !== ''){
if(this.headContent.processesCode === 'OP165'){
this.headContent.sfcCode = response.msg.substring(13,26)
+ this.queryParams.productNum = response.msg.substring(13,26);
}else {
this.headContent.sfcCode = response.msg;
this.queryParams.productNum = response.msg;
@@ -788,7 +799,7 @@
if(self.headContent.processesCode === "OP165"){
// self.test1()
// self.test2()
- self.text = 'P9900200461#T'+self.headContent.sfcCode+'#V993983#SSW002.005#HHW001.001#NMCU#'
+ self.text = 'P9900200461#T'+self.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU'
}
}else if (event.data.includes("[")) {//鎷х揣
--
Gitblit v1.9.3