自定义标准与运算更改
parent
631c903135
commit
e21d3b331a
|
@ -666,8 +666,10 @@ export default {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
num = parseFloat(this.questionForm[o.TableQuestionId])
|
num = parseFloat(this.questionForm[o.TableQuestionId])
|
||||||
|
if (!isNaN(num)) {
|
||||||
dataArr.push(num)
|
dataArr.push(num)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (rules.CustomCalculateMark) {
|
switch (rules.CustomCalculateMark) {
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -709,8 +711,10 @@ export default {
|
||||||
case 13:
|
case 13:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
||||||
|
} else {
|
||||||
|
dataArr.push(0)
|
||||||
}
|
}
|
||||||
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr, 0) ? 1 : 0;
|
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
||||||
break;
|
break;
|
||||||
case 14:
|
case 14:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
|
|
|
@ -595,8 +595,10 @@ export default {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
num = parseFloat(this.questionForm[o.TableQuestionId]);
|
num = parseFloat(this.questionForm[o.TableQuestionId]);
|
||||||
|
if (!isNaN(num)) {
|
||||||
dataArr.push(num)
|
dataArr.push(num)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
switch (rules.CustomCalculateMark) {
|
switch (rules.CustomCalculateMark) {
|
||||||
case 1:
|
case 1:
|
||||||
|
@ -634,8 +636,10 @@ export default {
|
||||||
case 13:
|
case 13:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
|
||||||
|
} else {
|
||||||
|
dataArr.push(0)
|
||||||
}
|
}
|
||||||
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr, 0) ? 1 : 0;
|
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
|
||||||
break;
|
break;
|
||||||
case 14:
|
case 14:
|
||||||
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
|
||||||
|
|
Loading…
Reference in New Issue