|
|
@@ -39,7 +39,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="box-dashed">
|
|
|
- <div class="mg-b-20">函数公式..（节点公式）</div>
|
|
|
+ <div class="mg-b-20">函数公式（节点公式）</div>
|
|
|
<div class="edit-text">
|
|
|
<span>
|
|
|
<formula-item
|
|
|
@@ -92,8 +92,55 @@
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
<el-col :span="16" class="h-100p flex flex-d-c ov-hidden">
|
|
|
- <div class="operation-box">
|
|
|
- <!-- 运算符选择区域 -->
|
|
|
+ <!-- 放出来的代码——start -->
|
|
|
+ <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>
|
|
|
+ <div class="mg-t-10 no-mb-col flex1 ov-hidden" style="height: 360px; overflow-y: auto; max-height: 360px;">
|
|
|
+ <el-scrollbar style="height: 100%">
|
|
|
+ <el-row v-loading="eleListable">
|
|
|
+ <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-scrollbar>
|
|
|
+ </div>
|
|
|
+ <div class="flex jc-sb">
|
|
|
+
|
|
|
+ <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>
|
|
|
+ <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>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+
|
|
|
+ <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>
|
|
|
+ <div class="border-grey sele-ele-box" >
|
|
|
+ <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>
|
|
|
+ <!-- 放出来的代码——end -->
|
|
|
+ <!-- 运算符选择区域 -->
|
|
|
+ <!-- <div class="operation-box">
|
|
|
<div class="flex jc-sb operation-symbol-box">
|
|
|
|
|
|
<div class="icon-box ">
|
|
|
@@ -159,10 +206,13 @@
|
|
|
</el-scrollbar>
|
|
|
</div>
|
|
|
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
+ <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>
|
|
|
<div v-show="!operationVisible && !showFunDetail && !deviationRange.show">
|
|
|
@@ -359,7 +409,7 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
- <el-dialog title="选择元素222" :visible.sync="chooseEleVisible" width="80%" append-to-body :close-on-click-modal="false">
|
|
|
+ <el-dialog title="选择元素" :visible.sync="chooseEleVisible" width="80%" append-to-body :close-on-click-modal="false">
|
|
|
<div>
|
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="8">
|
|
|
@@ -397,8 +447,7 @@
|
|
|
|
|
|
<div class="mg-t-10 mg-b-10 no-mb-col">
|
|
|
<el-scrollbar style="height: 460px">
|
|
|
-
|
|
|
- <tableFormWrite :pkeyId="eleTableId" :multiple-select="true" @element-selected="(obj, val,list) => handleElementSelectedList(obj, val, list)" :initTableName="initTableNameList" :key="tableKey" :container-id="'excel-container-'+tableKey" :selectedTableKey="selectedTableKeyList"></tableFormWrite>
|
|
|
+ <tableFormWrite :pkeyId="eleTableId" :multiple-select="true" @element-selected="(obj, val,list) => handleElementSelectedList(obj, val, list)" :initTableName="initTableNameComp" :key="tableKey" :container-id="'excel-container-'+tableKey" :selectedTableKey="selectedTableKeyList"></tableFormWrite>
|
|
|
</el-scrollbar>
|
|
|
|
|
|
</div>
|
|
|
@@ -460,7 +509,7 @@ 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";
|
|
|
-import { log } from "@antv/g2plot/lib/utils";
|
|
|
+// import { log } from "@antv/g2plot/lib/utils";
|
|
|
|
|
|
|
|
|
export default {
|
|
|
@@ -629,7 +678,7 @@ export default {
|
|
|
selectedTableKey:'', // 存储选中的表格元素key
|
|
|
initTableNameComp:'',//初始表名组件
|
|
|
selectedTableKeyComp:'', // 存储选中的表格元素key 组件
|
|
|
- initTableNameList:'',//初始表名 选择元素弹窗
|
|
|
+ // initTableNameList:'',//初始表名 选择元素弹窗
|
|
|
selectedTableKeyList:'', // 存储 选择元素弹窗 选中的表格元素key
|
|
|
seleList:[],//选择元素弹窗 选中的元素列表
|
|
|
tableKey:'3',
|
|
|
@@ -2040,7 +2089,7 @@ console.log(remark,'remark');
|
|
|
},
|
|
|
|
|
|
getTableEle(tableId){
|
|
|
- console.log("getTableEle",tableId);
|
|
|
+ console.log("getTableEle",tableId,this.eleTableList);
|
|
|
this.initTableName=''
|
|
|
|
|
|
|
|
|
@@ -2141,7 +2190,7 @@ console.log(remark,'remark');
|
|
|
//方法下面的查询元素
|
|
|
getTableEleComp(tableId){
|
|
|
this.input3=''
|
|
|
- console.log(this.iswbstype,'this.iswbstype');
|
|
|
+ console.log('this.iswbstype', this.iswbstype);
|
|
|
|
|
|
if(tableId === '选择节点参数'){
|
|
|
this.eleListComp = this.paramDataList;
|
|
|
@@ -2344,6 +2393,8 @@ item.name=item.eName
|
|
|
},
|
|
|
handleElementSelectedList(item,value,list) {
|
|
|
|
|
|
+console.log(item,value,list,'1111list');
|
|
|
+
|
|
|
this.seleList=list
|
|
|
console.log(list,'list');
|
|
|
this.seleList.forEach((element,index) => {
|
