|
@@ -866,6 +866,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ console.log(data)
|
|
|
setTimeout(()=>{
|
|
|
this.loading = false
|
|
|
var data2 = []
|
|
@@ -885,22 +886,24 @@ export default {
|
|
|
proofGroupDescription2 : obj.proofGroups[j].description2,
|
|
|
evidenceReason:obj.proofGroups[j].evidenceReason
|
|
|
}
|
|
|
- if( obj.proofGroups[j].evidenceReason && obj.proofGroups[j].evidenceReason.length>0){
|
|
|
+ if( (obj.proofGroups[j].evidenceReason && obj.proofGroups[j].evidenceReason.length>0) ||(obj.proofGroups[j].secondEvidenceReason && obj.proofGroups[j].secondEvidenceReason.length>0)){
|
|
|
var evidenceReason = this.freightData(obj.proofGroups[j].evidenceReason)
|
|
|
var secondEvidenceReason =this.freightData(obj.proofGroups[j].secondEvidenceReason || [])
|
|
|
- var evidence = Object.keys(evidenceReason)
|
|
|
- // if(evidenceReason.length>=secondEvidenceReason.length){
|
|
|
- // evidence = evidenceReason
|
|
|
- // }else{
|
|
|
- // evidence = secondEvidenceReason
|
|
|
- // }
|
|
|
+ // var evidence = Object.keys(evidenceReason)
|
|
|
+ if(Object.keys(evidenceReason).length>=Object.keys(secondEvidenceReason).length){
|
|
|
+ var evidence = Object.keys(evidenceReason)
|
|
|
+ var evidences = evidenceReason
|
|
|
+ }else{
|
|
|
+ var evidence = Object.keys(secondEvidenceReason)
|
|
|
+ var evidences = secondEvidenceReason
|
|
|
+ }
|
|
|
var len = evidence[evidence.length-1]
|
|
|
if(len){
|
|
|
len = Number(len)
|
|
|
}
|
|
|
for(let y1 = 0;y1<len;y1++){
|
|
|
var y = y1 + 1
|
|
|
- var feature = evidenceReason[y]
|
|
|
+ var feature = evidences[y]
|
|
|
if(!feature){
|
|
|
continue
|
|
|
}
|