Prechádzať zdrojové kódy

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

duy 2 dní pred
rodič
commit
9140195216

+ 2 - 2
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20251022164630"
-}
+  "value": "20251111142404"
+}

+ 4 - 1
src/api/system/user.js

@@ -1,5 +1,6 @@
 import request from '@/router/axios';
 
+
 export const getList = (current, size, params, deptId) => {
     return request({
         url: '/api/blade-user/page',
@@ -12,6 +13,7 @@ export const getList = (current, size, params, deptId) => {
         }
     })
 }
+
 export const remove = (ids) => {
     return request({
         url: '/api/blade-user/remove',
@@ -164,4 +166,5 @@ export const getListBySearch = (params) => {
         method: 'get',
         params
     })
-}
+}
+

+ 1 - 2
src/api/tentative/testcollect.js

@@ -190,11 +190,10 @@ export const getLinkData = (params) => {
     params
   })
 }
-
 export const removeLinkData = (params) => {
   return request({
     url: '/api/blade-manager/trial/summary/reflection/remove',
     method: 'post',
     params
   })
-}
+}

+ 3 - 3
src/config/index.json

@@ -1,9 +1,9 @@
 {
-  "target111": "http://127.0.0.1:8090",
+  "target33": "http://127.0.0.1:8090",
+
 
-  "target": "http://192.168.0.109:8090",
-  
   "target22": "http://39.108.216.210:8090",
+  "target": "http://192.168.0.109:8090",
   "target11": "http://219.151.181.73:8090",
   "target3": "http://183.247.216.148:28090",
   "dev": {

+ 1 - 1
src/views/exctab/ElementIdentification/index.vue

@@ -459,7 +459,7 @@
 
       <!-- 关联公共WBS模板 -->
       <el-dialog
-        title="关联公共WBS模板22"
+        title="关联公共WBS模板"
         class="excelBox"
         :visible.sync="AssociatedPublicTap"
         modal-append-to-body

+ 52 - 174
src/views/exctab/excelmodel/excelmodel.vue

@@ -60,6 +60,13 @@
                   <!-- 编辑 -->
                   <i class="el-icon-edit marleft10" @click.stop="editExcel(data)" v-if="data.fileType != 1"></i>
 
+                  <!-- 调整排序 -->
+                  <!-- <i
+                  class="el-icon-sort"
+                  @click.stop="sortpai(data, node)"
+                  v-if="node.level == 3"
+                  title="调整排序"
+                ></i> -->
                   <el-link :underline="false">
                     <i class="el-icon-sort" @click.stop="sortpai(data, node)" v-if="node.level == 3" title="调整排序"></i>
                   </el-link>
@@ -103,7 +110,7 @@
               </el-upload>
             </template>
 
-            <div style="margin-left:50px;position: relative;" class="flex">
+            <div style="margin-left:50px;" class="flex">
               <div class="excelname mg-r-10" v-if="from.templateExtension">
                 <div>{{ from.templateExtension }}</div>
                 <i class="el-icon-success marleft10" style="color: rgb(0, 168, 112);"></i>
@@ -112,36 +119,21 @@
                 :on-change="uploadcoverfileExcel" ref="file3">
                 <el-button type="primary" size="mini">{{ from.templateExtension ? '重新上传导入模板' : '上传导入模板' }}</el-button>
               </el-upload> -->
-             <div>
-               <el-link v-if="from.templateExtension" class="marleft10 colorblue" @click="delectExcelMSModel">删除</el-link>
+              <el-link v-if="from.templateExtension" class="marleft10 colorblue" @click="delectExcelMSModel">删除</el-link>
               <el-link v-if="from.templateExtension" underline class="marleft10 colorblue"
                 style="text-decoration:underline;" @click="downloadExcelModel()">下载模板</el-link>
-               <el-button type="success" size="mini" @click="saveExcelInfo" :loading="saveExcelJsonLoad" style="margin-left: 5px;">保存数据</el-button>
-                <el-button type="primary" size="mini" @click="preViewInfoPdf" style="margin-left: 5px;"  :loading="pdfLoad">预览</el-button>
-             </div>
-              </div>
-           
-            
-             <div style="position: absolute;right:30px;top:65px;">
-               <el-button type="primary" size="mini"  @click="fullPage">全屏显示</el-button>
-             </div>
+            </div>
+            <el-button type="primary" size="mini" class="marleft10" @click="fullPage">全屏显示</el-button>
           </div>
 
           <el-empty style="height:80%;" v-show="!from.checkd" description="该目录为根目录没有EXCEL文件"></el-empty>
-          <div class="martop10" v-if="from.fileUrl" style="flex:1;">
+          <div class="martop20" v-if="from.fileUrl" style="flex:1;">
             <!-- <iframe
               :src="excelSrc"
               style="width:100%;height:100%;"
             ></iframe> -->
-            <div v-if='excelshow' style="width:100%;height:100%;" id="fullscreen_content">
-              <!-- <vab-only-office :option='exceloption' /> -->
-               <lucky-sheet
-               v-loading="initLoad"
-                ref="luckySheet"
-                @data-change="handleDataChange"
-                :initialData="initialData"
-                :url="from.fileUrl"
-              ></lucky-sheet>
+            <div v-if='excelshow' class='qualityManual-container-office' style="width:100%;height:100%;" id="fullscreen_content">
+              <vab-only-office :option='exceloption' />
             </div>
           </div>
         </div>
@@ -248,12 +240,7 @@
         <el-button type="primary" @click="aumbitexcelmoudel">确 定上传</el-button>
       </span>
     </el-dialog>
-     <!--  预览pdf -->
-            <PdfView
-              ref="pdfDrawerExcelRef"
-              @save-pdf="saveExcelInfoPdf"
-              :saveExcelJsonLoadPdf="saveExcelJsonLoadPdf"
-            />
+
   </div>
 </template>
 
@@ -265,18 +252,25 @@ import {
 } from '@/api/exctab/excelmodel';
 import ManualSorting from '@/components/WbsTree/ManualSorting'
 import VabOnlyOffice from '@/components/online-office/index'
- import PdfView from '@/components/PdfView.vue';
+import { log } from '@antv/g2plot/lib/utils';
 import screenfull from "screenfull";
-import LuckySheet from '@/components/lucky-sheet-editor/LuckySheet.vue'
-import {getExcelJson,saveExcelJson,getExcelPdf,getTempExcelFileUrl} from '@/api/exctab/exceltab';
+
 export default {
   components: {
-    ManualSorting, VabOnlyOffice,LuckySheet,PdfView
+    ManualSorting, VabOnlyOffice
   },
   data() {
     return {
       //参考vabOnlyOffice组件参数配置
-
+      exceloption: {
+        url: '',
+        isEdit: '',
+        fileType: '',
+        title: '',
+        lang: '',
+        isPrint: '',
+        user: { id: null, name: '' }
+      },
       excelshow: false,
 
       expandedKeys: [],//默认展开的节点
@@ -377,15 +371,7 @@ export default {
       uploadId:'',
       excelfileList: [],
       dataList: [],
-      fileobj: [],
-      initialData: [],
-      initLoad: false,
-      saveExcelJsonLoad: false,
-      pdfLoad: false,
-      pdfDrawerExcelRef: null,
-      saveExcelJsonLoadPdf: false,
-      saveDataInfo: {},
-      pdfDataUrl:''
+      fileobj: []
     }
   },
   computed: {
@@ -408,13 +394,33 @@ export default {
 
 s
     },
-
+    getBaseUrl () {
+      const host = window.location.hostname;
+      if (host === '192.168.0.109') {
+        return 'http://192.168.0.109:8090';
+      } else if (host === 'testmanger.hcxxy.com') {
+        return 'http://219.151.181.73:8090';
+      }else if(host === '183.247.216.148'){
+         return 'http://183.247.216.148:8090';
+      }
+      return 'http://192.168.0.109:8090'; // 默认值
+    },
     getFile() {
       this.excelshow = true
-
-      this.getInitialData()
+      this.exceloption.isEdit = true
+      this.exceloption.lang = 'zh-CN'
+      this.exceloption.url = this.from.fileUrl
+      this.exceloption.title = this.from.extension
+      this.exceloption.fileType = 'xlsx'
+      this.exceloption.isPrint = false
+      this.exceloption.user = { id: this.userInfo.id, name: this.userInfo.user_name }
+      // this.exceloption.editUrl = "http://172.31.222.127:8090/blade-manager/exceltab/callbackSave";
+      // this.exceloption.editUrl = "http://47.110.251.215:8090/blade-manager/exceltab/callbackSave";
+     // this.exceloption.editUrl = "http://219.151.181.73:8090/blade-manager/exceltab/callbackSave";
+          // this.exceloption.editUrl =  "http://192.168.0.109:8090/blade-manager/exceltab/callbackSave";
+          this.exceloption.editUrl = `${this.getBaseUrl()}/blade-manager/exceltab/callbackSave`;
+      this.exceloption.key = this.from.id + "_" + Math.random() + "";
     },
-
     //刷新左边树形数据
     refreshTree() {
       console.log(this.curTreeData, 'this.curTreeData111111111');
@@ -1117,135 +1123,7 @@ s
       this.exceldialogVisible=false
       this.dataList=[]
       this.excelfileList=[]
-    },
-      handleDataChange(data) {
-      // 处理数据变化
-      console.log('表格数据已更新:', data)
-      // 可以在这里将数据发送到后端保存
-    },
-    async getInitialData(){
-      this.initLoad=true
-        const { data: res } = await getExcelJson(
-        {
-          url: this.from.fileUrl,
-         
-        })
-         this.initLoad=false
-      if (res.code == 200) {
-    
-        this.initialData = JSON.parse(res.data)
-      
-        
-        
-      }else{
-        this.$message.error(res.msg)
-        this.initialData=[]
-      }
-    },
-    //保存表格数据
-async saveExcelInfo() {
-
-      const saveData = await this.$refs.luckySheet.getData();
-      this.saveDataInfo = saveData
-      this.saveExcelJsonLoad = true; // 开始加载
-      try {
-      
-        const { data: res } = await getTempExcelFileUrl({
-          key: this.from.id,
-          jsonExcel: JSON.stringify(saveData)
-        });
-        
-        if (res.code === 200) {
-          console.log(res.data,'data');
-          this.pdfDataUrl = res.data;
-          this.saveExcelInfoPdfUrL()
-
-          
-        } else {
-          this.pdfDataUrl=''
-          this.$message.error(res.msg);
-        
-        }
-      } catch (error) {
-
-      } finally {
-        // 无论成功还是失败,最终都会执行这里
-        this.saveExcelJsonLoad = false;
-      }
-
-
-},
- async saveExcelInfoPdfUrL() { 
-    const { data: res } = await getExcelPdf({
-          key: this.from.id,
-          url: this.pdfDataUrl
-        });
-        console.log(res.data,'res1');
-        
-          this.$nextTick(() => {
-            this.$refs.pdfDrawerExcelRef.show(res.data,true)
-          
-          })
-},
-async saveExcelInfoPdf() {
-  this.saveExcelJsonLoadPdf = true; // 开始加载
-  console.log(this.saveDataInfo ,'this.saveDataInfo ');
-  
-  try {
-    // const saveData = await this.$refs.luckySheet.getData();
-    const { data: res } = await saveExcelJson({
-      key: this.from.id,
-      jsonExcel: JSON.stringify(this.saveDataInfo )
-    });
-    
-    if (res.code === 200) {
-      this.$message({
-        message: '保存成功',
-        type: 'success'
-      });
-    } else {
-      this.$message.error(res.msg);
-      this.getInitialData();
     }
-  } catch (error) {
-
-  } finally {
-    // 无论成功还是失败,最终都会执行这里
-    this.saveExcelJsonLoadPdf = false;
-  }
-},
-//预览pdf
- async preViewInfoPdf(){
-  console.log('预览');
-  this.pdfLoad = true; // 开始加载
-
-  try {
-   
-    const { data: res } = await getExcelPdf({
-      key: this.from.id,
-    
-    });
-    
-    if (res.code === 200) {
-      console.log(res.data,'data');
-
-      this.$nextTick(() => {
-        this.$refs.pdfDrawerExcelRef.show(res.data,false)
-       
-      })
-      
-    } else {
-      this.$message.error(res.msg);
-     
-    }
-  } catch (error) {
-
-  } finally {
-    // 无论成功还是失败,最终都会执行这里
-    this.pdfLoad = false;
-  }
-  }
-
   },
   created() {
     this.excelType()//清表类型

+ 0 - 2140
src/views/formula/edit-new.vue

@@ -1,2140 +0,0 @@
-<template>
-  <basic-container>
-  <div class="flex flex-d-c h-100p">
-    <div class="box-dashed flex jc-sb">
-      <div class="flex">
-        <div class="retain-box">
-          <el-checkbox v-model="isRetain"></el-checkbox>
-          <span>保留</span>
-          <el-input-number
-            v-model="retainNum"
-            :step="1"
-            :min="0" :max="5"
-            :disabled="!isRetain"
-            size="small"
-          ></el-input-number>
-          <span class="retain">位</span>
-        </div>
-        <div class="retain-box">
-          <el-button size="mini" style="margin:10px;margin-top:16px;" @click="deviationRange.show = !deviationRange.show">允许偏差值范围</el-button>
-        </div>
-        <div>
-          <el-menu
-            :default-active="activeIndex"
-            class="el-menu-demo"
-            mode="horizontal"
-            @select="handleSelect"
-          >
-            <el-submenu v-for="(value,key,index) in formulaList" :key="key" :index="key">
-              <template slot="title">
-                <span>{{key}}</span>
-              </template>
-              <el-menu-item v-for="(item2,index2) in value" :key="index2" :index="(index+1) +'-' + (index2+1)">{{item2.name}}</el-menu-item>
-            </el-submenu>
-          </el-menu>
-        </div>
-      </div>
-      <div>
-        <el-button size="small" @click="handwrit">手写模式</el-button>
-      </div>
-    </div>
-    <div class="box-dashed">
-      <div class="mg-b-20">函数公式..(节点公式)</div>
-      <div class="edit-text">
-        <span>
-          <formula-item
-            v-for="(item,index) in resultFormula" :key="index"
-            :item="item" @click="obj => equationClick(obj,index,'resultFormula')"
-          >
-          </formula-item>
-        </span>
-        <span style="margin-left: 5px;margin-right: 5px;">=</span>
-        <span   v-for="(item,index) in processFormula"     :key="index">
-          <el-tooltip class="item" effect="light" placement="top-start" :disabled="item.type!=='Element'">
-            <div slot="content">{{item.tableName }}</div>
-            <formula-item
-              :getname="getItemTableName(item)"
-              :item="item" @click="obj => equationClick(obj,index,'processFormula')"
-            >
-            </formula-item>
-          </el-tooltip>
-        </span>
-      </div>
-      <div class="flex jc-sb">
-        <div></div>
-        <div><el-button type="info" size="small" @click="operationEdit">重置函数</el-button></div>
-      </div>
-    </div>
-    <div v-show="operationVisible" class="operation-box flex1 flex flex-d-c ov-hidden">
-      <div class="flex ">
-        <div>选择参数设置</div>
-        <div style="margin-left: 29%;font-weight: 700;">公式配置</div>
-      </div>
-      <div class="flex flex-d-c flex1 ov-hidden">
-        <el-row :gutter="20" class="flex1 ov-hidden">
-          <el-col :span="8" class="h-100p">
-            <el-card shadow="never" v-loading="treeLoad" class="h-100p ov-auto">
-              <el-scrollbar style="height: 100%">
-              
-                <el-tree
-                  class="filter-tree"
-                  :data="treeData"
-                  :default-expanded-keys="defaultExpanded"
-                  @node-click="getNodeDetail"
-                  :props="defaultProps"
-                  :expand-on-click-node="false"
-                  highlight-current
-                  node-key="id"
-                  ref="tree"
-                >
-                </el-tree>
-              </el-scrollbar>
-            </el-card>
-          </el-col>
-          <el-col :span="16" class="h-100p flex flex-d-c ov-hidden">
-            <div class="operation-box">
-              <!-- 运算符选择区域 -->
-                  <div class="flex jc-sb operation-symbol-box">
-                    
-                    <div class="icon-box ">
-                        <span class="text-sm" >插入运算符:</span>
-                    
-                      <el-link :underline="false" type="primary" @click="addOperator('+')" icon="el-icon-circle-plus-outline"></el-link>
-                      <el-link :underline="false" type="primary" @click="addOperator('-')" icon="el-icon-remove-outline"></el-link>
-                      <el-link :underline="false" type="primary" @click="addOperator('*')" icon="el-icon-circle-close"></el-link>
-                      <el-link :underline="false" type="primary" @click="addOperator('%')">÷</el-link>
-                       <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('(',false)">(</el-link>
-                      <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(')',true)">)</el-link>
-                        <el-link :underline="false" type="primary" @click="addText">固定值</el-link>
-                    </div>
-                    <div>
-                      操作
-                    <el-link :underline="false" icon="el-icon-delete" type="danger" @click="removeSelect"></el-link>
-                    </div>
-                  </div>
-      
-                  
-                <div class="border-grey sele-ele-box1" >
-                    <draggable v-model="selectEleFormula">
-                      <formula-item
-                        v-for="(item,index) in selectEleFormula" :key="index"
-                        :item="item" @click="obj => eleFormulaClick(obj,index)"
-                      >
-                      </formula-item>
-                    </draggable>
-                  </div>
-                  <div class="flex mg-t-10" style="justify-content: space-between;width:100%;">
-                    <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表1" style="width:45%">
-                      <el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></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>
-                    </el-select>
-                    <!-- 搜索元素下拉框 -->
-                    <!-- <el-select v-model="input3" filterable clearable placeholder="搜索元素字段"  @change="getInput" style="width:45%">
-                      <el-option
-                        v-for="item in eleList1"
-                        :key="item.id"
-                        :label="item.eName"
-                        :value="item.eName">
-                      </el-option>
-                    </el-select> -->
-                     <div class="text-align-c">
-                      <el-button size="small" @click="canceloperationVisible ">取消</el-button>
-                      <el-button size="small" @click="operationHandle" type="primary">保存</el-button>
-                    </div>
-                  </div>
-           
-                <div class="mg-t-10 no-mb-col flex1" >
-                  <el-scrollbar style="height: 350px">
-                    <!-- <el-row v-loading="eleListable"  v-if="eleList.length>0">
-                      <el-col :span="6" v-for="item in eleList" :key="item.id" >
-                        <div class="ele-box">
-                          <span v-if="item.k">{{item.name}}</span>
-                          <span v-else>{{item.eName}}</span>
-                          <el-checkbox v-model="item.checked" @change="value => eleChang(value,item)"></el-checkbox>
-                        </div>
-                        
-                      </el-col>
-                    </el-row> -->
-                    <!-- <el-row v-else style="text-align: center;line-height: 328px;border:1px solid #bbb">暂无数据</el-row> -->
-                     777
-                  </el-scrollbar>
-                </div>
-         
-            </div>
-          </el-col>
-        </el-row>
-       
-      </div>
-    </div>
-    <div v-show="!operationVisible && !showFunDetail && !deviationRange.show">
-      <div class="box-dashed">
-        <div class="mg-b-20">函数公式运算执行溯源</div>
-        <div>
-          <el-select
-            v-model="projectId"
-            @change="projectChange"
-            placeholder="请选择项目"
-            style="width: 380px"
-          >
-            <el-option
-              v-for="item in projectList"
-              :key="item.id"
-              :label="item.projectName"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-          <el-select v-model="contractId" placeholder="请选择合同段">
-            <el-option
-              v-for="item in contractList"
-              :key="item.id"
-              :label="item.contractName"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-          <el-button type="info">查询</el-button>
-        </div>
-      </div>
-    </div>
-    <div v-if="!operationVisible && showFunDetail" class="flex1">
-      <el-tabs v-model="actiFunIndex" closable @tab-remove="removeFun" :before-leave="funLeave">
-        <el-tab-pane v-for="(item,index) in equationSelectEle.children" :key="index" :label="item.name" :name="index.toString()">
-          <template v-if="!componentMap[item.name]">
-            <formula-template ref="dynamiccomponent" :formulainfo="item" :curele="equationSelectEle" @sele-ele-handle="showChooseEle">
-            </formula-template>
-          </template>
-          <template v-else>
-            <div class="flex" >
-              <div class=" flex-d-c"  style="width:40%">
-                <component ref="dynamiccomponent" 
-                v-bind:is="componentMap[item.name]" 
-                :formulainfo="item" 
-                :curele="equationSelectEle" 
-                :formulamap="formulaMap"
-                :map="formulaDetailMap"
-                 @uncheck="unCheckEleComp" 
-                 class="flex1" 
-                 :moreConditions="moreConditions" 
-                :isMore="isMore"
-                :isGetData="isGetData"
-                :dataListGet="dataListGet"
-                :isDataChange="isDataChange"
-                :dataForm="dataForm"
-                :remark="remark"
-                >
-              </component>
-                <div class="flex1" v-show="item.showSelectEle" style="margin-top:10px;margin-bottom:30px">
-                  <el-scrollbar style="height: 400px">
-                    <el-tree
-                   
-                      class="filter-tree"
-                      :data="treeData"
-                      :default-expanded-keys="defaultExpanded"
-                      @node-click="getNodeDetailComp"
-                      :props="defaultProps"
-                      :expand-on-click-node="false"
-                      highlight-current
-                      node-key="id"
-                      ref="tree"
-                    >
-                    </el-tree>
-                  </el-scrollbar>
-                </div>
-              </div>
-                <div v-show="item.showSelectEle"  style="width:60%">
-                  <div  class="flex" style="justify-content: space-between;width:100%">
-                        <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
-                        <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-                        <!-- <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option> -->
-                                                 <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="item.pkeyId"></el-option>
-                      </el-select>
-                      <!-- 搜索元素下拉框 -->
-                      <el-select v-model="input3" filterable placeholder="搜索元素字段"  @change="getInput1" style="width:45%">
-                      <el-option
-                        v-for="item in eleListComp1"
-                        :key="item.id"
-                        :label="item.eName"
-                        :value="item.eName">
-                      </el-option>
-                      </el-select>
-                  </div>
-                  
-                  <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
-                    <el-scrollbar style="height:520px;">
-                      <el-row>
-                        <el-col :span="6" v-for="item in eleListComp" :key="item.id">
-                          <div class="ele-box">
-                            <span v-if="item.k">{{item.name}}</span>
-                            <span v-else>{{item.eName}}</span>
-                            <el-checkbox v-model="item.checked" @change="value => setComponentEle(value,item,index)"></el-checkbox>
-                          </div>
-                        </el-col>
-                      </el-row>
-                    </el-scrollbar>
-                  </div>
-                </div>
-            </div>
-          </template>
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-
-    <!-- 允许偏差值范围 -->
-    <div v-if="!operationVisible && !showFunDetail && deviationRange.show" class="flex1">
-      <div class="flex">
-        <div class=" flex-d-c"  style="width:40%">
-          <deviation-range ref="deviationrange" :formulainfo="deviationRange" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></deviation-range>
-          <div class="flex1" v-show="deviationRange.showSelectEle" style="margin-top:10px;margin-bottom:30px">
-            <el-scrollbar style="height: 400px">
-              <el-tree
-                class="filter-tree"
-                :data="treeData"
-                :default-expanded-keys="defaultExpanded"
-                @node-click="getNodeDetailComp"
-                :props="defaultProps"
-                :expand-on-click-node="false"
-                highlight-current
-                node-key="id"
-                ref="tree"
-              >
-              </el-tree>
-            </el-scrollbar>
-          </div>
-        </div>
-        <div v-show="deviationRange.showSelectEle"  style="width:60%">
-           <div  class="flex" style="justify-content: space-between;width:100%">
-                <el-select v-model="eleTableIdComp" @change="getTableEleComp" placeholder="请选择元素表" style="width:45%">
-                <el-option v-if="paramDataList.length" label="选择节点参数" value="选择节点参数"></el-option>
-                <el-option  v-for="item in eleTableListComp" :key="item.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)"></el-option>
-              </el-select>
-           <!-- 搜索元素下拉框 -->
-              <el-select v-model="input3" filterable clearable placeholder="搜索元素字段"  @change="getInput1" style="width:45%">
-                  <el-option
-                    v-for="item in eleListComp1"
-                    :key="item.id"
-                    :label="item.eName"
-                    :value="item.eName">
-                  </el-option>
-              </el-select>
-           </div>
-       
-          <div class="mg-t-10 mg-b-10 no-mb-col" style="width:100%">
-            <el-scrollbar style="height:520px;">
-              <el-row>
-                <el-col :span="6" v-for="item in eleListComp" :key="item.id">
-                  <div class="ele-box">
-                    <span v-if="item.k">{{item.name}}</span>
-                    <span v-else>{{item.eName}}</span>
-                    <el-checkbox v-model="item.checked" @change="value => setDeviationRangeEle(value,item)"></el-checkbox>
-                  </div>
-                </el-col>
-              </el-row>
-            </el-scrollbar>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="text-align-c" v-show="!operationVisible">
-      <el-button type="warning" @click="$emit('hideDialog')">取消</el-button>
-      <el-button type="primary" @click="saveFormula">保存</el-button>
-    </div>
-  </div>
-
-    <el-dialog title="输入值" :visible.sync="inputVisible" width="300px" append-to-body :close-on-click-modal="false">
-      <el-input v-model="inputText" placeholder="请输入内容"></el-input>
-      <div class="text-align-c mg-t-10">
-        <el-button size="small" @click="addTextHandle" type="primary">保存</el-button>
-        <el-button size="small" @click="inputVisible = false">取消</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="选择元素" :visible.sync="chooseEleVisible" width="70%" append-to-body :close-on-click-modal="false">
-      <div>
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-card shadow="never">
-              <el-scrollbar style="height: 460px">
-                <el-tree
-                  class="filter-tree"
-                  :data="treeData"
-                  :default-expanded-keys="defaultExpanded"
-                  @node-click="getNodeDetail"
-                  :props="defaultProps"
-                  :expand-on-click-node="false"
-                  highlight-current
-                  node-key="id"
-                  ref="tree"
-                >
-                </el-tree>
-              </el-scrollbar>
-            </el-card>
-          </el-col>
-          <el-col :span="16">
-             <div  class="flex" style="justify-content: space-between;width:100%">
-               <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表">
-                <el-option v-if="paramDataList.length" label="选择节点参数3" value="选择节点参数"></el-option>
-                <!-- <template v-if="pid">
-                    <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.id" :label="item.tableName" :value="(item.pkeyId!==null&&item.pkeyId!==-1)?item.pkeyId:item.id"></el-option>
-                </template>
-              
-              </el-select>
-              <!-- 搜索元素下拉框 -->
-                <el-select v-model="input3" filterable clearable placeholder="搜索元素字段"  @change="getInput" style="width:45%">
-                <el-option
-                  v-for="item in eleList1"
-                  :key="item.id"
-                  :label="item.eName"
-                  :value="item.eName">
-                </el-option>
-                </el-select>
-             </div>
-            
-
-            <div class="mg-t-10 mg-b-10 no-mb-col">
-              <el-scrollbar style="height: 460px">
-                <el-row v-loading="eleListable"  v-if="eleList.length>0">
-                  <el-col :span="6" v-for="item in eleList" :key="item.id">
-                    <div class="ele-box">
-                      <span v-if="item.k">{{item.name}}</span>
-                      <span v-else>{{item.eName}}</span>
-                      <el-checkbox v-model="item.checked" @change="value => eleCheckHandle(value,item)"></el-checkbox>
-                    </div>
-                  </el-col>
-                </el-row>
-                 <el-row v-else style="text-align: center;line-height: 328px;border:1px solid #bbb">暂无数据</el-row>
-              </el-scrollbar>
-            </div>
-          </el-col>
-        </el-row>
-        <div class="text-align-c">
-          <el-button size="small" @click="chooseEleHandle" type="primary">保存</el-button>
-          <el-button size="small" @click="chooseEleVisible = false">取消</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="手写模式" :visible.sync="handwritVisible" width="900px" append-to-body :close-on-click-modal="false">
-      <div class="font-c-warning">tips:手写模式不保证能转换成配置模式!!即使能转换也不保证正确!!!</div>
-      <div class="mg-b-20 font-c-warning">无法在手写模式手写加入新的元素!新的节点参数!</div>
-      <editor v-model="handwritText" @init="editorInit" lang="javascript" theme="github" width="100%" height="200"></editor>
-      <!-- <el-input
-        type="textarea"
-        :autosize="{ minRows: 5,}"
-        placeholder="请输入内容"
-        v-model="handwritText">
-      </el-input> -->
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handwritVisible = false">取 消</el-button>
-        <el-button type="primary" @click="handwritTransform">转 换</el-button>
-      </span>
-    </el-dialog>
-
-  </basic-container>
-</template>
-
-<script>
-import { getLazytree,selectFormElements,getAlltree,getNodeTabAndParam} from "@/api/manager/wbstree";
-import { getProjectList,findProjectTree } from "@/api/manager/projectinfo";
-import { findContractByProjectId } from "@/api/manager/contractinfo";
-import { getDetail as getEleDeatil } from "@/api/manager/wbsformelement";
-import { getTypeMap,saveFormula,formulaDetail,updateFormula } from "@/api/formula/formula";
-import { getNodeTabAndParam as wbsPrivateGetNodeTabAndParam } from "@/api/manager/wbsprivate";
-import {mapGetters} from "vuex";
-
-import formulaItem from "./component/formulaItem"
-import formulaTemplate from "./component/formulaTemplate"
-
-import dateDeviation from "./component/funComponent/dateDeviation"
-import dateFormat from "./component/funComponent/dateFormat"
-import datasRepeat from "./component/funComponent/datasRepeat"
-import datasReme from "./component/funComponent/datasReme"
-import datasGetlist from "./component/funComponent/datasGetlist"
-import datasJoin from "./component/funComponent/datasJoin"
-import ifelse from "./component/funComponent/ifelse"
-
-import deviationRange from "./component/deviationRange/deviationRange"
-import {rangeToString} from "./component/deviationRange/rangeToString"
-
-import {formulaArrayToString} from "./formulaArrayToString"
-import {formulaStringToArray} from "./formulaStringToArray"
-
-import draggable from 'vuedraggable'
-import {formatArrayMore,restoreArrayMore,generateResult} from './component/funComponent/multiIfElseTools'
-import dataChange from "./component/funComponent/dataChange"
-import tableFormWrite from "./component/table-form-write.vue";
-
-export default {
-  components: {
-    draggable,
-
-    formulaItem,
-    formulaTemplate,
-
-    editor: require('vue2-ace-editor'),
-
-    dateDeviation,
-    dateFormat,
-    datasRepeat,
-    datasReme,
-    datasGetlist,
-    datasJoin,
-    ifelse,
- 
-    deviationRange,
-    dataChange,
-    tableFormWrite
-  },
-  props: {
-    wbsid:{
-      type:String,
-      default:''
-    },
-    eleid:{
-      type:String,
-      default:''
-    },
-    globaltype:{
-      type:Number,
-      default:10
-    },
-    nodeid:{
-      type:String,
-      default:''
-    },
-    pid:{
-      type:String,
-      default:''
-    },
-    fromcurNode:{
-      type:Object,
-      default:() => ({})
-    },
-    iswbstype:{//是否是公共wbs
-      type:String,
-      default:''
-    }
-  },
-  data() {
-    return {
-      // wbsid: "", //从哪个wbs树过来的
-      // eleid: "", //元素id
-      // nodeid:'',//所在树节点id
-      // pid:'',//项目id 私有树才有
-      formulaid:'',
-
-      treeData:[],//树节点
-      treeLoad:false,
-      defaultExpanded:[],//默认展开节点
-
-      isRetain: false, //是否保留小数
-      retainNum: 2, //保留几位小数
-      formulaList:{},
-      formulaMap:{},
-      activeIndex: "1-1", //当前选择的公式
-      itemList:[],
-      projectList: [], //项目备选列表
-      projectId: "", //溯源的项目ID
-      curProjiect: {}, //当前项目对象
-      contractList: [], //合同段备选列表
-      contractId: "", //合同段id
-
-      operationVisible: false, //基础运算弹窗
-      defaultProps: {
-        children: "children",
-        label: "title",
-        isLeaf: function (data) {
-          return !data.hasChildren || (data.isExistForm==1);
-        },
-      },
-      eleTableId:'',//选中的元素表id
-      eleTableList:[],
-      eleList:[],
-      eleChecks:[],//勾选的元素列表
-      selectEleFormula:[],
-      curSeleEleIndex:-1,//公式文字里面选中的元素索引
-      inputVisible:false,//输入弹窗
-      inputText:"",//输入值
-      deleEleIndex:-1,//删除元素的位置,如果下次添加元素,先加到这个位置
-
-      resultFormula:[],//=等号左边的数组
-      processFormula:[],//=等号右边的数组
-      rightDict:[],//等号右边元素的字典
-      processType:'',//选中的元素在等号哪边
-      processSelectIndex:0,//选中的索引
-      actiFunIndex:0,//元素下挂载的计算式的索引
-      chooseEleVisible:false,//选择元素弹窗
-      argumenObj:{},
-      checkGsId:'',//选中的元素表id
-
-      symbolReg:/(\+|-|\*|\/)(.+)/,
-      operatorReg : /^\+|-|\*|%/,//加减乘除
-      startFCRegExp : /^FC\.([a-zA-Z0-9]+)\(/,// 匹配开始的FC.xxx(
-
-      componentMap:{
-        '日期偏移':'date-deviation',
-        '日期格式化':'date-format',
-        // '去重':'datas-repeat',
-        // '去空':'datas-reme',
-        '下标取数':'datas-getlist',
-        // '数组转字符串':"datas-join",
-        '判断':'ifelse',
-        '数据自变':'data-change'
-      
-      },
-
-      eleListComp:[],//方法下面元素列表
-      eleTableListComp:[],//方法下面元素表列表
-      eleTableIdComp:'',//方法下面元素表id
-
-      handwritVisible:false,//手写弹框
-      handwritText:'',//文本
-      handwritEleMap:'',//元素map
-
-      paramDataList:[],//节点参数数组
-
-      deviationRange:{
-        show:false,//显示
-        showSelectEle:false,//显示选择元素
-        datas:{
-          symbol:'【min,max】',
-          model:'1',
-          arguments1:'',
-          arguments2:'',
-        },
-      },//允许偏差值范围
-
-      version:1,//版本号,以后可能会有不兼容旧公式的改动,留作以后可能用来判断
-      input3:'',//搜索元素字段
-      eleListable:false,
-      isMore:false,//是否是多条件判断
-      moreConditions:[],//多条件判断数组
-      formulaDetailMap:{},//公式详情map
-      dataListGet:'',
-      isGetData:false,//是否获取数据
-      isDataChange:false,//是否数据自变
-      dataForm:'',
-      remark:'',//备注
-
-
-    };
-  },
-  computed: {
-    ...mapGetters(["userInfo"]),
-
-    // selectEleFormulaText:function(){
-    //   let text = '';
-    //   this.selectEleFormula.forEach((Element)=>{
-    //     text+=Element.name;
-    //   })
-    //   return text
-    // }
-
-    //等式中选中的元素
-    equationSelectEle:function(){
-      if(this.processType){
-        return this[this.processType][this.processSelectIndex];
-      }else{
-        return null;
-      }
-    },
-
-    //是否显示元素下挂载的计算式信息
-    showFunDetail:function(){
-      if(this.equationSelectEle && this.equationSelectEle.children && this.equationSelectEle.children.length>0){
-        return true;
-      }else{
-        return false;
-      }
-    }
-  },
-  created() {
-    // this.wbsid = this.$route.query.wbsid;
-    // this.eleid = this.$route.query.eleid;
-    // this.nodeid = this.$route.query.nodeid;
-    this.pid = this.$route.query.pid;//项目id 私有树才有
-    this.init();
-  },
-  methods: {
-    async init() {
-      this.getEleDeatil();
-      this.getProjectList();
-      this.geTreeData();
-      await this.getTypeMap();
-      this.formulaStringToArray();
-    },
-
-    geTreeData(){
-      this.treeLoad = true;
-      if(this.pid){
-        findProjectTree(this.pid, this.wbsid).then((res) => {
-          this.treeLoad = false;
-          this.treeData = res.data.data;
-          this.defaultExpanded = [this.nodeid];
-          
-          this.$nextTick(()=>{
-            let isArray = Array.isArray(this.$refs.tree)
-            if (isArray) {
-              // 根据 id 获取节点信息
-              this.$refs.tree[0].setCurrentKey(this.nodeid);
-            } else {
-                this.$refs.tree.setCurrentKey(this.nodeid);
-            }
-              this.getNodeDetail(this.fromcurNode)
-              this. getNodeDetailComp(this.fromcurNode)
-          })
-          
-        })
-      }else{
-        getAlltree(this.userInfo.tenant_id, 1, this.wbsid).then((res) => {
-          this.treeLoad = false;
-          this.treeData = res.data.data;
-          this.defaultExpanded = [this.nodeid];
-           console.log(this.$refs.tree,'tree');
-          this.$nextTick(()=>{
-            let isArray = Array.isArray(this.$refs.tree)
-            if (isArray) {
-              // 根据 id 获取节点信息
-              this.$refs.tree[0].setCurrentKey(this.nodeid);
-            } else {
-                this.$refs.tree.setCurrentKey(this.nodeid);
-            }
-             this.getNodeDetail(this.fromcurNode)
-              this. getNodeDetailComp(this.fromcurNode)
-          })
-          
-        })
-      }
-    },
-
-    //懒加载树
-    loadNode(node, resolve) {
-      let pid = 0;
-      if (node.level != 0) {
-        pid = node.data.id;
-      }
-      getLazytree(this.wbsid, pid, this.userInfo.tenant_id).then((res) => {
-        let arr = [];
-        if (Array.isArray(res.data.data)) {
-          arr = res.data.data;
-        }
-        return resolve(arr);
-      });
-    },
-
-    //获取项目列表
-    getProjectList() {
-      getProjectList(1, 999).then((res) => {
-        this.projectList = res.data.data.records;
-      });
-    },
-
-    //选择公式处理
-    handleSelect(index,indexPath) {
-      //console.log(index,'index')
-      //console.log(indexPath,'indexPath')
-      if(this.operationVisible){
-        this.openerationSelect(index,indexPath)
-      }else{
-        this.equationSelect(index,indexPath)
-      }
-    },
-
-    //在选择元素模式下点选计算式
-    openerationSelect(index,indexPath){
-      if(indexPath[0]!='基础运算'){
-        this.$message({
-          type: "warning",
-          message: "当前只能使用基础运算"
-        });
-        return;
-      }
-      let formulaindex = Number(indexPath[1].split('-')[1])-1;
-      this.eleAddFormulaHandle(this.formulaList[indexPath[0]][formulaindex]);
-    },
-
-    //溯源项目id切换
-    projectChange(id) {
-      for (let i = 0; i < this.projectList.length; i++) {
-        if (id == this.projectList[i].id) {
-          this.curProjiect = this.projectList[i];
-          //根据项目id获取合同段列表
-          findContractByProjectId(this.curProjiect.id).then((res) => {
-            this.contractList = res.data.data;
-            this.contractId = "";
-          });
-          return;
-        }
-      }
-    },
-
-    operationEdit(){
-      this.selectEleFormula= JSON.parse(JSON.stringify(this.processFormula));
-      this.operationVisible = true;
-    },
-
-    eleAddFormula(){
-      for (let i = 0; i < this.eleList.length; i++) {
-        if (this.eleList[i].checked) {
-          this.eleAddFormulaHandle(this.eleList[i]);
-          break;
-        }
-      }
-    },
-
-    // eleChang(value,item){
-    //   //console.log(value)
-    //   //console.log(item)
-    //   if(value){
-    //     //简单语法判断
-    //     if(this.selectEleFormula.length != 0 && this.deleEleIndex < 0){
-    //       let lastEle = this.selectEleFormula[this.selectEleFormula.length-1];
-    //       if(lastEle.type == 'Element'){
-    //         this.$message({
-    //           type: "warning",
-    //           message: "元素无法连续出现在元素后面"
-    //         });
-    //         item.checked = false;
-    //         return;
-    //       }
-    //       if(lastEle.type == 'Text'){
-    //         this.$message({
-    //           type: "warning",
-    //           message: "元素无法连续出现在输入值后面"
-    //         });
-    //         item.checked = false;
-    //         return;
-    //       }
-    //       if(lastEle.type == 'Brackets' && lastEle.name == ')'){
-    //         this.$message({
-    //           type: "warning",
-    //           message: "元素无法连续出现在右括号后面"
-    //         });
-    //         item.checked = false;
-    //         return;
-    //       }
-    //     }
-
-    //     this.eleAddFormulaHandle(item);
-    //   }else{
-    //     let index = -1;
-    //     for (let i = 0; i < this.selectEleFormula.length; i++) {
-    //       if(this.selectEleFormula[i].id == item.id){
-    //         index = i;
-    //         break;
-    //       }
-    //     }
-    //     if(index>-1){
-    //       this.selectEleFormula.splice(index,1);
-    //     }
-    //   }
-    // },
-    eleChang(value,item){
-      if(value){
-        //简单语法判断
-        if(this.itemList.length != 0 && this.deleEleIndex < 0){
-                let lastEle = this.itemList[this.itemList.length-1];
-                if(lastEle.type == 'Text'){
-                  this.$message({
-                    type: "warning",
-                    message: "元素无法连续出现在输入值后面"
-                  });
-              item.checked = false;
-              return;
-             }
-            if(lastEle.type == 'Brackets' && lastEle.name == ')'){
-              this.$message({
-                type: "warning",
-                message: "元素无法连续出现在右括号后面"
-              });
-              item.checked = false;
-              return;
-            }
-        }
-        let lastEle = this.selectEleFormula[this.selectEleFormula.length-1];
-        if(this.selectEleFormula.length == 0 || lastEle.type == 'Operator' || lastEle.type == 'Brackets' || lastEle.name == '('){ /* 存在运算符 */
-          this.eleAddFormulaHandle(item);
-        } else {
-          this.itemList.push(item);
-        }
-
-      }else{
-           let index = -1;
-            for (let i = 0; i < this.itemList.length; i++) {
-            if(this.itemList[i].id == item.id){
-              index = i;
-              break;
-            }
-          }
-          if(index>-1){
-            this.itemList.splice(index,1);
-          }
-      }
-    },
-    //快捷添加运算符号
-    // addOperator(operator){
-    //   this.eleAddFormulaHandle(this.formulaMap[operator]);
-    // },
-   randomaddOperator(ele){
-      //type 是true 表示在元素右边插入
-      let item={
-        type:'Operator',
-        name:this.symbolReg.exec(ele.name)[1],
-        selected:false,
-        template:ele.template
-      }
-      let index = Number(this.curSeleEleIndex);
-      let currentName = this.selectEleFormula[index]
-      if (currentName.type === 'Operator') { /* 选择的符号的时候,直接替换 */
-
-        this.selectEleFormula.splice(index,1, item)
-      }
-      else { /* 选择元素的时候,如果下一个是符号则替换,如果下一个是元素则添加 */
-
-        let size = index + 1;
-        let lastName = this.selectEleFormula[size]
-
-        if (lastName.type === 'Operator') { /* 是符号,替换 */
-
-          this.selectEleFormula.splice(size,1, item)
-        }
-        else { /* 是元素,添加 */
-
-          this.selectEleFormula.splice(size,0, item)
-        }
-
-      }
-
-    },
-    addOperator(operator){
-          if(  this.itemList.length>0){
-          this.itemList.forEach(e => {
-            let lastEle = this.selectEleFormula[this.selectEleFormula.length-1];
-            if(this.selectEleFormula.length != 0 && lastEle.type != 'Operator' && lastEle.type != 'Brackets' && lastEle.name != '('){ /* 不存在运算符 */
-              this.eleAddFormulaHandle(this.formulaMap[operator]);
-            }
-            this.eleAddFormulaHandle(e);
-          })
-          }else{
-
-              if(this.curSeleEleIndex===-1 || this.curSeleEleIndex === this.selectEleFormula.length - 1){ /* 没选择值或者选择最后一个的时候直接添加符号 */
-                this.eleAddFormulaHandle(this.formulaMap[operator]);
-              }else{ /* 选择中间的值,如果下一个是符号这替换,反之则在指定的位置添加 */
-                this.randomaddOperator(this.formulaMap[operator])
-              }
-          }
-        this.itemList=[];
-    },
-    canceloperationVisible(){
-      this.operationVisible=false;
-      this.allTreeShow=false;
-      this.filterText=''
-      this.treeId=''
-      this.itemList=[];
-      this.eleList.forEach((ele)=>{
-          this.$set(ele,'checked',false);
-          //ele.checked = false;
-      })
-      console.log('取消');
-    },
-    //把元素加到公式里
-    eleAddFormulaHandle(ele){
-      if(ele.tableElementKey){
-        console.log(ele,'ele');
-        //元素
-        if(this.deleEleIndex > -1 && this.selectEleFormula.length-1 >= this.deleEleIndex){
-          //删除元素的位置,如果下次添加元素,先加到这个位置
-          this.selectEleFormula.splice(this.deleEleIndex,0,{
-            type:'Element',
-            name:ele.eName,
-            id:ele.id,
-            selected:false,
-            tableElementKey:ele.tableElementKey,
-            children:[],
-          })
-          this.deleEleIndex = -1;
-        }else{
-          this.selectEleFormula.push({
-            type:'Element',
-            name:ele.eName,
-            id:ele.id,
-            selected:false,
-            tableElementKey:ele.tableElementKey,
-            children:[],
-          })
-          this.deleEleIndex = -1;
-        }
-
-      }else if(ele.template && ele.example){
-
-        //简单语法判断
-        if(this.selectEleFormula.length == 0){
-          this.$message({
-            type: "warning",
-            message: "公式开头不能是运算符号"
-          });
-          return;
-        }else{
-          let lastEle = this.selectEleFormula[this.selectEleFormula.length-1];
-          if(lastEle.type == 'Operator'){
-            this.$message({
-              type: "warning",
-              message: "运算符号无法连续出现在运算符号后面"
-            });
-            return;
-          }
-          if(lastEle.type == 'Brackets' && lastEle.name == '('){
-            this.$message({
-              type: "warning",
-              message: "运算符号无法连续出现在左括号后面"
-            });
-            return;
-          }
-        }
-
-        //运算符号
-        this.selectEleFormula.push({
-          type:'Operator',
-          name:this.symbolReg.exec(ele.name)[1],
-          selected:false,
-          template:ele.template
-        })
-      }else if(ele.type == 'Brackets'){
-        //括号
-        this.selectEleFormula.splice(ele.selectIndex,0,{
-          type:'Brackets',
-          name:ele.name,
-          selected:false,
-        })
-      }else if(ele.type == 'Text'){
-        //输入值
-        this.selectEleFormula.push({
-          type:'Text',
-          name:ele.name,
-          selected:false,
-        })
-      }else if(ele.k){
-        //节点参数
-        this.selectEleFormula.push({
-          type:'ParamData',
-          name:ele.name,
-          selected:false,
-          id:ele.id,
-          v:ele.v,
-          k:ele.k,
-          children:[],
-        })
-      }
-    },
-
-    //添加括号
-    addBrackets(text,type){
-      //type 是true 表示在元素右边插入
-      if(this.curSeleEleIndex == Number(this.curSeleEleIndex)){
-        this.eleAddFormulaHandle({
-          type:'Brackets',
-          name:text,
-          selectIndex:type?Number(this.curSeleEleIndex)+1:this.curSeleEleIndex
-        })
-        //如果在左边插入index要增1
-        if(!type){
-          this.curSeleEleIndex = Number(this.curSeleEleIndex)+1;
-        }
-      }
-    },
-
-
-    addText(){
-      this.inputVisible = true;
-    },
-    //添加输入值
-    addTextHandle(){
-      //简单语法判断
-      if(this.selectEleFormula.length != 0){
-        let lastEle = this.selectEleFormula[this.selectEleFormula.length-1];
-        if(lastEle.type == 'Element'){
-          this.$message({
-            type: "warning",
-            message: "输入值无法连续出现在元素后面"
-          });
-          return;
-        }
-        if(lastEle.type == 'Text'){
-          this.$message({
-            type: "warning",
-            message: "输入值无法连续出现在输入值后面"
-          });
-          return;
-        }
-        if(lastEle.type == 'Brackets' && lastEle.name == ')'){
-          this.$message({
-            type: "warning",
-            message: "输入值无法连续出现在右括号后面"
-          });
-          return;
-        }
-      }
-
-      this.eleAddFormulaHandle({
-        type:'Text',
-        name:this.inputText
-      })
-      this.inputVisible = false;
-    },
-
-    //勾选元素
-    // eleCheckHandle(checked,item){
-    //   if(checked){
-    //     this.eleList.forEach((ele)=>{
-    //       this.$set(ele,'checked',false);
-    //       //ele.checked = false;
-    //     })
-    //     item.checked = true;
-    //   }
-    // },
-    //勾选元素多选
-    eleCheckHandle(checked,item){
-      if(checked){
-        this.eleChecks.push(item);
-      }else{
-        for (let i = 0; i < this.eleChecks.length; i++) {
-          if(this.eleChecks[i].id == item.id){
-            this.eleChecks.splice(i,1);
-            break;
-          }
-        }
-      }
-    },
-
-    //点选公式中的元素
-    eleFormulaClick({selected,item},index){
-      if(selected){
-        this.selectEleFormula.forEach((ele)=>{
-          ele.selected = false;
-        })
-        item.selected = true;
-        this.curSeleEleIndex = index;
-      }else{
-        this.curSeleEleIndex = -1;
-      }
-    },
-
-    //取消勾选
-    unCheckEleFormulac(eleId){
-      for (let i = 0; i < this.eleList.length; i++) {
-        if(this.eleList[i].id == eleId){
-          this.eleList[i].checked = false;
-        }
-      }
-    },
-
-    //删除点选公式中的元素
-    removeSelect(){
-      if(this.curSeleEleIndex > -1 && this.curSeleEleIndex <= this.selectEleFormula.length-1){
-        if(this.selectEleFormula[this.curSeleEleIndex].type == 'Element'){
-          //删除元素的位置,如果下次添加元素,先加到这个位置
-          this.deleEleIndex = this.curSeleEleIndex;
-          this.unCheckEleFormulac(this.selectEleFormula[this.curSeleEleIndex].id)
-        }
-        this.selectEleFormula.splice(this.curSeleEleIndex,1);
-        //this.curSeleEleIndex = -1;
-      }
-    },
-
-    //赋值给等号右边的数组
-    operationHandle(){
-      //检测左右括号数量是否相等
-      let lBracketNum = 0;
-      let rBracketNum = 0;
-      this.selectEleFormula.forEach((ele)=>{
-        if(ele.type == 'Brackets'){
-          if(ele.name == '('){
-            lBracketNum++;
-          }else if(ele.name == ')'){
-            rBracketNum++;
-          }
-        }
-      })
-      if(lBracketNum != rBracketNum){
-        this.$message({
-          type: "warning",
-          message: "左右括号数量不相等,请先检查是否正确"
-        });
-        return;
-      }
-
-
-      this.processFormula = JSON.parse(JSON.stringify(this.selectEleFormula));
-      this.operationVisible = false;
-    },
-
-    //点选等式中的元素
-    equationClick({selected,item},index,arrName){
-      this.checkGsId=item.id
-
-      if(selected){
-        this.resultFormula.forEach((ele)=>{
-          ele.selected = false;
-        })
-        this.processFormula.forEach((ele)=>{
-          ele.selected = false;
-        })
-        this.processSelectIndex = index;
-        this.processType = arrName;
-        item.selected = true;
-
-        if(this.showFunDetail){
-          //切到第一个
-          this.actiFunIndex = '0';
-        }
-      }else{
-        this.processType = '';
-      }
-    },
-        //获取当前元素的表名
-     getItemTableName(item){
-
-      
-      if(item.type==="Element"){
-        this.rightDict.forEach((ele)=>{
-          if(ele.ekey===item.tableElementKey){
-            item.tableName= ele.tableName
-          }
-        })
-      }
-    },
-
-    //在等式模式下点选计算式
-    equationSelect(index,indexPath){
-      if(!this.equationSelectEle ||(this.equationSelectEle && !(this.equationSelectEle.type == 'Element' || this.equationSelectEle.type == 'ParamData')) ){
-        this.$message({
-          type: "warning",
-          message: "请先选中元素"
-        });
-        return;
-      }
-
-      let formulaindex = Number(indexPath[1].split('-')[1])-1;
-      let expression = this.formulaList[indexPath[0]][formulaindex];
-      if(expression.type ==1){
-        return;
-      }
-      //console.log(JSON.parse(expression.template));
-      let obj = Object.assign({}, expression);
-      //obj.template = JSON.parse(obj.template);
-      obj.arguments = new Array(obj.template.args.length);
-
-      let ele = {};
-      if(this.equationSelectEle.type == 'ParamData'){
-        ele = {
-          type:'ParamData',
-          name:this.equationSelectEle.name,
-          id:this.equationSelectEle.id,
-          selected:false,
-          v:this.equationSelectEle.v,
-          k:this.equationSelectEle.k,
-        }
-      }else{
-        ele = {
-            id:this.equationSelectEle.id,
-            name:this.equationSelectEle.name,
-            selected:false,
-            tableElementKey:this.equationSelectEle.tableElementKey,
-            type:"Element",
-        };
-      }
-
-      obj.arguments[0] = ele;
-      this.equationSelectEle.children.push(obj);
-      //跳转到最新的标签
-      this.actiFunIndex = (this.equationSelectEle.children.length-1).toString();
-    },
-
-    //选择元素
-    // chooseEleHandle(){
-    //   for (let i = 0; i < this.eleList.length; i++) {
-    //     if (this.eleList[i].checked) {
-    //       let ele = this.eleList[i];
-    //       let obj = {};
-    //       if(ele.k){
-    //         obj = {
-    //           type:'ParamData',
-    //           name:ele.name,
-    //           id:ele.id,
-    //           selected:false,
-    //           v:ele.v,
-    //           k:ele.k,
-    //           children:[],
-    //         }
-    //       }else{
-    //         obj = {
-    //           type:'Element',
-    //           name:ele.eName,
-    //           id:ele.id,
-    //           selected:false,
-    //           tableElementKey:ele.tableElementKey,
-    //           children:[],
-    //         }
-    //       }
-
-
-    //       this.$set(this.argumenObj.arguments,this.argumenObj.index,obj);
-    //       this.chooseEleVisible = false;
-    //       break;
-    //     }
-    //   }
-    // },
-    //选择元素多选
-    chooseEleHandle(){
-      this.eleChecks.forEach((element,index) => {
-        this.setEleToArgumen(element,index+this.argumenObj.index);
-      });
-
-      this.chooseEleVisible = false;
-
-      this.clearEleListCheck();
-    },
-    //设置元素到指定位置参数
-    setEleToArgumen(ele,index){
-      let obj = {};
-      if(ele.k){
-        obj = {
-          type:'ParamData',
-          name:ele.name,
-          id:ele.id,
-          selected:false,
-          v:ele.v,
-          k:ele.k,
-          children:[],
-        }
-      }else{
-        obj = {
-          type:'Element',
-          name:ele.eName,
-          id:ele.id,
-          selected:false,
-          tableElementKey:ele.tableElementKey,
-          children:[],
-        }
-      }
-      if(index < this.argumenObj.arguments.length){
-        this.$set(this.argumenObj.arguments,index,obj);
-      }
-    },
-    //清理元素列表的勾选
-    clearEleListCheck(){
-      this.eleChecks = [];
-      this.eleList.forEach((item)=>{
-        item.checked = false;
-      })
-    },
-
-    //显示选择元素弹窗
-    showChooseEle(argumenObj){
-      this.argumenObj = argumenObj;
-      this.chooseEleVisible = true;
-    },
-
-    //移除挂载的函数
-    removeFun(name){
-      //console.log(name)
-      this.equationSelectEle.children.splice(Number(name), 1);
-    },
-
-    //切换公式tab标签
-    funLeave(activeName, oldActiveName){
-      if(oldActiveName){
-        let formula = this.equationSelectEle.children[Number(oldActiveName)];
-        if(formula){
-          return this.checkFormulaLegal(formula);
-        }
-      }
-
-    },
-
-    //检测公式合法
-    checkFormulaLegal(formula){
-      if(!formula.arguments){
-        return false;
-      }
-
-      //当前选中的元素
-      let curEle = this.equationSelectEle;
-      let isIn = false;
-      for (let i = 0; i < formula.arguments.length; i++) {
-        if(Array.isArray(formula.arguments[i])){
-          for(let j=0;j<formula.arguments[i].length;j++){
-            if(formula.arguments[i][j] && formula.arguments[i][j].id ==curEle.id){
-              isIn = true;
-              break;
-            }
-          }
-          if(isIn){
-            break;
-          }
-        }else if(formula.arguments[i] && formula.arguments[i].id ==curEle.id){
-          isIn = true;
-          break;
-        }
-      }
-      if(!isIn){
-        this.$message({
-          type: "warning",
-          message: "参数必须有一个值是当前元素"
-        });
-        return false;
-      }
-
-      return true;
-    },
-
-
-
-
-
-    //保存公式
-    saveFormula(){
-      console.log('保存',this.pid);
-      console.log(this.processFormula,'this.processFormula1111111112333');
-      console.log(this.resultFormula,'this.resultFormula1111111112333');
-      console.log(this.$refs.dynamiccomponent,'this.$refs.dynamiccomponent');
-      
-      if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].symbol=='more'){
-        //多条件保存公式
-
-        console.log('this.$refs.conditionList[0]',this.$refs.dynamiccomponent[0].conditionList);
-        let resMore=formatArrayMore(this.$refs.dynamiccomponent[0].conditionList);
-        const resJson=generateResult(this.$refs.dynamiccomponent[0].conditionList);
-        let remark=this.$refs.dynamiccomponent[0].remark;
-console.log(remark,'remark');
-
-        console.log(resJson,'resJson');
-        
-     
-            if(this.formulaid){
-              updateFormula({
-                id:this.formulaid,
-                formula:'',
-                formulas:resMore,
-                remark:remark,
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:JSON.stringify(resJson),
-                scope:this.globaltype,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                dev:deviationRangeText
-              }).then(()=>{
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "修改成功"
-                });
-              })
-            }else{
-              saveFormula({
-                formula:'',
-                formulas:resMore,
-                remark:remark,
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:JSON.stringify(resJson),
-                scope:this.globaltype,
-                dev:deviationRangeText,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                ver:this.version
-              }).then((res)=>{
-                if(res.data.data){
-                  this.formulaid = res.data.data;
-                }
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "保存成功"
-                });
-              })
-            }
-            
-            return;
-        
-        
-      }else if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].symbol=='getData'){
-       //数据获取保存公式
-        const dataRes = this.$refs.dynamiccomponent[0].getDataConditionData();
-       console.log(dataRes,'dataRes');
-       const result =dataRes.result;
-       const mapEle = JSON.stringify(dataRes.mapEle);
-       console.log(mapEle,'mapEle');
-       
-
-            if(this.formulaid){
-              updateFormula({
-                id:this.formulaid,
-               formula:"FC.switchCase"+'('+result+')',
-             
-                remark:'',
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:mapEle,
-                scope:this.globaltype,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                dev:deviationRangeText
-              }).then(()=>{
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "修改成功"
-                });
-              })
-            }else{
-              saveFormula({
-                  formula:"FC.switchCase" +'('+result+')',
-          
-                remark:'',
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:mapEle,
-                scope:this.globaltype,
-                dev:deviationRangeText,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                ver:this.version
-              }).then((res)=>{
-                if(res.data.data){
-                  this.formulaid = res.data.data;
-                }
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "保存成功"
-                });
-              })
-            }
-            
-            return;
-       
-      }else if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].formData){
-        console.log(this.$refs.dynamiccomponent[0],'this.$refs.dynamiccomponent[0');
-        const resForm=this.$refs.dynamiccomponent[0].getDataChangeList();
-        console.log(resForm,'resForm');
-        
-        //数据自变保存
-
-             if(this.formulaid){
-              updateFormula({
-                id:this.formulaid,
-                formula:resForm.test,
-                remark:'',
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:JSON.stringify(resForm.map),
-                scope:this.globaltype,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                dev:deviationRangeText
-              }).then(()=>{
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "修改成功"
-                });
-              })
-            }else{
-              saveFormula({
-                formula:resForm.test,
-                remark:'',
-                nodeId:this.nodeid,
-                elementId:this.eleid,
-                scale:this.isRetain?this.retainNum:'',
-                number:number,
-                map:JSON.stringify(resForm.map),
-                scope:this.globaltype,
-                dev:deviationRangeText,
-                // projectId:this.curProjiect.id||this.projectId,
-                projectId:this.curProjiect.id||this.pid,
-                ver:this.version
-              }).then((res)=>{
-                if(res.data.data){
-                  this.formulaid = res.data.data;
-                }
-                this.formulaStringToArray();
-                this.$message({
-                  type: "success",
-                  message: "保存成功"
-                });
-              })
-            }
-            return
-      }
-      
-      
-      let arr=JSON.parse(JSON.stringify(this.processFormula));
-      let filteredArr = arr.filter(item => item.id ===this.checkGsId);
-      let obj
-      let obj2
-      obj = formulaArrayToString(this.processFormula,this.resultFormula);
-      obj2 = formulaArrayToString(filteredArr,this.resultFormula);
-        // 判断 obj2.text 是否包含 FC.ifelse
-      if (obj2.text && (obj2.text.includes('FC.ifelse'))|| obj2.text.includes("''")) {
-        obj = obj2; // 如果包含 FC.ifelse,使用 obj2
-      }
-      let deviationRangeText = rangeToString(this.deviationRange.datas,obj.eleMap);
-      obj.eleMap.deviationRangeJson = JSON.stringify(this.deviationRange.datas);
-
-      //console.log(obj.eleMap)
-      //return;
-
-      //特殊公式会有number
-      let number = '';
-      for (let i = 0; i < this.processFormula.length; i++) {
-        if(this.processFormula[i].children){
-          for (let j = 0; j < this.processFormula[i].children.length; j++) {
-            if(this.processFormula[i].children[j].number){
-              number = this.processFormula[i].children[j].number;
-              break;
-            }
-          }
-        }
-        if(number){
-          break;
-        }
-      }
-      if(number === ''){
-        for (let i = 0; i < this.resultFormula.length; i++) {
-          if(this.resultFormula[i].children){
-            for (let j = 0; j < this.resultFormula[i].children.length; j++) {
-              if(this.resultFormula[i].children[j].number){
-                number = this.resultFormula[i].children[j].number;
-                break;
-              }
-            }
-          }
-          if(number){
-            break;
-          }
-        }
-      }
-
-      //console.log(text);
-      if(this.formulaid){
-        updateFormula({
-          id:this.formulaid,
-          formula:obj.text,
-          remark:'',
-          nodeId:this.nodeid,
-          elementId:this.eleid,
-          scale:this.isRetain?this.retainNum:'',
-          number:number,
-          map:JSON.stringify(obj.eleMap),
-          scope:this.globaltype,
-          // projectId:this.curProjiect.id||this.projectId,
-           projectId:this.curProjiect.id||this.pid,
-          dev:deviationRangeText
-        }).then(()=>{
-          this.formulaStringToArray();
-          this.$message({
-            type: "success",
-            message: "修改成功"
-          });
-        })
-      }else{
-        saveFormula({
-          formula:obj.text,
-          remark:'',
-          nodeId:this.nodeid,
-          elementId:this.eleid,
-          scale:this.isRetain?this.retainNum:'',
-          number:number,
-          map:JSON.stringify(obj.eleMap),
-          scope:this.globaltype,
-          dev:deviationRangeText,
-          // projectId:this.curProjiect.id||this.projectId,
-           projectId:this.curProjiect.id||this.pid,
-          ver:this.version
-        }).then((res)=>{
-          if(res.data.data){
-            this.formulaid = res.data.data;
-          }
-          this.formulaStringToArray();
-          this.$message({
-            type: "success",
-            message: "保存成功"
-          });
-        })
-      }
-
-    },
-
-    //把公式文本还原数组
-    async formulaStringToArray(){
-      let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid,projectId:this.curProjiect.id||this.pid})).data.data;
-      console.log(detail,'detail');
-      this.remark = detail.remark;
-
-      if(detail&&detail.formula.includes('FC.ifelseMulti')){
-        detail.formula = detail.formula.replace('FC.ifelseMulti','FC.ifelse');
-        this.isMore = true;
-            this.formulaDetailMap = detail.map;
-        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap)
-    
-      }else if(detail&&detail.formula.includes('FC.switchCase')){
-        //数据获取
-        this.formulaDetailMap = detail.map;
-         detail.formula = detail.formula.replace('FC.switchCase','FC.ifelse');
-         this.isGetData = true;
-         this.dataListGet=detail.formula
-         console.log( this.dataListGet,' this.dataListGet');
-         
-      }else if(detail&&detail.formula.includes('FC.dataChange')){
-        //数据自变
-        this.formulaDetailMap = detail.map;
-      
-         this.isDataChange = true;
-         this.dataForm=detail.formula
-         console.log( this.dataForm,' this.dataListGet');
-         
-      }
-      else{
-        this.isMore = false;
-        this.moreConditions = []
-        this.formulaDetailMap ={}
-        this.isGetData = false;
-        this.dataListGet=''
-        this.isDataChange = false;
-        this.dataForm='';
-
-      }
-
-    
-      if(detail&&detail.id){
-          //获取右边元素的字典
-          let dictMap=detail.dict
-        let dictArr=[]
-        //遍历:
-        for(let i in dictMap){
-          dictArr.push(dictMap[i])
-
-        }
-        this.rightDict=dictArr
-        console.log( this.rightDict,' this.rightDict');
-        
-        this.formulaid = detail.id;
-        //let formula = formulaStringToArray('FC.sum(FC.repeat(E[测试测试_222]))+FC.ifelse(3<E[测试测试_333]&&E[测试测试_333]<10,E[测试测试_222]+E[测试测试_333],E[测试测试_333])',detail.map,this.formulaMap);
-      
-        
-        
-        let formula = formulaStringToArray(detail.formula,detail.map,this.formulaMap);
-        console.log(formula,'formula');
-        
-        this.processFormula = formula.processFormula;
-        formula.resultFormula[0].id = this.resultFormula[0].id;
-        formula.resultFormula[0].name = this.resultFormula[0].name;
-        formula.resultFormula[0].tableElementKey = this.resultFormula[0].tableElementKey;
-        this.resultFormula[0].children = formula.resultFormula[0].children;
-
-        //允许偏差值范围
-        let mapObj = JSON.parse(detail.map);
-        if(mapObj.deviationRangeJson){
-          this.deviationRange.datas = JSON.parse(mapObj.deviationRangeJson);
-        }
-      }
-
-      if (detail&&detail.scale!=null&&detail.scale>=0){
-        this.isRetain = true;
-        this.retainNum = detail.scale;
-      }else{
-        this.isRetain = false;
-        this.retainNum=2
-      }
-    },
-
-
-    //设置动态组件里面的元素
-    setComponentEle(value,item,index){
-      if(value){
-        //console.log(this.$refs.dynamiccomponent[index])
-        this.$refs.dynamiccomponent[index].setELe(item);
-      }
-    },
-
-    //设置动态组件里面的元素
-    setDeviationRangeEle(value,item){
-      if(value){
-        //console.log(this.$refs.dynamiccomponent[index])
-        this.$refs.deviationrange.setELe(item);
-      }
-    },
-
-    getNodeDetail(data) {
-      if(this.pid){
-          this.eleListable=true;
-          console.log(data.id,'data.id');
-        wbsPrivateGetNodeTabAndParam(data.id, this.pid, this.wbsid).then((res) => {
-          if(res.data.data.tabData.length){
-            this.eleTableList = res.data.data.tabData;
-              this.eleListable=false;
-            // 获取点击节点的第一张表
-            console.log(this.eleTableList[0],'this.eleTableList[0]');
-            // let tabId= this.eleTableList[0].initTableId; pkeyId
-            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
-            console.log("wbsPrivateGetNodeTabAndParam")
-            this.getTableEle(tabId);
-            setTimeout(() => {
-              // 启动这个指令的DOM结构点击事件
-              this.eleTableId = tabId;
-            },1000); // 默认1秒
-          }else{
-            this.eleTableList = [];
-            this.eleTableId = '';
-            this.eleList = [];
-          }
-
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }else{
-         this.eleListable=true;
-        getNodeTabAndParam(data.id).then((res)=>{
-          if(res.data.data.tabData.length){
-            this.eleTableList = res.data.data.tabData;
-             this.eleListable=false;
-            // let tabId= this.eleTableList[0].initTableId;
-               let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
-               console.log(this.eleTableList[0],'this.eleTableList[0]');
-            console.log("getNodeTabAndParam",tabId);
-            this.getTableEle(tabId);
-            setTimeout(() => {
-              // 启动这个指令的DOM结构点击事件
-              this.eleTableId = tabId;
-            },1000); // 默认1秒
-          }else{
-            this.eleTableList = [];
-            this.eleTableId = '';
-            this.eleList = [];
-              this.eleListable=false;
-          }
-
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }
-    },
-
-    getEleDeatil(){
-      getEleDeatil(this.eleid).then((res)=>{
-        let ele = res.data.data;
-        this.resultFormula = [{
-          type:'Element',
-          name:ele.eName,
-          id:ele.id,
-          selected:false,
-          tableElementKey:ele.tableElementKey,
-          children:[],
-        }]
-      })
-    },
-
-    getTableEle(tableId){
-      console.log("getTableEle",tableId);
-      this.input3=''
-      if(tableId === '选择节点参数'){
-        this.eleList = this.paramDataList;
-        this.eleList1 = this.paramDataList;
-      }else{
-        selectFormElements(tableId,{nodeId:this.nodeid,type:this.iswbstype}).then((res)=>{
-          this.eleList = res.data.data;
-          this.eleList1 = res.data.data;
-        })
-      }
-    },
-    getInput(tableId){
-      if(tableId.length>0){
-        let arr=[]
-        arr=this.eleList1.filter((item)=>{
-          if(item.eName===tableId){
-            return item
-          }
-        })
-        this.eleList=arr;
-      }else{
-        this.eleList=this.eleList1
-      }
-       
-    },
-    getInput1(tableId){
-      if(tableId.length>0){
-        let arr=[]
-        arr=this.eleListComp1.filter((item)=>{
-          if(item.eName===tableId){
-            return item
-          }
-        })
-        this.eleListComp=arr;
-      }else{
-         this.eleListComp=this.eleListComp1;
-      }
-       
-    },
-
-    //方法下面的点击树节点
-    getNodeDetailComp(data) {
-       console.log(data.id,'data.id111111111');
-      if(this.pid){
-        wbsPrivateGetNodeTabAndParam(data.id, this.pid, this.wbsid).then((res) => {
-          if(res.data.data.tabData.length){
-            this.eleTableListComp = res.data.data.tabData;
-
-            // this.eleTableIdComp = this.eleTableListComp[0].initTableId;
-           this.eleTableIdComp = this.eleTableListComp[0].pkeyId;
-            this.getTableEleComp(this.eleTableIdComp);
-          }else{
-            this.eleTableListComp = [];
-            this.eleTableIdComp = '';
-            this.eleListComp = [];
-          }
-
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }else{
-        getNodeTabAndParam(data.id).then((res)=>{
-          if(res.data.data.tabData.length){
-            this.eleTableListComp = res.data.data.tabData;
-
-            this.eleTableIdComp = this.eleTableListComp[0].initTableId;
-            let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
-            this.getTableEleComp(tabId);
-          }else{
-            this.eleTableListComp = [];
-            this.eleTableIdComp = '';
-            this.eleListComp = [];
-          }
-
-          if(res.data.data.paramData.length){
-            this.paramDataList = res.data.data.paramData;
-          }else{
-            this.paramDataList = [];
-          }
-        })
-      }
-    },
-
-    //方法下面的查询元素
-    getTableEleComp(tableId){
-        this.input3=''
-       console.log(this.iswbstype,'this.iswbstype');
-       
-      if(tableId === '选择节点参数'){
-        this.eleListComp = this.paramDataList;
-        this.eleListComp1 = this.paramDataList;
-      }else{
-        selectFormElements(tableId,{nodeId:this.nodeid,type:this.iswbstype}).then((res)=>{
-          this.eleListComp = res.data.data;
-           this.eleListComp1 = res.data.data;
-        })
-      }
-    },
-
-    //取消方法下面 元素勾选
-    unCheckEleComp(eleId){
-      //console.log(eleId)
-      for (let i = 0; i < this.eleListComp.length; i++) {
-        if(this.eleListComp[i].id == eleId){
-          this.eleListComp[i].checked = false;
-        }
-      }
-    },
-
-    //手写模式
-    handwrit(){
-      try {
-        let obj = formulaArrayToString(this.processFormula,this.resultFormula);
-        this.handwritText = obj.text;
-        this.handwritEleMap = JSON.stringify(obj.eleMap);
-        this.handwritVisible = true;
-      } catch (error) {
-        console.error(error)
-        this.$message({
-          type: "error",
-          message: "生成公式文本失败,"+error
-        });
-      }
-    },
-
-    //转成配置用的数组
-    handwritTransform(){
-      try {
-        let formula = formulaStringToArray(this.handwritText,this.handwritEleMap,this.formulaMap);
-        this.processFormula = formula.processFormula;
-        formula.resultFormula[0].id = this.resultFormula[0].id;
-        formula.resultFormula[0].name = this.resultFormula[0].name;
-        formula.resultFormula[0].tableElementKey = this.resultFormula[0].tableElementKey;
-        this.resultFormula[0].children = formula.resultFormula[0].children;
-        this.handwritVisible = false;
-      } catch (error) {
-        console.error(error)
-        this.$message({
-          type: "error",
-          message: "转成配置用的数组失败,"+error
-        });
-      }
-
-    },
-
-    editorInit: function (editor) {
-        console.log('editorInit')
-        require('brace/ext/searchbox') //添加搜索功能
-        require('brace/ext/language_tools') //language extension prerequsite...
-        require('brace/mode/javascript')    //language
-        require('brace/theme/github')
-        require('brace/snippets/javascript') //snippet
-
-        editor.session.setUseWrapMode(true);//切换自动换行
-        editor.setHighlightActiveLine(false);//设置行高亮显示
-        editor.setShowPrintMargin(false);
-        editor.setOptions({
-          enableLiveAutocompletion:true,//语法提示和补全
-          showInvisibles:true,//显示隐藏,空格,回车等
-          fontSize:'16px'
-        })
-    },
-
-    getTypeMap(){
-      return new Promise((resolve)=>{
-        getTypeMap().then((res)=>{
-          //console.log(res)
-          this.formulaList = res.data.data;
-
-          //生成map,方便查找
-          for (let key in this.formulaList) {
-            if(typeof(this.formulaList[key]) == 'object'){
-              this.formulaList[key].forEach((formula)=>{
-                formula.template =  JSON.parse(formula.template);
-                if(this.operatorReg.test(formula.template.ft)){
-                  this.formulaMap[formula.template.ft] = formula;
-                }else if(this.startFCRegExp.test(formula.template.ft)){
-                  let regRes = formula.template.ft.match(this.startFCRegExp);
-                  this.formulaMap[regRes[0]] = formula;
-                }
-              })
-            }
-          }
-        }).finally(() => {
-          resolve();
-        })
-      })
-    }
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.box-dashed {
-  border: 1px dashed #bbbbbb;
-  border-radius: 6px;
-  padding: 10px;
-  margin-bottom: 10px;
-}
-.retain-box {
-  border-right: 1px dashed #bbbbbb;
-}
-.retain {
-  line-height: 50px;
-  margin-right: 10px;
-}
-.edit-text {
-  font-size: 26px;
-  margin-left: 20px;
-}
-
-.el-menu--popup .el-menu-item.is-active {
-  background-color: #fff;
-}
-.ele-box{
-  //border: 1px solid #bbb;
-  //height: 26px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 6px;
-  height: 100%;
-  box-sizing: border-box;
-  overflow: hidden;
-}
-.no-mb-col .el-col{
-  margin-bottom: 0px;
-  border: 1px solid #bbb;
-  height: 100px;
-}
-.sele-ele-box{
-  height: 160px;
-  padding: 20px;
-  // margin-top: 10px;
-}
-
-.icon-box .el-link{
-  font-size: 14px;
-  margin-right: 10px;
-}
-</style>
-
-<style lang="scss">
-.basic-container.h-basic-full {
-  height: calc(100% - 30px);
-  overflow: auto;
-  .el-card, .el-card .el-card__body {
-    height: 100%;
-  }
-}
-.operation-box-inset{
-  display: flex;
-  flex-direction: column;
-}
-</style>
-<style scoped>
-.operation-symbol-box{
-  display: flex;
-  align-items: center;
-  border: 1px solid rgb(229, 231, 235);
-  background-color: #F9FAFB;
-  padding: 10px 10px;
-  border-radius:  5px 5px 0px 0px;
-  margin-top: 10px;
-  
-}
-.sele-ele-box1{
-  padding: 10px;
-  border: 1px solid rgb(229, 231, 235);
-  border-radius: 0px 0px 5px 5px;
-
-  height: 50px;
-}
-.text-sm{
-  font-size: 14px;
-  margin-right: 10px;
-}
-</style>

+ 7 - 7
src/views/formula/edit.vue

@@ -1756,8 +1756,8 @@ console.log(remark,'remark');
             }
             return
       }
-      
-      
+
+
       let arr=JSON.parse(JSON.stringify(this.processFormula));
       let filteredArr = arr.filter(item => item.id ===this.checkGsId);
       let obj
@@ -1952,11 +1952,11 @@ console.log(remark,'remark');
 
     //设置动态组件里面的元素
     setDeviationRangeEle(item,value){
-     
-      
+
+
       if(value){
-       
-        
+
+
         this.$refs.deviationrange.setELe(item);
       }
     },
@@ -1975,7 +1975,7 @@ console.log(remark,'remark');
             // let tabId= this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
             let tabId=this.pkeyId?this.pkeyId:this.eleTableList[0].pkeyId!==-1&&this.eleTableList[0].pkeyId!==null?this.eleTableList[0].pkeyId:this.eleTableList[0].id;
             console.log(this.pkeyId,'this.pkeyId');
-            
+
             console.log("wbsPrivateGetNodeTabAndParam")
             this.getTableEle(tabId);
             setTimeout(() => {

+ 505 - 36
src/views/formula/edit1.vue

@@ -57,7 +57,7 @@
             <div slot="content">{{item.tableName }}</div>
             <formula-item
               :getname="getItemTableName(item)"
-              :item="item" @click="obj => equationClick(obj,index,'processFormula')"
+              :item="item" @click="obj => equationClick(obj,index,'processFormula')" :isShowCursor="false"
             >
             </formula-item>
           </el-tooltip>
@@ -119,7 +119,7 @@
             </el-card>
           </el-col>
           <el-col :span="16" class="h-100p flex flex-d-c ov-hidden">
-             <div style="display:flex">
+             <!-- <div style="display:flex">
                       <el-input placeholder="请输入你想搜索的元素字段" v-model="inputele"  clearable  @clear="clearinput" >  </el-input>
                         <el-button type="primary" icon="el-icon-search"  size="small"  @click="searchChange">搜索</el-button>
                </div>
@@ -130,7 +130,7 @@
                     <div class="ele-box">
                       <span v-if="item.k">{{item.name}}</span>
                       <span v-else>{{item.eName}}</span>
-                       <!-- <span >{{item.title}}</span> -->
+                     
 
                       <el-checkbox v-model="item.checked" @change="value => eleChang(value,item)"></el-checkbox>
                     </div>
@@ -139,7 +139,7 @@
               </el-scrollbar>
             </div>
             <div class="flex jc-sb">
-              <!-- <div>定位数据位置:</div> -->
+       
               <div class="icon-box">
                 <el-link :underline="false" icon="el-icon-delete" type="danger" @click="removeSelect"></el-link>
                 <el-link :underline="false" type="primary" @click="addOperator('+')" icon="el-icon-circle-plus-outline"></el-link>
@@ -148,11 +148,10 @@
                 <el-link :underline="false" type="primary" @click="addOperator('%')">÷</el-link>
               </div>
               <div>
-                <!-- <el-link :underline="false" type="primary" class="mg-r-20" @click="eleAddFormula">元素添加到公式</el-link> -->
+                
                 <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('(',false)">(</el-link>
                 <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(')',true)">)</el-link>
-                <!-- <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets('[',false)">【</el-link>
-                <el-link :underline="false" type="primary" class="mg-r-10" @click="addBrackets(']',true)">】</el-link> -->
+       
                 <el-link :underline="false" type="primary" @click="addText">输入值</el-link>
               </div>
             </div>
@@ -164,6 +163,74 @@
                 >
                 </formula-item>
               </draggable>
+            </div> -->
+            <div class="operation-box">
+              <!-- 运算符选择区域 -->
+                <div class="flex jc-sb operation-symbol-box">
+                    
+                    <div class="icon-box ">
+                        <span class="text-sm" >插入运算符:</span>
+                    
+                      <el-link type="primary" @click="addOperator('+')" icon="el-icon-circle-plus-outline" size="mini"></el-link>
+                      <el-link  type="primary" @click="addOperator('-')" icon="el-icon-remove-outline"></el-link>
+                      <el-link type="primary" @click="addOperator('*')" icon="el-icon-circle-close"></el-link>
+                      <el-link  type="primary" @click="addOperator('%')">÷</el-link>
+                       <el-link type="primary" class="mg-r-10" @click="addBrackets('(',false)">(</el-link>
+                      <el-link  type="primary" class="mg-r-10" @click="addBrackets(')',true)">)</el-link>
+                        <el-link type="primary" @click="addText">固定值</el-link>
+                    </div>
+                    <div>
+                      操作
+                    <el-link  icon="el-icon-delete" type="danger" @click="removeSelect"></el-link>
+                    </div>
+                  </div>
+      
+               <div 
+                  class="border-grey sele-ele-box1"  
+               
+                  tabindex="0"
+                  @keydown.left="handleLeftArrow"
+                  @keydown.right="handleRightArrow"
+                  @keydown.delete="handleDelete"
+                  @keydown.shift.189="addOperator('-')" 
+                  @keydown.shift.191="addOperator('/')" 
+                  @keydown.shift.57="addBrackets('(')"  
+                  @keydown.shift.48="addBrackets(')')" 
+                  @keydown.shift.187="addOperator('+')" 
+                  @keydown.shift.56="addOperator('*')" 
+                  @focus="containerFocused = true"
+                  @blur="containerFocused = false"
+                >
+                  <draggable v-model="selectEleFormula">
+                    <formula-item
+                      v-for="(item,index) in selectEleFormula" 
+                      :key="index"
+                      :item="item" 
+                      @click="obj => eleFormulaClick(obj,index)"  
+                    >
+                    </formula-item>
+                  </draggable>
+                </div>
+            
+                  <div class="flex mg-t-10" style="justify-content: space-between;width:100%;">
+                    <el-select v-model="eleTableId" @change="getTableEle" placeholder="请选择元素表1" style="width:45%"  size="small">
+                      <el-option v-if="paramDataList.length" label="选择节点参数2" value="选择节点参数"></el-option>
+                      <el-option  v-for="item in eleTableList" :key="item.id" :label="item.title" :value="(item.pkeyId!==null&&item.pkeyId!==-1)?item.pkeyId:item.id"></el-option>
+                    </el-select>
+
+                     <div class="text-align-c">
+                      <el-button size="small" @click="canceloperationVisible ">取消</el-button>
+                      <el-button size="small" @click="operationHandle" type="primary">保存</el-button>
+                    </div>
+                  </div>
+           
+                <div class="mg-t-10 no-mb-col flex1" >
+                  <el-scrollbar style="height: 450px">
+        
+                     <tableFormWrite :pkeyId="eleTableId" @element-selected="handleElementSelected" :initTableName="initTableName"  :selectedTableKey="selectedTableKey"  :key="1" :container-id="'excel-container-1'" ></tableFormWrite>
+                  </el-scrollbar>
+                </div>
+         
             </div>
           </el-col>
         </el-row>
@@ -213,7 +280,24 @@
           <template v-else>
             <div class="flex" >
               <div class=" flex-d-c"  style="width:40%">
-                <component ref="dynamiccomponent" v-bind:is="componentMap[item.name]" :formulainfo="item" :curele="equationSelectEle" :formulamap="formulaMap" @uncheck="unCheckEleComp" class="flex1"></component>
+                <component 
+                  ref="dynamiccomponent" 
+                  v-bind:is="componentMap[item.name]" 
+                  :formulainfo="item" :curele="equationSelectEle" 
+                  :formulamap="formulaMap" 
+                    :map="formulaDetailMap"
+                  @uncheck="unCheckEleComp" 
+                  class="flex1"
+                  :moreConditions="moreConditions" 
+                  :isMore="isMore"
+                  :isGetData="isGetData"
+                  :dataListGet="dataListGet"
+                  :isDataChange="isDataChange"
+                  :dataForm="dataForm"
+                  :remark="remark"
+                  
+                  >
+                </component>
                 <div class="flex1" v-show="item.showSelectEle" style="margin-top:10px;margin-bottom:30px">
                   <div class="flex">
                       <el-input
@@ -490,8 +574,8 @@ import {formulaStringToArray} from "./formulaStringToArray"
 
 
 import draggable from 'vuedraggable'
-
-
+import tableFormWrite from "./component/table-form-write.vue";
+import {formatArrayMore,restoreArrayMore,generateResult} from './component/funComponent/multiIfElseTools'
 export default {
   components: {
     draggable,
@@ -509,7 +593,8 @@ export default {
     datasJoin,
     ifelse,
 
-    deviationRange
+    deviationRange,
+    tableFormWrite
   },
   props: {
     wbsid:{
@@ -663,8 +748,15 @@ export default {
       inputele:'',
       inputelepian:'',
       inputelejudge:'',
-
-
+      moreConditions:[],//多条件判断数组
+      isMore:false,//是否多条件
+      isGetData:false,//是否获取数据
+      dataListGet:[],//获取的数据列表
+      isDataChange:false,//数据是否变化
+      dataForm:'',
+      remark:'',
+      formulaDetailMap:{},//公式详情map
+      containerFocused:false,//公式编辑区域是否聚焦
     };
   },
   computed: {
@@ -698,6 +790,20 @@ export default {
     },
 
 
+  },
+  watch: {
+    selectEleFormula: {
+      handler() {
+        this.checkDefaultSelection();
+          this.$nextTick(() => {
+            this.$el.querySelector('.sele-ele-box1').focus();
+          });
+      },
+      deep: true
+    },
+  
+
+
   },
 
   created() {
@@ -705,6 +811,10 @@ export default {
     // this.eleid = this.$route.query.eleid;
     // this.nodeid = this.$route.query.nodeid;
      this.pid = this.$route.query.pid;//项目id 私有树才有
+     console.log(this.pid,'this.pid');
+     console.log(this.globaltype,'this.globaltype');
+     
+     
     this.init();
   },
   methods: {
@@ -731,11 +841,6 @@ export default {
         // 开启 “加载中” 动画
         if(node.level == 0) this.loading = true
         if(!this.elementType) {
-          if (node.level != 0 && !node.data.hasChildren) {
-            this.loading = false
-            resolve(null)
-            return
-          }
          tabTypeLazyTreeAll({parentId,current:1,size:1000,hasPartFormula:this.fromcurNode.hasPartFormula}).then(res => {
             // 请求接口,返回数据
             let data = res.data.data.records;
@@ -902,6 +1007,11 @@ export default {
     operationEdit(){
       this.selectEleFormula= JSON.parse(JSON.stringify(this.processFormula));
       this.operationVisible = true;
+
+         // 确保容器获得焦点
+        this.$nextTick(() => {
+          this.$el.querySelector('.sele-ele-box1').focus();
+        });
     },
 
     eleAddFormula(){
@@ -1163,17 +1273,34 @@ export default {
     },
 
     //点选公式中的元素
-    eleFormulaClick({selected,item},index){
-      if(selected){
-        this.selectEleFormula.forEach((ele)=>{
-          ele.selected = false;
-        })
-        item.selected = true;
-        this.curSeleEleIndex = index;
-      }else{
-        this.curSeleEleIndex = -1;
+    eleFormulaClick(obj, index) {
+      // 先取消所有选中状态
+      this.selectEleFormula.forEach(item => {
+        item.selected = false;
+      });
+      
+      // 设置当前选中项
+      obj.item.selected = obj.selected;
+      this.curSeleEleIndex = index;
+      
+      // 确保容器获得焦点以接收键盘事件
+       this.$el.querySelector('.sele-ele-box1').focus();
+    // 处理类型为ELEMENT的元素,提取tableElementKey
+    console.log(obj.item,'obj.item.');
+    
+      if (obj.item.type === 'Element' && obj.item.tableElementKey) {
+        // 从类似"m_20220928142210_1575007943793836032:key_1"的格式中提取key部分
+        const keyParts = obj.item.tableElementKey.split('key');
+        this.selectedTableKey = keyParts.length > 1 ? 'key'+keyParts[1] : null;
+   
+        
+      } else {
+        // 非ELEMENT类型清空选中状态
+        this.selectedTableKey = null;
       }
+      
     },
+    
 
     //取消勾选
     unCheckEleFormulac(eleId){
@@ -1430,6 +1557,185 @@ export default {
     saveFormula(){
       console.log('保存1',this.pid);
       // let obj = formulaArrayToString(this.processFormula,this.resultFormula);
+      if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].symbol=='more'){
+        //多条件保存公式
+
+        console.log('this.$refs.conditionList[0]',this.$refs.dynamiccomponent[0].conditionList);
+        let resMore=formatArrayMore(this.$refs.dynamiccomponent[0].conditionList);
+        const resJson=generateResult(this.$refs.dynamiccomponent[0].conditionList);
+        let remark=this.$refs.dynamiccomponent[0].remark;
+        console.log(remark,'remark');
+
+        console.log(resJson,'resJson');
+        
+     
+            if(this.formulaid){
+              updateFormula({
+                id:this.formulaid,
+                formula:'',
+                formulas:resMore,
+                remark:remark,
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:JSON.stringify(resJson),
+                scope:this.globaltype,
+                // projectId:this.curProjiect.id||this.projectId,
+                projectId:this.curProjiect.id||this.pid,
+                dev:deviationRangeText
+              }).then(()=>{
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "修改成功"
+                });
+              })
+            }else{
+              saveFormula({
+                formula:'',
+                formulas:resMore,
+                remark:remark,
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:JSON.stringify(resJson),
+                scope:this.globaltype,
+                dev:deviationRangeText,
+               
+                projectId:this.curProjiect.id||this.pid,
+                ver:this.version
+              }).then((res)=>{
+                if(res.data.data){
+                  this.formulaid = res.data.data;
+                }
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "保存成功"
+                });
+              })
+            }
+            
+            return;
+        
+        
+      }else if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].symbol=='getData'){
+       //数据获取保存公式
+        const dataRes = this.$refs.dynamiccomponent[0].getDataConditionData();
+       console.log(dataRes,'dataRes');
+       const result =dataRes.result;
+       const mapEle = JSON.stringify(dataRes.mapEle);
+       console.log(mapEle,'mapEle');
+       
+
+            if(this.formulaid){
+              updateFormula({
+                id:this.formulaid,
+               formula:"FC.switchCase"+'('+result+')',
+             
+                remark:'',
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:mapEle,
+                scope:this.globaltype,
+                // projectId:this.curProjiect.id||this.projectId,
+                projectId:this.curProjiect.id||this.pid,
+                dev:deviationRangeText
+              }).then(()=>{
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "修改成功"
+                });
+              })
+            }else{
+              saveFormula({
+                  formula:"FC.switchCase" +'('+result+')',
+          
+                remark:'',
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:mapEle,
+                scope:this.globaltype,
+                dev:deviationRangeText,
+                // projectId:this.curProjiect.id||this.projectId,
+                projectId:this.curProjiect.id||this.pid,
+                ver:this.version
+              }).then((res)=>{
+                if(res.data.data){
+                  this.formulaid = res.data.data;
+                }
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "保存成功"
+                });
+              })
+            }
+            
+            return;
+       
+      }else if(this.$refs.dynamiccomponent&&this.$refs.dynamiccomponent.length>0&&this.$refs.dynamiccomponent[0]&& this.$refs.dynamiccomponent[0].formData){
+        console.log(this.$refs.dynamiccomponent[0],'this.$refs.dynamiccomponent[0');
+        const resForm=this.$refs.dynamiccomponent[0].getDataChangeList();
+        console.log(resForm,'resForm');
+        
+        //数据自变保存
+
+             if(this.formulaid){
+              updateFormula({
+                id:this.formulaid,
+                formula:resForm.test,
+                remark:'',
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:JSON.stringify(resForm.map),
+                scope:this.globaltype,
+                // projectId:this.curProjiect.id||this.projectId,
+                projectId:this.curProjiect.id||this.pid,
+                dev:deviationRangeText
+              }).then(()=>{
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "修改成功"
+                });
+              })
+            }else{
+              saveFormula({
+                formula:resForm.test,
+                remark:'',
+                nodeId:this.nodeid,
+                elementId:this.eleid,
+                scale:this.isRetain?this.retainNum:'',
+                number:number,
+                map:JSON.stringify(resForm.map),
+                scope:this.globaltype,
+                dev:deviationRangeText,
+                // projectId:this.curProjiect.id||this.projectId,
+                projectId:this.curProjiect.id||this.pid,
+                ver:this.version
+              }).then((res)=>{
+                if(res.data.data){
+                  this.formulaid = res.data.data;
+                }
+                this.formulaStringToArray();
+                this.$message({
+                  type: "success",
+                  message: "保存成功"
+                });
+              })
+            }
+            return
+      }
        let arr=JSON.parse(JSON.stringify(this.processFormula));
       let filteredArr = arr.filter(item => item.id ===this.checkGsId);
       //  let obj = formulaArrayToString(filteredArr,this.resultFormula);
@@ -1536,6 +1842,41 @@ export default {
     async formulaStringToArray(){
       let detail = (await formulaDetail({elementId:this.eleid,scope:this.globaltype,nodeId:this.nodeid,projectId:this.curProjiect.id||this.pid})).data.data;
       console.log(detail);
+      this.remark== detail.remark;
+      //判断公式特殊处理
+      if(detail&&detail.formula.includes('FC.ifelseMulti')){
+        detail.formula = detail.formula.replace('FC.ifelseMulti','FC.ifelse');
+        this.isMore = true;
+            this.formulaDetailMap = detail.map;
+        this.moreConditions =  restoreArrayMore(detail.formulas,this.formulaDetailMap)
+    
+      }else if(detail&&detail.formula.includes('FC.switchCase')){
+        //数据获取
+        this.formulaDetailMap = detail.map;
+         detail.formula = detail.formula.replace('FC.switchCase','FC.ifelse');
+         this.isGetData = true;
+         this.dataListGet=detail.formula
+         console.log( this.dataListGet,' this.dataListGet');
+         
+      }else if(detail&&detail.formula.includes('FC.dataChange')){
+        //数据自变
+        this.formulaDetailMap = detail.map;
+      
+         this.isDataChange = true;
+         this.dataForm=detail.formula
+         console.log( this.dataForm,' this.dataListGet');
+         
+      }
+      else{
+        this.isMore = false;
+        this.moreConditions = []
+        this.formulaDetailMap ={}
+        this.isGetData = false;
+        this.dataListGet=''
+        this.isDataChange = false;
+        this.dataForm='';
+
+      }
       if(detail&&detail.id){
         //获取右边元素的字典
         let dictMap=detail.dict
@@ -1606,13 +1947,15 @@ export default {
       this.input3=''
         if(data.hasChildren===false||data.isLinkTable===2){
            this.eleListable=true;
-           getTableElments(data.initTableId ).then((res)=>{
-             if(res.data.code == 200){
-                this.eleList=res.data.data;
-                 this.eleTableList =res.data.data;
-                this.eleListable=false;
-             }
-           })
+          //  getTableElments(data.initTableId ).then((res)=>{
+          //    if(res.data.code == 200){
+          //       this.eleList=res.data.data;
+          //        this.eleTableList =res.data.data;
+          //       this.eleListable=false;
+          //    }
+          //  })
+          this.eleTableList=[this.curData]||[]
+          this.eleTableId=this.eleTableList[0].id;
         }
         else{
           this.eleListable=true;
@@ -1806,7 +2149,107 @@ export default {
           resolve();
         })
       })
-    }
+    },
+        // 左箭头导航
+    handleLeftArrow(e) {
+      e.preventDefault(); // 阻止默认行为
+      if (this.curSeleEleIndex > 0) {
+        // 取消当前选中项
+        if (this.selectEleFormula[this.curSeleEleIndex]) {
+          this.selectEleFormula[this.curSeleEleIndex].selected = false;
+        }
+        
+        // 选中左侧项
+        this.curSeleEleIndex--;
+        this.selectEleFormula[this.curSeleEleIndex].selected = true;
+        // this.selectedTableKey = this.selectEleFormula[this.curSeleEleIndex].tableElementKey;
+         const keyParts =  this.selectEleFormula[this.curSeleEleIndex].tableElementKey.split('key');
+        this.selectedTableKey = keyParts.length > 1 ? 'key'+keyParts[1] : null;
+      }
+    },
+    
+    // 右箭头导航
+    handleRightArrow(e) {
+      e.preventDefault(); // 阻止默认行为
+      if (this.curSeleEleIndex < this.selectEleFormula.length - 1) {
+        // 取消当前选中项
+        if (this.selectEleFormula[this.curSeleEleIndex]) {
+          this.selectEleFormula[this.curSeleEleIndex].selected = false;
+        }
+        
+        // 选中右侧项
+        this.curSeleEleIndex++;
+        this.selectEleFormula[this.curSeleEleIndex].selected = true;
+        // this.selectedTableKey = this.selectEleFormula[this.curSeleEleIndex].tableElementKey;
+               const keyParts =  this.selectEleFormula[this.curSeleEleIndex].tableElementKey.split('key');
+        this.selectedTableKey = keyParts.length > 1 ? 'key'+keyParts[1] : null;
+      }
+    },
+    
+        // 处理删除操作
+    handleDelete(e) {
+      e.preventDefault();
+      
+      // 增加更严格的索引检查
+      if (
+        this.curSeleEleIndex === null || 
+        this.curSeleEleIndex === undefined ||
+        this.curSeleEleIndex < 0 || 
+        this.curSeleEleIndex >= this.selectEleFormula.length
+      ) {
+        
+        return;
+      }
+      
+      // 保存当前要删除的元素索引(避免后续操作影响)
+      const indexToDelete = this.curSeleEleIndex;
+      const itemToDelete = this.selectEleFormula[indexToDelete];
+      
+    
+      
+      // 处理元素取消勾选
+      if (itemToDelete && itemToDelete.type === 'Element') {
+        this.deleEleIndex = indexToDelete;
+        this.unCheckEleFormulac(itemToDelete.id);
+      }
+      
+      // 执行删除(只删除指定索引的1个元素)
+      const deletedItems = this.selectEleFormula.splice(indexToDelete, 1);
+      
+      
+      // 正确更新当前选中索引
+      if (this.selectEleFormula.length > 0) {
+        // 如果删除的是最后一个元素,选中前一个
+        this.curSeleEleIndex = Math.min(
+          indexToDelete, 
+          this.selectEleFormula.length - 1
+        );
+          const keyParts =  this.selectEleFormula[this.curSeleEleIndex].tableElementKey.split('key');
+            this.selectedTableKey = keyParts.length > 1 ? 'key'+keyParts[1] : null;
+        // 确保选中状态正确
+        this.selectEleFormula.forEach((item, idx) => {
+          item.selected = idx === this.curSeleEleIndex;
+        });
+      } else {
+        this.curSeleEleIndex = -1;
+        this.selectedTableKey = null;
+      }
+    },
+    checkDefaultSelection() {
+      const hasSelected = this.selectEleFormula.some(item => item.selected);
+      if (!hasSelected && this.selectEleFormula.length > 0) {
+        // 取消所有选中
+        this.selectEleFormula.forEach(item => {
+          item.selected = false;
+        });
+        
+        // 选中最后一个元素
+        const lastIndex = this.selectEleFormula.length - 1;
+        this.selectEleFormula[lastIndex].selected = true;
+        this.curSeleEleIndex = lastIndex;
+   
+      }
+    },
   },
 
 
@@ -1859,7 +2302,7 @@ export default {
 }
 
 .icon-box .el-link{
-  font-size: 24px;
+  font-size: 14px;
   margin-right: 10px;
 }
 </style>
@@ -1883,3 +2326,29 @@ export default {
         display: inline-block;
    }
 </style>
+<style scoped>
+.operation-symbol-box{
+  display: flex;
+  align-items: center;
+  border: 1px solid rgb(229, 231, 235);
+  background-color: #F9FAFB;
+  padding: 10px 10px;
+  border-radius:  5px 5px 0px 0px;
+  margin-top: 10px;
+  
+}
+.sele-ele-box1{
+  padding: 10px;
+  border: 1px solid rgb(229, 231, 235);
+  border-radius: 0px 0px 5px 5px;
+
+  height: 50px;
+}
+.text-sm{
+  font-size: 14px;
+  margin-right: 10px;
+}
+.icon-box .el-icon {
+  font-size: 12px !important; /* 更小的尺寸,按需修改 */
+}
+</style>

+ 10 - 9
src/views/formula/formulaStringToArray.js

@@ -79,7 +79,7 @@ function parseArguments(ele,funObj){
               //是前面的计算结果
               fun.arguments.push(ele)
             }
-  
+
           }else{
             let arg = argSpliceArr[index][0];
             if(!arg){
@@ -97,7 +97,7 @@ function parseArguments(ele,funObj){
             }
           }
         }
-      })  
+      })
   }
 
   ele.children.push(fun);
@@ -129,7 +129,7 @@ function parseProcessFormula(funObj,ele){
       ele.k = endEle.k;
       ele.type = "ParamData";
     }
-    
+
   }
 
 }
