|
@@ -434,10 +434,16 @@ const countComputed = async () => {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+ console.log(formulaForm.value, "-----");
|
|
|
// let newValue = reverseReplace(formListNum, oldValue);
|
|
|
- console.log(oldValue, "oldValue--最终传值");
|
|
|
- const { code, msg, data } =
|
|
|
- await calculateScoreByConditionMoCondition(oldValue);
|
|
|
+ // console.log(oldValue, "oldValue--最终传值");
|
|
|
+ const { code, msg, data } = await calculateScoreByConditionMoCondition({
|
|
|
+ ...params1,
|
|
|
+ calculateScore: formulaForm.value.reduce((map, item) => {
|
|
|
+ map[item.name] = item.value !== null ? item.value : 0; // 用 0 替代 null
|
|
|
+ return map;
|
|
|
+ }, {})
|
|
|
+ });
|
|
|
if (code == 200) {
|
|
|
grade.value = data;
|
|
|
}
|