瀏覽代碼

feat: 计算接口联调

haifeng.zhang 2 周之前
父節點
當前提交
94390bc8ee

+ 8 - 2
src/components/formula/manyFormula.vue

@@ -383,8 +383,14 @@ const countComputed = async () => {
         });
       }
       // let newValue = reverseReplace(formListNum, oldValue);
-      const { code, msg, data } =
-        await calculateScoreByConditionMoCondition(oldValue);
+      const { code, msg, data } = await calculateScoreByConditionMoCondition({
+        formulaType: 1,
+        formulaParams: formulaParamsChange(oldValue),
+        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;
       }

+ 9 - 3
src/views/evaluate/children/change/components/settingIndexDrawer.vue

@@ -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;
         }