多条件判断修改

src/api/formula/formula.js

@@ -10,7 +10,7 @@ export const getTypeMap = (params) => {
   })
 }
 
-export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,scope,projectId,dev,ver,formulas}) => {
+export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,scope,projectId,dev,ver,formulas,method}) => {
   return request({
     url: '/api/blade-manager/formula/save',
     method: 'post',
@@ -26,12 +26,13 @@ export const saveFormula = ({formula,remark,nodeId,elementId,scale,number,map,sc
       projectId,
       dev,
       ver,
-      formulas
+      formulas,
+      method
     }
   })
 }
 
-export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,map,scope,dev,formulas}) => {
+export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,map,scope,dev,formulas,method}) => {
   return request({
     url: '/api/blade-manager/formula/update',
     method: 'post',
@@ -46,7 +47,8 @@ export const updateFormula = ({id,formula,remark,nodeId,elementId,scale,number,m
       map,
       scope,
       dev,
-      formulas
+      formulas,
+      method
     }
   })
 }

src/views/formula/component/funComponent/ifelse.vue

@@ -23,6 +23,10 @@
         <el-option label="数据获取" value="3"></el-option>
       
       </el-select>
+      <el-select v-model="method" size="medium" placeholder="请选择"     v-if="symbol=='more'" class="mg-l-10">
+        <el-option label="总数" value="sum"></el-option>
+        <el-option label="平均值" value="avg"></el-option>
+      </el-select>
       <el-button class="mg-l-10" size="small" type="info" @click="showSelectEle">选择参数</el-button>
     </div>
 
@@ -473,7 +477,10 @@ export default {
         type: String,
         default:'',
       },
-    
+      method:{
+        type: String,
+        default:'',
+      }
     
 
   },
@@ -554,7 +561,8 @@ export default {
       elseTagsLeft: [],
       elseTagRight: '',
       elseTagsRight: [],
-      elseFocus: '' // 用于跟踪否则部分的焦点
+      elseFocus: '', // 用于跟踪否则部分的焦点
+ 
 
     }
   },

src/views/formula/edit.vue

@@ -220,6 +220,7 @@
                 :dataForm="dataForm"
                 :remark="remark"
                 @clickTag="handleClickTagElse"
+                :method="method"
                 >
               </component>
                 <div class="flex1" v-show="item.showSelectEle" style="margin-top:10px;margin-bottom:30px">
@@ -630,6 +631,7 @@ export default {
       tableKey:'3',
       initTableNameDev:'',//初始表名 允许偏差值范围
       selectedTableKeyDev:'', // 存储
+      method:''
 
     };
   },
@@ -1571,6 +1573,10 @@ handleDelete(e) {
         let resMore=formatArrayMore(this.$refs.dynamiccomponent[0].conditionList);
         const resJson=generateResult(this.$refs.dynamiccomponent[0].conditionList);
         let remark=this.$refs.dynamiccomponent[0].remark;
+        let method=this.$refs.dynamiccomponent[0].method;
+        console.log(method,'method');
+        
+
 console.log(remark,'remark');
 
         console.log(resJson,'resJson');
@@ -1590,7 +1596,8 @@ console.log(remark,'remark');
                 scope:this.globaltype,
                 // projectId:this.curProjiect.id||this.projectId,
                 projectId:this.curProjiect.id||this.pid,
-                dev:deviationRangeText
+                dev:deviationRangeText,
+                method:method
               }).then(()=>{
                 this.formulaStringToArray();
                 this.$message({
@@ -1612,7 +1619,9 @@ console.log(remark,'remark');
                 dev:deviationRangeText,
                 // projectId:this.curProjiect.id||this.projectId,
                 projectId:this.curProjiect.id||this.pid,
-                ver:this.version
+                ver:this.version,
+                method:method
+
               }).then((res)=>{
                 if(res.data.data){
                   this.formulaid = res.data.data;
@@ -1852,6 +1861,7 @@ console.log(remark,'remark');
         detail.formula = detail.formula.replace('FC.ifelseMulti','FC.ifelse');
         this.isMore = true;
             this.formulaDetailMap = detail.map;
+            this.method=detail.method;
         this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap)
     
       }else if(detail&&detail.formula.includes('FC.switchCase')){