|
@@ -36,7 +36,7 @@
|
|
|
<el-form-item label="关联对象">
|
|
|
<el-select v-model="item.relObj">
|
|
|
<el-option
|
|
|
- v-for="op in releatedObjOptions"
|
|
|
+ v-for="op in relatedObjOptions"
|
|
|
:key="op.value"
|
|
|
:label="op.label"
|
|
|
:value="op.value">
|
|
@@ -56,7 +56,7 @@
|
|
|
<br>
|
|
|
|
|
|
<el-button size="mini" @click="addFilterItem()">添加条件(and)</el-button>
|
|
|
- <el-button size="mini" @click="addRelationItem()" v-if="releatedObjs && releatedObjs.length > 0">添加关系过滤(and)</el-button>
|
|
|
+ <el-button size="mini" @click="addRelationItem()" v-if="relatedObjs && relatedObjs.length > 0">添加关系过滤(and)</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -75,7 +75,7 @@
|
|
|
dataFilter: any;
|
|
|
|
|
|
@Prop()
|
|
|
- releatedObjs: any[];
|
|
|
+ relatedObjs: any[];
|
|
|
|
|
|
@Prop()
|
|
|
dicRels: any[];
|
|
@@ -83,11 +83,11 @@
|
|
|
filterItems: any[] = [];
|
|
|
relFilterItems: any[] = [];
|
|
|
|
|
|
- releatedObjOptions: any[] = [];
|
|
|
+ relatedObjOptions: any[] = [];
|
|
|
|
|
|
mounted(){
|
|
|
this.buildFilterItems();
|
|
|
- this.buildReleatedObjOptions();
|
|
|
+ this.buildrelatedObjOptions();
|
|
|
}
|
|
|
|
|
|
@Watch("dataFilter")
|
|
@@ -95,13 +95,13 @@
|
|
|
this.buildItems(this.dataFilter);
|
|
|
}
|
|
|
|
|
|
- @Watch("releatedObjs")
|
|
|
- buildReleatedObjOptions(){
|
|
|
- this.releatedObjOptions = [];
|
|
|
- if(this.releatedObjs) {
|
|
|
- for(const obj of this.releatedObjs) {
|
|
|
+ @Watch("relatedObjs")
|
|
|
+ buildrelatedObjOptions(){
|
|
|
+ this.relatedObjOptions = [];
|
|
|
+ if(this.relatedObjs) {
|
|
|
+ for(const obj of this.relatedObjs) {
|
|
|
if(obj.compType == 'mainPipe'){
|
|
|
- this.releatedObjOptions.push({value: 'mainPipe:' + obj.id, label: '干管:' + (obj.name != null ? obj.name : obj.id)});
|
|
|
+ this.relatedObjOptions.push({value: 'mainPipe:' + obj.id, label: '干管:' + (obj.name != null ? obj.name : obj.id)});
|
|
|
} else if(obj.compType == 'container') {
|
|
|
//TODO
|
|
|
}
|