Bläddra i källkod

变量名称修改

zhaoyk 3 år sedan
förälder
incheckning
41c25476f3
2 ändrade filer med 15 tillägg och 15 borttagningar
  1. 11 11
      adm_comp/src/components/FilterPanel.vue
  2. 4 4
      adm_comp/src/views/DiagramTemplate.vue

+ 11 - 11
adm_comp/src/components/FilterPanel.vue

@@ -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
 					}

+ 4 - 4
adm_comp/src/views/DiagramTemplate.vue

@@ -280,7 +280,7 @@
 		
 		<!-- 设备过滤对话框 -->
 		<el-dialog title="设备过滤" :visible.sync="dlgFilterVisible">
-			<FilterPanel ref="filterPanel" :dataFilter="dataFilter" :releatedObjs="filterReleatedObjs" :dicRels="dicRels"></FilterPanel>
+			<FilterPanel ref="filterPanel" :dataFilter="dataFilter" :relatedObjs="filterRelatedObjs" :dicRels="dicRels"></FilterPanel>
 			
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="dlgFilterVisible = false">取 消</el-button>
@@ -398,7 +398,7 @@
 		
 		propsData: any = {};
 		dataFilter: any = {};
-		filterReleatedObjs: any[] = [];
+		filterRelatedObjs: any[] = [];
 		selectionInfo = '~';
 		dynInfo = '';
 		
@@ -751,9 +751,9 @@
 			const sel = this.editor.getSelComp();
 			this.dataFilter = sel.dataFilter != null ? sel.dataFilter : {};//为null时赋一个新对象,触发子组件watch
 			if(sel.compType == 'container') {
-				this.filterReleatedObjs = Template.findRelatedMainPipes(sel, this.currentTemplate);
+				this.filterRelatedObjs = Template.findRelatedMainPipes(sel, this.currentTemplate);
 			} else {
-				this.filterReleatedObjs = [];
+				this.filterRelatedObjs = [];
 			}
 			
 			this.dlgFilterVisible = true;