图纸园区逻辑优化-电

src/components/monitoring/clickCp.vue

@@ -274,6 +274,7 @@ export default {
 				"电":1,
 				"水":2,
 				"热":3,
+				"暖":3,
 				"监控":4,
 				"照明":5,
 				"消防":6,
@@ -302,15 +303,15 @@ export default {
 		setTimeout(() =>{
 			this.active =  this.active == '' ? 25 : this.active
 			this.ttActive =  this.ttActive == '' ? 20 : this.ttActive
-			console.log('进入此方法111111111111111',this.active)
+			console.log('进入此方法111111111111111',this.type);
-			this.getTypeList(this.type)
+			this.getTypeList(this.bimModel==1?this.active:this.ttActive,this.type,this.bimModel)
 		},500)
 		
 	},
 	methods: {
 		// 根据楼号获取分类列表
-		getTypeList(type){
+		getTypeList(active,type,area){
-			console.log('专业-区域-楼号-楼层 ====>',this.sbTypeKeys[this.sbType],this.bimModel,type,'active ====>',this.active,'ttActive ===>',this.ttActive, this.tower)
+			console.log('专业-区域-楼号-楼层 ====>',this.sbType,this.bimModel,'type ====>',type,'active ====>',this.active,'ttActive ===>',this.ttActive, this.tower)
 			let _draweClass = this.sbTypeKeys[this.sbType];
 			if(type == 'build'){
 				this.typeList = [];
@@ -378,7 +379,7 @@ export default {
 			if(this.isShowType) {
 				this.page.current = 1;
 				//展开重新拉取最新图纸列表
-				this.getTypeList(this.type);
+				this.getTypeList('',this.type,'');
 			}
 		},
 		//图纸
@@ -494,7 +495,7 @@ export default {
 			this.active = activeNum;
 			this.tower = tower;
 			this.type = type
-			this.getTypeList(type);
+			this.getTypeList('',type,'');
 			if (this.sbType == '空开' && activeNum != 25) {
 
 				bfHelper.lookPipeline2(null, null, tower,

src/components/monitoring/electricity.vue

@@ -617,10 +617,12 @@ export default {
                 }
               } else {
                 lookEquipmentCop("电");
-                this.$refs.clickcp.area = 1;
+                this.$nextTick(() => {
-                this.$refs.clickcp.type = 'build';
+                  this.$refs.clickcp.area = 1;
-                this.$refs.clickcp.active = 25;
+                  this.$refs.clickcp.type = 'build';
-                this.$refs.clickcp.getTypeList(25,'build',1)
+                  this.$refs.clickcp.active = 25;
+                  this.$refs.clickcp.getTypeList(25,'build',1)
+                })
                 setOpacityFun(false,0.3);
                 this.getNavigationMap();
               }