From 5a4c6108b5c30d22d41d614c6212711607920c92 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期五, 08 九月 2023 14:26:20 +0800
Subject: [PATCH] 1

---
 src/assets/js/menuTool.js |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/assets/js/menuTool.js b/src/assets/js/menuTool.js
index e4633a5..4e64359 100644
--- a/src/assets/js/menuTool.js
+++ b/src/assets/js/menuTool.js
@@ -43,7 +43,12 @@
           heading: -90,
         });
         break;
-
+      case "b4": //姹℃煋鐗╂墿鏁ｈ秼鍔�
+        window.sgworld.Core.postMessage({ TypeG1: "Start" });
+        window.sgworld.Navigate.flyToPosition(115.95108, 39.7411754, 7200, {
+          heading: -90,
+        });
+        break;
       case "c2": //棰勮淇℃伅
         break;
       case "c3": //鎶ヨ淇℃伅
@@ -60,15 +65,15 @@
         break;
       case "d22": //瑗块儴椋庡満妯℃嫙
         this.createFC("fc", "", {
-          start: 0,
-          end: 30,
+          start: 20,
+          end: 25,
           Classify: "West",
         });
         break;
       case "d23": //涓滈儴椋庡満妯℃嫙
         this.createFC("fc", "", {
-          start: 0,
-          end: 30,
+          start: 13,
+          end: 19,
           Classify: "East",
         });
         break;
@@ -122,6 +127,8 @@
         window.sgworld.Core.postMessage({ TypeG1: "Delete" });
         this.delLine();
         store.commit("getWGobj", null);
+        window.sgworld.Core.postMessage({ TypeG1: "End" });
+
         break;
       case "b2": //瓒呮爣鐐归娴嬫竻闄�
         window.sgworld.Core.postMessage({ TypeG1: "Delete" });
@@ -130,6 +137,10 @@
         break;
       case "b3": //姹℃煋鐗╂墿鏁ｈ秼鍔挎竻闄�
         window.sgworld.Core.postMessage({ TypeG1: "Delete" });
+        break;
+      case "b4": //姹℃煋鐗╂墿鏁ｈ秼鍔挎竻闄�
+        window.sgworld.Core.postMessage({ TypeG1: "End" });
+
         break;
       case "c1": //棰勮淇℃伅娓呴櫎鎶ヨ淇℃伅娓呴櫎
         this.closePoi();
@@ -147,6 +158,7 @@
         this.closePoi();
         this.delFC();
         this.delLine();
+        this.closeSYWG();
         break;
       case "d1": //
         this.closePoi();
@@ -167,6 +179,7 @@
         break;
       case "d3": //姹℃煋鐗╂ā鎷熸竻闄�
         this.delWRW();
+
         break;
       case "d4": //鐩戞帶鐐逛綅娓呴櫎
         this.closePoi();
@@ -229,7 +242,7 @@
     this.closePoi();
     this.YJlist.forEach((e) => {
       let ids = window.sgworld.Core.createRandomId();
-      this.createPoi(e, "img/yjd.png", ids, "locationName", "WY", -25);
+      this.createPoi(e, "img/yjd.png", ids, "name", "WY", -25);
       this.YJpoi.push(ids);
     });
   },
@@ -238,7 +251,7 @@
     this.closePoi();
     this.BJlist.forEach((e) => {
       let ids = window.sgworld.Core.createRandomId();
-      this.createPoi(e, "img/bjd.png", ids, "locationName", "WY", -25);
+      this.createPoi(e, "img/bjd.png", ids, "name", "WY", -25);
       this.BJpoi.push(ids);
     });
   },
@@ -318,7 +331,7 @@
   },
   //椋庡満妯℃嫙
   createFC(type, date, data) {
-    let config = data || {
+    const config = data || {
       start: 1,
       end: 30,
       Classify: "Main",
@@ -328,6 +341,9 @@
       sgworld.Core.postMessage(
         `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
       );
+      // console.log(
+      //   `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
+      // );
     } else if (type == "sj") {
       let arr = date.split(/\s+/);
 
@@ -336,10 +352,10 @@
       let Hour = arr[1];
 
       sgworld.Core.postMessage(
-        `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${data.start};EndLayer=${data.end};Classify=${data.Classify};`
+        `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
       );
       // console.log(
-      //   `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour[0]};Density=${FC.Density};Speed=${FC.Speed};`
+      //   `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
       // );
     }
   },
@@ -368,6 +384,9 @@
       sgworld.Core.postMessage(
         `Type=wuranwu;Bool=true;Type2=zidingyi;Yearstart=${day[0]};Mouthstart=${day[1]};Daystart=${day[2]};Hourend=${Hour};Alpha=0.03;Speed=0.5;`
       );
+      // console.log(
+      //   `Type=wuranwu;Bool=true;Type2=zidingyi;Yearstart=${day[0]};Mouthstart=${day[1]};Daystart=${day[2]};Hourend=${Hour};Alpha=0.03;Speed=0.5;`
+      // );
     }
   },
   async bjthis(time) {
@@ -377,9 +396,7 @@
 
     var obj = {};
     this.BJlist = dt.result.reduce(function (item, next) {
-      obj[next.locationName]
-        ? ""
-        : (obj[next.locationName] = true && item.push(next));
+      obj[next.name] ? "" : (obj[next.name] = true && item.push(next));
       return item;
     }, []);
 
@@ -398,12 +415,9 @@
     // });
     var obj = {};
     this.YJlist = dt1.result.reduce(function (item, next) {
-      obj[next.locationName]
-        ? ""
-        : (obj[next.locationName] = true && item.push(next));
+      obj[next.name] ? "" : (obj[next.name] = true && item.push(next));
       return item;
     }, []);
-
     // this.YJtext = `${this.YJlist.length}鏉￠璀︿俊鎭痐;
     store.commit("getYJtext", this.YJlist);
     this.createYJpoi();

--
Gitblit v1.9.3