Просмотр исходного кода

气象页面修改,电子围栏修改

sunzehao 1 месяц назад
Родитель
Сommit
8139fdc075

BIN
src/assets/cesiumImg/homeImg/header1_left.png


BIN
src/assets/cesiumImg/homeImg/header1_right.png


BIN
src/assets/cesiumImg/homeImg/header2.png


+ 77 - 0
src/components/cesiumHeader/index.vue

@@ -0,0 +1,77 @@
+<template>
+    <div class="headerView">
+      <img :src="headLeft" alt="">
+      <span class="name">“天镜” 数字孪生可视化引擎</span>
+      <img :src="headRight" alt="">
+    </div>
+    <!-- <div class="headerView2">
+      <span class="name">“天镜” 数字孪生可视化引擎</span>
+    </div> -->
+</template>
+
+<script>
+import headLeft from "@/assets/cesiumImg/homeImg/header1_left.png"
+import headRight from "@/assets/cesiumImg/homeImg/header1_right.png"
+import homeImg2 from "@/assets/cesiumImg/homeImg/header2.png"
+export default {
+  data() {
+    return {
+      headLeft,
+      headRight,
+      homeImg2
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.headerView{
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  position: absolute;
+  top: 10px;
+  z-index: 1;
+  img{
+    width: 27%;
+  }
+  .name{
+    width: 20%;
+    color: #fff;
+    font-size: 26px;
+    // font-weight: bold;
+    display: inline-block;
+    text-align: center;
+    position: relative;
+    top: 9px;
+    text-shadow: 
+        -1px -1px 5px #0dcfef,
+        1px -1px 5px #0dcfef,
+        -1px 1px 5px #0dcfef,
+        1px 1px 5px #0dcfef;
+  }
+}
+.headerView2{
+  width: 100%;
+  height: 60px;
+  background-image: url("@/assets/cesiumImg/homeImg/header2.png");
+  position: absolute;
+  top: 15px;
+  z-index: 1;
+  background-size: 80%;
+  background-repeat: no-repeat;
+  background-position: center;
+  display: flex;
+  justify-content: center;
+  .name{
+    width: 20%;
+    color: #0dcfef;
+    font-size: 26px;
+    font-weight: bold;
+    display: inline-block;
+    text-align: center;
+    position: relative;
+    font-family: "Bicubik";
+  }
+}
+</style>

+ 2 - 2
src/router/index.js

@@ -27,7 +27,7 @@ const routes = [
     {
         path: '/drawPlot',
         name: 'drawPlot',
-        component: () => import('../views/cesiumComponents/drawPlot.vue')
+        component: () => import('../views/cesiumComponents/drawPlotCom/drawPlot.vue')
     },
     //风机地图页面
     {
@@ -44,7 +44,7 @@ const routes = [
     {
         path: '/windReport',
         name: 'windReport',
-        component: () => import('../views/cesiumComponents/windReport.vue')
+        component: () => import('../views/cesiumComponents/windReportCom/windReport.vue')
     },
     {
         path: "/:catchAll(.*)",

+ 60 - 81
src/views/cesium.vue

@@ -79,7 +79,8 @@
       @showDetail="menuComTSty"
       @backStations="backStations"
     /> -->
-    <weatherView />
+    <weatherView ref="weatherView" :basicGeoJson="basicGeoJson" @coverOnChange="coverOnChange"
+     @resetChangeWind="resetChangeWind" @resetChangeStation="resetChangeStation" />
     <!-- <timeControl class="timeControl" :mode="controlMode" :viewer="viewer" />  -->
   </div>
 </template>
@@ -91,18 +92,18 @@ import * as Cesium from "cesium";
 import "cesium/Build/Cesium/Widgets/widgets.css";
 import { createWind } from "../assets/wind/Windy.js";
 
-// import headerView from "@/components/cesiumHeader/index.vue";
+import headerView from "@/components/cesiumHeader/index.vue";
 // import { parseGIF } from 'gifuct-js';
 // import { decompressFrames } from 'gifuct-js';
 
 import cesiumweatherView from "./weatherComponents/cesiumweatherView.vue";
-// import weatherView from "./weatherComponents/weatherView.vue";
+import weatherView from "./weatherComponents/weatherView.vue";
 import jsonData from "./weatherComponents/weatherBase.json";
 import allStationJson from "./cesiumComponents/allStationJson.json";
 // import fjLonLatJson from "./cesiumComponents/fjLonLat.json";
 
 import { WindLayer } from "cesium-wind";
-
+import { ElMessage } from "element-plus";
 import output from "../assets/WechatIMG1693.jpg";
 import rainoutput from "../assets/rainoutput.jpg";
 
@@ -143,8 +144,6 @@ import windPro from "@/components/windProDetail/windProblem.vue";
 import cesiumwindView from "./cesiumComponents/cesiumwindView.vue";
 import timeControl from "@/components/timeControl/index.vue";
 
-import * as turf from "@turf/turf";
-
 export default {
   name: "CesiumMap",
 
@@ -155,8 +154,8 @@ export default {
     windPro,
     cesiumwindView,
     timeControl,
-    // headerView,
-    // weatherView,
+    headerView,
+    weatherView,
   },
 
   data() {
@@ -239,15 +238,16 @@ export default {
       showTypeViewer: true,
       stationValue: ["Wind", "Fire", "Solar", "Storage"],
       controlMode: "",
+      cityWeather: {}
     };
   },
 
   created() {
     this.getWeatherData();
-    console.log(1111, this.findLocation(109.6429758178942, 34.10868446715471));
   },
 
   mounted() {
+    
     this.initEventListener();
     this.initCesium();
     if (this.showDevInfoBox) {
@@ -268,59 +268,6 @@ export default {
   },
 
   methods: {
-    // 传入经纬度,获取经纬度所在的行政区信息
-    findLocation(lng, lat) {
-      const point = turf.point([lng, lat]);
-      let foundProvince = null;
-      let foundCity = null;
-
-      // 遍历所有要素查找包含点的多边形
-      for (const feature of basicGeoJson.features) {
-        try {
-          if (
-            feature.geometry &&
-            turf.booleanPointInPolygon(point, feature.geometry)
-          ) {
-            const properties = feature.properties;
-
-            // 根据你的GeoJSON结构调整属性名
-            // 常见的有:name, NAME, 省, 市, province, city等
-            const province =
-              properties.province || properties.省 || properties.name;
-            const city = properties.city || properties.市 || properties.name;
-
-            // 如果是省级数据(没有city属性)
-            if (city === province || !properties.city) {
-              if (!foundProvince) {
-                foundProvince = {
-                  province: province,
-                  adcode: properties.adcode || properties.code,
-                  geometry: feature.geometry,
-                  properties: properties,
-                };
-              }
-            } else {
-              // 市级数据
-              foundCity = {
-                province: province,
-                city: city,
-                adcode: properties.adcode || properties.code,
-                geometry: feature.geometry,
-                properties: properties,
-              };
-              break; // 找到市级就停止
-            }
-          }
-        } catch (error) {
-          console.warn("处理要素时出错:", error);
-          continue;
-        }
-      }
-
-      const result = foundCity || foundProvince;
-
-      return result;
-    },
 
     changeType(value) {
       this.stationValue = value;
@@ -342,18 +289,23 @@ export default {
       this.showAllStation(this.viewer, showStation);
     },
     coverOnChange(val) {
-      if (val.value === "风场") {
+      if (val.name === "风场图") {
         this.controlMode = this.controlMode === "wind" ? "" : "wind";
-        // this.switchWindLayer(val.check);
-      } else if (val.value === "云层") {
+        this.switchWindLayer(val.check);
+      } else if (val.name === "云层图") {
         this.controlMode = this.controlMode === "cloud" ? "" : "cloud";
-        // this.switchCloudLayer(val.check);
-      } else if (val.value === "降雨") {
+        this.switchCloudLayer(val.check);
+      } else if (val.name === "降雨图") {
         this.controlMode = this.controlMode === "rain" ? "" : "rain";
-        // this.switchRainLayer(val.check);
-      } else if (val.value === "温度") {
+        this.switchRainLayer(val.check);
+      } else if (val.name === "温度图") {
         this.controlMode = this.controlMode === "temp" ? "" : "temp";
-        // this.switchTemperatureLayerr(val.check);
+        this.switchTemperatureLayerr(val.check);
+      } else {
+        ElMessage({
+          message: '暂无数据',
+          type: 'warning',
+        })
       }
     },
     test() {
@@ -480,7 +432,7 @@ export default {
       // this.initCesiumTerrain();
       this.initCesiumBaseMapImage();
       //   this.switchWindLayer();
-      this.showAllStation(viewer, allStationJson.station);
+      this.showAllStation(viewer, allStationJson.station, "Wind");
       this.initGeoJsonData();
     },
 
@@ -947,6 +899,22 @@ export default {
         }
       });
     },
+    resetChangeWind(data) {
+      let that = this;
+      that.viewer.camera.flyTo({
+        destination: Cesium.Cartesian3.fromDegrees(
+          data.longitude,
+          data.latitude,
+          100000
+        ),
+        orientation: {
+          heading: Cesium.Math.toRadians(0),
+          pitch: Cesium.Math.toRadians(-90),
+          roll: 0.0,
+        },
+        duration: 3.0,
+      });
+    },
 
     // 设置地球底图
     setMapImageryProvider(val) {
@@ -1682,19 +1650,30 @@ export default {
       var loadingEl = document.getElementById("loading");
       loadingEl.style.display = "none";
     },
-
+    resetChangeStation(value) {
+      this.allStationentitys.forEach(({ entity, handler }) => {
+        this.viewer.entities.remove(entity); // 移除实体
+        if (!handler.isDestroyed()) {
+          handler.destroy(); // 销毁事件处理器(关键!)
+        }
+      });
+      this.showAllStation(this.viewer, allStationJson.station, value);
+    },
     // 展示所有风场
-    showAllStation(viewer, station) {
+    showAllStation(viewer, station, type) {
       station.forEach((e, index) => {
-        if (e.energytype === "Wind") {
-          this.showStationFn(viewer, e, index, fc);
-        } else if (e.energytype === "Fire") {
-          this.showStationFn(viewer, e, index, hd);
-        } else if (e.energytype === "Storage") {
-          this.showStationFn(viewer, e, index, chu);
-        } else {
-          this.showStationFn(viewer, e, index, gf);
+        if (e.energytype === type) {
+          this.showStationFn(viewer, e, index, type ==="Wind" ? fc : type ==="Fire" ? hd : type ==="Storage" ? chu : gf);
         }
+        // if (e.energytype === "Wind") {
+        //   this.showStationFn(viewer, e, index, fc);
+        // } else if (e.energytype === "Fire") {
+        //   this.showStationFn(viewer, e, index, hd);
+        // } else if (e.energytype === "Storage") {
+        //   this.showStationFn(viewer, e, index, chu);
+        // } else {
+        //   this.showStationFn(viewer, e, index, gf);
+        // }
       });
       this.resetViewport(11000000);
     },

+ 0 - 0
src/views/cesiumComponents/drawPlot.vue → src/views/cesiumComponents/drawPlotCom/drawPlot.vue


+ 0 - 0
src/views/cesiumComponents/drawPlotJson.json → src/views/cesiumComponents/drawPlotCom/drawPlotJson.json


+ 0 - 0
src/views/cesiumComponents/drawPlotView.vue → src/views/cesiumComponents/drawPlotCom/drawPlotView.vue


+ 117 - 116
src/views/cesiumComponents/windMap2D.vue

@@ -434,17 +434,17 @@ export default {
       //   url = "ws://10.121.128.117:8431/ws/DHSM";
       // }
 
-      webSocketService.connect({
-        url: `ws/${this.getWsUrl(stationName)}`,
-        autoReconnect: true,
-        maxReconnectAttempts: 5,
-        reconnectInterval: 3000,
-        onOpen: (event) => {
-          console.log("✅ WebSocket 连接成功", event);
-        },
-        onError: (error) => {
-          console.log("❌ WebSocket 错误:", error);
-        //   return
+      // webSocketService.connect({
+      //   url: `ws/${this.getWsUrl(stationName)}`,
+      //   autoReconnect: true,
+      //   maxReconnectAttempts: 5,
+      //   reconnectInterval: 3000,
+      //   onOpen: (event) => {
+      //     console.log("✅ WebSocket 连接成功", event);
+      //   },
+      //   onError: (error) => {
+      //     console.log("❌ WebSocket 错误:", error);
+      //     return
           if (stationName === "MYFDC") {
             fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
           } else if (stationName === "JNWHZ") {
@@ -458,7 +458,7 @@ export default {
           let wtArray = JSON.parse(JSON.stringify(wsRes.windMachineList));
           this.isFakeData = true;
 
-          this.fakeDataTimmer = setInterval(() => {
+          // this.fakeDataTimmer = setInterval(() => {
             fjLonLatJson.data.forEach((e) => {
               let fjItem =
                 wtArray.find((findEle) => {
@@ -489,53 +489,53 @@ export default {
             });
 
             this.fjLonLatJsonArr = fjLonLatJson;
-          }, 1000);
-        },
-      });
-
-      webSocketService.on("message", (res) => {
-        if (stationName === "MYFDC") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
-        } else if (stationName === "JNWHZ") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjWHZLonLatJson));
-        } else if (stationName === "JNYPL") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjYPLLonLatJson));
-        } else if (stationName === "JNSMS") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjSMSLonLatJson));
-        }
-
-        let wtArray = JSON.parse(JSON.stringify(res.windMachineList));
-        fjLonLatJson.data.forEach((e) => {
-          let fjItem =
-            wtArray.find((findEle) => {
-              return findEle.fjbh === e.fjbh;
-            }) || {};
-          const fjMix = Object.assign({}, e, fjItem);
-          fjMix.status = this.getStatus(fjMix.fjzt);
-          e = fjMix;
-          if (e.status) {
-            if (e.status === 1) {
-              this.showStatuswind(viewer, e, dj);
-            } else if (e.status === 2) {
-              this.showStatuswind(viewer, e, gz);
-            } else if (e.status === 3) {
-              this.showStatuswind(viewer, e, jx);
-            } else if (e.status === 4) {
-              this.showStatuswind(viewer, e, xd);
-            } else if (e.status === 5) {
-              this.showStatuswind(viewer, e, lx);
-            } else if (e.status === 6) {
-              this.showStatuswind(viewer, e, sl);
-            } else {
-              //并网风机
-              this.showAnimatewind(viewer, e);
-            }
-          }
-          this.changeZb(fjMix);
-        });
-
-        this.fjLonLatJsonArr = fjLonLatJson;
-      });
+          // }, 1000);
+      //   },
+      // });
+
+      // webSocketService.on("message", (res) => {
+      //   if (stationName === "MYFDC") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
+      //   } else if (stationName === "JNWHZ") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjWHZLonLatJson));
+      //   } else if (stationName === "JNYPL") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjYPLLonLatJson));
+      //   } else if (stationName === "JNSMS") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjSMSLonLatJson));
+      //   }
+
+      //   let wtArray = JSON.parse(JSON.stringify(res.windMachineList));
+      //   fjLonLatJson.data.forEach((e) => {
+      //     let fjItem =
+      //       wtArray.find((findEle) => {
+      //         return findEle.fjbh === e.fjbh;
+      //       }) || {};
+      //     const fjMix = Object.assign({}, e, fjItem);
+      //     fjMix.status = this.getStatus(fjMix.fjzt);
+      //     e = fjMix;
+      //     if (e.status) {
+      //       if (e.status === 1) {
+      //         this.showStatuswind(viewer, e, dj);
+      //       } else if (e.status === 2) {
+      //         this.showStatuswind(viewer, e, gz);
+      //       } else if (e.status === 3) {
+      //         this.showStatuswind(viewer, e, jx);
+      //       } else if (e.status === 4) {
+      //         this.showStatuswind(viewer, e, xd);
+      //       } else if (e.status === 5) {
+      //         this.showStatuswind(viewer, e, lx);
+      //       } else if (e.status === 6) {
+      //         this.showStatuswind(viewer, e, sl);
+      //       } else {
+      //         //并网风机
+      //         this.showAnimatewind(viewer, e);
+      //       }
+      //     }
+      //     this.changeZb(fjMix);
+      //   });
+
+      //   this.fjLonLatJsonArr = fjLonLatJson;
+      // });
 
       // const ws = useWebSocket(url);
       // let wtArray = ws.messages.windMachineList;
@@ -828,7 +828,8 @@ export default {
         const glZb = this.viewer.entities.add({
           position,
           label: {
-            text: `功率: ${glText} MW/n风速: ${fsText}/n转速: ${zsText}`,
+            // text: `功率: ${glText} MW/n风速: ${fsText}/n转速: ${zsText}`,
+            text: `功率: ${glText} MW`,
             font: "14pt sans-serif",
             style: Cesium.LabelStyle.FILL_AND_OUTLINE,
             outlineWidth: 2,
@@ -854,68 +855,68 @@ export default {
 
         glZb.zb = "glText";
 
-        // const fsZb = this.viewer.entities.add({
-        //   position,
-        //   label: {
-        //     text: `风速: ${fsText}`,
-        //     font: "14pt sans-serif",
-        //     style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-        //     outlineWidth: 2,
-        //     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        //     showBackground: false, // 显示背景
-        //     backgroundColor: new Cesium.Color.fromCssColorString(
-        //       "rgba(13, 38, 77, 0.5)"
-        //     ), // 背景颜色
-        //     backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
-        //     verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
-        //     horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
-        //     pixelOffset: new Cesium.Cartesian2(80, -20), // 原来是-20,现在改为30,向上移动
-        //     eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
-        //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-        //     scaleByDistance: new Cesium.NearFarScalar(
-        //       6000, // 6000米内
-        //       1,
-        //       9000, // 9000米外
-        //       0.8
-        //     ),
-        //   },
-        // });
+        const fsZb = this.viewer.entities.add({
+          position,
+          label: {
+            text: `风速: ${fsText}`,
+            font: "14pt sans-serif",
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+            outlineWidth: 2,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            showBackground: false, // 显示背景
+            backgroundColor: new Cesium.Color.fromCssColorString(
+              "rgba(13, 38, 77, 0.5)"
+            ), // 背景颜色
+            backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
+            verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
+            pixelOffset: new Cesium.Cartesian2(80, -20), // 原来是-20,现在改为30,向上移动
+            eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+            scaleByDistance: new Cesium.NearFarScalar(
+              6000, // 6000米内
+              1,
+              9000, // 9000米外
+              0.8
+            ),
+          },
+        });
 
-        // fsZb.zb = "fsText";
+        fsZb.zb = "fsText";
 
-        // const zsZb = this.viewer.entities.add({
-        //   position,
-        //   label: {
-        //     text: `转速: ${zsText}`,
-        //     font: "14pt sans-serif",
-        //     style: Cesium.LabelStyle.FILL_AND_OUTLINE,
-        //     outlineWidth: 2,
-        //     verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
-        //     showBackground: false, // 显示背景
-        //     backgroundColor: new Cesium.Color.fromCssColorString(
-        //       "rgba(13, 38, 77, 0.5)"
-        //     ), // 背景颜色
-        //     backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
-        //     verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
-        //     horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
-        //     pixelOffset: new Cesium.Cartesian2(80, 0), // 原来是-20,现在改为30,向上移动
-        //     eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
-        //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
-        //     scaleByDistance: new Cesium.NearFarScalar(
-        //       6000, // 6000米内
-        //       1,
-        //       9000, // 9000米外
-        //       0.8
-        //     ),
-        //   },
-        // });
+        const zsZb = this.viewer.entities.add({
+          position,
+          label: {
+            text: `转速: ${zsText}`,
+            font: "14pt sans-serif",
+            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
+            outlineWidth: 2,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            showBackground: false, // 显示背景
+            backgroundColor: new Cesium.Color.fromCssColorString(
+              "rgba(13, 38, 77, 0.5)"
+            ), // 背景颜色
+            backgroundPadding: new Cesium.Cartesian2(10, 10), // 背景内边距
+            verticalOrigin: Cesium.VerticalOrigin.CENTER, // 垂直对齐方式
+            horizontalOrigin: Cesium.HorizontalOrigin.LEFT, // 水平对齐方式
+            pixelOffset: new Cesium.Cartesian2(80, 0), // 原来是-20,现在改为30,向上移动
+            eyeOffset: new Cesium.Cartesian3(0, 0, 0), // 保持固定大小
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+            scaleByDistance: new Cesium.NearFarScalar(
+              6000, // 6000米内
+              1,
+              9000, // 9000米外
+              0.8
+            ),
+          },
+        });
 
-        // zsZb.zb = "zsText";
+        zsZb.zb = "zsText";
 
         this.zbLabelList.push({
           fjbh: model.fjbh,
-        //   zb: [wtName, glZb, fsZb, zsZb],
-          zb: [wtName, glZb],
+          zb: [wtName, glZb, fsZb, zsZb],
+          // zb: [wtName, glZb],
         });
       }
     },

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

@@ -529,17 +529,17 @@ export default {
       let fjLonLatJson = [];
       this.fjLonLatJsonArr = [];
 
-      webSocketService.connect({
-        url: `ws/${this.getWsUrl(stationName)}`,
-        autoReconnect: true,
-        maxReconnectAttempts: 5,
-        reconnectInterval: 3000,
-        onOpen: (event) => {
-          console.log("✅ WebSocket 连接成功", event);
-        },
-        onError: (error) => {
-          console.log("❌ WebSocket 错误:", error);
-          return;
+      // webSocketService.connect({
+      //   url: `ws/${this.getWsUrl(stationName)}`,
+      //   autoReconnect: true,
+      //   maxReconnectAttempts: 5,
+      //   reconnectInterval: 3000,
+      //   onOpen: (event) => {
+      //     console.log("✅ WebSocket 连接成功", event);
+      //   },
+      //   onError: (error) => {
+      //     console.log("❌ WebSocket 错误:", error);
+      //     return;
           if (stationName === "MYFDC") {
             fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
           } else if (stationName === "JNWHZ") {
@@ -566,7 +566,7 @@ export default {
       });
       this.fjLonLatJsonArr = fjLonLatJson;
 
-          this.fakeDataTimmer = setInterval(() => {
+          // this.fakeDataTimmer = setInterval(() => {
             wtArray.forEach((fjzbItem) => {
               const jwdItem =
                 fjLonLatJson.data.find((findEle) => {
@@ -574,48 +574,48 @@ export default {
                 }) || {};
               this.changeZb(Object.assign({}, jwdItem, fjzbItem));
             });
-          }, 1000);
-        },
-      });
+          // }, 1000);
+      //   },
+      // });
 
-      webSocketService.on("message", (res) => {
-        if (stationName === "MYFDC") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
-        } else if (stationName === "JNWHZ") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjWHZLonLatJson));
-        } else if (stationName === "JNYPL") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjYPLLonLatJson));
-        } else if (stationName === "JNSMS") {
-          fjLonLatJson = JSON.parse(JSON.stringify(fjSMSLonLatJson));
-        }
+      // webSocketService.on("message", (res) => {
+      //   if (stationName === "MYFDC") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjMYLonLatJson));
+      //   } else if (stationName === "JNWHZ") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjWHZLonLatJson));
+      //   } else if (stationName === "JNYPL") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjYPLLonLatJson));
+      //   } else if (stationName === "JNSMS") {
+      //     fjLonLatJson = JSON.parse(JSON.stringify(fjSMSLonLatJson));
+      //   }
 
-        let wtArray = JSON.parse(JSON.stringify(res.windMachineList));
+      //   let wtArray = JSON.parse(JSON.stringify(res.windMachineList));
 
-        if (this.isFirstAdd) {
-          fjLonLatJson.data.forEach((e) => {
-            let fjItem =
-              wtArray.find((findEle) => {
-                return findEle.fjbh === e.fjbh;
-              }) || {};
-            const fjMix = Object.assign({}, e, fjItem);
-            fjMix.status = this.getStatus(fjMix.fjzt);
-            e = fjMix;
+      //   if (this.isFirstAdd) {
+      //     fjLonLatJson.data.forEach((e) => {
+      //       let fjItem =
+      //         wtArray.find((findEle) => {
+      //           return findEle.fjbh === e.fjbh;
+      //         }) || {};
+      //       const fjMix = Object.assign({}, e, fjItem);
+      //       fjMix.status = this.getStatus(fjMix.fjzt);
+      //       e = fjMix;
 
-            this.showStatuswind(viewer, e);
-          });
-        }
+      //       this.showStatuswind(viewer, e);
+      //     });
+      //   }
 
-        this.fjLonLatJsonArr = fjLonLatJson;
-        this.isFirstAdd = false;
+      //   this.fjLonLatJsonArr = fjLonLatJson;
+      //   this.isFirstAdd = false;
 
-        wtArray.forEach((fjzbItem) => {
-          const jwdItem =
-            fjLonLatJson.data.find((findEle) => {
-              return findEle.fjbh === fjzbItem.fjbh;
-            }) || {};
-          this.changeZb(Object.assign({}, jwdItem, fjzbItem));
-        });
-      });
+      //   wtArray.forEach((fjzbItem) => {
+      //     const jwdItem =
+      //       fjLonLatJson.data.find((findEle) => {
+      //         return findEle.fjbh === fjzbItem.fjbh;
+      //       }) || {};
+      //     this.changeZb(Object.assign({}, jwdItem, fjzbItem));
+      //   });
+      // });
 
       this.resetWindViewport();
     },

+ 0 - 0
src/views/cesiumComponents/windReport.vue → src/views/cesiumComponents/windReportCom/windReport.vue


Разница между файлами не показана из-за своего большого размера
+ 364 - 0
src/views/weatherComponents/weatherView.vue


Некоторые файлы не были показаны из-за большого количества измененных файлов