@@ -186,6 +186,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
   const operatorReg = /^ (\+|-|\*|%|\/) /;//加减乘除
   // const wordReg = /^[\u4e00-\u9fa5\w0-9'"-]+/;//文本
   // const wordReg = /^[\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/;//文本
+  // const wordReg = /^[\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/;//文本
   const wordReg = /^[±\u4e00-\u9fa5\{\}\w\\.0-9'"-]+/; // 新增±符号到文本匹配正则
 
  const sxReg = /^[|]/; // 匹配字符串开头竖线
@@ -209,7 +210,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
       //匹配FC开始部分FC.xxx(
       let regRes = nuText.match(startFCRegExp);
       let startText = regRes[0];//匹配到的文本
-      
+
       let obj = {};
       if(formulaMap[startText]){
         Object.assign(obj,formulaMap[startText]);
@@ -236,7 +237,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
 
       let popObj = contentStack.pop();
       let arrType = [];
-      
+
       if(contentStack.length > 0){
         let content =contentStack[contentStack.length - 1];
         content.children.push(popObj);
@@ -269,7 +270,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
       //console.log('匹配左括号')
       //匹配左括号
       let startBrackets = nuText.match(startBracketsReg)[0];
-      
+
       contentStack.push({
         type:'Brackets',
         children:[],
@@ -301,7 +302,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
           tag:eleArr[0]
         }
       }
-      
+
       let content =contentStack[contentStack.length - 1];
       if(content){
         content.children.push(obj);
@@ -334,7 +335,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
           tag:"paramData"
         }
       }
-      
+
       let content =contentStack[contentStack.length - 1];
       if(content){
         content.children.push(obj);
@@ -416,7 +417,7 @@ export const formulaStringToArray = (text,elemap,formulaMap) => {
 
       strIndex += word.length?word.length:2;//索引移动
     }
-   
+
     else{
       console.log('匹配不到:',nuText)
       //匹配不到

+ 1 - 1
src/views/manager/projectinfo/detail.vue

@@ -809,7 +809,7 @@ export default {
     })
   },
   methods: {
- getCreateUserItems(){
+    getCreateUserItems(){
       getList(
         1,
         1000,

+ 54 - 51
src/views/tentative/components/dataMap.vue

@@ -17,7 +17,7 @@
       </div>
       <template v-if="listArr.length>0">
          <div class="right_box" v-for="(eleItem,index) in listArr" :key="index">
-     
+
              <div>
                 <span>选择表单</span>
                 <el-select
@@ -66,15 +66,15 @@
                     <el-button type="primary" size="small" @click="addList(index)">新增元素</el-button>
                     <el-button type="danger"  size="small" v-if="index>0" @click="delList(index,eleItem)">删除元素</el-button>
                   </div>
-                
+
                 </div>
               </div>
-       
+
       </div>
       </template>
       <el-empty description="暂无数据" v-else ></el-empty>
 
-     
+
     </div>
   </div>
 </template>
@@ -86,7 +86,7 @@ import {
   getLinkDetail,
   removeLinkData,
   getLinkData,
-  saveLinkDetail 
+  saveLinkDetail
 } from "@/api/tentative/testcollect";
 import Vue from "vue";
 import Split from "split.js";
@@ -124,10 +124,10 @@ export default {
     };
   },
   watch: {
- 
+
   },
   methods: {
-  
+
     async getExcelHtmlCol(classId, form) {
       //获取excel模板
       const { data: res } = await getLinkHtml({ classId });
@@ -152,7 +152,7 @@ export default {
           },
           template: res.data,
           methods: {
-     
+
             contextmenuClick() {},
             getInformation() {},
             formUploadSuccess() {},
@@ -235,11 +235,11 @@ export default {
           this.$set(this.curItem, "htmlKeyName", this.clickKeyname);
           this.listArr.forEach((ele)=>{
             ele.htmlKeyName= this.clickKeyname
-        
+
           })
-        await this.getInfoDEtail();   
+        await this.getInfoDEtail();
+
 
-     
       }
     },
     getParentTD(ele) {
@@ -290,8 +290,8 @@ export default {
       this.getEleList(val);
       this.formoptions.forEach((ele) => {
         if (ele.initTabId === val) {
-       
-   
+
+
           this.listArr[index].trialTabId= ele.pkeyId
           this.listArr[index].trialTabName= ele.initTableName
           this.listArr[index].tabName= ele.tabName
@@ -301,8 +301,8 @@ export default {
     changeEle(val,index) {
       this.eleOptions.forEach((ele) => {
         if (ele.id === val) {
-       
-       
+
+
           this.listArr[index].elementName= ele.eName
           this.listArr[index].elementId= ele.id
         }
@@ -330,25 +330,25 @@ export default {
         this.listArr = res.data.length>0?res.data:[{}]
           this.listArr.forEach((ele)=>{
             ele.htmlKeyName= this.clickKeyname
-        
+
           })
         this.formoptions.forEach((ele)=>{
          this.listArr.forEach(async(eleItem,eleIndex)=>{
-          if(ele.pkeyId==eleItem.trialTabId){
+          if(ele.pkeyId===eleItem.trialTabId){
             eleItem.initTabId=ele.initTabId
             await this.getEleList(ele.initTabId)
            this.changeEle(eleItem.elementId,eleIndex)
 
-            
+
           }
 
          })
         })
-      
-       
-        
 
-    
+
+
+
+
       } else {
           this.listArr = [{}]
 
@@ -357,16 +357,16 @@ export default {
 
     //映射数据保存
     async saveInfo() {
-  
-      
+
+
       if (this.listArr.length === 0) {
         this.$message.warning("请进行数据映射配置");
         return;
       }
-    const isValid = this.listArr.every(item => 
+    const isValid = this.listArr.every(item =>
     item.elementId && item.initTabId
   );
-  
+
   if (!isValid) {
     this.$message.warning("请确保选择了所有表单和元素字段!");
     return;
@@ -398,7 +398,7 @@ export default {
           });
           return; // 不满足条件则不添加
         }
-       this.listArr.splice(index + 1, 0, { 
+       this.listArr.splice(index + 1, 0, {
           htmlKeyName: this.clickKeyname
         ,
 
@@ -406,36 +406,39 @@ export default {
           elementName: ''
         });
     },
-    delList(index,item){
-   
-      if(!item.id){
-        this.listArr.splice(index,1)
-        return
-      }else{
-         this.$confirm('删除后,数据将无法恢复,是否确认删除!', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-  
-            removeLinkData({id:item.id}).then((res) => {
-              if(res.data.code==200){
+  delList(index, item) {
+      if (!item.id) {
+        this.listArr.splice(index, 1);
+        return;
+      } else {
+        this.$confirm('删除后,数据将无法恢复,是否确认删除!', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 接口调用时添加 catch 处理接口错误
+          removeLinkData({ id: item.id })
+            .then((res) => {
+              if (res.data.code === 200) {
                 this.$message.success(res.data.msg);
-              
                 this.listArr.splice(index, 1);
-              this.getLinkedData();
-              this.getExcelHtmlCol(this.classId, this.linkedData); //获取excel模板
-              }else{
+                this.getLinkedData();
+                this.getExcelHtmlCol(this.classId, this.linkedData);
+              } else {
                 this.$message.error(res.data.msg);
               }
+            })
+            .catch((err) => {
+              // 处理接口调用失败(如网络错误、500错误等)
+              this.$message.error('删除接口调用失败,请重试');
+              console.error('删除失败:', err); // 方便调试
             });
-          }).catch(() => {
-            this.$message.info('已取消删除');
-          })
+        }).catch(() => {
+          // 这里仅处理用户点击“取消”的情况
+          this.$message.info('已取消删除');
+        });
       }
-
-      
-    }
+}
   },
   async created() {
     this.classId = this.$route.query.classId;

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 297 - 179
yarn.lock


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov