From 81f54040c2cb65537c6c6e1db8358a39a57dea0d Mon Sep 17 00:00:00 2001
From: mayisheng <admin>
Date: Mon, 15 Aug 2022 16:14:01 +0800
Subject: [PATCH] 1

---
 src/divForms/divForms.js |   56 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/divForms/divForms.js b/src/divForms/divForms.js
index 27719de..a72b9e9 100644
--- a/src/divForms/divForms.js
+++ b/src/divForms/divForms.js
@@ -7,36 +7,32 @@
  * @LastEditTime: 2020-10-22 13:48:22
  */
 
-import DC from '@dvgis/dc-sdk/dist/dc.base.min' // 基础包
-import DcCore from '@dvgis/dc-sdk/dist/dc.core.min' // 核心包
-
-DC.use(DcCore) // 安装DC核心库
-
+import store from '@/store/index'
 class DivForms {
     /**
      * @popup 存放 dom 相关
      *
      */
-    constructor (viewer, popup) {
+    constructor(viewer, popup) {
         this._viewer = viewer
         this._popup = popup
         this._position = popup.position
         this.appendPopup()
     }
 
-    get viewer () {
+    get viewer() {
         return this._viewer
     }
 
-    get popup () {
+    get popup() {
         return this._popup
     }
 
-    get position () {
+    get position() {
         return this._position
     }
 
-    appendPopup () {
+    appendPopup() {
         /**
          * @domId 存放 dom 的id, 多个数组,单个字符串
          */
@@ -45,27 +41,49 @@
     }
 
     // 创建元素并追加
-    createVideoWindowAll (id) {
+    createVideoWindowAll(id) {
+        this.clearMove(id)
+
         this._viewer.scene.postRender.addEventListener(this.movePopup(id))
     }
 
-    movePopup (id) {
+    movePopup(id) {
         var self = this
-        return function () {
-            const windowCoord = DC.Namespace.Cesium.SceneTransforms.wgs84ToWindowCoordinates(
+        return function() {
+            var position = global.DC.Transform.transformCartesianToWGS84(self._position[0])
+            var positionChange = null
+            if (store.state.viewer.twoOrThree == '三 维') {
+                positionChange = global.DC.Transform.transformWGS84ToCartesian(
+                    new global.DC.Position(
+                        Number(position.lng),
+                        Number(position.lat),
+                        Number(0)
+                    )
+                )
+            } else {
+                positionChange = global.DC.Transform.transformWGS84ToCartesian(
+                    new global.DC.Position(
+                        Number(position.lng),
+                        Number(position.lat),
+                        Number(50)
+                    )
+                )
+            }
+
+            const windowCoord = global.DC.Namespace.Cesium.SceneTransforms.wgs84ToWindowCoordinates(
                 self._viewer.scene,
-                self._position[0]
+                positionChange
             )
 
             self.positionPopUp(windowCoord, id)
         }
     }
 
-    clearMove (id) {
+    clearMove(id) {
         this._viewer.scene.postRender.removeEventListener(this.movePopup(id))
     }
 
-    positionPopUp (windowCoord, id) {
+    positionPopUp(windowCoord, id) {
         if (document.getElementById(id) == null || document.getElementById(id) == undefined) {
             this._viewer.scene.postRender.removeEventListener(this.movePopup(id))
             return
@@ -74,7 +92,7 @@
             windowCoord.y && windowCoord.y != undefined && !Number.isNaN(windowCoord.y)) {
             const x = windowCoord.x
             const y = windowCoord.y - document.getElementById(id).offsetHeight
-            // x = windowCoord.x - document.getElementById(id).offsetWidth
+                // x = windowCoord.x - document.getElementById(id).offsetWidth
 
             document.getElementById(id).style.cssText = `
             visibility:visible;
@@ -84,4 +102,4 @@
     }
 }
 
-export default DivForms
+export default DivForms
\ No newline at end of file

--
Gitblit v1.9.3