|
|
@ -29,9 +29,13 @@ datalist.reverse(); |
|
|
|
let yxdatalist = datalist.filter(it=>{ |
|
|
|
let yxdatalist = datalist.filter(it=>{ |
|
|
|
return !it.stop; |
|
|
|
return !it.stop; |
|
|
|
}); |
|
|
|
}); |
|
|
|
if(jkGroupType=="2"){ |
|
|
|
|
|
|
|
|
|
|
|
let yidatalist = yxdatalist.filter(it=>{ |
|
|
|
|
|
|
|
return it.parse; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
if(jkGroupType=="2" && yidatalist.length>0){ |
|
|
|
runModes = []; |
|
|
|
runModes = []; |
|
|
|
yxdatalist.forEach(it=>{ |
|
|
|
yidatalist.forEach(it=>{ |
|
|
|
let grouname = it.group || it.type; |
|
|
|
let grouname = it.group || it.type; |
|
|
|
if(runModes.indexOf(grouname) == -1){ |
|
|
|
if(runModes.indexOf(grouname) == -1){ |
|
|
|
runModes.push(grouname); |
|
|
|
runModes.push(grouname); |
|
|
@ -39,9 +43,6 @@ if(jkGroupType=="2"){ |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let yidatalist = yxdatalist.filter(it=>{ |
|
|
|
|
|
|
|
return it.parse; |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
let erdatalist = yxdatalist.filter(it=>{ |
|
|
|
let erdatalist = yxdatalist.filter(it=>{ |
|
|
|
return it.erparse; |
|
|
|
return it.erparse; |
|
|
|
}); |
|
|
|
}); |
|
|
|