Browse Source

常规上传

sunzehao 2 months ago
parent
commit
339bdacdf2

+ 1 - 1
src/views/cesium.vue

@@ -432,7 +432,7 @@ export default {
       this.viewer = viewer;
 
       // this.setMapImageryProvider();
-      this.initCesiumTerrain(); 
+    //   this.initCesiumTerrain(); 
       this.initCesiumBaseMapImage();
       //   this.switchWindLayer();
       this.showAllStation(viewer, allStationJson.station);

+ 9 - 1
src/views/cesiumComponents/windMap2D.vue

@@ -77,6 +77,7 @@ import "../../Cesium/Widgets/widgets.css";
 import fjMYLonLatJson from "../fjLonLatJson/fj_MY.json"; //迈越风电场
 import fjWHZLonLatJson from "../fjLonLatJson/fj_WHZ.json"; //京能旺海庄
 import fjYPLLonLatJson from "../fjLonLatJson/fj_YPL.json"; //京能营盘梁
+import fjSMSLonLatJson from "../fjLonLatJson/fj_SMS.json"; //京能苏木山
 import allStationJson from "./allStationJson.json"
 import basicGeoJson from "../../assets/geoJson/basic.json";
 import comModelDialog from "@/components/comModelDialog.vue";
@@ -149,7 +150,12 @@ export default {
                 longitude: 112.5270545,
                 latitude: 40.35920334,
                 name: "JNYPL"
-            }
+            },
+            {
+                longitude: 112.69922452,
+                latitude: 40.31857399,
+                name: "JNSMS",
+            },
         ],
       viewer: null,
       windLayer: null, // 风场图
