feat:分析管理

nx/helper/calcAnalysisValue.js

@@ -46,12 +46,11 @@ export function calcAnalysisValue(group) {
         if (formulaVal.startsWith('Get')) {
           //计算公式为Get开头的，都是执行方法
           v = eval(formulaVal)
-        } else if (formulaVal.startsWith('From')) {
         } else {
           v = math.evaluate(formulaVal).toString()
           v = isFinite(v) ? v.toString() : ''
         }
-        ele.value = handleRoundFiveNumber(v, ele.dataType)
+        ele.value = handleRoundFiveNumber(v, ele.decimalPosition)
       }
     }
   } catch (error) {
@@ -86,7 +85,6 @@ export function calcRowAnalysisValue(row, columnObj, dynamicsColumns) {
       if (formulaVal.startsWith('Get')) {
         formulaVal = formulaVal.replace(')', ",'" + row.conBaseSampleId + "')")
         v = eval(formulaVal)
-      } else if (formulaVal.startsWith('From')) {
       } else {
         v = math.evaluate(formulaVal).toString()
         v = isFinite(v) ? v : 0
@@ -330,10 +328,14 @@ function accAdd(arg1, arg2) {
 }
 
 // 通过配置项分组
-export function groupByField(list, groupKey = 'groupDictionaryBusinessKey') {
+export function groupByField(list, cupNumFieldIndex, groupKey = 'groupDictionaryBusinessKey') {
   const groupMap = new Map()
   list.unshift({ groupDictionaryBusinessKey: 'all', groupDictionaryBusinessName: '全部' })
   for (const item of list) {
+    // 赋值杯号fieldindex
+    if (item.title === '杯号') {
+      cupNumFieldIndex.value = item.fieldIndex
+    }
     const key = item[groupKey]
     if (!key) continue // 跳过没有 group 的项（可选）