sunzehao il y a 1 semaine
Parent
commit
2a81c579e8

+ 2 - 2
src/views/cesium.vue

@@ -436,7 +436,7 @@ export default {
       this.initCesiumBaseMapImage();
       //   this.switchWindLayer();
       this.showAllStation(viewer, allStationJson.station);
-      this.initGeoJsonData();
+    //   this.initGeoJsonData();
     },
 
     // 初始化地形
@@ -453,7 +453,7 @@ export default {
         }
       );
 
-      this.viewer.scene.verticalExaggeration = 10.0;
+      this.viewer.scene.verticalExaggeration = 10;
       this.viewer.scene.verticalExaggerationRelativeHeight = 2400.0;
 
       this.viewer.terrainProvider = terrainProvider;

+ 24 - 24
src/views/cesiumComponents/windMap3D.vue

@@ -435,12 +435,12 @@ export default {
         this.showStatuswind(viewer, e);
       });
 
-      let mountainMsg = mountainPosJson.data.find(it => it.stationName === stationName)
+    //   let mountainMsg = mountainPosJson.data.find(it => it.stationName === stationName)
 
-        this.addTreeain(
-            viewer, 
-            mountainMsg
-        );
+    //     this.addTreeain(
+    //         viewer, 
+    //         mountainMsg
+    //     );
       this.resetWindViewport();
     },
     // 根据状态展示不同颜色风机贴图
@@ -451,7 +451,7 @@ export default {
         e.longitude,
         e.latitude,
         e.status,
-        e.height || 0,
+        e.heightS || 0,
         e
       );
     },
@@ -549,7 +549,7 @@ export default {
         //     : "/public/static/model/dixing/model.glb",
         //   // : "/public/static/model/dixing/terrain.glb",
         uri: `/public/static/model/fjStatus/fj_${statueFJ}.glb`,
-          scale: 12,
+          scale: 0.5,
           // 模型贴地
           //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           //   heightReference: Cesium.HeightReference.NONE,
@@ -557,11 +557,11 @@ export default {
           //   silhouetteColor: Cesium.Color.fromCssColorString(statueColor),
           //   runAnimations: wtStatue !== 7 ? false : true,
         },
-        // label: { 
-        //     text: name,
-        //     font: '14px sans-serif',
-        //     fillColor: Cesium.Color.fromBytes(255, 255, 255),
-        // }
+        label: { 
+            text: name,
+            font: '14px sans-serif',
+            fillColor: Cesium.Color.fromBytes(255, 255, 255),
+        }
       });
 
       // 使用高级灯牌生成器
@@ -591,18 +591,18 @@ export default {
         borderGradient: ["#00e5ff", "#2979ff"],
       });
 
-      const entityxy = viewer.entities.add({
-        name,
-        position,
-        billboard: {
-          image: billboardImage,
-          scale: 1,
-          verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 原来已经是CENTER,现在改为BOTTOM
-          pixelOffset: new Cesium.Cartesian2(80, -50), // 原来是-20,现在改为30,向上移动
-          eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
-          heightReference: Cesium.HeightReference.NONE,
-        },
-      });
+    //   const entityxy = viewer.entities.add({
+    //     name,
+    //     position,
+    //     billboard: {
+    //       image: billboardImage,
+    //       scale: 1,
+    //       verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 原来已经是CENTER,现在改为BOTTOM
+    //       pixelOffset: new Cesium.Cartesian2(80, -50), // 原来是-20,现在改为30,向上移动
+    //       eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
+    //       heightReference: Cesium.HeightReference.NONE,
+    //     },
+    //   });
 
       this.dixingAdd = true;
 

+ 20 - 10
src/views/fjLonLatJson/fj_YPL.json

@@ -2,70 +2,80 @@
     "data":[
         {
             "name": "F01",
-            "height": 1463.7,
+            "heightS": 1463.7,
+            "height": 550,
             "longitude": 112.4552657,
             "latitude": 40.38726386,
             "status": 7
         },
         {
             "name": "F02",
-            "height": 1473.7,
+            "heightS": 1473.7,
+            "height": 700,
             "longitude": 112.4619149,
             "latitude": 40.38295804,
             "status": 7
         },
         {
             "name": "F03",
-            "height": 1481.9,
+            "heightS": 1481.9,
+            "height": 800,
             "longitude": 112.4675194,
             "latitude": 40.37935749,
             "status": 7
         },
         {
             "name": "F04",
-            "height": 1511.2,
+            "heightS": 1511.2,
+            "height": 800,
             "longitude": 112.4727347,
             "latitude": 40.37513017,
             "status": 7
         },
         {
             "name": "F05",
-            "height": 1508.6,
+            "heightS": 1508.6,
+            "height": 900,
             "longitude": 112.475277,
             "latitude": 40.366816,
             "status": 7
         },
         {
             "name": "F06",
-            "height": 1510.8,
+            "heightS": 1510.8,
+            "height": 600,
             "longitude": 112.4872141,
             "latitude": 40.37190309,
             "status": 7
         },
         {
             "name": "F07",
-            "height": 1509.8,
+            "heightS": 1509.8,
+            "height": 600,
             "longitude": 112.4904652,
             "latitude": 40.367932,
             "status": 7
         },
         {
             "name": "F08",
-            "height": 1475.9,
+            "heightS": 1475.9,
+            "height": 200,
             "longitude": 112.5026055,
             "latitude": 40.37064841,
             "status": 7
         },
         {
             "name": "F09",
-            "height": 1588.4,
+            "heightS": 1588.4,
+            "height": 600,
             "longitude": 112.5270545,
             "latitude": 40.35920334,
             "status": 7
         },
         {
             "name": "F10",
-            "height": 1737.9,
+            "heightS": 1737.9,
+            "height": 900,
             "longitude": 112.5325336,
             "latitude": 40.34506285,
             "status": 7

+ 1 - 1
src/views/fjLonLatJson/mountainPos.json

@@ -10,7 +10,7 @@
             "longitude": 112.898333,
             "latitude": 40.475556,
             "height": -5000,
-            "scale": 8000
+            "scale": 3000
         },
         {
             "modelName": "京能苏木山",