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

shuishen

2021-12-23 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0

 src/components/mobilemap/index.vue

@@ -186,71 +186,107 @@
        if (!that.MobileWindowsHide) {
          // that.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
        }
        // if (!that.MobileWindowsHideFixed) {
        //   that.$store.dispatch("CLOSE_WIDOWFIXED"); //关闭固定弹窗
        // }
        // if (!that.MobileWindowsHide && that.popupsDom) {
        //   that.popupsDom.closeOur();
        //   that.$store.commit("MSET_MOBILEWINDOWSHIDE", true);
        // }
        // nowPosition = [e.wgs84Position.lng, e.wgs84Position.lat];
        // console.log(nowPosition);
      });

      const layer = new DC.TilesetLayer("layer");
      viewer.addLayer(layer);
      const tileset = new DC.Tileset(
        "http://resource.dvgis.cn/data/3dtiles/ljz/tileset.json"
      );
      const style = new DC.TilesetStyle();
      style.color = {
        conditions: [
          ["${Height} >= 300", "rgba(45, 0, 75, 0.5)"],
          ["${Height} >= 200", "rgb(102, 71, 151)"],
          ["${Height} >= 100", "rgb(170, 162, 204)"],
          ["${Height} >= 50", "rgb(224, 226, 238)"],
          ["${Height} >= 25", "rgb(252, 230, 200)"],
          ["${Height} >= 10", "rgb(248, 176, 87)"],
          ["${Height} >= 5", "rgb(198, 106, 11)"],
          ["true", "rgb(127, 59, 8)"],
        ],
      };
      //自带白模型↓
      // const layer = new DC.TilesetLayer("layer");
      // viewer.addLayer(layer);
      // const tileset = new DC.Tileset(
      //   "http://resource.dvgis.cn/data/3dtiles/ljz/tileset.json"
      // );
      // const style = new DC.TilesetStyle();
      // style.color = {
      //   conditions: [
      //     ["${Height} >= 300", "rgba(45, 0, 75, 0.5)"],
      //     ["${Height} >= 200", "rgb(102, 71, 151)"],
      //     ["${Height} >= 100", "rgb(170, 162, 204)"],
      //     ["${Height} >= 50", "rgb(224, 226, 238)"],
      //     ["${Height} >= 25", "rgb(252, 230, 200)"],
      //     ["${Height} >= 10", "rgb(248, 176, 87)"],
      //     ["${Height} >= 5", "rgb(198, 106, 11)"],
      //     ["true", "rgb(127, 59, 8)"],
      //   ],
      // };

      viewer.use(new DC.Measure());
      // viewer.use(new DC.Measure());

      tileset.setStyle(style);
      // tileset.setStyle(style);
      // layer.addOverlay(tileset);
      // viewer.flyTo(tileset);
      that.$store.dispatch("mapFlyTo", {
        lntLat: [115.87186406, 28.74449337, 1200],
        heading: 0,
        pitch: -45,
        roll: 0,
        noOpen: true,
      //自带白模型↑

      //精细模型↓
      const tilesetLayer = new that.DC.TilesetLayer("tilesetLayer");
      viewer.addLayer(tilesetLayer);
      const tileset = new that.DC.Tileset(
        "http://data.mars3d.cn/3dtiles/max-shihua/tileset.json",
        {
          luminanceAtZenith: 0.5,
        }
      );
      tilesetLayer.addOverlay(tileset);
      viewer.flyTo(tileset);
      //精细模型↑

      //瀑布流↓
      const wallLayer = new that.DC.VectorLayer("wallLayer");
      viewer.addLayer(wallLayer);
      var arr = [
        [115.87597219, 28.74628526, 100],
        [115.87556558, 28.74415792, 100],
        [115.87459782, 28.74197687, 100],
        [115.87371834, 28.74219927, 100],
        [115.87210924, 28.74182217, 100],
        [115.86469971, 28.73630725, 100],
        [115.86387107, 28.73620123, 100],
        [115.86274498, 28.73616026, 100],
        [115.86173699, 28.7424135, 100],
        [115.86105468, 28.74643934, 100],
        [115.8660924, 28.74642593, 100],
        [115.87597219, 28.74628526, 100],
      ];
      arr.forEach((item) => {
        item = item.join(",");
      });
      arr = arr.join(";");
      const wall = new that.DC.Wall(arr);
      wall.setStyle({
        material: new that.DC.WallTrailMaterialProperty({
          color: that.DC.Color.DEEPSKYBLUE,
          speed: 4,
        }),
      });
      wallLayer.addOverlay(wall);

      viewer.use(new that.DC.Measure());
      //瀑布流↑

      //飞入起始点
      // 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");
      // that.$store.dispatch("MSET_CREADE");

      tileset.on(DC.MouseEventType.CLICK, (e) => {
        // that.popupFlag = true
        // that.popupWindow = true;

        viewer.scene.globe.depthTestAgainstTerrain = false;

        // console.log(document.getElementById("mobile-map_content_content"));
        // console.log(e);

        // 定制化窗体
        that.openPopupS(e.position, [e.wgs84Position.lng, e.wgs84Position.lat]);

        // popup.setWrapper('<div></div>')

        // popup.showAt(e.position, document.getElementById('modelPopup'))
        that.openPopupS(
          e.position,
          [e.wgs84Position.lng, e.wgs84Position.lat],
          {
            name: e.layer._bid,
            address: e.layer.type,
            introduce: e.layer._id,
          }
        );
      });

      // viewer.zoomToPosition(
      //     new DC.Position(105.565571, 31.984708, 15362816, 0, -90)
      // )

      viewer.compass.enable = false;
      viewer.zoomController.enable = true;
@@ -267,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);