diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue index 2a9a9b7..6b5b501 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/2d.vue @@ -190,19 +190,21 @@ const getDetailMsg = (row) =>{ if(row.twoDimDate != null && row.lastDate != null ){ const starttemp = new Date(row.twoDimDate); starttemp.setHours(23,59,59,999); + const endtemp = new Date(row.lastDate); + endtemp.setHours(23,59,59,999); const start =starttemp.getTime() - const end = new Date(row.lastDate).getTime(); + const end = endtemp.getTime(); const diffTime = Math.abs(end - start); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); if(day == 0){ - if(row.isDelay == 1 && row.lastDate > row.blankDate){ + if(row.isDelay == 1 && row.lastDate > starttemp){ return '延后' + (day+1) +'天'; } return '按时完成' }else{ - if(row.lastDate > row.blankDate){ + if(row.lastDate > starttemp){ return '延后' + day +'天'; - }else if (row.lastDate < row.blankDate){ + }else if (row.lastDate < starttemp){ return '提前' + day +'天'; }else{ return '按时完成' diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue index d10686d..19f1217 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/3d.vue @@ -240,19 +240,21 @@ const getDetailMsg = (row) =>{ if(row.threeDimDate != null && row.lastDate != null ){ const starttemp = new Date(row.threeDimDate); starttemp.setHours(23,59,59,999); + const endtemp = new Date(row.lastDate); + endtemp.setHours(23,59,59,999); const start =starttemp.getTime() - const end = new Date(row.lastDate).getTime(); + const end = endtemp.getTime(); const diffTime = Math.abs(end - start); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); if(day == 0){ - if(row.isDelay == 1 && row.lastDate > row.blankDate){ + if(row.isDelay == 1 && row.lastDate > starttemp){ return '延后' + (day+1) +'天'; } return '按时完成' }else{ - if(row.lastDate > row.blankDate){ + if(row.lastDate > starttemp){ return '延后' + day +'天'; - }else if (row.lastDate < row.blankDate){ + }else if (row.lastDate < starttemp){ return '提前' + day +'天'; }else{ return '按时完成' diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue index 9590707..ae83d79 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue @@ -208,19 +208,21 @@ const getDetailMsg = (row) =>{ if(row.craftEndDate != null && row.lastDate != null ){ const starttemp = new Date(row.craftEndDate); starttemp.setHours(23,59,59,999); + const endtemp = new Date(row.lastDate); + endtemp.setHours(23,59,59,999); const start =starttemp.getTime() - const end = new Date(row.lastDate).getTime(); + const end = endtemp.getTime(); const diffTime = end - start var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); if(day == 0){ - if(row.isDelay == 1 && row.lastDate > row.blankDate){ + if(row.isDelay == 1 && row.lastDate > starttemp){ return '延后' + (day+1) +'天'; } return '按时完成' }else{ - if(row.lastDate > row.blankDate){ + if(row.lastDate > starttemp){ return '延后' + day +'天'; - }else if (row.lastDate < row.blankDate){ + }else if (row.lastDate < starttemp){ return '提前' + day +'天'; }else{ return '按时完成' diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue index e23d6af..55c8070 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/workblank.vue @@ -189,8 +189,10 @@ const getDetailMsg = (row) =>{ if(row.blankDate != null && row.lastDate != null ){ const starttemp = new Date(row.blankDate); starttemp.setHours(23,59,59,999); + const endtemp = new Date(row.lastDate); + endtemp.setHours(23,59,59,999); const start =starttemp.getTime() - const end = new Date(row.lastDate).getTime(); + const end = endtemp.getTime(); const diffTime = Math.abs(end - start); var day = Math.floor(diffTime / (1000 * 60 * 60 * 24)); if(day == 0){