@@ -367,6 +373,8 @@ export default {
             fjLonLatJson = fjWHZLonLatJson
         } else if (stationName === "JNYPL") {
             fjLonLatJson = fjYPLLonLatJson
+        } else if (stationName === "JNSMS") {
+            fjLonLatJson = fjSMSLonLatJson;
         }
         fjLonLatJson.data.forEach((e, index) => {
             if (e.status) {

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

@@ -83,6 +83,7 @@ import "../../Cesium/Widgets/widgets.css";
 import fjMYLonLatJson from "../fjLonLatJson/fj_MY1.json";
 import fjWHZLonLatJson from "../fjLonLatJson/fj_WHZ.json"; //京能旺海庄
 import fjYPLLonLatJson from "../fjLonLatJson/fj_YPL.json"; //京能营盘梁
+import fjSMSLonLatJson from "../fjLonLatJson/fj_SMS.json"; //京能苏木山
 import mountainPosJson from "../fjLonLatJson/mountainPos.json";
 import allStationJson from "./allStationJson.json";
 import basicGeoJson from "../../assets/geoJson/basic.json";
@@ -141,6 +142,11 @@ export default {
           latitude: 40.35920334,
           name: "JNYPL",
         },
+        {
+          longitude: 112.69922452,
+          latitude: 40.31857399,
+          name: "JNSMS",
+        },
       ],
       loading: true,
       viewer: null,
@@ -456,6 +462,8 @@ export default {
         fjLonLatJson = fjWHZLonLatJson;
       } else if (stationName === "JNYPL") {
         fjLonLatJson = fjYPLLonLatJson;
+      } else if (stationName === "JNSMS") {
+        fjLonLatJson = fjSMSLonLatJson;
       }
       fjLonLatJson.data.forEach((e, index) => {
         this.showStatuswind(viewer, e);
@@ -477,7 +485,7 @@ export default {
         e.longitude,
         e.latitude,
         e.status,
-        e.heightS || 0,
+        e.height || 0,
         e
       );
     },
@@ -587,8 +595,7 @@ export default {
           //     : "/public/static/model/dixing/model.glb",
           //   // : "/public/static/model/dixing/terrain.glb",
           uri: `/public/static/model/fjStatus/fj_${statueFJ}.glb`,
-          // scale: 0.5,
-          scale: 5,
+          scale: 0.5,
           // 模型贴地
           //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
           // heightReference: Cesium.HeightReference.NONE,
@@ -612,11 +619,11 @@ export default {
     `,
           }),
         },
-        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),
+        // },
       });
 
       // 使用高级灯牌生成器
@@ -646,18 +653,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;
 
@@ -1010,11 +1017,11 @@ export default {
           targetLat = it.latitude;
         }
       });
-      const targetHeight = 10000;
+      const targetHeight = 5000;
 
       const draggableHeightTolerance = 5000; // 允许拖拽的高度范围:20,000 ~ 30,000
-      const minHeight = 5000; // 最低高度
-      const maxHeight = 1000000; // 最高高度
+      const minHeight = 1000; // 最低高度
+      const maxHeight = 10000; // 最高高度
 
       const allowedOffsetDegrees = 2; // 允许拖拽的最大偏移(经纬度)
 
@@ -1045,7 +1052,7 @@ export default {
         duration: 3.0,
         complete: function () {
           console.log("飞入完成,启用拖拽限制逻辑");
-          // enableHeightBasedDragControl();
+          enableHeightBasedDragControl();
         },
       });
       // ===== 控制逻辑:根据高度决定是否允许拖拽 =====

+ 3 - 3
src/views/cesiumComponents/windView.vue

@@ -96,14 +96,14 @@
                      :checked="it.check" @change="valueOnChange(it)">{{it.value}}</el-check-tag>
                 </span>
                 <span class="values">hpa </span> -->
-        <span class="values">10000(m)</span>
+        <span class="values">0(m)</span>
         <div class="op-progress-bar">
           <div
             class="op-progress-bar-inner"
             :style="`width: ${progressPoint}` + '%'"
           ></div>
         </div>
-        <span class="values"> 800000(m)</span>
+        <span class="values"> 10000(m)</span>
       </div>
       <div class="stat-block2">
         <span class="labels">覆盖模式 </span>
@@ -843,7 +843,7 @@ export default {
       handler(val) {
         if (val) {
           this.progressHeight = Math.ceil(val);
-          this.progressPoint = Math.ceil((Math.ceil(val) / 790000) * 100);
+          this.progressPoint = Math.ceil((Math.ceil(val) / 10000) * 100);
         }
       },
     },

+ 32 - 16
src/views/fjLonLatJson/fj_MY.json

@@ -1409,7 +1409,8 @@
             "latitude": 35.35543,
             "name": "F01号风机",
             "aname": "F01",
-            "status": 1
+            "status": 1,
+            "height": 1000
         },
         {
             "nemCode": "F02",
@@ -1417,7 +1418,8 @@
             "latitude": 35.35685,
             "name": "F02号风机",
             "aname": "F02",
-            "status": 2
+            "status": 2,
+            "height": 1000
         },
         {
             "nemCode": "F03",
@@ -1425,7 +1427,8 @@
             "latitude": 35.34992,
             "name": "F03号风机",
             "aname": "F03",
-            "status": 7
+            "status": 7,
+            "height": 1000
         },
         {
             "nemCode": "F04",
@@ -1433,7 +1436,8 @@
             "latitude": 35.31883,
             "name": "F04号风机",
             "aname": "F04",
-            "status": 3
+            "status": 3,
+            "height": 1000
         },
         {
             "nemCode": "F05",
@@ -1441,7 +1445,8 @@
             "latitude": 35.33221,
             "name": "F05号风机",
             "aname": "F05",
-            "status": 7
+            "status": 7,
+            "height": 1000
         },
         {
             "nemCode": "F06",
@@ -1449,7 +1454,8 @@
             "latitude": 35.32451,
             "name": "F06号风机",
             "aname": "F06",
-            "status": 3
+            "status": 3,
+            "height": 1000
         },
         {
             "nemCode": "F07",
@@ -1457,7 +1463,8 @@
             "latitude": 35.32497,
             "name": "F07号风机",
             "aname": "F07",
-            "status": 4
+            "status": 4,
+            "height": 1000
         },
         {
             "nemCode": "F08",
@@ -1465,7 +1472,8 @@
             "latitude": 35.32916,
             "name": "F08号风机",
             "aname": "F08",
-            "status": 5
+            "status": 5,
+            "height": 1000
         },
         {
             "nemCode": "F09",
@@ -1473,7 +1481,8 @@
             "latitude": 35.32300,
             "name": "F09号风机",
             "aname": "F09",
-            "status": 4
+            "status": 4,
+            "height": 1000
         },
         {
             "nemCode": "F10",
@@ -1481,7 +1490,8 @@
             "latitude": 35.32297,
             "name": "F10号风机",
             "aname": "F10",
-            "status": 5
+            "status": 5,
+            "height": 1000
         },
         {
             "nemCode": "F11",
@@ -1489,7 +1499,8 @@
             "latitude": 35.30587,
             "name": "F11号风机",
             "aname": "F11",
-            "status": 7
+            "status": 7,
+            "height": 1000
         },
         {
             "nemCode": "F12",
@@ -1497,7 +1508,8 @@
             "latitude": 35.29389,
             "name": "F12号风机",
             "aname": "F12",
-            "status": 6
+            "status": 6,
+            "height": 1000
         },
         {
             "nemCode": "F13",
@@ -1505,7 +1517,8 @@
             "latitude": 35.28476,
             "name": "F13号风机",
             "aname": "F13",
-            "status": 5
+            "status": 5,
+            "height": 1000
         },
         {
             "nemCode": "F14",
@@ -1513,7 +1526,8 @@
             "latitude": 35.28616,
             "name": "F14号风机",
             "aname": "F14",
-            "status": 6
+            "status": 6,
+            "height": 1000
         },
         {
             "nemCode": "F15",
@@ -1521,7 +1535,8 @@
             "latitude": 35.28261,
             "name": "F15号风机",
             "aname": "F15",
-            "status": 7
+            "status": 7,
+            "height": 1000
         },
         {
             "nemCode": "F16",
@@ -1529,7 +1544,8 @@
             "latitude": 35.30268,
             "name": "F16号风机",
             "aname": "F16",
-            "status": 7
+            "status": 7,
+            "height": 1000
         }
     ]
 }

+ 21 - 16
src/views/fjLonLatJson/fj_MY1.json

@@ -1409,7 +1409,8 @@
             "latitude": 37.300002,
             "name": "F01号风机",
             "aname": "F01",
-            "status": 1
+            "status": 1,
+            "height": 1000
         },
         {
             "nemCode": "F02",
@@ -1418,7 +1419,7 @@
             "name": "F02号风机",
             "aname": "F02",
             "status": 2,
-            "height": 8500
+            "height": 1000
         },
         {
             "nemCode": "F03",
@@ -1427,7 +1428,7 @@
             "name": "F03号风机",
             "aname": "F03",
             "status": 7,
-            "height": 8500
+            "height": 1000
         },
         {
             "nemCode": "F04",
@@ -1436,7 +1437,7 @@
             "name": "F04号风机",
             "aname": "F04",
             "status": 3,
-            "height": 4500
+            "height": 1000
         },
         {
             "nemCode": "F05",
@@ -1445,7 +1446,7 @@
             "name": "F05号风机",
             "aname": "F05",
             "status": 7,
-            "height": 9000
+            "height": 1000
         },
         {
             "nemCode": "F06",
@@ -1454,7 +1455,7 @@
             "name": "F06号风机",
             "aname": "F06",
             "status": 3,
-            "height": 6500
+            "height": 1000
         },
         {
             "nemCode": "F07",
@@ -1463,7 +1464,7 @@
             "name": "F07号风机",
             "aname": "F07",
             "status": 4,
-            "height": 4800
+            "height": 1000
         },
         {
             "nemCode": "F08",
@@ -1472,7 +1473,7 @@
             "name": "F08号风机",
             "aname": "F08",
             "status": 5,
-            "height": 9500
+            "height": 1000
         },
         {
             "nemCode": "F09",
@@ -1481,7 +1482,7 @@
             "name": "F09号风机",
             "aname": "F09",
             "status": 4,
-            "height": 9500
+            "height": 1000
         },
         {
             "nemCode": "F10",
@@ -1490,7 +1491,7 @@
             "name": "F10号风机",
             "aname": "F10",
             "status": 5,
-            "height": 6000
+            "height": 1000
         },
         {
             "nemCode": "F11",
@@ -1499,7 +1500,7 @@
             "name": "F11号风机",
             "aname": "F11",
             "status": 7,
-            "height": 8500
+            "height": 1000
         },
         {
             "nemCode": "F12",
@@ -1508,7 +1509,7 @@
             "name": "F12号风机",
             "aname": "F12",
             "status": 6,
-            "height": 9000
+            "height": 1000
         },
         {
             "nemCode": "F13",
@@ -1516,7 +1517,8 @@
             "latitude": 37.30543,
             "name": "F13号风机",
             "aname": "F13",
-            "status": 5
+            "status": 5,
+            "height": 1000
         },
         {
             "nemCode": "F14",
@@ -1524,7 +1526,8 @@
             "latitude": 37.30432,
             "name": "F14号风机",
             "aname": "F14",
-            "status": 6
+            "status": 6,
+            "height": 1000
         },
         {
             "nemCode": "F15",
@@ -1532,7 +1535,8 @@
             "latitude": 37.308195,
             "name": "F15号风机",
             "aname": "F15",
-            "status": 7
+            "status": 7,
+            "height": 1000
         },
         {
             "nemCode": "F16",
@@ -1540,7 +1544,8 @@
             "latitude": 37.311301,
             "name": "F16号风机",
             "aname": "F16",
-            "status": 7
+            "status": 7,
+            "height": 1000
         }
     ]
 }

+ 529 - 602
src/views/fjLonLatJson/fj_SMS.json

@@ -1,602 +1,529 @@
-[
-  {
-    "id": "#1",
-    "altitude": 1816.3,
-    "longitude": 112.4236,
-    "latitude": 40.5123,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#2",
-    "altitude": 1839.4,
-    "longitude": 112.4351,
-    "latitude": 40.5218,
-    "firstGridTime": "2025-11-03",
-    "isBenchmark": false
-  },
-  {
-    "id": "#3",
-    "altitude": 1842.4,
-    "longitude": 112.4367,
-    "latitude": 40.5209,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#4",
-    "altitude": 1740.3,
-    "longitude": 112.4241,
-    "latitude": 40.5112,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#5",
-    "altitude": 1672.9,
-    "longitude": 112.4289,
-    "latitude": 40.5156,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#6",
-    "altitude": 1723.9,
-    "longitude": 112.4285,
-    "latitude": 40.5153,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#7",
-    "altitude": 1721.6,
-    "longitude": 112.4378,
-    "latitude": 40.5182,
-    "firstGridTime": "2025-10-30",
-    "isBenchmark": false
-  },
-  {
-    "id": "#8",
-    "altitude": 1751.6,
-    "longitude": 112.4321,
-    "latitude": 40.5225,
-    "firstGridTime": "2025-10-29",
-    "isBenchmark": false
-  },
-  {
-    "id": "#9",
-    "altitude": 1870.6,
-    "longitude": 112.4253,
-    "latitude": 40.5108,
-    "firstGridTime": "2025-11-04",
-    "isBenchmark": false
-  },
-  {
-    "id": "#10",
-    "altitude": 1896.4,
-    "longitude": 112.4332,
-    "latitude": 40.5219,
-    "firstGridTime": "2025-10-31",
-    "isBenchmark": false
-  },
-  {
-    "id": "#11",
-    "altitude": 1910.6,
-    "longitude": 112.4341,
-    "latitude": 40.5219,
-    "firstGridTime": "2025-11-03",
-    "isBenchmark": false
-  },
-  {
-    "id": "#12",
-    "altitude": 1846.9,
-    "longitude": 112.4358,
-    "latitude": 40.5198,
-    "firstGridTime": "2025-10-30",
-    "isBenchmark": false
-  },
-  {
-    "id": "#13",
-    "altitude": 1853.5,
-    "longitude": 112.4355,
-    "latitude": 40.5204,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#14",
-    "altitude": 1904.0,
-    "longitude": 112.4344,
-    "latitude": 40.5209,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#15",
-    "altitude": 1895.0,
-    "longitude": 112.4315,
-    "latitude": 40.5142,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": true
-  },
-  {
-    "id": "#16",
-    "altitude": 1785.0,
-    "longitude": 112.4317,
-    "latitude": 40.5147,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#17",
-    "altitude": 1808.5,
-    "longitude": 112.4258,
-    "latitude": 40.5084,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": true
-  },
-  {
-    "id": "#18",
-    "altitude": 1882.2,
-    "longitude": 112.4343,
-    "latitude": 40.5248,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#19",
-    "altitude": 1909.0,
-    "longitude": 112.4259,
-    "latitude": 40.5072,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#20",
-    "altitude": 1659.0,
-    "longitude": 112.4237,
-    "latitude": 40.5069,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#21",
-    "altitude": 1651.6,
-    "longitude": 112.4292,
-    "latitude": 40.5129,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#22",
-    "altitude": 1631.7,
-    "longitude": 112.4292,
-    "latitude": 40.5124,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#23",
-    "altitude": 1631.4,
-    "longitude": 112.4287,
-    "latitude": 40.5119,
-    "firstGridTime": "2024-05-25",
-    "isBenchmark": false
-  },
-  {
-    "id": "#24",
-    "altitude": 1563.0,
-    "longitude": 112.4270,
-    "latitude": 40.5101,
-    "firstGridTime": "2024-05-24",
-    "isBenchmark": false
-  },
-  {
-    "id": "#25",
-    "altitude": 1584.0,
-    "longitude": 112.4252,
-    "latitude": 40.5078,
-    "firstGridTime": "2024-05-25",
-    "isBenchmark": false
-  },
-  {
-    "id": "#26",
-    "altitude": 1598.2,
-    "longitude": 112.4240,
-    "latitude": 40.5061,
-    "firstGridTime": "2024-05-24",
-    "isBenchmark": false
-  },
-  {
-    "id": "#27",
-    "altitude": 1619.2,
-    "longitude": 112.4259,
-    "latitude": 40.5063,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#28",
-    "altitude": 1890.5,
-    "longitude": 112.4262,
-    "latitude": 40.5069,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#29",
-    "altitude": 1929.0,
-    "longitude": 112.4293,
-    "latitude": 40.5098,
-    "firstGridTime": "2024-05-10",
-    "isBenchmark": false
-  },
-  {
-    "id": "#30",
-    "altitude": 1952.4,
-    "longitude": 112.4292,
-    "latitude": 40.5092,
-    "firstGridTime": "2024-05-10",
-    "isBenchmark": false
-  },
-  {
-    "id": "#31",
-    "altitude": 1764.0,
-    "longitude": 112.4281,
-    "latitude": 40.5086,
-    "firstGridTime": "2024-05-10",
-    "isBenchmark": false
-  },
-  {
-    "id": "#32",
-    "altitude": 1793.3,
-    "longitude": 112.4272,
-    "latitude": 40.5084,
-    "firstGridTime": "2024-05-11",
-    "isBenchmark": false
-  },
-  {
-    "id": "#33",
-    "altitude": 1806.0,
-    "longitude": 112.4308,
-    "latitude": 40.5108,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#34",
-    "altitude": 1831.8,
-    "longitude": 112.4305,
-    "latitude": 40.5104,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#35",
-    "altitude": 1633.5,
-    "longitude": 112.4295,
-    "latitude": 40.5096,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#36",
-    "altitude": 1665.5,
-    "longitude": 112.4299,
-    "latitude": 40.5091,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#37",
-    "altitude": 1700.8,
-    "longitude": 112.4324,
-    "latitude": 40.5134,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#38",
-    "altitude": 1733.4,
-    "longitude": 112.4318,
-    "latitude": 40.5122,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#39",
-    "altitude": 1606.2,
-    "longitude": 112.4312,
-    "latitude": 40.5119,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#40",
-    "altitude": 1664.0,
-    "longitude": 112.4307,
-    "latitude": 40.5115,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#41",
-    "altitude": 1662.0,
-    "longitude": 112.4327,
-    "latitude": 40.5129,
-    "firstGridTime": "2024-09-19",
-    "isBenchmark": false
-  },
-  {
-    "id": "#42",
-    "altitude": 1616.5,
-    "longitude": 112.4327,
-    "latitude": 40.5123,
-    "firstGridTime": "2024-09-19",
-    "isBenchmark": false
-  },
-  {
-    "id": "#43",
-    "altitude": 1730.0,
-    "longitude": 112.4316,
-    "latitude": 40.5109,
-    "firstGridTime": "2024-09-19",
-    "isBenchmark": false
-  },
-  {
-    "id": "#44",
-    "altitude": 1778.7,
-    "longitude": 112.4323,
-    "latitude": 40.5106,
-    "firstGridTime": "2024-09-19",
-    "isBenchmark": false
-  },
-  {
-    "id": "#45",
-    "altitude": 1747.0,
-    "longitude": 112.4379,
-    "latitude": 40.5225,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#46",
-    "altitude": 1725.8,
-    "longitude": 112.4347,
-    "latitude": 40.5122,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#47",
-    "altitude": 1623.0,
-    "longitude": 112.4351,
-    "latitude": 40.5126,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#48",
-    "altitude": 1654.5,
-    "longitude": 112.4489,
-    "latitude": 40.5278,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#49",
-    "altitude": 1678.2,
-    "longitude": 112.4472,
-    "latitude": 40.5275,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#50",
-    "altitude": 1678.0,
-    "longitude": 112.4508,
-    "latitude": 40.5276,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#51",
-    "altitude": 1695.0,
-    "longitude": 112.4516,
-    "latitude": 40.5274,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#52",
-    "altitude": 1702.2,
-    "longitude": 112.4471,
-    "latitude": 40.5242,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#53",
-    "altitude": 1655.2,
-    "longitude": 112.4467,
-    "latitude": 40.5237,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#54",
-    "altitude": 1633.7,
-    "longitude": 112.4442,
-    "latitude": 40.5239,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": true
-  },
-  {
-    "id": "#55",
-    "altitude": 1831.7,
-    "longitude": 112.4436,
-    "latitude": 40.5215,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#56",
-    "altitude": 1854.6,
-    "longitude": 112.4444,
-    "latitude": 40.5209,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#57",
-    "altitude": 1892.2,
-    "longitude": 112.4446,
-    "latitude": 40.5205,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": true
-  },
-  {
-    "id": "#58",
-    "altitude": 1906.4,
-    "longitude": 112.4372,
-    "latitude": 40.5232,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#59",
-    "altitude": 1829.2,
-    "longitude": 112.4430,
-    "latitude": 40.5214,
-    "firstGridTime": "2024-09-18",
-    "isBenchmark": false
-  },
-  {
-    "id": "#60",
-    "altitude": 1753.6,
-    "longitude": 112.4440,
-    "latitude": 40.5291,
-    "firstGridTime": "2024-09-18",
-    "isBenchmark": false
-  },
-  {
-    "id": "#61",
-    "altitude": 1844.0,
-    "longitude": 112.4371,
-    "latitude": 40.5248,
-    "firstGridTime": null,
-    "isBenchmark": false
-  },
-  {
-    "id": "#62",
-    "altitude": 1702.5,
-    "longitude": 112.4349,
-    "latitude": 40.5287,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": true
-  },
-  {
-    "id": "#63",
-    "altitude": 1674.0,
-    "longitude": 112.4450,
-    "latitude": 40.5283,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#64",
-    "altitude": 1721.5,
-    "longitude": 112.4335,
-    "latitude": 40.5285,
-    "firstGridTime": "2024-12-28",
-    "isBenchmark": false
-  },
-  {
-    "id": "#65",
-    "altitude": 1645.9,
-    "longitude": 112.4341,
-    "latitude": 40.5274,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#66",
-    "altitude": 1596.4,
-    "longitude": 112.4358,
-    "latitude": 40.5292,
-    "firstGridTime": "2024-05-24",
-    "isBenchmark": false
-  },
-  {
-    "id": "#67",
-    "altitude": 1605.8,
-    "longitude": 112.4362,
-    "latitude": 40.5278,
-    "firstGridTime": "2024-05-26",
-    "isBenchmark": false
-  },
-  {
-    "id": "#68",
-    "altitude": 1618.0,
-    "longitude": 112.4357,
-    "latitude": 40.5229,
-    "firstGridTime": "2024-05-20",
-    "isBenchmark": false
-  },
-  {
-    "id": "#69",
-    "altitude": 1587.5,
-    "longitude": 112.4360,
-    "latitude": 40.5224,
-    "firstGridTime": "2024-05-21",
-    "isBenchmark": false
-  },
-  {
-    "id": "#70",
-    "altitude": 1590.0,
-    "longitude": 112.4356,
-    "latitude": 40.5221,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#71",
-    "altitude": 1620.8,
-    "longitude": 112.4356,
-    "latitude": 40.5215,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#72",
-    "altitude": 1635.3,
-    "longitude": 112.4322,
-    "latitude": 40.5240,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#73",
-    "altitude": 1626.0,
-    "longitude": 112.4315,
-    "latitude": 40.5237,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#74",
-    "altitude": 1619.2,
-    "longitude": 112.4324,
-    "latitude": 40.5227,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": false
-  },
-  {
-    "id": "#75",
-    "altitude": 1646.7,
-    "longitude": 112.4328,
-    "latitude": 40.5222,
-    "firstGridTime": "2024-09-12",
-    "isBenchmark": true
-  }
-]
+{
+    "data": [
+    {
+        "name": "F1",
+        "height": 1816.3,
+        "longitude": 112.6909514,
+        "latitude": 40.30911409,
+        "status": 7
+    },
+    {
+        "name": "F2",
+        "height": 1839.4,
+        "longitude": 112.69259769,
+        "latitude": 40.28940535,
+        "status": 7
+    },
+    {
+        "name": "F3",
+        "height": 1842.4,
+        "longitude": 112.68589995,
+        "latitude": 40.30208377,
+        "status": 7
+    },
+    {
+        "name": "F4",
+        "height": 1740.3,
+        "longitude": 112.68993196,
+        "latitude": 40.2954515,
+        "status": 7
+    },
+    {
+        "name": "F5",
+        "height": 1672.9,
+        "longitude": 112.65609446,
+        "latitude": 40.3196245,
+        "status": 7
+    },
+    {
+        "name": "F6",
+        "height": 1723.9,
+        "longitude": 112.68110002,
+        "latitude": 40.31943567,
+        "status": 7
+    },
+    {
+        "name": "F7",
+        "height": 1721.6,
+        "longitude": 112.65736936,
+        "latitude": 40.31219469,
+        "status": 7
+    },
+    {
+        "name": "F8",
+        "height": 1751.6,
+        "longitude": 112.70078318,
+        "latitude": 40.28671043,
+        "status": 7
+    },
+    {
+        "name": "F9",
+        "height": 1870.6,
+        "longitude": 112.70311926,
+        "latitude": 40.26191863,
+        "status": 7
+    },
+    {
+        "name": "F10",
+        "height": 1896.4,
+        "longitude": 112.69862964,
+        "latitude": 40.27165592,
+        "status": 7
+    },
+    {
+        "name": "F11",
+        "height": 1910.6,
+        "longitude": 112.69816852,
+        "latitude": 40.27976783,
+        "status": 7
+    },
+    {
+        "name": "F12",
+        "height": 1846.9,
+        "longitude": 112.67732146,
+        "latitude": 40.29090309,
+        "status": 7
+    },
+    {
+        "name": "F13",
+        "height": 1853.5,
+        "longitude": 112.68263576,
+        "latitude": 40.28862943,
+        "status": 7
+    },
+    {
+        "name": "F14",
+        "height": 1904,
+        "longitude": 112.68792786,
+        "latitude": 40.28178348,
+        "status": 7
+    },
+    {
+        "name": "F15",
+        "height": 1895,
+        "longitude": 112.76533981,
+        "latitude": 40.2768592,
+        "status": 7
+    },
+    {
+        "name": "F16",
+        "height": 1785,
+        "longitude": 112.76695713,
+        "latitude": 40.26783888,
+        "status": 7
+    },
+    {
+        "name": "F17",
+        "height": 1808.5,
+        "longitude": 112.77830992,
+        "latitude": 40.26644965,
+        "status": 7
+    },
+    {
+        "name": "F18",
+        "height": 1882.2,
+        "longitude": 112.73512988,
+        "latitude": 40.28125876,
+        "status": 7
+    },
+    {
+        "name": "F19",
+        "height": 1909,
+        "longitude": 112.76008306,
+        "latitude": 40.37209394,
+        "status": 7
+    },
+    {
+        "name": "F20",
+        "height": 1659,
+        "longitude": 112.76807842,
+        "latitude": 40.38096701,
+        "status": 7
+    },
+    {
+        "name": "F21",
+        "height": 1651.6,
+        "longitude": 112.79071154,
+        "latitude": 40.38819723,
+        "status": 7
+    },
+    {
+        "name": "F22",
+        "height": 1631.7,
+        "longitude": 112.79167412,
+        "latitude": 40.39452407,
+        "status": 7
+    },
+    {
+        "name": "F23",
+        "height": 1631.4,
+        "longitude": 112.7140726,
+        "latitude": 40.42864268,
+        "status": 7
+    },
+    {
+        "name": "F24",
+        "height": 1563,
+        "longitude": 112.715381,
+        "latitude": 40.42369937,
+        "status": 7
+    },
+    {
+        "name": "F25",
+        "height": 1584,
+        "longitude": 112.71009393,
+        "latitude": 40.41756116,
+        "status": 7
+    },
+    {
+        "name": "F26",
+        "height": 1598.2,
+        "longitude": 112.71720884,
+        "latitude": 40.41438666,
+        "status": 7
+    },
+    {
+        "name": "F27",
+        "height": 1619.2,
+        "longitude": 112.71474074,
+        "latitude": 40.27786862,
+        "status": 7
+    },
+    {
+        "name": "F28",
+        "height": 1890.5,
+        "longitude": 112.72309144,
+        "latitude": 40.27049965,
+        "status": 7
+    },
+    {
+        "name": "F29",
+        "height": 1929,
+        "longitude": 112.77993883,
+        "latitude": 40.32157003,
+        "status": 7
+    },
+    {
+        "name": "F30",
+        "height": 1952.4,
+        "longitude": 112.77873844,
+        "latitude": 40.31426701,
+        "status": 7
+    },
+    {
+        "name": "F31",
+        "height": 1764,
+        "longitude": 112.78103763,
+        "latitude": 40.31120462,
+        "status": 7
+    },
+    {
+        "name": "F32",
+        "height": 1793.3,
+        "longitude": 112.78225196,
+        "latitude": 40.30335428,
+        "status": 7
+    },
+    {
+        "name": "F33",
+        "height": 1806,
+        "longitude": 112.73490119,
+        "latitude": 40.34901704,
+        "status": 7
+    },
+    {
+        "name": "F34",
+        "height": 1831.8,
+        "longitude": 112.7184778,
+        "latitude": 40.33622737,
+        "status": 7
+    },
+    {
+        "name": "F35",
+        "height": 1633.5,
+        "longitude": 112.73044447,
+        "latitude": 40.33585474,
+        "status": 7
+    },
+    {
+        "name": "F36",
+        "height": 1665.5,
+        "longitude": 112.76745203,
+        "latitude": 40.33920597,
+        "status": 7
+    },
+    {
+        "name": "F37",
+        "height": 1700.8,
+        "longitude": 112.72551264,
+        "latitude": 40.38300043,
+        "status": 7
+    },
+    {
+        "name": "F38",
+        "height": 1733.4,
+        "longitude": 112.74051705,
+        "latitude": 40.3820879,
+        "status": 7
+    },
+    {
+        "name": "F39",
+        "height": 1606.2,
+        "longitude": 112.73052263,
+        "latitude": 40.37810037,
+        "status": 7
+    },
+    {
+        "name": "F40",
+        "height": 1664,
+        "longitude": 112.72164915,
+        "latitude": 40.36745396,
+        "status": 7
+    },
+    {
+        "name": "F41",
+        "height": 1662,
+        "longitude": 112.78746813,
+        "latitude": 40.34589875,
+        "status": 7
+    },
+    {
+        "name": "F42",
+        "height": 1616.5,
+        "longitude": 112.77903589,
+        "latitude": 40.34394967,
+        "status": 7
+    },
+    {
+        "name": "F43",
+        "height": 1730,
+        "longitude": 112.78168958,
+        "latitude": 40.33665081,
+        "status": 7
+    },
+    {
+        "name": "F44",
+        "height": 1778.7,
+        "longitude": 112.77210906,
+        "latitude": 40.32459661,
+        "status": 7
+    },
+    {
+        "name": "F45",
+        "height": 1747,
+        "longitude": 112.70247008,
+        "latitude": 40.31430338,
+        "status": 7
+    },
+    {
+        "name": "F46",
+        "height": 1725.8,
+        "longitude": 112.85050449,
+        "latitude": 40.39025637,
+        "status": 7
+    },
+    {
+        "name": "F47",
+        "height": 1623,
+        "longitude": 112.85464049,
+        "latitude": 40.38015294,
+        "status": 7
+    },
+    {
+        "name": "F48",
+        "height": 1654.5,
+        "longitude": 112.84768981,
+        "latitude": 40.38041563,
+        "status": 7
+    },
+    {
+        "name": "F49",
+        "height": 1678.2,
+        "longitude": 112.74651557,
+        "latitude": 40.36660823,
+        "status": 7
+    },
+    {
+        "name": "F50",
+        "height": 1678,
+        "longitude": 112.84678936,
+        "latitude": 40.37241395,
+        "status": 7
+    },
+    {
+        "name": "F51",
+        "height": 1695,
+        "longitude": 112.84358333,
+        "latitude": 40.3675097,
+        "status": 7
+    },
+    {
+        "name": "F52",
+        "height": 1702.2,
+        "longitude": 112.834105,
+        "latitude": 40.37397368,
+        "status": 7
+    },
+    {
+        "name": "F53",
+        "height": 1655.2,
+        "longitude": 112.82790022,
+        "latitude": 40.37052458,
+        "status": 7
+    },
+    {
+        "name": "F54",
+        "height": 1633.7,
+        "longitude": 112.78006164,
+        "latitude": 40.2978797,
+        "status": 7
+    },
+    {
+        "name": "F55",
+        "height": 1831.7,
+        "longitude": 112.78158174,
+        "latitude": 40.29155841,
+        "status": 7
+    },
+    {
+        "name": "F56",
+        "height": 1854.6,
+        "longitude": 112.77485735,
+        "latitude": 40.28665308,
+        "status": 7
+    },
+    {
+        "name": "F57",
+        "height": 1892.2,
+        "longitude": 112.78028045,
+        "latitude": 40.28057165,
+        "status": 7
+    },
+    {
+        "name": "F58",
+        "height": 1906.4,
+        "longitude": 112.71400816,
+        "latitude": 40.30759901,
+        "status": 7
+    },
+    {
+        "name": "F59",
+        "height": 1829.2,
+        "longitude": 112.75805039,
+        "latitude": 40.28831439,
+        "status": 7
+    },
+    {
+        "name": "F60",
+        "height": 1753.6,
+        "longitude": 112.75696724,
+        "latitude": 40.29422745,
+        "status": 7
+    },
+    {
+        "name": "F61",
+        "height": 1844,
+        "longitude": 112.73367887,
+        "latitude": 40.3070554,
+        "status": 7
+    },
+    {
+        "name": "F62",
+        "height": 1702.5,
+        "longitude": 112.83703136,
+        "latitude": 40.36028898,
+        "status": 7
+    },
+    {
+        "name": "F63",
+        "height": 1674,
+        "longitude": 112.82900297,
+        "latitude": 40.36032651,
+        "status": 7
+    },
+    {
+        "name": "F64",
+        "height": 1721.5,
+        "longitude": 112.78119211,
+        "latitude": 40.35425455,
+        "status": 7
+    },
+    {
+        "name": "F65",
+        "height": 1645.9,
+        "longitude": 112.71563453,
+        "latitude": 40.3695464,
+        "status": 7
+    },
+    {
+        "name": "F66",
+        "height": 1596.4,
+        "longitude": 112.72296084,
+        "latitude": 40.41008334,
+        "status": 7
+    },
+    {
+        "name": "F67",
+        "height": 1605.8,
+        "longitude": 112.71884596,
+        "latitude": 40.38647584,
+        "status": 7
+    },
+    {
+        "name": "F68",
+        "height": 1618,
+        "longitude": 112.71233971,
+        "latitude": 40.37500556,
+        "status": 7
+    },
+    {
+        "name": "F69",
+        "height": 1587.5,
+        "longitude": 112.70604642,
+        "latitude": 40.35706517,
+        "status": 7
+    },
+    {
+        "name": "F70",
+        "height": 1590,
+        "longitude": 112.68263093,
+        "latitude": 40.39523173,
+        "status": 7
+    },
+    {
+        "name": "F71",
+        "height": 1620.8,
+        "longitude": 112.68171874,
+        "latitude": 40.39202574,
+        "status": 7
+    },
+    {
+        "name": "F72",
+        "height": 1635.3,
+        "longitude": 112.68695131,
+        "latitude": 40.38206033,
+        "status": 7
+    },
+    {
+        "name": "F73",
+        "height": 1626,
+        "longitude": 112.70576059,
+        "latitude": 40.35081221,
+        "status": 7
+    },
+    {
+        "name": "F74",
+        "height": 1619.2,
+        "longitude": 112.69006544,
+        "latitude": 40.35950882,
+        "status": 7
+    },
+    {
+        "name": "F75",
+        "height": 1646.7,
+        "longitude": 112.68680256,
+        "latitude": 40.35537682,
+        "status": 7
+    }
+    ]
+}

+ 73 - 146
src/views/fjLonLatJson/fj_WHZ.json

@@ -8,8 +8,7 @@
             "name": "F01号风机",
             "aname": "F01",
             "status": 1,
-            "heightS": 1531.7,
-            "height": 800
+            "height": 1531.7
         },
         {
             "nemCode": "F02",
@@ -18,8 +17,7 @@
             "name": "F02号风机",
             "aname": "F02",
             "status": 2,
-            "heightS": 1592.0,
-            "height": 500
+            "height": 1592.0
         },
         {
             "nemCode": "F03",
@@ -28,8 +26,7 @@
             "name": "F03号风机",
             "aname": "F03",
             "status": 7,
-            "heightS": 1543.2,
-            "height": 1150
+            "height": 1543.2
         },
         {
             "nemCode": "F04",
@@ -38,8 +35,7 @@
             "name": "F04号风机",
             "aname": "F04",
             "status": 3,
-            "heightS": 1589.1,
-            "height": 730
+            "height": 1589.1
         },
         {
             "nemCode": "F05",
@@ -48,8 +44,7 @@
             "name": "F05号风机",
             "aname": "F05",
             "status": 7,
-            "heightS": 1505.5,
-            "height": 200
+            "height": 1505.5
         },
         {
             "nemCode": "F06",
@@ -58,8 +53,7 @@
             "name": "F06号风机",
             "aname": "F06",
             "status": 3,
-            "heightS": 1516.9,
-            "height": 200
+            "height": 1516.9
         },
         {
             "nemCode": "F07",
@@ -68,8 +62,7 @@
             "name": "F07号风机",
             "aname": "F07",
             "status": 4,
-            "heightS": 1522.9,
-            "height": 310
+            "height": 1522.9
         },
         {
             "nemCode": "F08",
@@ -78,8 +71,7 @@
             "name": "F08号风机",
             "aname": "F08",
             "status": 5,
-            "heightS": 1573.3,
-            "height": 1180
+            "height": 1573.3
         },
         {
             "nemCode": "F09",
@@ -88,8 +80,7 @@
             "name": "F09号风机",
             "aname": "F09",
             "status": 4,
-            "heightS": 1584.7,
-            "height": 950
+            "height": 1584.7
         },
         {
             "nemCode": "F10",
@@ -98,8 +89,7 @@
             "name": "F10号风机",
             "aname": "F10",
             "status": 5,
-            "heightS": 1573.4,
-            "height": 600
+            "height": 1573.4
         },
         {
             "nemCode": "F11",
@@ -108,8 +98,7 @@
             "name": "F11号风机",
             "aname": "F11",
             "status": 7,
-            "heightS": 1609.3,
-            "height": 730
+            "height": 1609.3
         },
         {
             "nemCode": "F12",
@@ -118,8 +107,7 @@
             "name": "F12号风机",
             "aname": "F12",
             "status": 6,
-            "heightS": 1571.4,
-            "height": 900
+            "height": 1571.4
         },
         {
             "nemCode": "F13",
@@ -128,8 +116,7 @@
             "name": "F13号风机",
             "aname": "F13",
             "status": 5,
-            "heightS": 1574.5,
-            "height": 600
+            "height": 1574.5
         },
         {
             "nemCode": "F14",
@@ -138,8 +125,7 @@
             "name": "F14号风机",
             "aname": "F14",
             "status": 6,
-            "heightS": 1568.3,
-            "height": 330
+            "height": 1568.3
         },
         {
             "nemCode": "F15",
@@ -148,8 +134,7 @@
             "name": "F15号风机",
             "aname": "F15",
             "status": 7,
-            "heightS": 1547.8,
-            "height": 350
+            "height": 1547.8
         },
         {
             "nemCode": "F16",
@@ -158,8 +143,7 @@
             "name": "F16号风机",
             "aname": "F16",
             "status": 7,
-            "heightS": 1553.8,
-            "height": 300
+            "height": 1553.8
         },
         {
             "nemCode": "F17",
@@ -168,8 +152,7 @@
             "name": "F17号风机",
             "aname": "F17",
             "status": 5,
-            "heightS": 1551.1,
-            "height": 1200
+            "height": 1551.1
         },
         {
             "nemCode": "F18",
@@ -178,8 +161,7 @@
             "name": "F18号风机",
             "aname": "F18",
             "status": 6,
-            "heightS": 1591.0,
-            "height": 1470
+            "height": 1591.0
         },
         {
             "nemCode": "F19",
@@ -188,8 +170,7 @@
             "name": "F19号风机",
             "aname": "F19",
             "status": 7,
-            "heightS": 1619.0,
-            "height": 1900
+            "height": 1619.0
         },
         {
             "nemCode": "F20",
@@ -198,8 +179,7 @@
             "name": "F20号风机",
             "aname": "F20",
             "status": 7,
-            "heightS": 1627.9,
-            "height": 2300
+            "height": 1627.9
         },
         {
             "nemCode": "F21",
@@ -208,8 +188,7 @@
             "name": "F21号风机",
             "aname": "F21",
             "status": 7,
-            "heightS": 1569.0,
-            "height": 600
+            "height": 1569.0
         },
         {
             "nemCode": "F22",
@@ -218,8 +197,7 @@
             "name": "F22号风机",
             "aname": "F22",
             "status": 6,
-            "heightS": 1575.9,
-            "height": 800
+            "height": 1575.9
         },
         {
             "nemCode": "F23",
@@ -228,8 +206,7 @@
             "name": "F23号风机",
             "aname": "F23",
             "status": 5,
-            "heightS": 1586.7,
-            "height": 1000
+            "height": 1586.7
         },
         {
             "nemCode": "F24",
@@ -238,8 +215,7 @@
             "name": "F24号风机",
             "aname": "F24",
             "status": 6,
-            "heightS": 1613.8,
-            "height": 900
+            "height": 1613.8
         },
         {
             "nemCode": "F25",
@@ -248,8 +224,7 @@
             "name": "F25号风机",
             "aname": "F25",
             "status": 7,
-            "heightS": 1621.2,
-            "height": 1720
+            "height": 1621.2
         },
         {
             "nemCode": "F26",
@@ -258,8 +233,7 @@
             "name": "F26号风机",
             "aname": "F26",
             "status": 7,
-            "heightS": 1673.1,
-            "height": 2500
+            "height": 1673.1
         },
         {
             "nemCode": "F27",
@@ -268,8 +242,7 @@
             "name": "F27号风机",
             "aname": "F27",
             "status": 5,
-            "heightS": 1655.7,
-            "height": 2200
+            "height": 1655.7
         },
         {
             "nemCode": "F28",
@@ -278,8 +251,7 @@
             "name": "F28号风机",
             "aname": "F28",
             "status": 6,
-            "heightS": 1635.2,
-            "height": 1950
+            "height": 1635.2
         },
         {
             "nemCode": "F29",
@@ -288,8 +260,7 @@
             "name": "F29号风机",
             "aname": "F29",
             "status": 7,
-            "heightS": 1603.4,
-            "height": 1100
+            "height": 1603.4
         },
         {
             "nemCode": "F30",
@@ -298,8 +269,7 @@
             "name": "F30号风机",
             "aname": "F30",
             "status": 7,
-            "heightS": 1589.2,
-            "height": 900
+            "height": 1589.2
         },
         {
             "nemCode": "F31",
@@ -308,8 +278,7 @@
             "name": "F31号风机",
             "aname": "F31",
             "status": 7,
-            "heightS": 1589.1,
-            "height": 1050
+            "height": 1589.1
         },
         {
             "nemCode": "F32",
@@ -318,8 +287,7 @@
             "name": "F32号风机",
             "aname": "F32",
             "status": 6,
-            "heightS": 1600.0,
-            "height": 1200
+            "height": 1600.0
         },
         {
             "nemCode": "F33",
@@ -328,8 +296,7 @@
             "name": "F33号风机",
             "aname": "F33",
             "status": 5,
-            "heightS": 1607.0,
-            "height": 900
+            "height": 1607.0
         },
         {
             "nemCode": "F34",
@@ -338,8 +305,7 @@
             "name": "F34号风机",
             "aname": "F34",
             "status": 6,
-            "heightS": 1609.7,
-            "height": 1100
+            "height": 1609.7
         },
         {
             "nemCode": "F35",
@@ -348,8 +314,7 @@
             "name": "F35号风机",
             "aname": "F35",
             "status": 7,
-            "heightS": 1610.1,
-            "height": 1100
+            "height": 1610.1
         },
         {
             "nemCode": "F36",
@@ -358,8 +323,7 @@
             "name": "F36号风机",
             "aname": "F36",
             "status": 7,
-            "heightS": 1590.6,
-            "height": 1100
+            "height": 1590.6
         },
         {
             "nemCode": "F37",
@@ -368,8 +332,7 @@
             "name": "F37号风机",
             "aname": "F37",
             "status": 5,
-            "heightS": 1566.9,
-            "height": 600
+            "height": 1566.9
         },
         {
             "nemCode": "F38",
@@ -378,8 +341,7 @@
             "name": "F38号风机",
             "aname": "F38",
             "status": 6,
-            "heightS": 1588.3,
-            "height": 700
+            "height": 1588.3
         },
         {
             "nemCode": "F39",
@@ -388,8 +350,7 @@
             "name": "F39号风机",
             "aname": "F39",
             "status": 7,
-            "heightS": 1585.9,
-            "height": 700
+            "height": 1585.9
         },
         {
             "nemCode": "F40",
@@ -398,8 +359,7 @@
             "name": "F40号风机",
             "aname": "F40",
             "status": 7,
-            "heightS": 1596.6,
-            "height": 750
+            "height": 1596.6
         },
         {
             "nemCode": "F41",
@@ -408,8 +368,7 @@
             "name": "F41号风机",
             "aname": "F41",
             "status": 7,
-            "heightS": 1555.9,
-            "height": 600
+            "height": 1555.9
         },
         {
             "nemCode": "F42",
@@ -418,8 +377,7 @@
             "name": "F42号风机",
             "aname": "F42",
             "status": 6,
-            "heightS": 1559.4,
-            "height": 660
+            "height": 1559.4
         },
         {
             "nemCode": "F43",
@@ -428,8 +386,7 @@
             "name": "F43号风机",
             "aname": "F43",
             "status": 5,
-            "heightS": 1574.9,
-            "height": 900
+            "height": 1574.9
         },
         {
             "nemCode": "F44",
@@ -438,8 +395,7 @@
             "name": "F44号风机",
             "aname": "F44",
             "status": 6,
-            "heightS": 1585.3,
-            "height": 1000
+            "height": 1585.3
         },
         {
             "nemCode": "F45",
@@ -448,8 +404,7 @@
             "name": "F45号风机",
             "aname": "F45",
             "status": 7,
-            "heightS": 1521.9,
-            "height": 1100
+            "height": 1521.9
         },
         {
             "nemCode": "F46",
@@ -458,8 +413,7 @@
             "name": "F46号风机",
             "aname": "F46",
             "status": 7,
-            "heightS": 1516.4,
-            "height": 1100
+            "height": 1516.4
         },
         {
             "nemCode": "F47",
@@ -468,8 +422,7 @@
             "name": "F47号风机",
             "aname": "F47",
             "status": 5,
-            "heightS": 1568.4,
-            "height": 1150
+            "height": 1568.4
         },
         {
             "nemCode": "F49",
@@ -478,8 +431,7 @@
             "name": "F49号风机",
             "aname": "F49",
             "status": 7,
-            "heightS": 1644.5,
-            "height": 1300
+            "height": 1644.5
         },
         {
             "nemCode": "F50",
@@ -488,8 +440,7 @@
             "name": "F50号风机",
             "aname": "F50",
             "status": 7,
-            "heightS": 1680.7,
-            "height": 1900
+            "height": 1680.7
         },
         {
             "nemCode": "F52",
@@ -498,8 +449,7 @@
             "name": "F52号风机",
             "aname": "F52",
             "status": 6,
-            "heightS": 1600.7,
-            "height": 570
+            "height": 1600.7
         },
         {
             "nemCode": "F53",
@@ -508,8 +458,7 @@
             "name": "F53号风机",
             "aname": "F53",
             "status": 5,
-            "heightS": 1599.9,
-            "height": 450
+            "height": 1599.9
         },
         {
             "nemCode": "F54",
@@ -518,8 +467,7 @@
             "name": "F54号风机",
             "aname": "F54",
             "status": 6,
-            "heightS": 1544.2,
-            "height": 380
+            "height": 1544.2
         },
         {
             "nemCode": "F55",
@@ -528,8 +476,7 @@
             "name": "F55号风机",
             "aname": "F55",
             "status": 7,
-            "heightS": 1566.8,
-            "height": 0
+            "height": 1566.8
         },
         {
             "nemCode": "F56",
@@ -538,8 +485,7 @@
             "name": "F56号风机",
             "aname": "F56",
             "status": 7,
-            "heightS": 1581.5,
-            "height": 0
+            "height": 1581.5
         },
         {
             "nemCode": "F57",
@@ -548,8 +494,7 @@
             "name": "F57号风机",
             "aname": "F57",
             "status": 5,
-            "heightS": 1573.0,
-            "height": 0
+            "height": 1573.0
         },
         {
             "nemCode": "F58",
@@ -558,8 +503,7 @@
             "name": "F58号风机",
             "aname": "F58",
             "status": 7,
-            "heightS": 1566.6,
-            "height": 0
+            "height": 1566.6
         },
         {
             "nemCode": "F59",
@@ -568,8 +512,7 @@
             "name": "F59号风机",
             "aname": "F59",
             "status": 7,
-            "heightS": 1557.1,
-            "height": 0
+            "height": 1557.1
         },
         {
             "nemCode": "F60",
@@ -578,8 +521,7 @@
             "name": "F60号风机",
             "aname": "F60",
             "status": 7,
-            "heightS": 1741.2,
-            "height": 1300
+            "height": 1741.2
         },
         {
             "nemCode": "F61",
@@ -588,8 +530,7 @@
             "name": "F61号风机",
             "aname": "F61",
             "status": 6,
-            "heightS": 1731.5,
-            "height": 1131.5
+            "height": 1731.5
         },
         {
             "nemCode": "F62",
@@ -598,8 +539,7 @@
             "name": "F62号风机",
             "aname": "F62",
             "status": 6,
-            "heightS": 1683.1,
-            "height": 983.1
+            "height": 1683.1
         },
         {
             "nemCode": "F63",
@@ -608,8 +548,7 @@
             "name": "F63号风机",
             "aname": "F63",
             "status": 5,
-            "heightS": 1699.6,
-            "height": 1300
+            "height": 1699.6
         },
         {
             "nemCode": "F64",
@@ -618,8 +557,7 @@
             "name": "F64号风机",
             "aname": "F64",
             "status": 6,
-            "heightS": 1555.3,
-            "height": 520
+            "height": 1555.3
         },
         {
             "nemCode": "F65",
@@ -628,8 +566,7 @@
             "name": "F65号风机",
             "aname": "F65",
             "status": 7,
-            "heightS": 1569.1,
-            "height": 500
+            "height": 1569.1
         },
         {
             "nemCode": "F66",
@@ -638,8 +575,7 @@
             "name": "F66号风机",
             "aname": "F66",
             "status": 7,
-            "heightS": 1625.4,
-            "height": 600
+            "height": 1625.4
         },
         {
             "nemCode": "F67",
@@ -648,8 +584,7 @@
             "name": "F67号风机",
             "aname": "F67",
             "status": 5,
-            "heightS": 1590.7,
-            "height": 700
+            "height": 1590.7
         },
         {
             "nemCode": "F68",
@@ -658,8 +593,7 @@
             "name": "F68号风机",
             "aname": "F68",
             "status": 7,
-            "heightS": 1533.7,
-            "height": 0
+            "height": 1533.7
         },
         {
             "nemCode": "F69",
@@ -668,8 +602,7 @@
             "name": "F69号风机",
             "aname": "F69",
             "status": 7,
-            "heightS": 1549.5,
-            "height": 0
+            "height": 1549.5
         },
         {
             "nemCode": "F70",
@@ -678,8 +611,7 @@
             "name": "F70号风机",
             "aname": "F70",
             "status": 7,
-            "heightS": 1553.9,
-            "height": 0
+            "height": 1553.9
         },
         {
             "nemCode": "F71",
@@ -688,8 +620,7 @@
             "name": "F71号风机",
             "aname": "F71",
             "status": 6,
-            "heightS": 1544.0,
-            "height": 0
+            "height": 1544.0
         },
         {
             "nemCode": "F72",
@@ -698,8 +629,7 @@
             "name": "F72号风机",
             "aname": "F72",
             "status": 6,
-            "heightS": 1568.7,
-            "height": 30
+            "height": 1568.7
         },
         {
             "nemCode": "F73",
@@ -708,8 +638,7 @@
             "name": "F73号风机",
             "aname": "F73",
             "status": 5,
-            "heightS": 1561.9,
-            "height": 0
+            "height": 1561.9
         },
         {
             "nemCode": "F74",
@@ -718,8 +647,7 @@
             "name": "F74号风机",
             "aname": "F74",
             "status": 6,
-            "heightS": 1539.3,
-            "height": 0
+            "height": 1539.3
         },
         {
             "nemCode": "F75",
@@ -728,8 +656,7 @@
             "name": "F75号风机",
             "aname": "F75",
             "status": 7,
-            "heightS": 1529.4,
-            "height": 0
+            "height": 1529.4
         }
     ]
 }