Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2021-12-23 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0

 src/components/mobilemap/index.vue

@@ -225,7 +225,7 @@
        }
      );
      tilesetLayer.addOverlay(tileset);
      // viewer.flyTo(tileset);
      viewer.flyTo(tileset);
      //精细模型↑

      //瀑布流↓
@@ -262,21 +262,30 @@
      //瀑布流↑

      //飞入起始点
      that.$store.dispatch("mapFlyTo", {
        lntLat: [115.87186406, 28.74449337, 1200],
        heading: 0,
        pitch: -45,
        roll: 0,
        noOpen: true,
      });
      // that.$store.dispatch("mapFlyTo", {
      //   lntLat: [115.87186406, 28.74449337, 1200],
      //   heading: 0,
      //   pitch: -45,
      //   roll: 0,
      //   noOpen: true,
      // });
      //地图渲染完成执行srore中MSET_CREADE
      // that.$store.dispatch("MSET_CREADE");

      tileset.on(DC.MouseEventType.CLICK, (e) => {
        viewer.scene.globe.depthTestAgainstTerrain = false;
        // console.log(e);

        // 定制化窗体
        that.openPopupS(e.position, [e.wgs84Position.lng, e.wgs84Position.lat]);
        that.openPopupS(
          e.position,
          [e.wgs84Position.lng, e.wgs84Position.lat],
          {
            name: e.layer._bid,
            address: e.layer.type,
            introduce: e.layer._id,
          }
        );
      });

      viewer.compass.enable = false;
@@ -294,7 +303,7 @@
      let d = {
        position,
        lntLat,
        query: { ...(query || {}), introduce: position, address: lntLat },
        query: { introduce: position, address: lntLat, ...(query || {}) },
        useJWD: true, //仅使用经纬度
      };
      that.$store.dispatch("setMobileWindows", d);