添加关照、全局等高线、修改图层问题

src/renderer/views/dashboard/index.vue

@@ -127,7 +127,7 @@
     <fightingDataStyle ref="fightingDataStyle" class="fightingDataStyleBox absolute zIndex99"></fightingDataStyle>
     <DTH ref="dth" :host="host" :token="token" class="zIndex99"></DTH>
     <!-- 标准版本  无人机 -->
-    <flyer v-if="flyerDiv" class="flyer"></flyer>
+    <!-- <flyer v-if="flyerDiv" class="flyer"></flyer> -->
     <!-- <flyer2 v-if="flyerDiv2" class="flyer"></flyer2> -->
     <!--态势部分-->
     <div v-show="!showBigData && !noSituation" class="titles">
@@ -287,7 +287,7 @@ import rolePermission from "@/components/myHeaderAll/systemPopup/components/perm
 import gant from "../../components/gantt-next/gant.vue";
 import modelTransform from "./modelTransform";
 import DTH from "@/components/DTH/index";
-import flyer from "@/components/UAV2/index";
+// import flyer from "@/components/UAV2/index";
 // import flyer2 from "@/components/UAV3/index";
 import situationList from "@/components/situationList/index.vue";
 import deduction from "@/components/TS/deduction.vue";
@@ -338,7 +338,7 @@ export default {
     deduction,
     situationList,
     eventEditor,
-    flyer,
+    // flyer,
     // flyer2,
     DTH,
     gant,

src/renderer/views/dashboard/index_n.vue

@@ -269,13 +269,16 @@ import DTH from "@/components/DTH/index";
 // import flyer from "@/components/UAV2/index";
 // import flyer2 from "@/components/UAV3/index";
 import situationList from "@/components/situationList/index.vue";
-import Deduction from "@/components/newTL/Deduction.vue";
+import Deduction from "@/components/TS/deduction.vue";
 import cabin from "@/components/situationEdit/cabin.vue";
 import elements from "@/components/situationEdit/element.vue";
 import nodeType from "@/components/treeNode";
 import newEvent from "@/components/Events/newEvent.vue";
 import adddirectory from "../../components/dialog/adddirectory.vue";
 // import excelSet from "@/components/dialog/excelSet.vue";
+import excelSet from "@/components/dialog/excelSet.vue";
+import eventEditor from "@/components/TS/eventEditor/index.vue";
+import tufuSelect from "@/components/dialog/tufu_select.vue";
 import {
   getSelectedNode,
   getNodeData,
@@ -314,6 +317,7 @@ export default {
     cabin,
     Deduction,
     situationList,
+    eventEditor,
     // flyer,
     // flyer2,
     DTH,
@@ -344,7 +348,8 @@ export default {
     // richTextEditor
     // New,
     // WangEditor
-    // excelSet
+    excelSet,
+    tufuSelect
   },
 
   data() {
@@ -371,8 +376,8 @@ export default {
       dialogTableVisible: false,
       gisData: [],
       multipleSelection: [],
-      tasks: Store.tasks, //渲染的真实任务数据
-      scales: Store.scales,
+      // tasks: Store.tasks, //渲染的真实任务数据
+      // scales: Store.scales,
       host: localStorage.getItem("service"),
       token: getToken(),
       skinInfo: JSON.parse(localStorage.getItem("systemSetting")).skinInfo,
@@ -441,8 +446,8 @@ export default {
     //  if (!(this.$store.getters.token))
     //    handleLogin(this)
     //新增态势
-    window.Store = new TSTY.store();
-    window.Clock = new TSTY.clock();
+    // window.Store = new TSTY.store();
+    // window.Clock = new TSTY.clock();
   },
   mounted() {
     // new Notification("这是标题", {
@@ -748,25 +753,47 @@ export default {
       window.currentPlan = plan;
       eventList({ plan_id: plan.ID || plan.plan_id }, (res) => {
         console.log("eventList", res);
-        // obj.tasks = res.list;
-        let arr = [];
-        res.list.forEach((item) => {
-          arr.push(window.Store.databaseToTimeline(item));
+        this.eventLists = res.list
+        this.eventsList = true;
+        window.TSTYOBJ = window.TSTY.init({
+          startTimestamp: plan.plan_create_time,
+          tasks: this.eventLists,
+          scales: { preMainIndex: 2 }
         });
-        obj.tasks = arr;
-        obj.startTimestamp = plan.plan_create_time;
-        window.Store.initData(obj);
-        // window.Clock = new TSTY.clock();
-        this.scales = Store.scales;
-        this.tasks = Store.tasks;
-
+        this.action = window.TSTYOBJ.initAction()
+        this.TSTYOBJ = window.TSTYOBJ
+        this.$nextTick(() => {
+          TSTYOBJ.store.init()
+          TSTYOBJ.renderLine(this.$nextTick)
+          TSTYOBJ.renderLabel({ left: 0 })
+          TSTYOBJ.store.updateTimeLineRightRest()
+        })
         this.showList = !this.showList;
         this.editSituation = !this.editSituation;
         this.createEarth("earthContainers");
-        this.eventsList = true;
-        this.$nextTick(() => {
-          window.Store.setFullWidth();
-        });
+
+        /*
+ 
+         console.log("eventList", res);
+         // obj.tasks = res.list;
+         let arr = [];
+         res.list.forEach((item) => {
+           arr.push(window.Store.databaseToTimeline(item));
+         });
+         obj.tasks = arr;
+         obj.startTimestamp = plan.plan_create_time;
+         window.Store.initData(obj);
+         // window.Clock = new TSTY.clock();
+         this.scales = Store.scales;
+         this.tasks = Store.tasks;
+ 
+         this.showList = !this.showList;
+         this.editSituation = !this.editSituation;
+         this.createEarth("earthContainers");
+         this.eventsList = true;
+         this.$nextTick(() => {
+           window.Store.setFullWidth();
+         });*/
       });
     },
     removeEarth1() {