From fffd807c69b56990a5eb89cf894a12abc1ef637a Mon Sep 17 00:00:00 2001
From: jihongshun <1151753686@qq.com>
Date: 星期四, 17 七月 2025 15:06:54 +0800
Subject: [PATCH] bugfix

---
 src/views/system/shootPoint/components/shootPointDialog.vue |    9 ++++++++-
 src/views/system/project/components/addPorjectDialog.vue    |    5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/system/project/components/addPorjectDialog.vue b/src/views/system/project/components/addPorjectDialog.vue
index bed4cfe..89e5cc5 100644
--- a/src/views/system/project/components/addPorjectDialog.vue
+++ b/src/views/system/project/components/addPorjectDialog.vue
@@ -47,7 +47,6 @@
                     class="filter-tree"
                     :data="treeData"
                     :props="defaultProps"
-                    draggable  
                     default-expand-all
                     ref="tree">
                   </el-tree>
@@ -97,6 +96,7 @@
   methods:{
     handleClose(){
       this.dialogVisible = false
+      this.$emit('close')
     },
     flyToLocal(row){
       console.log(row)
@@ -400,6 +400,9 @@
      const rotatedZ = localStartPoint.z; //聽Z杞村潗鏍囦繚鎸佷笉鍙�
       //聽灏嗘棆杞悗鐨勫眬閮ㄥ潗鏍囪浆鎹㈠洖涓栫晫鍧愭爣绯�
      return Cesium.Matrix4.multiplyByPoint(transformationMatrix,聽new聽Cesium.Cartesian3(rotatedX,聽rotatedY,聽rotatedZ),聽new聽Cesium.Cartesian3());
+    },
+    submit(){
+      console.log('鐢熸垚鑸嚎')
     }
   }
 }
diff --git a/src/views/system/shootPoint/components/shootPointDialog.vue b/src/views/system/shootPoint/components/shootPointDialog.vue
index 3f2f6a8..cf11a51 100644
--- a/src/views/system/shootPoint/components/shootPointDialog.vue
+++ b/src/views/system/shootPoint/components/shootPointDialog.vue
@@ -96,10 +96,12 @@
     }
   },
   mounted(){
+    console.log(this.templateId)
     if(this.templateId) {
       //棰勮閫昏緫
       getPointInfo(this.templateId).then(res=>{
         if(res.code == 200 ) {
+          console.log(res.data)
           this.getRowData(res.data)
           let drawArr = this.convertToTree(res.data.ardListWayPointsLS)
           setTimeout(() => {
@@ -450,7 +452,12 @@
       this.showMap =false
       this.$nextTick(()=>{
         // this.towerUrl = row.modelRoute
-        this.towerUrl = row.modelRoute
+        
+        if(this.templateId){
+          this.towerUrl = row.ardTowerModel.modelRoute
+        }else {
+          this.towerUrl = row.modelRoute
+        }
         this.showMap = true
       })
     },

--
Gitblit v1.9.3