删除注释；bim缩放视角传参修正

src/components/monitoring/conditioner.vue

@@ -485,6 +485,7 @@ export default {
                   }, 300);
                   bfHelper.setOpacityFun();
                 } else {
+                  console.log(build,floor,"=======================")
                   if (floor.indexOf("undefined") == -1) {
                     setTimeout(() => {
                       this.setTowerKT("0" + build, "0" + floor);
@@ -510,7 +511,7 @@ export default {
                       );
                       this.$refs.clickcp.tower = commonValue.towerValue(build);
                     }, 300);
-                    bfHelper.lookPipeline2(null, null, build - 1, floor, "空调");
+                    bfHelper.lookPipeline2(null, null, build - 1, null, "空调");
                     // bfHelper.setCameraStatus(bfHelper.lightCamera[build - 1]);
                   }
                 }

src/components/monitoring/door.vue

@@ -1218,15 +1218,15 @@ export default {
       bfHelper.setSelectedById(arr);
       if (this.bimModel == 2) {
       } else {
-        if (bfHelper.getselectGather().length < 2) {
+        // if (bfHelper.getselectGather().length < 2) {
-          bfHelper.setCameraStatus(
+        //   bfHelper.setCameraStatus(
-            JSON.parse(window.sessionStorage.getItem("camera"))
+        //     JSON.parse(window.sessionStorage.getItem("camera"))
-          );
+        //   );
-        } else {
+        // } else {
-          bfHelper.setCameraView(location ? location : "Top");
+        //   bfHelper.setCameraView(location ? location : "Top");
-          // 缩放到加入选中集合的构件
+        //   // 缩放到加入选中集合的构件
-          bfHelper.zoomToSelectedComponents();
+        //   bfHelper.zoomToSelectedComponents();
-        }
+        // }
       }
       //清除所有标签
       bfHelper.clearDrawableContainer();

src/util/bfHelper.js

@@ -2862,12 +2862,12 @@ const loadModel = (i) => {
   // BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
   BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
   BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
-  // BimfaceLoaderConfig.path = i == 1 ? '/bimfaceApi/ywq/viewToken.json' :
+  BimfaceLoaderConfig.path = i == 1 ? '/bimfaceApi/ywq/viewToken.json' :
-  // 	'/bimfaceApi/tt/viewToken.json';
+    '/bimfaceApi/tt/viewToken.json';
-  BimfaceLoaderConfig.path =
+  // BimfaceLoaderConfig.path =
-    i == 1
+  //   i == 1
-      ? "http://10.90.100.203:8080/ywq/viewToken.json"
+  //     ? "http://10.90.100.203:8080/ywq/viewToken.json"
-      : "http://10.90.100.203:8080/tt/viewToken.json";
+  //     : "http://10.90.100.203:8080/tt/viewToken.json";
 
   BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded, (err) => {
     console.log('err', err)
@@ -3152,6 +3152,7 @@ const labelClick = (fn) => {
 
 // 设置相机视角
 const setCameraStatus = (status) => {
+  console.log('设置相机视角')
   return new Promise((resolve) => {
     viewer3D != undefined && viewer3D && viewer3D.setCameraStatus(
       {
@@ -4250,8 +4251,18 @@ const lookPipeline2 = (
         }
       }
     } else {
+      if(layer) {
+        console.log('rest 视角',layer)
+        setTimeout(() => {
+          setCameraView("Top");
+          setCameraStatus(cameraPosition[tower]);
+         },300)
+      }
+      else{
         setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
       }
+      // setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
+    }
     // 缩放到加入选中集合的构件
   } else if (sbType == "空开") {
     // 要显示的构件处理后的筛选条件
@@ -4313,7 +4324,7 @@ const lookPipeline2 = (
     // 设置视角为南侧俯视
     if (layer) {
       setCameraView("Top");
-      setCameraStatus(ktCamera[tower][layer - 1]);
+      setCameraStatus(cameraPosition[tower]);
     } else {
       setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
     }

src/views/garden/generalizePattern.vue

@@ -1200,7 +1200,7 @@ export default {
         };
         offlineData.push(obj);
       });
-      console.log("安防态势", lengendData);
+      // console.log("安防态势", lengendData);
       // 绘制图表
       myChart.setOption({
         // color: ["#01feae", "#f2b448", "#07a6ff", "#ff8b2e"],

vue.config.js

@@ -27,7 +27,7 @@ module.exports = {
     port: 1888,
     proxy: {
       "/bimfaceApi": {
-        target: 'http://192.168.1.3:8001',
+        target: 'http://192.168.1.106:8001',
         ws: true,
         pathRewrite: {
           "^/bimfaceApi": "/bimface",
@@ -45,8 +45,9 @@ module.exports = {
         // target: 'http://180.76.231.175:8000',
         // target: 'http://192.168.0.105:80',
         // target: "http://192.168.43.35",
-        // target: 'http://192.168.1.106',
+        // target: 'http://192.168.79.129',
-        target: "http://192.168.1.3",
+        // target: "http://192.168.1.106",
+        target: "http://192.168.1.106",
         // target: "http://10.90.100.204",
         // target: "http://rsvz4t.natappfree.cc",
         //远程演示服务地址,可用于直接启动项目