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

shuishen

2022-01-04 82742cb52233d158e55f62be60e7666ffe1a5e5f

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

 src/components/mobileCortrol/index.vue

@@ -64,6 +64,7 @@
  position: fixed;
  left: 20px;
  top: 93px;
  height: 10px;
  z-index: 20 !important;
  .m-l-inbut {
    width: 35px;

 src/components/mobilemap/index.vue

@@ -322,12 +322,9 @@
      //精细模型↓
      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,
        }
      );
      const tileset = new that.DC.Tileset("/mx/tileset.json", {
        luminanceAtZenith: 0.5,
      });
      tilesetLayer.addOverlay(tileset);
      // tilesetLayer.show = false;

@@ -515,7 +512,9 @@
          //   new DC.Position(115.86798885, 28.72502592, 2100, 0, -45)
          // );
          let doit = (int) => {
            if (val == 1) {
            if (int == "建模") {
              viewer.flyTo(tileset);
            } else if (val == 1) {
              viewer.camera.setView({
                // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
                // fromDegrees()方法，将经纬度和高程转换为世界坐标
@@ -553,7 +552,8 @@
          };
          that.dimension == "2.5D"
            ? doit([116.36618337, 27.95911915, 2000.0])
            : doit([117.08513731, 31.64790556, 600.0]);
            : // : doit([116.39038494750986, 39.902393222208644, 330.0]);
              doit("建模");
        };
        // startPoint(1);
      }