修改飞入方法，与区域管理关联

src/views/earthMap/edit/EarthComp.vue

@@ -813,14 +813,19 @@
         // this.createRealTimeObj(earthUI)
         //监听鼠标事件
         this.listenMouseHandler(earthUI);
-        // 获取部门信息
+
-        await this.getSceneInfo();
+
+        // 获取部门信息 //已弃用
+        // await this.getSceneInfo();
+        // 新的飞入方法
+        await this.newfly();
 
         //加载地图线路资源
         await this.createBBHLine(earthUI);
 
-        //飞入地点
+        //飞入地点 //已弃用
-        await this.fly();
+        // await this.fly();
+        
 
         //创建工具栏
         // console.log("earthUI",earthUI);
@@ -841,6 +846,40 @@
 
       });
     }
+    //新的飞入方法 20231222
+    async newfly(){
+      let position, rotation, viewDistance, duration;
+      const sceneId = this.userStore.userInfo?.sceneId;
+      await defHttp.get({
+          url: '/military/msMapScene/list',
+          params: {
+            pageNo: 1,
+            pageSize: 999,
+            sceneCode: sceneId + "*",
+            column: 'sceneCode',
+            order: 'asc',
+          }
+        }, { isTransformResponse: false }).then((response) => {
+          console.log("newfly",response);
+          // 设置岛屿信息为数组
+          this.sceneInfo = response.result.records;
+          return response.result.records;
+        }).then((res)=>{
+          //飞入
+          position = [res[0].cameraLon, res[0].cameraLat, res[0].cameraAltitude];
+          rotation = [res[0].rotationX, res[0].rotationY, res[0].rotationZ];
+          viewDistance = res[0].viewDistance;
+          duration = res[0].duration;
+          this._earth.camera.flyTo(position, viewDistance, rotation, duration);
+          // 地图复原事件
+          window.$flyTo = this.flyTo = () => {
+          this._earth.camera.flyTo(position, viewDistance, rotation, duration);
+          };
+        })
+
+    }
+
+    //已弃用
     async fly() {
       let position, rotation, viewDistance, duration;
       //
@@ -935,6 +974,7 @@
       };
     }
 
+    //已弃用
     async getSceneInfo() {
       // 登录人部门信息
       // const orgCode = Vue.ls.get(USER_INFO).orgCode;
@@ -956,7 +996,7 @@
             order: 'asc',
           }
         }, { isTransformResponse: false }).then((response) => {
-          // console.log("response",response);
+          console.log("总部",response);
 
           const records = response.result.records
           // 设置岛屿信息为数组
@@ -965,7 +1005,7 @@
         });
       } else {
         await defHttp.get({ url: '/military/msMapScene/queryByOrgCode', params: { orgCode: orgCode } }, { isTransformResponse: false }).then((response) => {
-
+          console.log("岛屿",response);
           const data = response.result;
           // 设置岛屿信息为Object
           this.sceneInfo = data;
@@ -998,7 +1038,7 @@
       }
     }
     /* 使用async/await 处理异步方法顺序执行。成功的操作放到try里，失败的放在catch里 */
-    async createBBHLine(earthUI =null) {
+    async createBBHLine(earthUI= null) {
       let models: any = null;
       let type = 0;
       if (!(this.sceneInfo instanceof Array)) {
@@ -1014,7 +1054,7 @@
         models = {
           ref: 'main',
           expand: true,
-          title: '岛礁',
+          title: this.sceneInfo[0].sceneName,
           children: [],
         };
         for (let record of this.sceneInfo) {
@@ -1029,7 +1069,7 @@
           });
         }
       }
-      // console.log('models',models);
+      console.log('models',models);
 
       // 加载区域
       // console.log("加载区域");

src/views/earthMap/show/EarthComp.vue

@@ -993,7 +993,7 @@
           });
         }
       }
-      // console.log('models',models);
+      console.log('models1',models);
 
       // 加载区域
       // console.log("加载区域");

src/views/military/modules/ai/monitorArea/DtMonitorAreaList.vue

