Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r38936 -r40302 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 38936) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 40302) @@ -4895,11 +4895,12 @@ var tousseId = params.tousseId || ''; var invoicePlanId = params.invoicePlanId || ''; var imgType = params.imgType || ''; + var disabledDown = params.disabledDown || false; var urls; if (imgType == 2) { - urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode; + urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode + '&disabledDown=' + disabledDown; } else { - urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode; + urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode + '&disabledDown=' + disabledDown; } if (tousseItemId !== '' || tousseId !== '') { urls += '&tousseItemId=' + tousseItemId + '&tousseId=' + tousseId + '&invoicePlanId=' + invoicePlanId; @@ -5624,9 +5625,9 @@ var today = new Date(newDate); var targetday_milliseconds = today.getTime(); if (queryPeriod && queryPeriod > 0 && queryPeriod <= 10000) { - targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * queryPeriod; + targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * (queryPeriod-1); + today.setTime(targetday_milliseconds); } - today.setTime(targetday_milliseconds); var tYear = today.getFullYear(); var tMonth = today.getMonth() + 1; var tDate = today.getDate();