diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
index c712877..204bda7 100644
--- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
+++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js
@@ -2,6 +2,7 @@ $(() => {
moduleTitle()
LOSS()
jp()
+ total('#total')
// 公共请求地址
let url = '/broad/zz'
@@ -97,6 +98,7 @@ $(() => {
//追踪事件轮询
$.post(url + "/selectInStoreOrderInfo", {}, data => {
data = JSON.parse(data)
+ total('#total',data.map(val => val.actual_number).reduce((val1,val2) => val1 + val2 ,0))
$('#trackEvents').remove()
$('.trackEventsScrollTable').html('')
dynamicTable({
@@ -104,7 +106,7 @@ $(() => {
rowNum: 5,
timeout: 0,
header: ["订单编号", '产品型号', "计划数量", "完成数量", "执行进度", "时间"],
- data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, value.plan_number - value.actual_number, value.day]),
+ data: data.map(value => [value.plan_code.slice(4, value.plan_code.length), value.name.split('-')[1], value.plan_number, value.actual_number, ((value.actual_number /value.plan_number).toFixed(4) * 100 + '').slice(0,5) + '%', value.day]),
index: false,
fontColor: '#B4B7BF ',
indexBGC: '#86F3FF',
@@ -181,3 +183,10 @@ const Tips = (el, top = {
`
$(el).html(html)
}
+
+const total = (el,val=0) => {
+ const html = `
+ 合计：${val}
+ `
+ $(el).html(html)
+}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/js/cron.min.js b/ruoyi-admin/src/main/resources/static/js/cron.min.js
new file mode 100644
index 0000000..1dceb5d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/static/js/cron.min.js
@@ -0,0 +1,2 @@
+function setCronTak(callback,cronstr){var bool=initCronTask(callback,cronstr);if(!bool){alert("表达式有误")}}function initCronTask(callback,cronstr){var contabs=cronstr.split(" ");var length=contabs.length;var cronArray=new Array();if(length==7){var secondSelectedArray=getValueArray(contabs[0],"second");if(secondSelectedArray==null||secondSelectedArray.length==0){return false}var minuteSelectedArray=getValueArray(contabs[1],"minute");if(minuteSelectedArray==null||minuteSelectedArray.length==0){return false}var hourSelectedArray=getValueArray(contabs[2],"hour");if(hourSelectedArray==null||hourSelectedArray.length==0){return false}var dayArray=getValueArray(contabs[3],"day");if(dayArray==null||dayArray.length==0){return false}var weekArray=getValueArray(contabs[6],"week");if(weekArray==null||weekArray.length==0){return false}var monthSelectedArray=getValueArray(contabs[4],"month");if(monthSelectedArray==null||monthSelectedArray.length==0){return false}var yearArray=getValueArray(contabs[5],"year");if(yearArray==null||yearArray.length==0){return false}}else{return false}var cronObj={};cronObj.secondSelectedArray=secondSelectedArray;cronObj.minuteSelectedArray=minuteSelectedArray;cronObj.hourSelectedArray=hourSelectedArray;cronObj.dayArray=dayArray;cronObj.weekArray=weekArray;cronObj.monthSelectedArray=monthSelectedArray;cronObj.yearArray=yearArray;var now=new Date();var nextTime=getCronNextTime(now,cronObj);if(nextTime!=null){now=new Date();var subTime=nextTime.getTime()-now.getTime();if(subTime<0){subTime=0}setTimeout(function(){callCronTask(callback,cronObj)},subTime)}return true}function callCronTask(callback,cronObj){setTimeout(callback,0);var now=new Date();var nextTime=getCronNextTime(now,cronObj);if(nextTime!=null){now=new Date();var subTime=nextTime.getTime()-now.getTime();if(subTime<0){subTime=0}setTimeout(function(){callCronTask(callback,cronObj)},subTime)}}function getCronNextTime(now,cronObj){var bool=preHandle(now,cronObj);if(!bool){return null}var nextDateObj={};var nextDate=getNextYear(now,cronObj,false,nextDateObj);if(nextDate!=null){return nextDate}else{return null}}function preHandle(now,cronObj){var nowYear=now.getFullYear();var yearArray=cronObj.yearArray;var hasLeapYear=preHandleYear(nowYear,yearArray);var maxSecMonthDay=28;if(hasLeapYear){maxSecMonthDay=29}var monthSelectedArray=cronObj.monthSelectedArray;var maxDays=getMaxDayInMonths(maxSecMonthDay,monthSelectedArray);var dayArray=cronObj.dayArray;var bool=getVaildDayCheck(maxDays,dayArray);if(bool){return true}else{return false}}function getVaildDayCheck(maxDays,dayArray){for(var i=0;imin?true:false;nextDate.nextYear=i;var dateTmp=getNextMonth(now,cronObj,gtFlag,nextDate);if(dateTmp!=null){return dateTmp}}}return null}function getMaxYear(yearArray){var maxYear=getMinValue("year");for(var i=0;imonth?true:false;var dateTmp=getNextDay(now,cronObj,tmpGtFlag,nextDate);if(dateTmp!=null){return dateTmp}}}}return null}function getNextDay(now,cronObj,gtFlag,nextDate){var dayArray=cronObj.dayArray;var weekArray=cronObj.weekArray;var min=getMinValue("day");if(!gtFlag){day=now.getDate();
+if(minmin?true:false;var dateTmp=getNextHour(now,cronObj,tmpGtFlag,nextDate);if(dateTmp!=null){return dateTmp}}}}return null}function getNextHour(now,cronObj,gtFlag,nextDate){var hourSelectedArray=cronObj.hourSelectedArray;var hour=null;if(!gtFlag){hour=now.getHours()}for(var i=0;ihour?true:false;var dateTmp=getNextMinute(now,cronObj,tmpGtFlag,nextDate);if(dateTmp!=null){return dateTmp}}}}return null}function getNextMinute(now,cronObj,gtFlag,nextDate){var minuteSelectedArray=cronObj.minuteSelectedArray;var minute=null;if(!gtFlag){minute=now.getMinutes()}for(var i=0;iminute?true:false;var dateTmp=getNextSencond(now,cronObj,tmpGtFlag,nextDate);if(dateTmp!=null){return dateTmp}}}}return null}function getNextSencond(now,cronObj,gtFlag,nextDate){var secondSelectedArray=cronObj.secondSelectedArray;var second=null;if(!gtFlag){second=now.getSeconds()}for(var i=0;i=3){return null}if(parts.length==1){ucron.divisor=1}else{if(isValidNumber(parts[1])&&parts[1]>0){ucron.divisor=parts[1]}else{return null}}var timeRange=parts[0].split("-");if(timeRange.length==1&&timeRange[0]=="*"){ucron.min=getMinValue(type);ucron.max=getMaxValue(type)}else{if(timeRange.length==1&&timeRange[0]=="?"&&(type=="day"||type=="week")){ucron.min=null;ucron.max=null}else{if(timeRange.length==1&&isValidNumber(timeRange[0])){ucron.min=timeRange[0];ucron.max=timeRange[0]}else{if(timeRange.length==2&&isValidNumber(timeRange[0])&&isValidNumber(timeRange[1])){ucron.min=timeRange[0];ucron.max=timeRange[1]}else{return null}}}}subcronArray[i]=ucron}if(type=="day"||type=="week"||type=="year"){return subcronArray}else{return getSelectedValue(subcronArray,type)}}function getSelectedValue(subcronArray,type){var min=getMinValue(type);var max=getMaxValue(type);var selectedArray=new Array();var j=0;for(var i=min;i<=max;i++){if(isValidValue(subcronArray,i)){selectedArray[j]=i;j++}}return selectedArray}function isValidValue(subcronArray,value){for(var i=0;i=min&&(max==null||value<=max)&&value%divisor==0){return true}}return false}function isIgnore(subcronArray){for(var i=0;i
-
+