zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:扭转日期变动时添加是否为空的判断

This commit is contained in:
shijing 2026-02-04 10:38:06 +08:00
parent d21cc6bdf2
commit 0faf237e43
2 changed files with 63 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/views/wpm_bx/mlogbw_check.vue
View File

@ -963,7 +963,7 @@ export default {
obj.printer_commands = str; obj.printer_commands = str;
obj.printer_name = that.printer_name; obj.printer_name = that.printer_name;
let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1'; let printer_ip=localStorage.getItem("printer_ip")||'127.0.0.1';
that.$API.wpm.prints.req(printer_ip, obj).then((response) => { that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
that.$message.success("打印成功"); that.$message.success("打印成功");
}); });
}) })
@ -1132,9 +1132,6 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
that.mlogbwlist[0].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss'); that.mlogbwlist[0].work_start_time = that.$TOOL.dateFormat(date, 'yyyy-MM-dd hh:mm:ss');
that.timeChange(that.mlogbwlist[0]); that.timeChange(that.mlogbwlist[0]);
} }
// if(that.optionsEq.length==0){
// that.getEquipment4();
// }
} }
if(that.setForm.cd_req_addr!==null&&!that.insInput){ if(that.setForm.cd_req_addr!==null&&!that.insInput){
//执行cd_req_addr,获取检测设备的数据 //执行cd_req_addr,获取检测设备的数据
@ -1172,41 +1169,38 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
} }
}); });
}, },
equipRemoteMethod(row){
let that = this;
console.log('row',row);
console.log('scope.row.equip',row.equip);
},
timeChange(row){ timeChange(row){
let that = this; let that = this;
let index = that.mlogbwlist.indexOf(row); if(row.work_start_time!==''&&row.work_start_time!==null&&row.work_start_time!==undefined){
let waveNum = 1; let index = that.mlogbwlist.indexOf(row);
let hours =Number(row.work_start_time.split(" ")[1].split(":")[0]); let waveNum = 1;
let minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]) ; let hours =Number(row.work_start_time.split(" ")[1].split(":")[0]);
console.log('hours',hours); let minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]);
console.log('minutes',minutes); if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){
if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){ waveNum = 9;
waveNum = 9; }else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){
}else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){ waveNum = 10;
waveNum = 10; }else if(hours==7||hours==8){
}else if(hours==7||hours==8){ waveNum = 1;
waveNum = 1; }else if(hours==9||hours==10){
}else if(hours==9||hours==10){ waveNum = 2;
waveNum = 2; }else if(hours==11||hours==12){
}else if(hours==11||hours==12){ waveNum = 3;
waveNum = 3; }else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){
}else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){ waveNum = 4;
waveNum = 4; }else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){
}else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){ waveNum = 5;
waveNum = 5; }else if(hours==18||hours==19){
}else if(hours==18||hours==19){ waveNum = 6;
waveNum = 6; }else if(hours==20||hours==21){
}else if(hours==20||hours==21){ waveNum = 7;
waveNum = 7; }else if(hours==22||hours==23){
}else if(hours==22||hours==23){ waveNum = 8;
waveNum = 8; }
that.mlogbwlist[index].波数 = waveNum;
}else{
that.mlogbwlist[index].波数 = null;
} }
that.mlogbwlist[index].波数 = waveNum;
}, },
saveSetting(){ saveSetting(){
let that = this; let that = this;
@ -1228,8 +1222,6 @@ that.$API.wpm.prints.req(printer_ip, obj).then((response) => {
}); });
that.$API.wpm.mlogbw.update.req("bulk",that.selectWpr).then((res) => { that.$API.wpm.mlogbw.update.req("bulk",that.selectWpr).then((res) => {
that.setVisible = false; that.setVisible = false;
// that.descriptionVisible = false;
// that.setForm = {};
that.getList(); that.getList();
}).catch((err) => { }).catch((err) => {
return err; return err;

62
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -555,37 +555,41 @@ export default {
let that = this; let that = this;
console.log('row',row) console.log('row',row)
let index = that.mlogbwlist.indexOf(row); let index = that.mlogbwlist.indexOf(row);
let waveNum = 1; if(row.work_start_time!==''&&row.work_start_time!==null&&row.work_start_time!==undefined){
let hours = 0,minutes=0; let waveNum = 1;
if(row.work_start_time.indexOf("T")>-1){ let hours = 0,minutes=0;
hours =Number(row.work_start_time.split("T")[1].split(":")[0]); if(row.work_start_time.indexOf("T")>-1){
minutes =Number(row.work_start_time.split("T")[1].split(":")[1]) ; hours =Number(row.work_start_time.split("T")[1].split(":")[0]);
minutes =Number(row.work_start_time.split("T")[1].split(":")[1]) ;
}else{
hours =Number(row.work_start_time.split(" ")[1].split(":")[0]);
minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]) ;
}
if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){
waveNum = 9;
}else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){
waveNum = 10;
}else if(hours==7||hours==8){
waveNum = 1;
}else if(hours==9||hours==10){
waveNum = 2;
}else if(hours==11||hours==12){
waveNum = 3;
}else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){
waveNum = 4;
}else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){
waveNum = 5;
}else if(hours==18||hours==19){
waveNum = 6;
}else if(hours==20||hours==21){
waveNum = 7;
}else if(hours==22||hours==23){
waveNum = 8;
}
that.mlogbwlist[index].波数 = waveNum;
}else{ }else{
hours =Number(row.work_start_time.split(" ")[1].split(":")[0]); that.mlogbwlist[index].波数 = null;
minutes =Number(row.work_start_time.split(" ")[1].split(":")[1]) ;
} }
if((hours==0&&minutes>29)||hours==1||(hours==2&&minutes<30)){
waveNum = 9;
}else if((hours==2&&minutes>29)||hours==3||(hours==4&&minutes<30)){
waveNum = 10;
}else if(hours==7||hours==8){
waveNum = 1;
}else if(hours==9||hours==10){
waveNum = 2;
}else if(hours==11||hours==12){
waveNum = 3;
}else if((hours==13&&minutes>29)||hours==14||(hours==15&&minutes<30)){
waveNum = 4;
}else if((hours==15&&minutes>29)||hours==16||(hours==17&&minutes<30)){
waveNum = 5;
}else if(hours==18||hours==19){
waveNum = 6;
}else if(hours==20||hours==21){
waveNum = 7;
}else if(hours==22||hours==23){
waveNum = 8;
}
that.mlogbwlist[index].波数 = waveNum;
}, },
getList(){ getList(){
let that = this; let that = this;