|
@@ -33,13 +33,13 @@
|
|
|
|
|
|
<el-collapse accordion>
|
|
|
<el-collapse-item title="单值元素" name="1">
|
|
|
- <el-tag v-for="(el,index) in elOpts?.single" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.name}}</el-tag>
|
|
|
+ <el-tag v-for="(el,index) in elOpts?.single" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.paramName}}</el-tag>
|
|
|
</el-collapse-item>
|
|
|
<el-collapse-item title="多值元素" name="2">
|
|
|
- <el-tag v-for="(el,index) in elOpts?.multi" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.name}}</el-tag>
|
|
|
+ <el-tag v-for="(el,index) in elOpts?.multi" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.paramName}}</el-tag>
|
|
|
</el-collapse-item>
|
|
|
<el-collapse-item title="其它元素" name="3">
|
|
|
- <el-tag v-for="(el,index) in elOpts?.oth" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.name}}</el-tag>
|
|
|
+ <el-tag v-for="(el,index) in elOpts?.oth" :key="index" @click="selEL(el)" :effect="el?.checked?'dark':'light'">{{el?.paramName}}</el-tag>
|
|
|
</el-collapse-item>
|
|
|
</el-collapse>
|
|
|
</el-card>
|
|
@@ -69,7 +69,7 @@
|
|
|
single:[],
|
|
|
multi:[],
|
|
|
oth:[
|
|
|
- {code:'wellName',name:'井名标题',elType:'wellName'}
|
|
|
+ {paramCode:'wellName',paramName:'井名标题',elType:'wellName'}
|
|
|
]
|
|
|
})
|
|
|
|
|
@@ -87,7 +87,7 @@
|
|
|
if(!srcEL.checked){
|
|
|
let finedIdx=null
|
|
|
layoutELModels.value.forEach((item,index)=>{
|
|
|
- if(item&&item.code==srcEL.code){
|
|
|
+ if(item&&item.paramCode==srcEL.paramCode){
|
|
|
finedIdx=index
|
|
|
return false
|
|
|
}
|
|
@@ -103,8 +103,8 @@
|
|
|
height: 60,
|
|
|
top: 0,
|
|
|
left: 100,
|
|
|
- name:srcEL.name,
|
|
|
- code:srcEL.code,
|
|
|
+ paramName:srcEL.paramName,
|
|
|
+ paramCode:srcEL.paramCode,
|
|
|
elType:srcEL.elType
|
|
|
}
|
|
|
if(srcEL.elType=="multi"){
|
|
@@ -129,8 +129,8 @@
|
|
|
if(resp.code==0){
|
|
|
let tmp
|
|
|
resp.data.forEach(param=>{
|
|
|
- param['name']=param.paramName
|
|
|
- param['code']=param.paramCode
|
|
|
+ //param['name']=param.paramName
|
|
|
+ //param['code']=param.paramCode
|
|
|
param['elType']='single'
|
|
|
tmp=elOpts.single
|
|
|
if(param.paramCode.indexOf('diagram')>=0){
|
|
@@ -161,13 +161,13 @@
|
|
|
|
|
|
const initElOptsCheck=(checkMap)=>{
|
|
|
elOpts.single.forEach((item,index)=>{
|
|
|
- item.checked=checkMap[item.code]
|
|
|
+ item.checked=checkMap[item.paramCode]
|
|
|
})
|
|
|
elOpts.multi.forEach((item,index)=>{
|
|
|
- item.checked=checkMap[item.code]
|
|
|
+ item.checked=checkMap[item.paramCode]
|
|
|
})
|
|
|
elOpts.oth.forEach((item,index)=>{
|
|
|
- item.checked=checkMap[item.code]
|
|
|
+ item.checked=checkMap[item.paramCode]
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -183,7 +183,7 @@
|
|
|
let elModels=JSON.parse(resp.data.tempContent)
|
|
|
let mapping={}
|
|
|
elModels.forEach((item,index)=>{
|
|
|
- mapping[item.code]=true
|
|
|
+ mapping[item.paramCode]=true
|
|
|
layoutELModels.value.push(item)
|
|
|
})
|
|
|
initElOptsCheck(mapping)
|