diff --git a/src/components/monitoring/clickCp.vue b/src/components/monitoring/clickCp.vue index d438d38..19651d7 100644 --- a/src/components/monitoring/clickCp.vue +++ b/src/components/monitoring/clickCp.vue @@ -310,7 +310,7 @@ export default { }, methods: { // 根据楼号获取分类列表 - getTypeList(active,type,area){ + getTypeList(type){ 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'){ @@ -358,6 +358,27 @@ export default { } console.log('typeList ====>',this.typeList, this.page) }) + }else if(type == ''){ + let build = this.bimModel == 1 ? this.active : this.ttActive; + console.log('bimModel ====>',this.bimModel,'draweClass ===>',_draweClass,'build ===>',build) + this.typeList = []; + getDrawList({current:1,size:200,draweClass:_draweClass,region:_draweClass+'-'+this.bimModel}).then(res =>{ + let arr = res.data.data.records + arr.map(item =>{ + this.typeList.push(item) + }) + //计算页码 + let pageCount = Math.ceil(this.typeList.length / 10); + let _pageArr = []; + for(let i = 1; i <= pageCount; i++){ + _pageArr.push(i); + } + this.page = { + current: 1, + pageCount: _pageArr + } + console.log('typeList ====>',this.typeList, this.page) + }) } }, diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue index b01133a..7aef81c 100644 --- a/src/components/monitoring/conditioner.vue +++ b/src/components/monitoring/conditioner.vue @@ -532,10 +532,13 @@ export default { bfHelper.lookEquipmentCop("空调"); this.getNavigationMap(); bfHelper.setOpacityFun(); - this.$refs.clickcp.area = 1; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.active = 25; - this.$refs.clickcp.getTypeList(25,'build',1) + setTimeout(() =>{ + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList('build') + },300) + // setTimeout(() => { this.initial(); // },300) diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue index 88ca5a3..72f7479 100644 --- a/src/components/monitoring/door.vue +++ b/src/components/monitoring/door.vue @@ -527,10 +527,13 @@ export default { // 查看管线 bfHelper.lookPipeline(null, null, this.condition, "电子门禁"); bfHelper.setOpacityFun(); - this.$refs.clickcp.area = 1; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.active = 25; - this.$refs.clickcp.getTypeList(25,'build',1) + setTimeout(() =>{ + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList('build') + },300) + this.getNavigationMap(); // this.initial() } @@ -614,9 +617,12 @@ export default { } else { // 查看管线 bfHelper.TtLookEquipmentCop("电子门禁"); - this.$refs.clickcp.area = 2; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.getTypeList(20,'build',2); + setTimeout(() =>{ + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList('build'); + },300) + bfHelper.setOpacityFun1(); } } diff --git a/src/components/monitoring/electricity.vue b/src/components/monitoring/electricity.vue index 3df8cc6..a2be74b 100644 --- a/src/components/monitoring/electricity.vue +++ b/src/components/monitoring/electricity.vue @@ -621,7 +621,7 @@ export default { this.$refs.clickcp.area = 1; this.$refs.clickcp.type = 'build'; this.$refs.clickcp.active = 25; - this.$refs.clickcp.getTypeList(25,'build',1) + this.$refs.clickcp.getTypeList('build') }) setOpacityFun(false,0.3); this.getNavigationMap(); @@ -705,11 +705,14 @@ export default { ); } } else { + setTimeout(() =>{ + this.$refs.clickcp.active = 20 + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList('build'); + },300) TtLookEquipmentCop("电"); - this.$refs.clickcp.active = 20 - this.$refs.clickcp.area = 2; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.getTypeList(20,'build',2); + setOpacityFun1(); } } diff --git a/src/components/monitoring/firefighting.vue b/src/components/monitoring/firefighting.vue index ddb02df..e9b85eb 100644 --- a/src/components/monitoring/firefighting.vue +++ b/src/components/monitoring/firefighting.vue @@ -341,6 +341,9 @@ export default { this.getFightWarnList(); //bim标注告警列表 this.getFiredWarnList(); //报警信息 this.addWaterLabel(); + // setTimeout(() =>{ + // this.$refs.clickcp.getTypeList('build') + // },300) }, }, //模型是否加载完成监听 @@ -438,10 +441,12 @@ export default { } else { bfHelper.lookEquipmentCop("消防", this.checkList); bfHelper.setOpacityFun(); - this.$refs.clickcp.area = 1; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.active = 25; - this.$refs.clickcp.getTypeList(25,'build',1) + setTimeout(() =>{ + this.$refs.clickcp.area = 1; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.active = 25; + this.$refs.clickcp.getTypeList('build') + },300) this.getNavigationMap(); } } else { @@ -529,10 +534,12 @@ export default { } else { // 查看管线 bfHelper.TtLookEquipmentCop("消防", this.checkList); - this.$refs.clickcp.active = 20 - this.$refs.clickcp.area = 2; - this.$refs.clickcp.type = 'build'; - this.$refs.clickcp.getTypeList(20,'build',2); + setTimeout(() =>{ + this.$refs.clickcp.active = 20 + this.$refs.clickcp.area = 2; + this.$refs.clickcp.type = 'build'; + this.$refs.clickcp.getTypeList('build'); + },300) bfHelper.setOpacityFun1(); } } diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue index f42bfc1..2206767 100644 --- a/src/components/monitoring/lift.vue +++ b/src/components/monitoring/lift.vue @@ -145,7 +145,36 @@ - + +