diff --git a/src/components/monitoring/light.vue b/src/components/monitoring/light.vue
index af8ad66..e6d437d 100644
--- a/src/components/monitoring/light.vue
+++ b/src/components/monitoring/light.vue
@@ -434,9 +434,7 @@ export default {
} else {
bfHelper.lookEquipmentCop("照明");
bfHelper.setOpacityFun();
- setTimeout(() => {
- this.getNavigationMap();
- }, 300);
+ this.getNavigationMap();
}
} else {
}
@@ -614,10 +612,7 @@ export default {
bfHelper.setColor("#a5bbe5", offList);
},
getNavigationMap() {
- // bfHelper.mapDestroy();
- setTimeout(() => {
- commonValue.getNavigationMap("water");
- });
+ commonValue.getNavigationMap("water");
},
// 接收子组件当前点击楼号
setTowerLight(i, j) {
diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js
index 4c2267c..3551d40 100644
--- a/src/util/bfHelper.js
+++ b/src/util/bfHelper.js
@@ -3154,7 +3154,7 @@ const labelClick = (fn) => {
// 设置相机视角
const setCameraStatus = (status) => {
return new Promise((resolve) => {
- viewer3D.setCameraStatus(
+ viewer3D !=undefined && viewer3D && viewer3D.setCameraStatus(
{
...cameraState,
...status,
@@ -3458,6 +3458,8 @@ const zoomToSelectedComponents = (margin) => {
const navigationMap = (dom, img, build, floor) => {
let mapViewerConfig =
new Glodon.Bimface.Plugins.NavigationMap.MapViewerConfig();
+ console.log('初始化导航地图');
+ document.querySelector(dom) && document.querySelector(dom).innerHTML == '';
mapViewerConfig.domElement = document.querySelector(dom);
let mapViewer = new Glodon.Bimface.Plugins.NavigationMap.MapViewer(
mapViewerConfig
@@ -3488,7 +3490,8 @@ const navigationMap = (dom, img, build, floor) => {
viewer3D.render();
};
const mapUpdate = (img, mapAnchors, modelAnchors) => {
- if (navigationMap2) {
+ console.log('mapUpdate', navigationMap2);
+ if (navigationMap2 != undefined && navigationMap2) {
navigationMap2.associateModel({
url: img,
mapAnchors: mapAnchors,
@@ -3499,7 +3502,7 @@ const mapUpdate = (img, mapAnchors, modelAnchors) => {
};
//销毁地图
const mapDestroy = () => {
- if (navigationMap2) {
+ if (navigationMap2 != undefined && navigationMap2) {
navigationMap2.destroy();
navigationMap2 = null;
}
diff --git a/src/views/garden/home.vue b/src/views/garden/home.vue
index ff21ed3..2ecfb55 100644
--- a/src/views/garden/home.vue
+++ b/src/views/garden/home.vue
@@ -192,8 +192,10 @@ export default {
position: absolute;
top: 0;
left: 50%;
- margin-left: -3.1rem;
- width: 6.2rem;
+ // margin-left: -3.1rem;
+ margin-left: -2.25rem;
+ // width: 6.2rem;
+ width: 4.5rem;
background-size: 100% 100%;
padding: 0 0.32rem;
@@ -201,7 +203,8 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
- width: 6.2rem;
+ // width: 6.2rem;
+ width: 4.5rem;
height: 0.57rem;
}
diff --git a/src/views/garden/index.vue b/src/views/garden/index.vue
index 1910103..8f6a55a 100644
--- a/src/views/garden/index.vue
+++ b/src/views/garden/index.vue
@@ -55,13 +55,6 @@
:style="{ 'top': topNav == 1 ? '1.25rem' : '1.938rem', 'left': topNav == 1 ? '1.25rem' : 'auto', 'right': topNav == 1 ? 'auto' : '7.625rem' }">
-
-
业务区
@@ -156,7 +149,6 @@ export default {
} else {
if (newValue == 1) {
- console.log(12222)
this.status = true;
bfHelper.resetStatus(1); //恢复全部状态
} else {
@@ -220,7 +212,6 @@ export default {
},
// 顶部导航按钮
topNavFun(i) {
-
window.sessionStorage.removeItem('build');
window.sessionStorage.removeItem('floor');
window.sessionStorage.removeItem('ttbuild');
@@ -235,7 +226,11 @@ export default {
}
this.clickNum++;
- } else {
+ }else if(i == 1) {
+ this.clickNum = 1;
+ this.goBackHome();//回主视角
+ }
+ else {
this.clickNum = 1;
}
},
@@ -254,15 +249,15 @@ export default {
this.$nextTick(() => {
if (name == '电') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(1);
+ this.$refs.monitoringPattern.clickMenu(1,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(1);
+ this.$refs.monitoringPattern.clickMenu(1,name,true);
}
} else if (name == '水') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(2);
+ this.$refs.monitoringPattern.clickMenu(2,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(2);
+ this.$refs.monitoringPattern.clickMenu(2,name,true);
}
} else if (name == '热') {
if (this.bimModel == 1) {
@@ -270,9 +265,9 @@ export default {
}
} else if (name == '监控') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(4);
+ this.$refs.monitoringPattern.clickMenu(4,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(3);
+ this.$refs.monitoringPattern.clickMenu(3,name,true);
}
} else if (name == '照明') {
if (this.bimModel == 1) {
@@ -280,15 +275,15 @@ export default {
}
} else if (name == '消防') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(6);
+ this.$refs.monitoringPattern.clickMenu(6,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(4);
+ this.$refs.monitoringPattern.clickMenu(4,name,true);
}
} else if (name == '电梯') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(7);
+ this.$refs.monitoringPattern.clickMenu(7,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(5);
+ this.$refs.monitoringPattern.clickMenu(5,name,true);
}
} else if (name == '空调') {
if (this.bimModel == 1) {
@@ -296,21 +291,21 @@ export default {
}
} else if (name == '电子门禁') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(9);
+ this.$refs.monitoringPattern.clickMenu(9,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(6);
+ this.$refs.monitoringPattern.clickMenu(6,name,true);
}
} else if (name == '电子围界') {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(10);
+ this.$refs.monitoringPattern.clickMenu(10,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(7);
+ this.$refs.monitoringPattern.clickMenu(7,name,true);
}
} else {
if (this.bimModel == 1) {
- this.$refs.monitoringPattern.clickMenu(9);
+ this.$refs.monitoringPattern.clickMenu(9,name,true);
} else {
- this.$refs.monitoringPattern.clickMenu(6);
+ this.$refs.monitoringPattern.clickMenu(6,name,true);
}
}
})
diff --git a/src/views/garden/monitoringPattern.vue b/src/views/garden/monitoringPattern.vue
index d585dc7..5489155 100644
--- a/src/views/garden/monitoringPattern.vue
+++ b/src/views/garden/monitoringPattern.vue
@@ -11,48 +11,6 @@
![]()
{{item.name}}
-
-
-