From 09a399a5324ca47243dfcf2f783d3aa2ea115404 Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Wed, 17 Jan 2024 15:49:58 +0800
Subject: [PATCH] =?UTF-8?q?//SenceInfo=20=E5=A2=9E=E5=8A=A0=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E4=BD=BF=E7=94=A8=EF=BC=8C=E7=94=A8=E4=BA=8E=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../military/modules/earthMap/scene/model/Modal.vue    |  3 ++-
 .../earthMap/scene/model/sceneInfo/SenceInfo.vue       | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/military/modules/earthMap/scene/model/Modal.vue b/src/views/military/modules/earthMap/scene/model/Modal.vue
index 666e01f..f7e436a 100644
--- a/src/views/military/modules/earthMap/scene/model/Modal.vue
+++ b/src/views/military/modules/earthMap/scene/model/Modal.vue
@@ -103,7 +103,8 @@
         lon: 0,
         lat: 0,
         altitude: 0,
-        cameraLon: 0,
+        //特殊使用，用于识别新增
+        cameraLon: undefined,
         cameraLat: 0,
         cameraAltitude: 0,
         rotationX: 0,
diff --git a/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue b/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
index dc9d006..835075c 100644
--- a/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
+++ b/src/views/military/modules/earthMap/scene/model/sceneInfo/SenceInfo.vue
@@ -10,7 +10,7 @@
       </a-col>
       <a-col :span="11" :offset="1">
         <div>区域名称:</div>
-        <a-input class="inputWidthCss1" v-model:value="subObject.sceneName" placeholder="请输入区域编号名称"
+        <a-input class="inputWidthCss1" v-model:value="subObject.sceneName" placeholder="请输入区域名称"
           :disabled="disable"></a-input>
       </a-col>
       <a-col :span="11" :offset="1">
@@ -62,7 +62,7 @@
       </a-col>
       <a-col :span="11" :offset="1">
         <div>
-          <div>相机经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLon"
+          <div>相机经度:</div><a-input-number class="inputWidthCss1" v-model:value="subObject.cameraLon" :min="0"
             :disabled="disable" />
         </div>
         <div>
@@ -234,7 +234,7 @@ onMounted(async () => {
 // 打开地图时飞入到指定位置
 const moveChinaPosition = function () {
   // console.log('movePosition', subObject.value);
-  if (subObject.value.id) {
+  if (subObject.value.id || subObject.value.cameraLon ) {
     window.$earth.camera.fov = subObject.value.viewDistance;
     //飞入应为相机位置
     window.$earth.camera.position = [subObject.value.cameraLon, subObject.value.cameraLat, subObject.value.cameraAltitude];
@@ -251,6 +251,10 @@ const moveChinaPosition = function () {
 // 弹窗地图框属性
 const mapVisible = ref(false);
 const mapShow = function () {
+  // if(!subObject.value.sceneName){
+  //   message.warning("请先填写区域名称！")
+  //   return
+  // }
   mapVisible.value = true;
 };
 // 关闭地图时设置，视角位置，视距信息