Merge branch 'test-dev' of http://219.151.181.73:3000/web/saber into test-dev

public/index.html

@@ -20,7 +20,7 @@
   <!-- <script type='text/javascript' src='http://192.168.0.109:8088/web-apps//api/documents/api.js'></script> -->
   <!-- <script type='text/javascript' src='http://47.110.251.215:8088/web-apps/apps/api/documents/api.js'></script> -->
   <!-- <script type='text/javascript' src='http://39.108.216.210:6831/web-apps/apps/api/documents/api.js'></script> -->
-  <script type='text/javascript' src='http://192.168.0.109:8088/web-apps/apps/api/documents/api.js'></script>
+  <!-- <script type='text/javascript' src='http://192.168.0.109:8088/web-apps/apps/api/documents/api.js'></script> -->
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
   <link rel="icon" href="<%= BASE_URL %>favicon.png">

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>
@@ -546,6 +547,7 @@ export default {
       actiFunIndex:0,//元素下挂载的计算式的索引
       chooseEleVisible:false,//选择元素弹窗
       argumenObj:{},
+      checkGsId:'',//选中的元素表id
 
       symbolReg:/(\+|-|\*|\/)（.+）/,
       operatorReg : /^\+|-|\*|%/,//加减乘除
@@ -1108,6 +1110,8 @@ export default {
 
     //点选等式中的元素
     equationClick({selected,item},index,arrName){
+      this.checkGsId=item.id
+
       if(selected){
         this.resultFormula.forEach((ele)=>{
           ele.selected = false;
@@ -1325,9 +1329,18 @@ export default {
     //保存公式
     saveFormula(){
       console.log('保存',this.pid);
-      let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      console.log(this.processFormula,'this.processFormula1111111112333');
+      let arr=JSON.parse(JSON.stringify(this.processFormula));
+      let filteredArr = arr.filter(item => item.id ===this.checkGsId);
+      // let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      let obj= formulaArrayToString(filteredArr,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 +1647,7 @@ export default {
     //方法下面的查询元素
     getTableEleComp(tableId){
         this.input3=''
+       console.log(this.iswbstype,'this.iswbstype');
        
       if(tableId === '选择节点参数'){
         this.eleListComp = this.paramDataList;

src/views/formula/edit1.vue

@@ -597,6 +597,7 @@ export default {
 
       resultFormula:[],//=等号左边的数组
       processFormula:[],//=等号右边的数组
+      checkGsId:'',//选中的公式id
       rightDict:[],//等号右边元素的字典
       processType:'',//选中的元素在等号哪边
       processSelectIndex:0,//选中的索引
@@ -1240,7 +1241,7 @@ export default {
 
     //点选等式中的元素
     equationClick({selected,item},index,arrName){
-      debugger
+    this.checkGsId=item.id
       if(selected){
         this.resultFormula.forEach((ele)=>{
           ele.selected = false;
@@ -1428,8 +1429,10 @@ export default {
     //保存公式
     saveFormula(){
       console.log('保存1',this.pid);
-      let obj = formulaArrayToString(this.processFormula,this.resultFormula);
-
+      // let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+       let arr=JSON.parse(JSON.stringify(this.processFormula));
+      let filteredArr = arr.filter(item => item.id ===this.checkGsId);
+       let obj = formulaArrayToString(filteredArr,this.resultFormula);
       let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
       obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
       //console.log(obj.eleMap)

src/views/manager/projectinfo/tree.vue

@@ -5140,18 +5140,29 @@ export default {
     handleSelectionChange(val) {
       let arr = []
       if(val.length>0){
-        for (let index = 0; index < val.length; index++) {
-          let i = val[index];
-          if( this.typeTem===2){
-             arr.push(i.pkeyId)
-          }else{
-             arr.push(i.id)
-          }
-           
-        //  arr.push(i.id)
-        }
 
-        this.syncForm.formIds=arr.join(',')
+      
+        if(this.syncForm.range==='2'){
+            for (let index = 0; index < val.length; index++) {
+                 let i = val[index];
+                 arr.push(i.pkeyId) 
+             } 
+               this.syncForm.formIds=arr.join(',')
+        }else{
+              for (let index = 0; index < val.length; index++) {
+                let i = val[index];
+                if( this.typeTem===2){
+                  arr.push(i.pkeyId)
+                }else{
+                  arr.push(i.id)
+                }
+                
+              
+              }
+              console.log(arr,'arr');
+              
+               this.syncForm.formIds=arr.join(',')
+        }
       }
     },
   async  handleCommand(command,row){