|
|
|
@ -413,9 +413,11 @@ function getMark(name,stype) { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
var marklist = []; |
|
|
|
var marklist = []; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
log(marklist) |
|
|
|
let mark = marklist.filter(it => { |
|
|
|
let mark = marklist.filter(it => { |
|
|
|
return it.name==name && it.type==stype; |
|
|
|
return it.name==name && it.type==stype; |
|
|
|
}) |
|
|
|
}) |
|
|
|
|
|
|
|
log(mark) |
|
|
|
if (mark.length > 0) { |
|
|
|
if (mark.length > 0) { |
|
|
|
return mark[0]; |
|
|
|
return mark[0]; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
|
