diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue index de2f752d..7b4f8b92 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue @@ -499,9 +499,10 @@ export default { if (rules.CalculateQuestionList.length === 0) { return false; } + let dataArr = [] rules.CalculateQuestionList.forEach((o, i) => { if (i === 0) { - if (rules.CustomCalculateMark > 4) { + if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) { switch (rules.CustomCalculateMark) { case 5: this.questionForm[o.QuestionId].forEach((q, qi) => { @@ -552,6 +553,7 @@ export default { } } else { num = parseFloat(this.questionForm[o.TableQuestionId]); + dataArr.push(num) } } else { switch (rules.CustomCalculateMark) { @@ -567,6 +569,26 @@ export default { case 4: num /= parseFloat(this.questionForm[o.TableQuestionId]); break; + case 10: + if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) { + dataArr.push(parseFloat(this.questionForm[o.TableQuestionId])) + } + num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => { + return acc + (typeof curr === "number" ? curr : 0); + }, 0) / dataArr.length; + break; + case 11: + if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) { + dataArr.push(parseFloat(this.questionForm[o.TableQuestionId])) + } + num = Math.max(...dataArr); + break; + case 12: + if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) { + dataArr.push(parseFloat(this.questionForm[o.TableQuestionId])) + } + num = Math.min(...dataArr); + break; } } }); @@ -581,8 +603,6 @@ export default { var find = v.CalculateQuestionList.filter((o) => { return o.QuestionId === questionId; }); - // find的自动计算值number - console.log("find", find); if (find) { var num = this.logic(v); if (num !== false) { diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue index cffafe01..ea421bcd 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue @@ -246,7 +246,7 @@ export default { deep: true, immediate: true, handler(v) { - console.log(v) + // console.log(v) } } }, diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index cd8e4390..13943606 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -518,7 +518,7 @@