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

2 years ago · f94c27147a
parent 2eadc788cc
commit f94c27147a
5 changed files with 48 additions and 35 deletions
--- a/src/components/monitoring/conditioner.vue
+++ b/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]);
                  }
                }
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@ -1218,15 +1218,15 @@ export default {
      bfHelper.setSelectedById(arr);
      if (this.bimModel == 2) {
      } else {
-        if (bfHelper.getselectGather().length < 2) {
-          bfHelper.setCameraStatus(
-            JSON.parse(window.sessionStorage.getItem("camera"))
-          );
-        } else {
-          bfHelper.setCameraView(location ? location : "Top");
-          // 缩放到加入选中集合的构件
-          bfHelper.zoomToSelectedComponents();
-        }
+        // if (bfHelper.getselectGather().length < 2) {
+        //   bfHelper.setCameraStatus(
+        //     JSON.parse(window.sessionStorage.getItem("camera"))
+        //   );
+        // } else {
+        //   bfHelper.setCameraView(location ? location : "Top");
+        //   // 缩放到加入选中集合的构件
+        //   bfHelper.zoomToSelectedComponents();
+        // }
      }
      //清除所有标签
      bfHelper.clearDrawableContainer();
--- a/src/util/bfHelper.js
+++ b/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' :
-  // 	'/bimfaceApi/tt/viewToken.json';
-  BimfaceLoaderConfig.path =
-    i == 1
-      ? "http://10.90.100.203:8080/ywq/viewToken.json"
-      : "http://10.90.100.203:8080/tt/viewToken.json";
+  BimfaceLoaderConfig.path = i == 1 ? '/bimfaceApi/ywq/viewToken.json' :
+    '/bimfaceApi/tt/viewToken.json';
+  // BimfaceLoaderConfig.path =
+  //   i == 1
+  //     ? "http://10.90.100.203:8080/ywq/viewToken.json"
+  //     : "http://10.90.100.203:8080/tt/viewToken.json";

  BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded, (err) => {
    console.log('err', err)
@ -3048,9 +3048,9 @@ const resetStatus = (bgType, cameraState, mode) => {
  viewer3D.exitWalk(); //退出漫游模式
  setCameraStatus(getCameraStatus()); //获取当前视角 恢复到当前相机视角 用于触发相机回调
  // onClick(() => {}); //恢复点击事件
-  editorChanged(() => {}); //结束外部构件编辑时间
-  rendered(() => {}); //恢复渲染完毕事件
-  CameraPositionChanged(() => {}); //恢复相机位置事件
+  editorChanged(() => { }); //结束外部构件编辑时间
+  rendered(() => { }); //恢复渲染完毕事件
+  CameraPositionChanged(() => { }); //恢复相机位置事件
  if (bgType == 2) {
    setBimBg(2);
  } else {
@ -3152,8 +3152,9 @@ const labelClick = (fn) => {

 // 设置相机视角
 const setCameraStatus = (status) => {
+  console.log('设置相机视角')
  return new Promise((resolve) => {
-    viewer3D !=undefined && viewer3D && viewer3D.setCameraStatus(
+    viewer3D != undefined && viewer3D && viewer3D.setCameraStatus(
      {
        ...cameraState,
        ...status,
@ -4250,7 +4251,17 @@ const lookPipeline2 = (
        }
      }
    } else {
-      setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
+      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")));
    }
@ -4509,7 +4520,7 @@ const lookPipeline2 = (
      // 根据条件显示
      arr2.push(...arr3);
      // 根据条件设置构件颜色
-      console.log('条件显示的构件',arr2)
+      console.log('条件显示的构件', arr2)
      showComponentsByObjectData(arr2);
      setConditionsColor(arr2, color);
    }
@ -4518,10 +4529,10 @@ const lookPipeline2 = (
    // console.log(sbType+' - top 视角=====')
    if (sbType == "空调" || sbType == '电' || sbType == '暖') {
      if (layer) {
-       setTimeout(() => {
-        setCameraView("Top");
-        setCameraStatus(sbType == "空调" ? ktCamera[tower][layer - 1] : cameraPosition[tower]);
-       },300)
+        setTimeout(() => {
+          setCameraView("Top");
+          setCameraStatus(sbType == "空调" ? ktCamera[tower][layer - 1] : cameraPosition[tower]);
+        }, 300)
      } else {
        console.log('ll1--2')
        setCameraStatus(JSON.parse(window.sessionStorage.getItem("camera")));
@ -5169,8 +5180,8 @@ const setOpacityFun = (isOpacity) => {
    } else {
      height = Math.sqrt(
        Math.pow(ywqOrigin[0] - data.position.x, 2) +
-          Math.pow(ywqOrigin[1] - data.position.y, 2) +
-          Math.pow(ywqOrigin[2] - data.position.z, 2)
+        Math.pow(ywqOrigin[1] - data.position.y, 2) +
+        Math.pow(ywqOrigin[2] - data.position.z, 2)
      );
      if (height >= 230000 && reload != 1) {
        // 设置墙体颜色
@ -5484,8 +5495,8 @@ const setOpacityFun1 = (isOpacity) => {
    } else {
      height = Math.sqrt(
        Math.pow(ttOrigin[0] - data.position.x, 2) +
-          Math.pow(ttOrigin[1] - data.position.y, 2) +
-          Math.pow(ttOrigin[2] - data.position.z, 2)
+        Math.pow(ttOrigin[1] - data.position.y, 2) +
+        Math.pow(ttOrigin[2] - data.position.z, 2)
      );

      if (height >= 230000 && reload != 1) {
--- a/src/views/garden/generalizePattern.vue
+++ b/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"],
--- a/vue.config.js
+++ b/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.1.3",
+        // target: 'http://192.168.79.129',
+        // target: "http://192.168.1.106",
+        target: "http://192.168.1.106",
        // target: "http://10.90.100.204",
        // target: "http://rsvz4t.natappfree.cc",
        //远程演示服务地址,可用于直接启动项目