111

src/views/formula/edit.vue

@@ -361,7 +361,8 @@
                     <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
                 </template> -->
                 <template>
-                    <el-option  v-for="item in eleTableList" :key="item.pkeyId" :label="item.tableName" :value="item.pkeyId"></el-option>
+                    <!-- <el-option  v-for="item in eleTableList" :key="item.pkeyId" :label="item.tableName" :value="item.pkeyId"></el-option> -->
+                         <el-option  v-for="item in eleTableList" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)?item.pkeyId:item.id"></el-option>
                 </template>
               
               </el-select>
@@ -1325,9 +1326,16 @@ export default {
     //保存公式
     saveFormula(){
       console.log('保存',this.pid);
+      console.log(this.processFormula,'this.processFormula1111111112333');
+      
       let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      console.log(this.processFormula,'this.processFormula1111111111');
+            console.log(this.resultFormula,'this.resultFormulaa1111111111');
+      console.log(obj,'obj1111111111111111111');
+      
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
       obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
+
       //console.log(obj.eleMap)
       //return;
 
@@ -1634,6 +1642,7 @@ export default {
     //方法下面的查询元素
     getTableEleComp(tableId){
         this.input3=''
+       console.log(this.iswbstype,'this.iswbstype');
        
       if(tableId === '选择节点参数'){
         this.eleListComp = this.paramDataList;