Browse Source

Merge branch 'lmx' of http://47.103.92.60:3003/skyversation/xujingtown_irflcmp_ui.git

# Conflicts:
#	src/components/Map.vue
wdq 9 months ago
parent
commit
9081ccc867
1 changed files with 12 additions and 96 deletions
  1. 12 96
      src/components/Map.vue

+ 12 - 96
src/components/Map.vue

@@ -49,7 +49,7 @@ export default {
         });
       });
     },
-    
+
     addScripts(src) {
       return new Promise((resolve, reject) => {
         // 创建一个新的script标签
@@ -255,98 +255,14 @@ export default {
         orientation: {
           heading: SkyScenery.Math.toRadians(0.0), // 方向
           pitch: SkyScenery.Math.toRadians(-90.0), // 倾斜角度
-          roll: 0
-        }
-      });
-      // 地图初始化完成,修改store中地图初始化完成变量
-      this.$store.commit("createdMap", true);
-      return;
-      viewer.entities.add({
-        name: "点",
-        position: SkyScenery.Cartesian3.fromDegrees(121.1, 31), //经纬度转世界坐标
-        point: {
-          show: true,
-          color: SkyScenery.Color.GREEN,
-          pixelSize: 20,
-          outlineColor: SkyScenery.Color.YELLOW,
-          outlineWidth: 3
+          roll: 0,
         },
-        label: {
-          text: "这里是标签", //设置文字内容
-          font: "normal 18px 楷体", //设置文字大小和字体
-          fillColor: SkyScenery.Color.fromCssColorString("#00ff00"), //设置文字填充的颜色
-          horizontalOrigin: SkyScenery.HorizontalOrigin.CENTER,
-          verticalOrigin: SkyScenery.VerticalOrigin.BOTTOM,
-          pixelOffset: new SkyScenery.Cartesian2(0, -20)
-        }
-      });
-      viewer.entities.add({
-        position: SkyScenery.Cartesian3.fromDegrees(121.2, 31),
-        billboard: {
-          image: "/static/image/point.png",
-          width: 48, // default: undefined
-          height: 48, // default: undefined
-          scale: 1.0, // default: 1.0
-          show: true, // default
-          horizontalOrigin: SkyScenery.HorizontalOrigin.CENTER, // default
-          verticalOrigin: SkyScenery.VerticalOrigin.BOTTOM // default: CENTER
-        },
-        label: {
-          text: "这是自定义图片", // 设置文字内容
-          font: "normal 18px 楷体", // 设置文字大小和字体
-          fillColor: SkyScenery.Color.fromCssColorString("#00ff00"), //设置文字填充的颜色
-          horizontalOrigin: SkyScenery.HorizontalOrigin.CENTER,
-          verticalOrigin: SkyScenery.VerticalOrigin.BOTTOM,
-          pixelOffset: new SkyScenery.Cartesian2(0, -50)
-        }
-      });
-      let positions = [
-        [121.04829640102727, 31.12735759260756],
-        [121.05219953077487, 31.126058264888133],
-        [121.0556573133586, 31.125143117515066],
-        [121.0585577885634, 31.12489903339664],
-        [121.05855842602281, 31.117437091290032],
-        [121.05755469646111, 31.116865171387122],
-        [121.05855867110577, 31.114567660254956],
-        [121.05716503781966, 31.111412856109656],
-        [121.05169919616742, 31.109414349328368],
-        [121.04846566530048, 31.10731617798831],
-        [121.04523257218045, 31.105074455848328],
-        [121.04372646220537, 31.108713847196935],
-        [121.04238895034425, 31.11239990163383],
-        [121.04216536839769, 31.11503097997496],
-        [121.03965751482633, 31.117141773623022],
-        [121.0392664980893, 31.119247569299414],
-        [121.0401584271992, 31.124267692010815],
-        [121.04534263782213, 31.124207732078528],
-        [121.04813004860797, 31.124919266167907],
-        [121.04829640102727, 31.12735759260756]
-      ];
-
-      viewer.entities.add({
-        name: " 面",
-        polygon: {
-          hierarchy: {
-            positions: SkyScenery.Cartesian3.fromDegreesArray(
-              positions
-                .join(",")
-                .split(",")
-                .map(function(num) {
-                  return Number(num);
-                })
-            )
-          },
-          material: new SkyScenery.ImageMaterialProperty({
-            image: "/static/image/b2.png", // 图片路径
-            transparent: true // 是否透明
-          })
-        }
       });
+      this.$store.commit("createdMap", true);
     },
 
     // 加载geojson数据
     addGeoJson(url, options) {
-      
       // options = {
       //   point: {
       //     imgUrl: ""
@@ -364,7 +280,7 @@ export default {
       //   }
       // };
 
-      SkyScenery.GeoJsonDataSource.load(url).then(function(dataSource) {
+      SkyScenery.GeoJsonDataSource.load(url).then(function (dataSource) {
         // dataSource.name = guid;
         // modValue.VECTOR[guid] = dataSource;
 
@@ -390,7 +306,7 @@ export default {
               width: 50,
               height: 50,
               pixelOffset: new SkyScenery.Cartesian2(0, -25),
-              heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND
+              heightReference: SkyScenery.HeightReference.CLAMP_TO_GROUND,
               // scaleByDistance: new SkyScenery.NearFarScalar(10000, 1, 20000, 0.75),
             });
           }
@@ -440,7 +356,7 @@ export default {
       return viewer.entities.add({
         name: "立体墙效果",
         wall: {
-          positions: positions.map(function(item) {
+          positions: positions.map(function (item) {
             return SkyScenery.Cartesian3.fromDegrees(item[0], item[1]);
           }),
           // 设置高度
@@ -449,19 +365,19 @@ export default {
           material: new SkyScenery.DynamicWallMaterialProperty({
             color: SkyScenery.Color.fromCssColorString(options.color), // "#"
             trailImage: "/static/image/color.png",
-            duration: options.duration || 3000 // 3000
-          })
-        }
+            duration: options.duration || 3000, // 3000
+          }),
+        },
       });
     },
-    
+
     /**
      * 加载3Dtitles
      * @author LiuMengxiang
      * @param {*} url 3Dtitles的url地址
      * @param {*} flyto 是否自动飞行到3Dtitles
      */
-     add3DTiles(url, flyto) {
+    add3DTiles(url, flyto) {
       let tileset = new SkyScenery.Cesium3DTileset({
         url: url + "/tileset.json",
         // "?servertype=OJK_BUILD&token=65463DEE-620A-0ED5-2385-17ECD07CD351",
@@ -498,7 +414,7 @@ export default {
       }
       return tileset;
     },
-  }
+  },
 };
 </script>