@@ -102,7 +102,8 @@
   import { defHttp } from '/@/utils/http/axios';
   import DtMonitorDeviceList from './areaDevice/DtMonitorDeviceList.vue';
   import MonitorAreaLinkageList from './linkageDevice/MonitorAreaLinkageList.vue';
-
+  import { useUserStore } from '/@/store/modules/user';
+  const userStore = useUserStore();
   const deviceInfo = ref(); //表格信息
   // 区域设备表
   const AreaDeviceShow = ref(false);
@@ -131,6 +132,7 @@
         fixed: 'right',
       },
       beforeFetch: (params) => {
+        // params.sceneId = userStore.userInfo?.sceneId + '*';
         return Object.assign(params, queryParam);
       },
     },

src/views/military/modules/ai/monitorArea/components/DtMonitorAreaForm.vue

@@ -78,7 +78,7 @@
   <!-- <EarthMapModal v-model:areaData="formData.areaData" v-model:drawData="formData.drawData" :visible="mapVisible"
     :enableTile="false" :enablePointer="true" @closeWin="() => { mapVisible = false }" @clearAreaData="clearAreaData">
   </EarthMapModal> -->
-  <VCEarthViewer v-if="mapVisible" v-model:areaData="formData.areaData" v-model:drawData="formData.drawData"> </VCEarthViewer>
+  <VCEarthViewer v-if="mapVisible" :sceneId="formData.sceneId" v-model:areaData="formData.areaData" v-model:drawData="formData.drawData"> </VCEarthViewer>
 </template>
 
 <script lang="ts" setup>
@@ -90,15 +90,14 @@
   import { Form, notification } from 'ant-design-vue';
   import { message } from 'ant-design-vue';
   import type { Rule } from 'ant-design-vue/es/form';
-
+  import { useUserStore } from '/@/store/modules/user';
   import VCEarthViewer from './VCEarthViewer.vue';
   import Area from '@/views/military/modules/ai/MonitorArea/components/Area.vue';
   import AreaByXbsjEarthUI from '@/views/military/modules/ai/MonitorArea/components/AreaByXbsjEarthUI.vue';
   import EarthMapModal from '/@/views/military/modules/earthMap/scene/model/mapModel/EarthMapModal.vue';
   import locationPng from '@/assets/images/getLocation.png';
 
-  import { FormatPainterOutlined } from '@ant-design/icons-vue';
+  const userStore = useUserStore();
-
   // 模型编码
   const modelCodeList: any = ref([]);
   // 获取模型编码
@@ -125,6 +124,7 @@
     field3: '',
     sysAreaCode: '',
     sysUnitCode: '',
+    sceneId:'',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -173,7 +173,9 @@
    * 新增
    */
   function add() {
-    edit({});
+    edit({
+      sceneId: userStore.userInfo?.sceneId
+    });
   }
 
   /**

src/views/military/modules/ai/monitorArea/components/VCEarthViewer.vue

@@ -65,6 +65,11 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  // 所属场景数据
+  sceneId: {
+    type: String,
+    default: '',
+  },
 });
 //地图提供
 const mapURL = import.meta.env.VITE_GLOB_EARTHMAP_URL + import.meta.env.VITE_GLOB_SATELLITE_URL
@@ -424,6 +429,8 @@ watch(
 );
 
 onMounted(async () => {
+  // console.log("pops",props);
+  
   await loadingData();
 });
 
@@ -435,112 +442,52 @@ function handleCancel() {
 }
 async function drawingsReadyDefault(e) {
   let viewer = e.viewer
-  console.log("viewer", viewer);
+  // console.log("viewer", viewer);
-  console.log("e", e);
+  // console.log("e", e);
   $viewer.value = viewer;
   // 取消双击旋转事件
   $viewer.value.cesiumWidget.screenSpaceEventHandler.removeInputAction(window.Cesium.ScreenSpaceEventType.LEFT_DOUBLE_CLICK);
 
-  // 获取部门信息
-  await getSceneInfo();
   // 飞入事件
   await fly(viewer);
 }
 
-// 获取部门信息
-async function getSceneInfo() {
-  // 登录人部门信息
-  const orgCode: any = userStore.userInfo?.orgCode;
-  // this.orgCode = orgCode;
-  // console.log("orgCode",orgCode);
 
-  // 登录人部门信息长度为3则为总部，否则为岛屿
+/**
-  if (orgCode.length == 3) {
+ * 
-    // 总部
+ * @description 飞入
+ * 新建则飞入用户所属场景
+ * 编辑则飞入区域所属场景
+ * 
+ **/
+async function fly(viewer: any = null) {
+  //判断sceneId
+  // const sceneId: any = props.sceneId == '' ? userStore.userInfo?.sceneId : props.sceneId;
+  const sceneId: any = props.sceneId;
+  // 获取当前坐标系标准
+  let ellipsoid = viewer.scene.globe.ellipsoid;
   await defHttp.get({
     url: '/military/msMapScene/list',
     params: {
-        pageNo: 1,
+      sceneCode: sceneId,
-        pageSize: 999,
-        sceneCode: "00001-00001*",
-        column: 'sysOrgCode',
-        order: 'asc',
     }
   }, { isTransformResponse: false }).then((response) => {
-      // console.log("response",response);
+    let res = response.result.records[0]
-      const records = response.result.records
-      // 设置岛屿信息为数组
-      sceneInfo.value = records;
-      return records;
-    });
-  } else {
-    await defHttp.get({
-      url: '/military/msMapScene/queryByOrgCode',
-      params: { orgCode: orgCode }
-    }, { isTransformResponse: false })
-      .then((response) => {
-        const data = response.result;
-        // 设置岛屿信息为Object
-        sceneInfo.value = data;
-        return data;
-      });
-  }
-}
-
-//飞入
-function fly(viewer: any = null) {
-  let position, rotation, viewDistance, duration;
-
-  // 获取当前坐标系标准
-  let ellipsoid = viewer.scene.globe.ellipsoid;
-
-  //
-  let parentData =
-    sceneInfo.value instanceof Array
-      ? sceneInfo.value.filter((item, index) => {
-        return item.sceneCode == "00001-00001";
-      })
-      : sceneInfo.value;
-  //过滤掉总部层级的
-  let data = sceneInfo.value instanceof Array ?
-    sceneInfo.value.filter((item, index) => {
-      return item.sceneCode.length > 3;
-    })
-    : sceneInfo.value;
-  // console.log("data",data);
-  // console.log("this.sceneInfo",this.sceneInfo);
-  if (data) {
-    if (!(data instanceof Array)) {
-      // debugger;
-      // 各岛礁
-      position = [data.lon, data.lat, data.altitude];
-      rotation = [data.rotationX, data.rotationY, data.rotationZ];
-      viewDistance = data.viewDistance;
-      duration = data.duration ? data.duration : 0;
-      // viewer.camera.flyTo(position, viewDistance, rotation, duration);
-      // console.log("data", position, viewDistance, rotation, duration);
-    } else {
-      // 总指挥中心
-      position = [parentData[0].lon, parentData[0].lat, parentData[0].altitude];
-      rotation = [parentData[0].rotationX, parentData[0].rotationY, parentData[0].rotationZ];
-      viewDistance = parentData[0].viewDistance;
-      duration = parentData[0].duration;
-      // console.log("data", position, viewDistance, rotation, duration);
-    }
     // 根据坐标系标准，将地理坐标转换为笛卡尔坐标
     let CartesianPosition = ellipsoid.cartographicToCartesian({
-      longitude: position[0],
+      longitude: res.cameraLon,
-      latitude: position[1],
+      latitude: res.cameraLat,
-      height: position[2]
+      height: res.cameraAltitude,
     });
     // console.log("CartesianPosition", CartesianPosition);
+    // console.log("response", response);
     viewer.camera.position = CartesianPosition
-  }
+  });
-  else {
-    // 没权限人员控制
-  }
 }
 
+
+
+
 function drawEvt(e, viewer) {
   const restoreCursor = getComputedStyle(viewer.canvas).cursor;
   if (e.finished) {