diff --git a/src/components/earthMap/Toolbar.vue b/src/components/earthMap/Toolbar.vue
index 23706df..1cb3b8a 100644
--- a/src/components/earthMap/Toolbar.vue
+++ b/src/components/earthMap/Toolbar.vue
@@ -95,7 +95,7 @@
     <KeyControlAreaList v-if="keyControlAreaListShow"></KeyControlAreaList>
     <NotificationModel v-if="notificationModelShow"></NotificationModel>
     <WarnList v-if="WarnListShow"></WarnList>
-    <DrawShape v-if="drawShapeShow"></DrawShape>
+    <DrawShape v-if="drawShapeShow" :drawShapePackage="drawShapePackage"></DrawShape>
     <DrawShapeMilitary v-if="drawShapeMilitaryShow"></DrawShapeMilitary>
   </div>
 </template>
@@ -131,6 +131,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import $ from 'jquery';
   import { useUserStore } from '/@/store/modules/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   import TestCom from './TestCom.vue';
 
@@ -154,6 +155,7 @@
       const { proxy }: any = getCurrentInstance();
       // const { userInfo } = useUserStore();
       const userStore = useUserStore();
+      const { createMessage } = useMessage();
       let _viewer = ref();
       let show = ref(true);
       let modalVisible = ref(false);
@@ -179,6 +181,7 @@
       const notificationModelShow = ref(false);
       const WarnListShow = ref(false);
       const drawShapeShow = ref(false);
+      const drawShapePackage = ref(null);
       const drawShapeMilitaryShow = ref(false);
 
       //计算属性
@@ -235,6 +238,11 @@
           $mitt.on('warnInfoMan', function () {
             warnInfoMan();
           });
+          //调用绘画组件，res.show为展示状态,res为传递数据
+          $mitt.on('drawShapeShow', function (res:any) {
+            drawShapeShow.value = res.show;
+            drawShapePackage.value = res
+          });
         }
         //数据绑定
         //disposers 用来收集资源销毁函数，并在析构时自动调用！
@@ -946,6 +954,8 @@
 
       //绘画图形
       function drawShape() {
+        //清空数据
+        drawShapePackage.value = null
         drawShapeShow.value = !drawShapeShow.value;
       }
       //绘画图形-军事态势
@@ -1019,7 +1029,6 @@
             // $mitt.emit('windowCancel')
             // com = addModelWin
             // console.log("proxy");
-
             addModelWinShow.value = true;
             break;
           case 'roamPathList':
@@ -1138,6 +1147,7 @@
         notificationModelShow,
         WarnListShow,
         drawShapeShow,
+        drawShapePackage,
         drawShapeMilitaryShow,
         drawShapeMilitaryIMG,
         test,
diff --git a/src/components/earthMap/toolbar/AddModelWin.vue b/src/components/earthMap/toolbar/AddModelWin.vue
index 6f29ecd..ff825dd 100644
--- a/src/components/earthMap/toolbar/AddModelWin.vue
+++ b/src/components/earthMap/toolbar/AddModelWin.vue
@@ -1,18 +1,7 @@
 <template>
   <div class="create-model-modal" v-if="winVisible">
-    <Window
-      :title="title"
-      @cancel="cancel"
-      @ok="ok"
-      :width="width"
-      :minWidth="600"
-      :height="height"
-      :left="left"
-      :top="top"
-      :floatright="false"
-      :footervisible="true"
-      v-show="!creating"
-    >
+    <Window :title="title" @cancel="cancel" @ok="ok" :width="width" :minWidth="600" :height="height" :left="left"
+      :top="top" :floatright="false" :footervisible="true" v-show="!creating">
       <div style="display: flex" class="custom-item" v-if="!isUpdateModel">
         <label class="custom-label">模型类型:</label>
         <div class="custom-item-box">
@@ -23,7 +12,8 @@
         <div style="display: flex" class="custom-item">
           <label class="custom-label">名称:</label>
           <div class="custom-item-box">
-            <input v-model="name" class="name-input" style="height: 90%; width: 100%" @change="nameChange(currentModel)" />
+            <input v-model="name" class="name-input" style="height: 90%; width: 100%"
+              @change="nameChange(currentModel)" />
           </div>
         </div>
         <div style="display: flex" class="custom-item">
@@ -38,14 +28,8 @@
             <!-- <XbsjSlider style="margin-top: 16px" :min="0" :max="256" :step="1" showTip="always"
               v-model="minimumPixelSize">
             </XbsjSlider> -->
-            <a-slider
-              v-model:value="minimumPixelSize"
-              :min="0"
-              :max="256"
-              :step="1"
-              :tooltipVisible="true"
-              v-if="currentModel && currentModel.xbsjType == 'Model'"
-            />
+            <a-slider v-model:value="minimumPixelSize" :min="0" :max="256" :step="1" :tooltipVisible="true"
+              v-if="currentModel && currentModel.xbsjType == 'Model'" />
           </div>
         </div>
         <div style="display: flex" class="custom-item">
@@ -71,28 +55,19 @@
           </div>
         </div>
         <div style="display: flex; align-items: center; justify-content: center" class="custom-item">
-          <button
-            @click="modelState('creating')"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%"
-          >
+          <button @click="modelState('creating')"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%">
             拾取
           </button>
-          <button
-            @click="currentModel.positionEditing = true"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%"
-          >
+          <button @click="currentModel.positionEditing = true"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%">
             移动
           </button>
-          <button
-            @click="modelState('rotationEditing')"
+          <button @click="modelState('rotationEditing')"
             :class="['xbsj-button', 'edit-model-btn', !currentModel || rotationEditing ? 'edit-model-btn-disable' : '']"
-            :disabled="rotationEditing"
-            style="width: 20%"
-          >
+            :disabled="rotationEditing" style="width: 20%">
             旋转
           </button>
         </div>
@@ -101,7 +76,8 @@
         <div style="display: flex" class="custom-item">
           <label class="custom-label">名称:</label>
           <div class="custom-item-box">
-            <input v-model="name" class="name-input" style="height: 90%; width: 100%" @change="nameChange(currentModel)" />
+            <input v-model="name" class="name-input" style="height: 90%; width: 100%"
+              @change="nameChange(currentModel)" />
           </div>
         </div>
         <div style="display: flex" class="custom-item">
@@ -126,7 +102,8 @@
           <label class="custom-label">上传图标:</label>
           <div class="custom-item-box">
             <div class="upload-box">
-              <upload v-model:file="uploadFile" :pre-view-url="previewImgUrl" :isUpdateModel="isUpdateModel" ref="pinIconUpload" />
+              <upload v-model:file="uploadFile" :pre-view-url="previewImgUrl" :isUpdateModel="isUpdateModel"
+                ref="pinIconUpload" />
             </div>
           </div>
         </div>
@@ -164,20 +141,14 @@
           </div>
         </div>
         <div style="display: flex; justify-content: center" class="custom-item">
-          <button
-            @click="modelState('creating')"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%; display: flex; align-items: center; justify-content: center"
-          >
+          <button @click="modelState('creating')"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%; display: flex; align-items: center; justify-content: center">
             拾取
           </button>
-          <button
-            @click="currentModel.editing = true"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%; display: flex; align-items: center; justify-content: center"
-          >
+          <button @click="currentModel.editing = true"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%; display: flex; align-items: center; justify-content: center">
             移动
           </button>
         </div>
@@ -186,7 +157,8 @@
         <div style="display: flex" class="custom-item">
           <label class="custom-label">名称:</label>
           <div class="custom-item-box">
-            <input v-model="name" class="name-input" style="height: 90%; width: 100%" @change="nameChange(currentModel)" />
+            <input v-model="name" class="name-input" style="height: 90%; width: 100%"
+              @change="nameChange(currentModel)" />
           </div>
         </div>
         <div style="display: flex" class="custom-item">
@@ -211,7 +183,8 @@
           <label class="custom-label">上传图标:</label>
           <div class="custom-item-box">
             <div class="upload-box">
-              <upload v-model:file="uploadFile" :pre-view-url="previewImgUrl" :isUpdateModel="isUpdateModel" ref="pinIconUpload" />
+              <upload v-model:file="uploadFile" :pre-view-url="previewImgUrl" :isUpdateModel="isUpdateModel"
+                ref="pinIconUpload" />
             </div>
           </div>
         </div>
@@ -225,20 +198,14 @@
           </div>
         </div>
         <div style="display: flex; justify-content: center" class="custom-item">
-          <button
-            @click="modelState('creating')"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%; display: flex; align-items: center; justify-content: center"
-          >
+          <button @click="modelState('creating')"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%; display: flex; align-items: center; justify-content: center">
             拾取
           </button>
-          <button
-            @click="currentModel.editing = true"
-            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']"
-            :disabled="creating"
-            style="width: 20%; display: flex; align-items: center; justify-content: center"
-          >
+          <button @click="currentModel.editing = true"
+            :class="['xbsj-button', 'edit-model-btn', creating ? 'edit-model-btn-disable' : '']" :disabled="creating"
+            style="width: 20%; display: flex; align-items: center; justify-content: center">
             移动
           </button>
         </div>
@@ -249,1360 +216,1429 @@
 </template>
 
 <script lang="ts">
-  import { onBeforeUnmount, watchEffect, onMounted, nextTick, defineComponent, ref, getCurrentInstance, computed, watch } from 'vue';
-  import xbsjScale from '/@/components/earthMap/components/xbsjScale.vue';
-  import XbsjSelect from '/@/components/earthMap/components/XbsjSelect.vue';
-  import XbsjColorButton from '/@/components/earthMap/components/XbsjColorButton.vue';
-  import upload from '/@/components/earthMap/components/upload.vue';
-  import Window from '@/components/earthMap/components/Window.vue';
-  import { useUserStore } from '/@/store/modules/user';
-  import { defHttp } from '/@/utils/http/axios';
-  // import mitt from '/@/utils/mitt';
-  import $mitt from '@/utils/earthMap/mitt';
-  import $ from 'jquery';
-  import { addModel, addPin, addViewShed, addViewShedRadar } from '@/utils/earthMap/earthObj';
-  export default defineComponent({
-    name: 'AddModelWin',
-    components: { xbsjScale, XbsjSelect, upload, XbsjColorButton, Window },
-    props: {
-      title: {
-        type: String,
-        default: '创建元素',
-      },
-      setLabelStatus: {
-        type: Function,
-        default: null,
-      },
-      czmObject: {
-        type: Object,
-        default: null,
-      },
-      node: {
-        type: Object,
-        default: null,
-      },
-      type: {
-        type: String,
-        default: '',
-      },
-      lineId: {
-        type: String,
-        default: '',
-      },
-      areaCode: {
-        type: String,
-        default: '',
-      },
-      areaByNodeId: {
-        type: Map,
-        default: null,
+import { onBeforeUnmount, watchEffect, onMounted, nextTick, defineComponent, ref, getCurrentInstance, computed, watch } from 'vue';
+import xbsjScale from '/@/components/earthMap/components/xbsjScale.vue';
+import XbsjSelect from '/@/components/earthMap/components/XbsjSelect.vue';
+import XbsjColorButton from '/@/components/earthMap/components/XbsjColorButton.vue';
+import upload from '/@/components/earthMap/components/upload.vue';
+import Window from '@/components/earthMap/components/Window.vue';
+import { useUserStore } from '/@/store/modules/user';
+import { defHttp } from '/@/utils/http/axios';
+// import mitt from '/@/utils/mitt';
+import $mitt from '@/utils/earthMap/mitt';
+import { useMessage } from '/@/hooks/web/useMessage';
+import $ from 'jquery';
+import { addModel, addPin, addViewShed, addViewShedRadar } from '@/utils/earthMap/earthObj';
+export default defineComponent({
+  name: 'AddModelWin',
+  components: { xbsjScale, XbsjSelect, upload, XbsjColorButton, Window },
+  props: {
+    title: {
+      type: String,
+      default: '创建元素',
+    },
+    setLabelStatus: {
+      type: Function,
+      default: null,
+    },
+    czmObject: {
+      type: Object,
+      default: null,
+    },
+    node: {
+      type: Object,
+      default: null,
+    },
+    type: {
+      type: String,
+      default: '',
+    },
+    lineId: {
+      type: String,
+      default: '',
+    },
+    areaCode: {
+      type: String,
+      default: '',
+    },
+    areaByNodeId: {
+      type: Map,
+      default: null,
+    },
+    setIconByRef: {
+      type: Function,
+      default: null,
+    },
+    el: {
+      type: Object,
+      default: null,
+    },
+    eidtId: {
+      type: String,
+      default: '',
+    },
+  },
+  setup(props, ctx) {
+    const { proxy }: any = getCurrentInstance();
+    const { createMessage } = useMessage();
+    // const $mitt = mitt();
+    const userStore = useUserStore();
+
+    let radarColor = ref({ rgba: { r: 0, g: 255, b: 0, a: 0.5 } });
+    let radarRange = ref(0);
+    let radarRadius = ref(0);
+    //法线偏移角度
+    let radarShifting = ref(0);
+    //雷达扫描编辑、取消使用
+    let radarOldObj: any = ref({});
+    let radarUrl = ref({
+      list: '/military/RadarConfig/list',
+      add: '/military/RadarConfig/add',
+      edit: '/military/RadarConfig/edit',
+      delete: '/military/RadarConfig/delete',
+    });
+
+    let heightCoefficient = ref(0.5); //  高
+    let widthCoefficient = ref(0.3); //  宽
+    let currentModel: any = ref(null); // 当前模型
+    let isUpdateModel = ref(false); // 是否有更新模型
+    let modelSelectList = ref([
+      {
+        id: 'qy',
+        name: '区域',
+        type: 'qy',
+        value: 'qy',
       },
-      setIconByRef: {
-        type: Function,
-        default: null,
+      {
+        id: 'jkd',
+        name: '监控点',
+        type: 'jkd',
+        value: 'jkd',
       },
-      el: {
-        type: Object,
-        default: null,
+      {
+        id: 'wb',
+        name: '微波',
+        type: 'wb',
+        value: 'wb',
       },
-      eidtId: {
-        type: String,
-        default: '',
+      {
+        id: 'ld',
+        name: '雷达',
+        type: 'ld',
+        value: 'ld',
       },
-    },
-    setup(props, ctx) {
-      const { proxy }: any = getCurrentInstance();
-      // const $mitt = mitt();
-      const userStore = useUserStore();
+    ]); //模型类型列表
+    let selectModel: any = ref({ name: '请选择创建类型' }); // 选中模型类型
+    let name = ref(''); // 模型名称
+    let LngLatHeight = ref([0, 0, 0]); // 俯仰角度
+    let rotation = ref([0, 0, 0]); // 旋转角度
+    let scale = ref([1, 1, 1]); // 缩放
+    let creating = ref(false); // 是否跟随鼠标状态
+    let show = ref(false); // // 是否可见
+    let rotationEditing = ref(false); // 开启旋转辅助
+    let winVisible = ref(true); // 窗口显示或隐藏
+    let areaList = ref([]); // 区域列表
+    let previewImgUrl = ref(''); // 上传图片路径
+    let uploadFile = ref(null); // 上传图片文件
+    let selectArea: any = ref(null); // 选中区域
+    let submitObject: any = ref({}); // 提交对象
+    let isFristChangeMethod = ref(true);
+    let revert = ref(null); // 取消还原数据
+    let islands = ref([]); // 岛屿列表
+    let minimumPixelSize = ref(80); // 最大像素大小
+    let hostDeviceList = ref([]); // 主机设备列表
+    let selectHostDevice: any = ref(null);
+    let deviceNumList = ref([]); // 设备编码列表
+    let selectDeviceNum = ref(null); // 提交对象
+    let timer = ref(null); //定时器
+    // 设置上传次数
+    let uploadFileCount = ref(1);
+    //ref
+    let pinIconUpload = ref(); //定时器
 
-      let radarColor = ref({ rgba: { r: 0, g: 255, b: 0, a: 0.5 } });
-      let radarRange = ref(0);
-      let radarRadius = ref(0);
-      //法线偏移角度
-      let radarShifting = ref(0);
-      //雷达扫描编辑、取消使用
-      let radarOldObj: any = ref({});
-      let radarUrl = ref({
-        list: '/military/RadarConfig/list',
-        add: '/military/RadarConfig/add',
-        edit: '/military/RadarConfig/edit',
-        delete: '/military/RadarConfig/delete',
-      });
+    //computed
+    const width = computed(() => {
+      return window.outerWidth * widthCoefficient.value;
+    });
+    const height = computed(() => {
+      return window.outerHeight * heightCoefficient.value;
+    });
+    const top = computed(() => {
+      return window.outerHeight * ((1.0 - heightCoefficient.value - 0.15) / 2);
+    });
+    const left = computed(() => {
+      return (window.outerWidth * (1.0 - widthCoefficient.value)) / 2;
+    });
 
-      let heightCoefficient = ref(0.5); //  高
-      let widthCoefficient = ref(0.3); //  宽
-      let currentModel: any = ref(null); // 当前模型
-      let isUpdateModel = ref(false); // 是否有更新模型
-      let modelSelectList = ref([
-        {
-          id: 'qy',
-          name: '区域',
-          type: 'qy',
-          value: 'qy',
-        },
-        {
-          id: 'jkd',
-          name: '监控点',
-          type: 'jkd',
-          value: 'jkd',
-        },
-        {
-          id: 'wb',
-          name: '微波',
-          type: 'wb',
-          value: 'wb',
-        },
-        {
-          id: 'ld',
-          name: '雷达',
-          type: 'ld',
-          value: 'ld',
-        },
-      ]); //模型类型列表
-      let selectModel: any = ref({ name: '请选择创建类型' }); // 选中模型类型
-      let name = ref(''); // 模型名称
-      let LngLatHeight = ref([0, 0, 0]); // 俯仰角度
-      let rotation = ref([0, 0, 0]); // 旋转角度
-      let scale = ref([1, 1, 1]); // 缩放
-      let creating = ref(false); // 是否跟随鼠标状态
-      let show = ref(false); // // 是否可见
-      let rotationEditing = ref(false); // 开启旋转辅助
-      let winVisible = ref(true); // 窗口显示或隐藏
-      let areaList = ref([]); // 区域列表
-      let previewImgUrl = ref(''); // 上传图片路径
-      let uploadFile = ref(null); // 上传图片文件
-      let selectArea: any = ref(null); // 选中区域
-      let submitObject: any = ref({}); // 提交对象
-      let isFristChangeMethod = ref(true);
-      let revert = ref(null); // 取消还原数据
-      let islands = ref([]); // 岛屿列表
-      let minimumPixelSize = ref(80); // 最大像素大小
-      let hostDeviceList = ref([]); // 主机设备列表
-      let selectHostDevice: any = ref(null);
-      let deviceNumList = ref([]); // 设备编码列表
-      let selectDeviceNum = ref(null); // 提交对象
-      let timer = ref(null); //定时器
-      // 设置上传次数
-      let uploadFileCount = ref(1);
-      //ref
-      let pinIconUpload = ref(); //定时器
+    //watch
+    // watch(radarColor,(newVal, oldVal)=>{
+    //   getRadarScan()
+    // })
+    // watch(radarRange,(newVal, oldVal)=>{
+    //   getRadarScan()
+    // })
+    // watch(radarRadius,(newVal, oldVal)=>{
+    //   getRadarScan()
+    // })
+    // watch(radarShifting,(newVal, oldVal)=>{
+    //   getRadarScan()
+    // })
+    //监听多个值
+    watch([radarColor, radarRange, radarRadius, radarShifting], () => {
+      getRadarScan();
+    });
 
-      //computed
-      const width = computed(() => {
-        return window.outerWidth * widthCoefficient.value;
-      });
-      const height = computed(() => {
-        return window.outerHeight * heightCoefficient.value;
-      });
-      const top = computed(() => {
-        return window.outerHeight * ((1.0 - heightCoefficient.value - 0.15) / 2);
-      });
-      const left = computed(() => {
-        return (window.outerWidth * (1.0 - widthCoefficient.value)) / 2;
-      });
+    watch(uploadFile, (newVal, oldVal) => {
+      // console.log("uploadFile-newVal",newVal);
 
-      //watch
-      // watch(radarColor,(newVal, oldVal)=>{
-      //   getRadarScan()
-      // })
-      // watch(radarRange,(newVal, oldVal)=>{
-      //   getRadarScan()
-      // })
-      // watch(radarRadius,(newVal, oldVal)=>{
-      //   getRadarScan()
-      // })
-      // watch(radarShifting,(newVal, oldVal)=>{
-      //   getRadarScan()
-      // })
-      //监听多个值
-      watch([radarColor, radarRange, radarRadius, radarShifting], () => {
-        getRadarScan();
+      // 模拟表单提交的对象
+      let formData = new FormData();
+      // 设置上传目录为temp
+      formData.append('biz', 'temp');
+      // 设置上传文件
+      formData.append('file', newVal);
+      // 进行上传等待响应
+      defHttp.post({ url: '/sys/common/upload', params: formData }, { isTransformResponse: false }).then((response) => {
+        // 响应并成功操作
+        if (response.success) {
+          // 设置图片显示地址
+          let imageUrl = '/dt/sys/common/static/' + response.message;
+          // 设置img dom元素src预览地址
+          previewImgUrl.value = imageUrl;
+          // 设置地图中pin的图片地址
+          currentModel.value.imageUrl = imageUrl;
+          if (!isUpdateModel.value && uploadFileCount.value == 1) {
+            // 设置pin展示
+            show.value = true;
+            // 设置为编辑状态
+            creating.value = true;
+            // 上传次数变成2
+            uploadFileCount.value++;
+          }
+        }
       });
+    });
 
-      watch(uploadFile, (newVal, oldVal) => {
-        // console.log("uploadFile-newVal",newVal);
+    // watchEffect(()=>{
+    //   console.log('uploadFile.value',uploadFile.value);
+    // })
 
-        // 模拟表单提交的对象
-        let formData = new FormData();
-        // 设置上传目录为temp
-        formData.append('biz', 'temp');
-        // 设置上传文件
-        formData.append('file', newVal);
-        // 进行上传等待响应
-        defHttp.post({ url: '/sys/common/upload', params: formData }, { isTransformResponse: false }).then((response) => {
-          // 响应并成功操作
-          if (response.success) {
-            // 设置图片显示地址
-            let imageUrl = '/dt/sys/common/static/' + response.message;
-            // 设置img dom元素src预览地址
-            previewImgUrl.value = imageUrl;
-            // 设置地图中pin的图片地址
-            currentModel.value.imageUrl = imageUrl;
-            if (!isUpdateModel.value && uploadFileCount.value == 1) {
-              // 设置pin展示
-              show.value = true;
-              // 设置为编辑状态
-              creating.value = true;
-              // 上传次数变成2
-              uploadFileCount.value++;
+    watch(selectModel, (newVal, oldVal) => {
+      // console.log("selectModel",newVal);
+      // debugger
+      /**
+       * 防止重复打开drawShape组件，所以每次变更选项时，都进行关闭操作
+       */
+      $mitt.emit('drawShapeShow', { show: false })
+      // 更新状态，什么也不做
+      if (isUpdateModel.value) {
+        return;
+      }
+      // 选中类型空了，什么也不做
+      if (!selectModel.value.value) {
+        return;
+      }
+      // 当前对象不为空时，释放掉这个对象，并清理上传图片
+      if (currentModel.value) {
+        currentModel.value.destroy();
+        currentModel.value = null;
+        pinIconUpload.value?.clear();
+      }
+      if (newVal.value == 'wb' || newVal.value == 'ld') {
+        getHostDeviceList();
+      }
+      // 登录人部门信息
+      // let orgCode = Vue.ls.get(USER_INFO).orgCode
+      let orgCode: any = userStore.userInfo?.orgCode;
+      if (orgCode.length <= 3) {
+        orgCode = undefined;
+      }
+      // this 别称
+      // const that = this
+      // 在取得区域数据后，进行模型的创建操作
+      getAreas(orgCode)
+        .then(() => {
+          try {
+            if (selectModel.value.value === 'jkd') {
+              // console.log("jkd");
+              currentModel.value = addModel();
+              // console.log(" currentModel.value", currentModel.value);
+            } else if (selectModel.value.value === 'qy') {
+
+              currentModel.value = addArea();
+              // currentModel.value = addPolyline();
+              // console.log(" currentModel.value", currentModel.value);
+            } else {
+              currentModel.value = addPin();
             }
+          } catch (e) {
+            // 无关紧要的语法错误，不影响运行
+            // console.log(that.currentModel)
+            // console.error(e)
           }
+        })
+        .catch((e) => {
+          // 提示用户加载数据出现了问题
+          // $mitt.emit('openNotification', '加载区域数据出错', 2, 'error', '50px')
+          $mitt.emit('openNotification', { msg: '加载区域数据出错', dt: 2, type: 'error', top: '50px' });
         });
-      });
+    });
 
-      // watchEffect(()=>{
-      //   console.log('uploadFile.value',uploadFile.value);
-      // })
-
-      watch(selectModel, (newVal, oldVal) => {
-        // console.log("selectModel",newVal);
-        // debugger
-        // 更新状态，什么也不做
-        if (isUpdateModel.value) {
-          return;
-        }
-        // 选中类型空了，什么也不做
-        if (!selectModel.value.value) {
-          return;
-        }
-        // 当前对象不为空时，释放掉这个对象，并清理上传图片
-        if (currentModel.value) {
-          currentModel.value.destroy();
-          currentModel.value = null;
-          pinIconUpload.value?.clear();
-        }
-        if (newVal.value == 'wb' || newVal.value == 'ld') {
-          getHostDeviceList();
-        }
-        // 登录人部门信息
-        // let orgCode = Vue.ls.get(USER_INFO).orgCode
-        let orgCode: any = userStore.userInfo?.orgCode;
-        if (orgCode.length <= 3) {
-          orgCode = undefined;
-        }
-        // this 别称
-        // const that = this
-        // 在取得区域数据后，进行模型的创建操作
-        getAreas(orgCode)
-          .then(() => {
+    onMounted(() => {
+      //监听关闭方法 关闭本组件
+      $mitt.on('windowCancel', cancel);
+      // debugger
+      // 传入属性
+      // const props = this.getBind()
+      // 当传入属性的更新对象为空时，什么也不做
+      if (!props.czmObject) {
+        return;
+      }
+      const areaCode = props.areaCode;
+      // 设置当前选中的元素，模拟用户操作，切换窗体元素
+      selectModel.value = { value: props.type };
+      // 设置当前状态为更新
+      isUpdateModel.value = props.czmObject ? true : false;
+      getHostDeviceList().then(() => {
+        // 获取到区域数据后在进行操作
+        // getAreas(Vue.ls.get(USER_INFO).orgCode).then(() => {
+        getAreas(userStore.userInfo?.orgCode).then(() => {
+          // 区域数据加载完后
+          nextTick(() => {
             try {
-              if (selectModel.value.value === 'jkd') {
-                // console.log("jkd");
-                currentModel.value = addModel();
-                // console.log(" currentModel.value", currentModel.value);
-              } else if (selectModel.value.value === 'qy') {
-                currentModel.value = addPolyline();
-                // console.log(" currentModel.value", currentModel.value);
-              } else {
-                currentModel.value = addPin();
-              }
+              // 记录回溯数据
+              revert.value = props.czmObject.toAllJSON();
+              // 设置当前模型为传入模型
+              currentModel.value = props.czmObject;
+              // console.log('currentModel.value',currentModel.value);
             } catch (e) {
-              // 无关紧要的语法错误，不影响运行
-              // console.log(that.currentModel)
-              // console.error(e)
+              // 抛出异常 因为源码proxy 没有set方法没有返回true
+              // 设置当前选中的元素，模拟用户操作，切换窗体元素
+              selectModel.value = { value: props.type };
             }
-          })
-          .catch((e) => {
-            // 提示用户加载数据出现了问题
-            // $mitt.emit('openNotification', '加载区域数据出错', 2, 'error', '50px')
-            $mitt.emit('openNotification', { msg: '加载区域数据出错', dt: 2, type: 'error', top: '50px' });
-          });
-      });
-
-      onMounted(() => {
-        //监听关闭方法 关闭本组件
-        $mitt.on('windowCancel', cancel);
-        // debugger
-        // 传入属性
-        // const props = this.getBind()
-        // 当传入属性的更新对象为空时，什么也不做
-        if (!props.czmObject) {
-          return;
-        }
-        const areaCode = props.areaCode;
-        // 设置当前选中的元素，模拟用户操作，切换窗体元素
-        selectModel.value = { value: props.type };
-        // 设置当前状态为更新
-        isUpdateModel.value = props.czmObject ? true : false;
-        getHostDeviceList().then(() => {
-          // 获取到区域数据后在进行操作
-          // getAreas(Vue.ls.get(USER_INFO).orgCode).then(() => {
-          getAreas(userStore.userInfo?.orgCode).then(() => {
-            // 区域数据加载完后
-            nextTick(() => {
-              try {
-                // 记录回溯数据
-                revert.value = props.czmObject.toAllJSON();
-                // 设置当前模型为传入模型
-                currentModel.value = props.czmObject;
-                // console.log('currentModel.value',currentModel.value);
-              } catch (e) {
-                // 抛出异常 因为源码proxy 没有set方法没有返回true
-                // 设置当前选中的元素，模拟用户操作，切换窗体元素
-                selectModel.value = { value: props.type };
-              }
-              // 设置页面加载后的初始数据
-              updateValueSet(props);
-            });
+            // 设置页面加载后的初始数据
+            updateValueSet(props);
           });
         });
       });
+    });
 
-      onBeforeUnmount(() => {
-        //组件销毁前 关闭mitt
-        $mitt.off('windowCancel');
-      });
-      // 取消方法
-      function cancel() {
-        if (isUpdateModel.value) {
-          // 调用更新时的取消
-          updateClose();
-        } else {
-          // 调用创建时的取消
-          close();
-        }
+    onBeforeUnmount(() => {
+      //组件销毁前 关闭mitt
+      $mitt.emit('drawShapeShow', { show: false })
+      $mitt.off('windowCancel');
+      $mitt.off('addAreaFinished');
 
-        //通过父组件v-if 关闭本组件
-        proxy.$parent.addModelWinShow = false;
+    });
+    // 取消方法
+    function cancel() {
+      if (isUpdateModel.value) {
+        // 调用更新时的取消
+        updateClose();
+      } else {
+        // 调用创建时的取消
+        close();
       }
 
-      // 创建时的取消方法
-      function close() {
-        // 模型不为空时，消耗模型
-        if (currentModel.value) {
-          if (currentModel.value.addViewShedReturn) {
-            window.$earth.czm.viewer.entities.remove(currentModel.value.addViewShedReturn);
-          }
-          currentModel.value.editing = false;
-          currentModel.value.destroy();
+      //通过父组件v-if 关闭本组件
+      proxy.$parent.addModelWinShow = false;
+    }
+
+    // 创建时的取消方法
+    function close() {
+      // 模型不为空时，消耗模型
+      if (currentModel.value) {
+        if (currentModel.value.addViewShedReturn) {
+          window.$earth.czm.viewer.entities.remove(currentModel.value.addViewShedReturn);
         }
+        currentModel.value.editing = false;
+        currentModel.value.destroy();
       }
+    }
 
-      // 更新时取消
-      function updateClose() {
-        // 还原数据
-        if (currentModel.value) {
-          currentModel.value.xbsjFromJSON(revert.value);
-          if (Object.keys(radarOldObj.value).length > 0) {
-            radarColor.value.rgba = radarOldObj.value.color;
-            radarRadius.value = radarOldObj.value.radarRadius;
-            radarRange.value = radarOldObj.value.radarRange;
-            radarShifting.value = radarOldObj.value.radarShifting;
-          }
-          currentModel.value.editing = false;
-          currentModel.value.positionEditing = false;
-          currentModel.value.rotationEditing = false;
+    // 更新时取消
+    function updateClose() {
+      // 还原数据
+      if (currentModel.value) {
+        currentModel.value.xbsjFromJSON(revert.value);
+        if (Object.keys(radarOldObj.value).length > 0) {
+          radarColor.value.rgba = radarOldObj.value.color;
+          radarRadius.value = radarOldObj.value.radarRadius;
+          radarRange.value = radarOldObj.value.radarRange;
+          radarShifting.value = radarOldObj.value.radarShifting;
         }
+        currentModel.value.editing = false;
+        currentModel.value.positionEditing = false;
+        currentModel.value.rotationEditing = false;
       }
+    }
 
-      function finish() {
-        if (currentModel.value) {
-          // 释放当前模型的引用
-          currentModel.value.rotationEditing = false;
-          currentModel.value.positionEditing = false;
-          currentModel.value = null;
-        }
-        //通过父组件v-if 关闭本组件
-        proxy.$parent.addModelWinShow = false;
+    function finish() {
+      if (currentModel.value) {
+        // 释放当前模型的引用
+        currentModel.value.rotationEditing = false;
+        currentModel.value.positionEditing = false;
+        currentModel.value = null;
       }
-      /**
-       * 确认方法
-       */
-      function ok() {
-        // debugger
-        // $mitt.off('windowCancel')
-        // console.log('selectArea.value',selectArea.value);
-        // console.log('selectArea.value.id',selectArea.value.id);
-        // console.log('currentModel.value',currentModel.value);
+      //通过父组件v-if 关闭本组件
+      proxy.$parent.addModelWinShow = false;
+    }
+    /**
+     * 确认方法
+     */
+    function ok() {
+      // debugger
+      // $mitt.off('windowCancel')
+      // console.log('selectArea.value',selectArea.value);
+      // console.log('selectArea.value.id',selectArea.value.id);
+      // console.log('currentModel.value',currentModel.value);
 
-        // 不允许选择模型为空
-        if (!selectModel.value.value) {
-          return;
-        } else if (name.value == null || name.value.length <= 0) {
-          // 名称效验
-          // $mitt.emit('openNotification', '需要先填写名称', 2, 'warning')
-          $mitt.emit('openNotification', { msg: '需要先填写名称', dt: 2, type: 'warning' });
+      // 不允许选择模型为空
+      if (!selectModel.value.value) {
+        return;
+      } else if (name.value == null || name.value.length <= 0) {
+        // 名称效验
+        // $mitt.emit('openNotification', '需要先填写名称', 2, 'warning')
+        $mitt.emit('openNotification', { msg: '需要先填写名称', dt: 2, type: 'warning' });
 
-          return;
-        } else if (currentModel.value.xbsjType == 'Pin' && currentModel.value.imageUrl.length <= 0) {
-          // pin类型图片效验
-          // $mitt.emit('openNotification', '需要先上传图片', 2, 'warning')
-          $mitt.emit('openNotification', { msg: '需要先上传图片', dt: 2, type: 'warning' });
-          return;
-        } else if (currentModel.value.xbsjType == 'Pin' && !selectHostDevice.value) {
-          // $mitt.emit('openNotification', '主机设备不能为空', 2, 'warning')
-          $mitt.emit('openNotification', { msg: '主机设备不能为空', dt: 2, type: 'warning' });
-          return;
-        } else if (currentModel.value.xbsjType == 'Pin' && !selectDeviceNum.value) {
-          // $mitt.emit('openNotification', '设备编码不能为空', 2, 'warning')
-          $mitt.emit('openNotification', { msg: '设备编码不能为空', dt: 2, type: 'warning' });
-          return;
-        }
-        //***************************************************
-        else if (currentModel.value.xbsjType !== 'Polyline' && (selectArea.value == null || selectArea.value.id <= 0)) {
-          // 非区域类型，区域效验
-          // $mitt.emit('openNotification', '需要先选择区域', 2, 'warning')
-          $mitt.emit('openNotification', { msg: '需要先选择区域', dt: 2, type: 'warning' });
-          return;
-        }
-        currentModel.value.editing = false;
-        // 提交数据
-        submitData();
+        return;
+      } else if (currentModel.value.xbsjType == 'Pin' && currentModel.value.imageUrl.length <= 0) {
+        // pin类型图片效验
+        // $mitt.emit('openNotification', '需要先上传图片', 2, 'warning')
+        $mitt.emit('openNotification', { msg: '需要先上传图片', dt: 2, type: 'warning' });
+        return;
+      } else if (currentModel.value.xbsjType == 'Pin' && !selectHostDevice.value) {
+        // $mitt.emit('openNotification', '主机设备不能为空', 2, 'warning')
+        $mitt.emit('openNotification', { msg: '主机设备不能为空', dt: 2, type: 'warning' });
+        return;
+      } else if (currentModel.value.xbsjType == 'Pin' && !selectDeviceNum.value) {
+        // $mitt.emit('openNotification', '设备编码不能为空', 2, 'warning')
+        $mitt.emit('openNotification', { msg: '设备编码不能为空', dt: 2, type: 'warning' });
+        return;
       }
-      // 绑定模型属性
-      function bindModelProps(model) {
-        // 绑定位移
-        model.disposers.push(window.XE.MVVM.bindPosition(proxy, 'LngLatHeight', model, 'xbsjPosition'));
-        // 绑定角度
-        model.disposers.push(window.XE.MVVM.bindRotation(proxy, 'rotation', model, 'xbsjRotation'));
-        // 绑定缩放
-        model.disposers.push(window.XE.MVVM.bind(proxy, 'scale', model, 'xbsjScale'));
-        // 绑定编辑状态
-        model.disposers.push(window.XE.MVVM.bind(proxy, 'creating', model, 'creating'));
-        // 绑定旋转状态
-        model.disposers.push(window.XE.MVVM.bind(proxy, 'rotationEditing', model, 'rotationEditing'));
-        // 绑定最小像素
-        model.disposers.push(window.XE.MVVM.bind(proxy, 'minimumPixelSize', model, 'minimumPixelSize'));
+      //***************************************************
+      else if (currentModel.value.xbsjType !== 'Polyline' && (selectArea.value == null || selectArea.value.id <= 0)) {
+        // 非区域类型，区域效验
+        // $mitt.emit('openNotification', '需要先选择区域', 2, 'warning')
+        $mitt.emit('openNotification', { msg: '需要先选择区域', dt: 2, type: 'warning' });
+        return;
       }
+      currentModel.value.editing = false;
+      // 提交数据
+      submitData();
+    }
+    // 绑定模型属性
+    function bindModelProps(model) {
+      // 绑定位移
+      model.disposers.push(window.XE.MVVM.bindPosition(proxy, 'LngLatHeight', model, 'xbsjPosition'));
+      // 绑定角度
+      model.disposers.push(window.XE.MVVM.bindRotation(proxy, 'rotation', model, 'xbsjRotation'));
+      // 绑定缩放
+      model.disposers.push(window.XE.MVVM.bind(proxy, 'scale', model, 'xbsjScale'));
+      // 绑定编辑状态
+      model.disposers.push(window.XE.MVVM.bind(proxy, 'creating', model, 'creating'));
+      // 绑定旋转状态
+      model.disposers.push(window.XE.MVVM.bind(proxy, 'rotationEditing', model, 'rotationEditing'));
+      // 绑定最小像素
+      model.disposers.push(window.XE.MVVM.bind(proxy, 'minimumPixelSize', model, 'minimumPixelSize'));
+    }
 
-      // 添加模型
-      function addModel() {
-        // debugger
-        // 创建模型
-        const model = new window.XE.Obj.Model(window.$earth);
-        // 设置视距
-        model.distanceDisplayCondition = [1, 30000];
-        // 设置模型地址
-        model.url = window._CONFIG['domianURL'] + '/sys/common/static/dxgG.gltf';
-        // 设置缩放倍数
-        model.scale = 0.03;
-        // model.creating = true
-        // 绑定属性
-        bindModelProps(model);
-        minimumPixelSize.value = 80;
-        // 切换为创建状态
-        modelState('creating');
-        // model.flyTo()
-        return model;
-      }
+    // 添加模型
+    function addModel() {
+      // debugger
+      // 创建模型
+      const model = new window.XE.Obj.Model(window.$earth);
+      // 设置视距
+      model.distanceDisplayCondition = [1, 30000];
+      // 设置模型地址
+      model.url = window._CONFIG['domianURL'] + '/sys/common/static/dxgG.gltf';
+      // 设置缩放倍数
+      model.scale = 0.03;
+      // model.creating = true
+      // 绑定属性
+      bindModelProps(model);
+      minimumPixelSize.value = 80;
+      // 切换为创建状态
+      modelState('creating');
+      // model.flyTo()
+      return model;
+    }
 
-      function bindPinProps(pin) {
-        pin.disposers.push(window.XE.MVVM.bindPosition(proxy, 'LngLatHeight', pin, 'position'));
-        pin.disposers.push(window.XE.MVVM.bind(proxy, 'creating', pin, 'creating'));
-        pin.disposers.push(window.XE.MVVM.bind(proxy, 'show', pin, 'show'));
-      }
+    function bindPinProps(pin) {
+      pin.disposers.push(window.XE.MVVM.bindPosition(proxy, 'LngLatHeight', pin, 'position'));
+      pin.disposers.push(window.XE.MVVM.bind(proxy, 'creating', pin, 'creating'));
+      pin.disposers.push(window.XE.MVVM.bind(proxy, 'show', pin, 'show'));
+    }
 
-      // 添加pin
-      function addPin() {
-        // 创建pin
-        const pin = new window.XE.Obj.Pin(window.$earth);
-        // 设置缩放
-        pin.scale = 0.8;
-        // 设置url
-        pin.imageUrl = '';
-        // 设置最大可视距离
-        pin.far = 1073741824;
-        // 设置显示文字样式
-        pin.pinBuilder.extTextFont = '30px 楷体';
-        pin.pinBuilder.extTextPixelOffset = [30, -20];
-        pin.pinBuilder.fillColor = [1, 1, 1, 0.9];
-        pin.pinBuilder.outlineColor = [0, 0, 0, 0.9];
-        // 绑定属性
-        bindPinProps(pin);
-        // 设置为不可见
-        show.value = false;
-        // 刷新窗体
-        modelState('creating');
-        modelState('creating');
-        return pin;
-      }
+    // 添加pin
+    function addPin() {
+      // 创建pin
+      const pin = new window.XE.Obj.Pin(window.$earth);
+      // 设置缩放
+      pin.scale = 0.8;
+      // 设置url
+      pin.imageUrl = '';
+      // 设置最大可视距离
+      pin.far = 1073741824;
+      // 设置显示文字样式
+      pin.pinBuilder.extTextFont = '30px 楷体';
+      pin.pinBuilder.extTextPixelOffset = [30, -20];
+      pin.pinBuilder.fillColor = [1, 1, 1, 0.9];
+      pin.pinBuilder.outlineColor = [0, 0, 0, 0.9];
+      // 绑定属性
+      bindPinProps(pin);
+      // 设置为不可见
+      show.value = false;
+      // 刷新窗体
+      modelState('creating');
+      modelState('creating');
+      return pin;
+    }
+
+    // 创建区域
+    /**
+     * @abstract 需要调用 drawShape组件 进行绘图，提取当中的坐标点position
+     *  处理完数据再使用 addPolyline方法 window.XE.Obj.Polyline 创建线段
+     * 
+     *  @abstract 
+     *   $mitt.emit('drawShapeShow') 打开drawShape组件显示
+     * @abstract 
+     *   $mitt.emit('addAreaFinished') 接受传回来的临时图形
+     */
+    function addArea() {
 
+      $mitt.emit('drawShapeShow', { show: true, title: '创建区域工具', from: 'addArea' })
+      $mitt.on("addAreaFinished", (t: any) => {
+        console.log("addAreaFinished", t);
+        //t 为drawShape传过来的临时图形
+        t.creating = true;
+        // 监控t数据，完成创建后调用后续方法
+        window.XE.MVVM.watch(t, 'creating', (n: any) => {
+          console.log("creating", n);
+          if (n == false) {
+            //面
+            let positions: any = []
+            if (t._polygon) {
+              positions = t._polygon._polyline.positions
+            }
+            //线
+            else if (t._polyline) {
+              positions = t._polyline.positions
+            }
+            else {
+              positions = t.positions
+              // console.error("图形错误");
+            }
+            //销毁临时图形
+            t.destroy()
+            /**
+             * 控制时序，处理完数据再调用方法  addPolyline
+             * 否则会出现在数据滞后在图形创建时，导致数据错误
+             * 
+            */
+            nextTick(() => { addPolyline(positions); })
+          }
+        })
+      })
+
+    }
+    /**
+     * @params 需要调用 addArea 方法进行绘图，获取坐标点position
+     */
+    function addPolyline(positions: any = null) {
+      // 关闭此窗体
+      cancel();
       // 创建区域
-      function addPolyline() {
-        // 关闭此窗体
-        cancel();
-        // 创建区域
-        const currentModel = new window.XE.Obj.Polyline(window.$earth);
-        // 获取地图ui对象
-        const earthUI = window.$uia;
-        // 打开一个区域编辑ui窗体
-        earthUI.showPropertyWindow(currentModel);
-        nextTick(() => {
-          // 主要ui窗口
-          const mainUI = earthUI._vm.$refs.mainUI;
-          // 所有打开的ui窗口Ref值
-          const windowsAttrList = Object.keys(mainUI.$refs);
-          // 寻找当前窗体的工具对象
-          const modelToolKey = windowsAttrList.filter((f) => f.indexOf(currentModel.guid) > -1)[0];
-          const modelTool = mainUI.$refs[modelToolKey][0];
-          // console.log("modelTool",modelTool);
+      const currentModel = new window.XE.Obj.Polyline(window.$earth);
+      // 设置配置参数
+      const objConfig = {
+        positions: positions,
+      }
+      // 插入数据
+      currentModel.xbsjFromJSON(objConfig);
+      console.log("currentModel", currentModel);
+      // 获取地图ui对象
+      const earthUI = window.$uia;
+      // 打开一个区域编辑ui窗体
+      earthUI.showPropertyWindow(currentModel);
+      nextTick(() => {
+        // 主要ui窗口
+        const mainUI = earthUI._vm.$refs.mainUI;
+        // 所有打开的ui窗口Ref值
+        const windowsAttrList = Object.keys(mainUI.$refs);
+        // 寻找当前窗体的工具对象
+        const modelToolKey = windowsAttrList.filter((f) => f.indexOf(currentModel.guid) > -1)[0];
+        const modelTool = mainUI.$refs[modelToolKey][0];
+        // console.log("modelTool",modelTool);
 
-          // 当前窗体的元素
-          const el = modelTool.$el;
-          // this.cloneEl(el)
-          //样式
-          el.children[2].style.padding = '0px';
-          el.children[2].style.transition = 'none';
-          // 取消按钮元素
-          const cancelBtn = el.children[3].children[0];
-          // 确认按钮元素
-          const okBtn = el.children[3].children[1];
-          // 设置确认按钮点击事件
-          okBtn.onclick = function () {
-            $mitt.emit('windowCancel');
-            // 提交对象
-            const submitData: any = {};
-            // 路径为空，无法提交
-            const poistions = currentModel.positions;
-            if (poistions.length <= 0) {
-              // $mitt.emit('openNotification', '路径为空，无法创建', 2, 'warning')
-              $mitt.emit('openNotification', { msg: '路径为空，无法创建', dt: 2, type: 'warning' });
+        // 当前窗体的元素
+        const el = modelTool.$el;
+        // this.cloneEl(el)
+        //样式
+        el.children[2].style.padding = '0px';
+        el.children[2].style.transition = 'none';
+        // 取消按钮元素
+        const cancelBtn = el.children[3].children[0];
+        // 确认按钮元素
+        const okBtn = el.children[3].children[1];
+        // 设置确认按钮点击事件
+        okBtn.onclick = function () {
+          $mitt.emit('windowCancel');
+          // 提交对象
+          const submitData: any = {};
+          // 路径为空，无法提交
+          const poistions = currentModel.positions;
+          if (poistions.length <= 0) {
+            // $mitt.emit('openNotification', '路径为空，无法创建', 2, 'warning')
+            $mitt.emit('openNotification', { msg: '路径为空，无法创建', dt: 2, type: 'warning' });
 
-              return;
-            }
-            // 模型名称
-            submitData.name = currentModel.name;
-            // 线段编码
-            submitData.lineCode = currentModel.guid;
-            // 首尾相连属性
-            submitData.isLoop = Number(currentModel.loop);
-            // 深度检查
-            submitData.isDepthCheck = Number(currentModel.depthTest);
-            // 宽度
-            submitData.width = currentModel.width;
-            // 插值方式
-            submitData.interpolation = currentModel.arcType;
-            // 路径数组
-            submitData.positions = JSON.stringify(poistions);
-            // 材质类型
-            switch (currentModel.material.type) {
-              // 实线
-              case 'XbsjColorMaterial':
-                // 实线材质0
-                submitData.materialType = 0;
-                // 线段颜色
-                submitData.color = JSON.stringify(currentModel.material.XbsjColorMaterial.color);
-                // 以下为没有属性，所以赋予默认值
-                submitData.intervalColor = null;
-                submitData.dashLength = 0;
-                submitData.dashStyle = 0;
-                break;
-              // 虚线
-              case 'XbsjPolylineDashMaterial':
-                // 虚线材质1
-                submitData.materialType = 1;
-                // 线段颜色
-                submitData.color = JSON.stringify(currentModel.material.XbsjPolylineDashMaterial.color);
-                // 间隔颜色
-                submitData.intervalColor = JSON.stringify(currentModel.material.XbsjPolylineDashMaterial.gapColor);
-                // 虚线长度
-                submitData.dashLength = currentModel.material.XbsjPolylineDashMaterial.dashLength;
-                // 虚线样式
-                submitData.dashStyle = currentModel.material.XbsjPolylineDashMaterial.dashPattern;
-                break;
-              // 箭头线
-              case 'XbsjPolylineArrowMaterial':
-                // 箭头线2
-                submitData.materialType = 2;
-                // 线段颜色
-                submitData.color = JSON.stringify(currentModel.material.XbsjPolylineArrowMaterial.color);
-                // 以下为没有的属性
-                submitData.intervalColor = null;
-                submitData.dashLength = 0;
-                submitData.dashStyle = 0;
-                break;
+            return;
+          }
+          // 模型名称
+          submitData.name = currentModel.name;
+          // 线段编码
+          submitData.lineCode = currentModel.guid;
+          // 首尾相连属性
+          submitData.isLoop = Number(currentModel.loop);
+          // 深度检查
+          submitData.isDepthCheck = Number(currentModel.depthTest);
+          // 宽度
+          submitData.width = currentModel.width;
+          // 插值方式
+          submitData.interpolation = currentModel.arcType;
+          // 路径数组
+          submitData.positions = JSON.stringify(poistions);
+          // 材质类型
+          switch (currentModel.material.type) {
+            // 实线
+            case 'XbsjColorMaterial':
+              // 实线材质0
+              submitData.materialType = 0;
+              // 线段颜色
+              submitData.color = JSON.stringify(currentModel.material.XbsjColorMaterial.color);
+              // 以下为没有属性，所以赋予默认值
+              submitData.intervalColor = null;
+              submitData.dashLength = 0;
+              submitData.dashStyle = 0;
+              break;
+            // 虚线
+            case 'XbsjPolylineDashMaterial':
+              // 虚线材质1
+              submitData.materialType = 1;
+              // 线段颜色
+              submitData.color = JSON.stringify(currentModel.material.XbsjPolylineDashMaterial.color);
+              // 间隔颜色
+              submitData.intervalColor = JSON.stringify(currentModel.material.XbsjPolylineDashMaterial.gapColor);
+              // 虚线长度
+              submitData.dashLength = currentModel.material.XbsjPolylineDashMaterial.dashLength;
+              // 虚线样式
+              submitData.dashStyle = currentModel.material.XbsjPolylineDashMaterial.dashPattern;
+              break;
+            // 箭头线
+            case 'XbsjPolylineArrowMaterial':
+              // 箭头线2
+              submitData.materialType = 2;
+              // 线段颜色
+              submitData.color = JSON.stringify(currentModel.material.XbsjPolylineArrowMaterial.color);
+              // 以下为没有的属性
+              submitData.intervalColor = null;
+              submitData.dashLength = 0;
+              submitData.dashStyle = 0;
+              break;
+            // 轨迹线
+            case 'XbsjODLineMaterial':
               // 轨迹线
-              case 'XbsjODLineMaterial':
-                // 轨迹线
-                submitData.materialType = 3;
-                // 线段颜色
-                submitData.color = JSON.stringify(currentModel.material.XbsjODLineMaterial.color);
-                // 没有的属性
-                submitData.intervalColor = null;
-                submitData.dashLength = 0;
-                submitData.dashStyle = 0;
-                // 循环周期
-                submitData.cycleFrame = currentModel.material.XbsjODLineMaterial.totoalFrameCount;
+              submitData.materialType = 3;
+              // 线段颜色
+              submitData.color = JSON.stringify(currentModel.material.XbsjODLineMaterial.color);
+              // 没有的属性
+              submitData.intervalColor = null;
+              submitData.dashLength = 0;
+              submitData.dashStyle = 0;
+              // 循环周期
+              submitData.cycleFrame = currentModel.material.XbsjODLineMaterial.totoalFrameCount;
 
-                // material.XbsjODLineMaterial = {}
-                // material.XbsjODLineMaterial.color = JSON.parse(data.color)
-                // material.XbsjODLineMaterial.totoalFrameCount = data.cycleFrame
-                break;
-            }
-            // 提交区域数据
+              // material.XbsjODLineMaterial = {}
+              // material.XbsjODLineMaterial.color = JSON.parse(data.color)
+              // material.XbsjODLineMaterial.totoalFrameCount = data.cycleFrame
+              break;
+          }
+          // 提交区域数据
 
-            defHttp
-              .post({ url: '/military/msMapLine/add', params: submitData }, { isTransformResponse: false })
-              .then((response) => {
-                // 成功后挂载节点到树中
-                if (response.success) {
-                  // 生成叶子节点
-                  const leaf = new window.XE.SceneTree.Leaf(currentModel);
-                  // 设置叶子节点标识
-                  leaf.ref = response.result;
-                  // 挂载上树
-                  window.$earth.sceneTree.root.children.push(leaf);
-                  // 隐藏叶子节点的dom节点
-                  nextTick(() => {
-                    $('#earthContainer>div>div>div:nth-child(5)')
-                      .children('div')
-                      .eq(1)
-                      .children()
-                      .eq(0)
-                      .children()
-                      .eq(0)
-                      .children()
-                      .each((index, element) => {
-                        if (index <= 1) {
-                          return;
-                        }
-                        const paddingLeft = $(element).children().eq(0).css('padding-left');
-                        if (paddingLeft === '10px') {
-                          $(element).css('display', 'none');
-                        }
-                      });
-                  });
-                  // 生成显示在树上的节点，此为虚假的节点，关联关系为ref一个为 node_ref 一个为ref
-                  const node = {
-                    ref: 'node_' + response.result,
-                    title: currentModel.name,
-                    expand: false,
-                    children: [
-                      {
-                        expand: false,
-                        title: '监控点位',
-                        ref: 'monitor_' + window.guid(),
-                        children: [],
-                      },
-                      {
-                        expand: false,
-                        title: '雷达点位',
-                        ref: 'ldList_' + window.guid(),
-                        children: [],
-                      },
-                      {
-                        expand: false,
-                        title: '微波点位',
-                        ref: 'wbList_' + window.guid(),
-                        children: [],
-                      },
-                    ],
-                  };
-                  // 挂载并显示到树上
-                  window.$earth.sceneTree.$refs.areas.children.push(node);
-                } else {
-                  throw '新增区域数据出错';
-                }
-              })
-              .catch((e) => {
-                // $mitt.emit('openNotification', '新增区域数据出错', 2, 'error', '50px')
-                $mitt.emit('openNotification', { msg: '新增区域数据出错', dt: 2, type: 'error', top: '50px' });
-              });
-          };
-          // 取消按钮
-          cancelBtn.onclick = function () {
-            $mitt.off('windowCancel');
-            // 消耗当前窗体的dom节点
-            el.remove();
-            // 消耗当前创建的对象
-            // console.log("currentModel",currentModel);
-            currentModel.destroy();
-          };
-        });
+          defHttp
+            .post({ url: '/military/msMapLine/add', params: submitData }, { isTransformResponse: false })
+            .then((response) => {
+              // 成功后挂载节点到树中
+              if (response.success) {
+                // 生成叶子节点
+                const leaf = new window.XE.SceneTree.Leaf(currentModel);
+                // 设置叶子节点标识
+                leaf.ref = response.result;
+                // 挂载上树
+                window.$earth.sceneTree.root.children.push(leaf);
+                // 隐藏叶子节点的dom节点
+                nextTick(() => {
+                  $('#earthContainer>div>div>div:nth-child(5)')
+                    .children('div')
+                    .eq(1)
+                    .children()
+                    .eq(0)
+                    .children()
+                    .eq(0)
+                    .children()
+                    .each((index, element) => {
+                      if (index <= 1) {
+                        return;
+                      }
+                      const paddingLeft = $(element).children().eq(0).css('padding-left');
+                      if (paddingLeft === '10px') {
+                        $(element).css('display', 'none');
+                      }
+                    });
+                });
+                // 生成显示在树上的节点，此为虚假的节点，关联关系为ref一个为 node_ref 一个为ref
+                const node = {
+                  ref: 'node_' + response.result,
+                  title: currentModel.name,
+                  expand: false,
+                  children: [
+                    {
+                      expand: false,
+                      title: '监控点位',
+                      ref: 'monitor_' + window.guid(),
+                      children: [],
+                    },
+                    {
+                      expand: false,
+                      title: '雷达点位',
+                      ref: 'ldList_' + window.guid(),
+                      children: [],
+                    },
+                    {
+                      expand: false,
+                      title: '微波点位',
+                      ref: 'wbList_' + window.guid(),
+                      children: [],
+                    },
+                  ],
+                };
+                // 挂载并显示到树上
+                window.$earth.sceneTree.$refs.areas.children.push(node);
+              } else {
+                throw '新增区域数据出错';
+              }
+            })
+            .catch((e) => {
+              // $mitt.emit('openNotification', '新增区域数据出错', 2, 'error', '50px')
+              $mitt.emit('openNotification', { msg: '新增区域数据出错', dt: 2, type: 'error', top: '50px' });
+            });
+        };
+        // 取消按钮
+        cancelBtn.onclick = function () {
+          $mitt.off('windowCancel');
+          // 消耗当前窗体的dom节点
+          el.remove();
+          // 消耗当前创建的对象
+          // console.log("currentModel",currentModel);
+          currentModel.destroy();
+        };
+      });
 
-        return currentModel;
-      }
+      return currentModel;
+    }
 
-      // 修改属性状态,取反
-      function modelState(propName) {
-        // propName.value = !propName.value
-        proxy[propName] = !proxy[propName];
+    // 修改属性状态,取反
+    function modelState(propName) {
+      // propName.value = !propName.value
+      proxy[propName] = !proxy[propName];
+    }
+    function submitModel() {
+      if (selectModel.value.value === 'jkd') {
       }
-      function submitModel() {
-        if (selectModel.value.value === 'jkd') {
-        }
+    }
+
+    // 名称修改的变化事件
+    function nameChange(model) {
+      if (model.xbsjType == 'Model') {
+      } else if (model.xbsjType == 'Pin') {
+        // pin类型的名称变化时修改显示的文字
+        model.pinBuilder.extText = name.value;
       }
+    }
 
-      // 名称修改的变化事件
-      function nameChange(model) {
-        if (model.xbsjType == 'Model') {
-        } else if (model.xbsjType == 'Pin') {
-          // pin类型的名称变化时修改显示的文字
-          model.pinBuilder.extText = name.value;
-        }
+    // 获取区域数据
+    function getAreas(area) {
+      const submitData: any = {
+        pageNo: 1,
+        pageSize: 999,
+      };
+      if (area) {
+        submitData.sysOrgCode = area + '*';
       }
+      return defHttp
+        .get({ url: '/military/msMapLine/list', params: submitData }, { isTransformResponse: false })
+        .then((response) => {
+          if (response.success) {
+            const labelAttr = selectModel.value.value == 'ld' ? 4 : 10; // 雷达字典编号4 微波字典编号10
+            //过滤区域（雷达为二级区域，其它为一级）
+            areaList.value = response.result.records.filter((item) => {
+              if (labelAttr == 4) {
+                return item.parentCode != null;
+              } else {
+                return item.parentCode == null;
+              }
+            });
+          } else {
+            throw '加载区域数据出错';
+          }
+        })
+        .catch((e) => {
+          console.error(e);
+        });
+    }
 
-      // 获取区域数据
-      function getAreas(area) {
-        const submitData: any = {
-          pageNo: 1,
-          pageSize: 999,
+    function getHostDeviceList() {
+      const url = '/military/msDeviceInfo/list';
+      const args = { pageNo: 1, pageSize: 999 };
+
+      return defHttp
+        .get({ url, params: args }, { isTransformResponse: false })
+        .then((reponse) => {
+          if (reponse.success) {
+            hostDeviceList.value = reponse.result.records;
+            // console.log(reponse)
+          }
+        })
+        .catch(() => {
+          throw '获取主机信息错误';
+        });
+    }
+
+    // 提交数据方法
+    function submitData() {
+      // 判断当前模型为模型所提交的数据
+      if (currentModel.value.xbsjType == 'Model') {
+        // 查找最后一个/所在位置
+        let startNum = currentModel.value.url.lastIndexOf('/') + 1;
+        // 获取出模型名称 监控点
+        let modelName = '';
+        if (startNum > -1) {
+          modelName = currentModel.value.url.substring(startNum, currentModel.value.url.length);
+        }
+        submitObject.value = {
+          id: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          sitecode: null,
+          sitename: name.value, // 名称
+          longitude: LngLatHeight.value[0], // x坐标
+          latitude: LngLatHeight.value[1], // y坐标
+          height: LngLatHeight.value[2], // z坐标
+          yaw: rotation.value[0], // x旋转
+          pitch: rotation.value[1], // y旋转
+          roll: rotation.value[2], // z旋转
+          lineId: selectArea.value.id ? selectArea.value.id : null, // 区域id
+          state: 1, // 数据状态
+          modelUrl: modelName, // 模型url地址
+          scale: currentModel.value.scale ? currentModel.value.scale : 1, // 整体缩放比例 默认1
+          xyzScale: scale.value.toString(), // xyz缩放比例
+          minimumPixelSize: minimumPixelSize.value, // 最小像素大小
         };
-        if (area) {
-          submitData.sysOrgCode = area + '*';
+        let request: any = null;
+        let url, // 提交地址
+          method = ''; // 提交方法类型
+        if (isUpdateModel.value) {
+          // 设置url为编辑地址，设置方法为put 设置记录id
+          url = '/military/camera/site/edit';
+          submitObject.value.id = currentModel.value.customProp;
+          request = defHttp.put({ url: url, params: submitObject.value }, { isTransformResponse: false });
+          // request = putAction(url, submitObject.value)
+        } else {
+          // 设置url为新增地址，设置方法为post
+          url = '/military/camera/site/add';
+          request = defHttp.post({ url: url, params: submitObject.value }, { isTransformResponse: false });
+          // request = postAction(url, this.submitObject)
         }
-        return defHttp
-          .get({ url: '/military/msMapLine/list', params: submitData }, { isTransformResponse: false })
-          .then((response) => {
+        // 提交数据，等待回复
+        request
+          .then(function (response) {
+            // 数据回复，并成功
             if (response.success) {
-              const labelAttr = selectModel.value.value == 'ld' ? 4 : 10; // 雷达字典编号4 微波字典编号10
-              //过滤区域（雷达为二级区域，其它为一级）
-              areaList.value = response.result.records.filter((item) => {
-                if (labelAttr == 4) {
-                  return item.parentCode != null;
-                } else {
-                  return item.parentCode == null;
-                }
-              });
-            } else {
-              throw '加载区域数据出错';
-            }
-          })
-          .catch((e) => {
-            console.error(e);
-          });
-      }
-
-      function getHostDeviceList() {
-        const url = '/military/msDeviceInfo/list';
-        const args = { pageNo: 1, pageSize: 999 };
-
-        return defHttp
-          .get({ url, params: args }, { isTransformResponse: false })
-          .then((reponse) => {
-            if (reponse.success) {
-              hostDeviceList.value = reponse.result.records;
-              // console.log(reponse)
+              // 设置显示节点的ref为 node_ref
+              const lineId = 'node_' + selectArea.value.id;
+              // 当前处于新增状态
+              if (!isUpdateModel.value) {
+                // 设置父节点
+                const parent = window.$earth.sceneTree.$refs[lineId].children[0];
+                // 真实的叶子节点
+                let node = new window.XE.SceneTree.Leaf(currentModel.value);
+                // 设置叶子节点的ref
+                node.ref = response.result;
+                // 将id存入customProp属性中
+                currentModel.value.customProp = response.result;
+                // 设置树中显示文
+                node.title = name.value;
+                // 设置节点的name，用来存储,区域id。name属性不在模型树上显示，故而只用作数据储存功能
+                node.name = selectArea.value.id;
+                // 将此节点添加到树中
+                window.$earth.sceneTree.root.children.push(node);
+                // 移除真实叶子节点显示的dom
+                nextTick(() => {
+                  $('#earthContainer>div>div>div:nth-child(5)')
+                    .children('div')
+                    .eq(1)
+                    .children()
+                    .eq(0)
+                    .children()
+                    .eq(0)
+                    .children()
+                    .each((index, element) => {
+                      if (index <= 1) {
+                        return;
+                      }
+                      const paddingLeft = $(element).children().eq(0).css('padding-left');
+                      if (paddingLeft === '10px') {
+                        $(element).css('display', 'none');
+                      }
+                    });
+                });
+                // 虚假的节点
+                const shamNode = {
+                  ref: 'node_' + response.result, // 设置节点ref
+                  title: name.value, // 设置节点显示文字
+                  expand: false,
+                  children: [],
+                };
+                // 树中加入并显示该节点
+                parent.children.push(shamNode);
+                // 提示用户
+                // $mitt.emit('openNotification', '添加成功！', 2, 'info')
+                $mitt.emit('openNotification', { msg: '添加成功！', dt: 2, type: 'info' });
+              } else {
+                //当前处于更新状态
+                // 获取更新的虚假节点
+                const shamNode = window.$earth.sceneTree.$refs['node_' + submitObject.value.id];
+                // 更新虚假节点的显示文字
+                shamNode.title = name.value;
+                // 设置name属性
+                currentModel.value.name = name.value;
+                moveNode('Model');
+                // 提示用户
+                // $mitt.emit('openNotification',{msg: '修改成功！', dt: 2, type:'info'} )
+                $mitt.emit('openNotification', { msg: '修改成功！', dt: 2, type: 'info' });
+              }
             }
           })
-          .catch(() => {
-            throw '获取主机信息错误';
+          .then(function () {
+            // 清空当前模型的引用
+            // currentModel.value = null
+            // 隐藏窗体
+            // winVisible.value = false
+            //通过父组件v-if 关闭本组件
+            // proxy.$parent.addModelWinShow = false
+            finish();
           });
-      }
-
-      // 提交数据方法
-      function submitData() {
-        // 判断当前模型为模型所提交的数据
-        if (currentModel.value.xbsjType == 'Model') {
-          // 查找最后一个/所在位置
-          let startNum = currentModel.value.url.lastIndexOf('/') + 1;
-          // 获取出模型名称 监控点
-          let modelName = '';
-          if (startNum > -1) {
-            modelName = currentModel.value.url.substring(startNum, currentModel.value.url.length);
-          }
-          submitObject.value = {
+      } else if (currentModel.value.xbsjType == 'Pin') {
+        const lastIndex = currentModel.value.imageUrl.lastIndexOf('/temp');
+        const ImgUrl = currentModel.value.imageUrl.substring(lastIndex + 1);
+        // 当前模型为Pin类型
+        // 更具创建时选择的模型类型判断，赋予模型类型标识
+        const labelAttr = selectModel.value.value == 'ld' ? 4 : 10; // 雷达字典编号4 微波字典编号10
+        submitObject.value = {
+          mapLabel: {
             id: null,
             createBy: null,
             createTime: null,
             updateBy: null,
             updateTime: null,
-            sitecode: null,
-            sitename: name.value, // 名称
-            longitude: LngLatHeight.value[0], // x坐标
-            latitude: LngLatHeight.value[1], // y坐标
-            height: LngLatHeight.value[2], // z坐标
-            yaw: rotation.value[0], // x旋转
-            pitch: rotation.value[1], // y旋转
-            roll: rotation.value[2], // z旋转
-            lineId: selectArea.value.id ? selectArea.value.id : null, // 区域id
-            state: 1, // 数据状态
-            modelUrl: modelName, // 模型url地址
-            scale: currentModel.value.scale ? currentModel.value.scale : 1, // 整体缩放比例 默认1
-            xyzScale: scale.value.toString(), // xyz缩放比例
-            minimumPixelSize: minimumPixelSize.value, // 最小像素大小
-          };
-          let request: any = null;
-          let url, // 提交地址
-            method = ''; // 提交方法类型
-          if (isUpdateModel.value) {
-            // 设置url为编辑地址，设置方法为put 设置记录id
-            url = '/military/camera/site/edit';
-            submitObject.value.id = currentModel.value.customProp;
-            request = defHttp.put({ url: url, params: submitObject.value }, { isTransformResponse: false });
-            // request = putAction(url, submitObject.value)
-          } else {
-            // 设置url为新增地址，设置方法为post
-            url = '/military/camera/site/add';
-            request = defHttp.post({ url: url, params: submitObject.value }, { isTransformResponse: false });
-            // request = postAction(url, this.submitObject)
-          }
-          // 提交数据，等待回复
-          request
-            .then(function (response) {
-              // 数据回复，并成功
-              if (response.success) {
-                // 设置显示节点的ref为 node_ref
-                const lineId = 'node_' + selectArea.value.id;
-                // 当前处于新增状态
-                if (!isUpdateModel.value) {
-                  // 设置父节点
-                  const parent = window.$earth.sceneTree.$refs[lineId].children[0];
-                  // 真实的叶子节点
-                  let node = new window.XE.SceneTree.Leaf(currentModel.value);
-                  // 设置叶子节点的ref
-                  node.ref = response.result;
-                  // 将id存入customProp属性中
-                  currentModel.value.customProp = response.result;
-                  // 设置树中显示文
-                  node.title = name.value;
-                  // 设置节点的name，用来存储,区域id。name属性不在模型树上显示，故而只用作数据储存功能
-                  node.name = selectArea.value.id;
-                  // 将此节点添加到树中
-                  window.$earth.sceneTree.root.children.push(node);
-                  // 移除真实叶子节点显示的dom
-                  nextTick(() => {
-                    $('#earthContainer>div>div>div:nth-child(5)')
-                      .children('div')
-                      .eq(1)
-                      .children()
-                      .eq(0)
-                      .children()
-                      .eq(0)
-                      .children()
-                      .each((index, element) => {
-                        if (index <= 1) {
-                          return;
-                        }
-                        const paddingLeft = $(element).children().eq(0).css('padding-left');
-                        if (paddingLeft === '10px') {
-                          $(element).css('display', 'none');
-                        }
-                      });
-                  });
-                  // 虚假的节点
-                  const shamNode = {
-                    ref: 'node_' + response.result, // 设置节点ref
-                    title: name.value, // 设置节点显示文字
-                    expand: false,
-                    children: [],
-                  };
-                  // 树中加入并显示该节点
-                  parent.children.push(shamNode);
+            sysOrgCode: null,
+            labelAttr: labelAttr, // 类型标识
+            labelName: name.value, // 名称
+            lineId: selectArea.value?.id ? selectArea.value.id : null, // 所属区域
+            labelLon: LngLatHeight.value[0], // x坐标
+            labelLat: LngLatHeight.value[1], // y坐标
+            labelHeight: LngLatHeight.value[2], // z坐标
+            labelImgUrl: ImgUrl, // 设置url
+            labelStatus: 1, // 启动:1 不启用 0
+            labelCode: selectDeviceNum.value,
+            cameraId: null,
+            cameraName: null,
+            pan: 0,
+            tile: 0,
+            zoom: 0,
+            placements: null,
+          },
+          deviceId: selectHostDevice.value.id,
+        };
+        // console.log("submitObject.value",submitObject.value);
+        // let radarObj = {
+        //             radarCode: selectDeviceNum.value,
+        //             elevation: Number(radarRange.value),
+        //             workingRadius: Number(radarRadius.value),
+        //             angularRadian: Number(radarShifting.value),
+        //             customProp: JSON.stringify({ color: radarColor.value.rgba })
+        //           }
+        //           console.log("radarObj",radarObj);
+        // debugger
+        let request: any = null;
+        let url1, // 提交地址
+          method1 = ''; // 提交方法类型
+        const { eidtId } = props;
+        if (isUpdateModel.value) {
+          // 设置url为编辑地址，设置方法为put 设置记录id
+          url1 = 'military/msMapLabel/editMapLabel';
+          submitObject.value.mapLabel.id = props.eidtId;
+          // console.log('props.eidtId,',props.eidtId);
+
+          request = defHttp.put({ url: url1, params: submitObject.value }, { isTransformResponse: false });
+          // request = putAction(url1, this.submitObject.value)
+        } else {
+          // 设置url为新增地址，设置方法为post
+          url1 = 'military/msMapLabel/addMapLabel';
+          request = defHttp.post({ url: url1, params: submitObject.value }, { isTransformResponse: false });
+          // request = postAction(url1, this.submitObject.value)
+        }
+        // const props = this.getBind()
+        const { setLabelStatus, setIconByRef, el } = props;
+        // 提交pin数据，等待响应
+        request
+          .then((response) => {
+            // 响应，并成功
+            if (response.success) {
+              // 记录虚假节点的Ref
+              const lineId = 'node_' + selectArea.value.id;
+              const ldLineId = 'nodeSecondary_' + selectArea.value.id;
+              // 创建状态下
+              if (!isUpdateModel.value) {
+                // 该区域的微波集合
+                const wbParent = window.$earth.sceneTree.$refs[lineId] && window.$earth.sceneTree.$refs[lineId].children[2];
+                // 该区域的雷达集合
+                const ldParent = window.$earth.sceneTree.$refs[ldLineId];
+                // 创建叶子节点
+                let node = new window.XE.SceneTree.Leaf(currentModel.value);
+                // 设置节点显示名称
+                node.title = name.value;
+                // 设置节点ref
+                node.ref = response.result;
+                // name属性用来记录区域id
+                node.name = submitObject.value.lineId;
+                // 用户属性用来记录标志类型
+                currentModel.value.customProp =
+                  '{"labelAttr":' + labelAttr + ',"labelCode":"' + selectDeviceNum.value + '","deviceId":"' + selectHostDevice.value.id + '"}';
+                setLabelStatus(selectHostDevice.value, selectDeviceNum.value, node.ref, 2).finally(() => {
+                  if (labelAttr == 4) {
+                    // 雷达新增一圆
+                    ldParent.children.push(node);
+                  } else {
+                    // 微波新增一圆
+                    wbParent.children.push(node);
+                  }
                   // 提示用户
                   // $mitt.emit('openNotification', '添加成功！', 2, 'info')
                   $mitt.emit('openNotification', { msg: '添加成功！', dt: 2, type: 'info' });
-                } else {
-                  //当前处于更新状态
-                  // 获取更新的虚假节点
-                  const shamNode = window.$earth.sceneTree.$refs['node_' + submitObject.value.id];
-                  // 更新虚假节点的显示文字
-                  shamNode.title = name.value;
-                  // 设置name属性
-                  currentModel.value.name = name.value;
-                  moveNode('Model');
-                  // 提示用户
-                  // $mitt.emit('openNotification',{msg: '修改成功！', dt: 2, type:'info'} )
-                  $mitt.emit('openNotification', { msg: '修改成功！', dt: 2, type: 'info' });
-                }
+                });
+              } else {
+                const node = window.$earth.sceneTree.$refs[eidtId];
+                node.title = name.value;
+                // 用户属性用来记录标志类型
+                currentModel.value.customProp =
+                  '{"labelAttr":' + labelAttr + ',"labelCode":"' + selectDeviceNum.value + '","deviceId":"' + selectHostDevice.value.id + '"}';
+                setLabelStatus(selectHostDevice.value, selectDeviceNum.value, node.ref, 2).finally(() => {
+                  const hasMoveNode = moveNode(selectModel.value.value);
+                  if (!hasMoveNode) {
+                    setIconByRef(node.ref, el);
+                  }
+                });
+                // 提示用户
+                // $mitt.emit('openNotification', '编辑成功！', 2, 'info')
+                $mitt.emit('openNotification', { msg: '编辑成功！', dt: 2, type: 'info' });
+                //-----------------------
               }
-            })
-            .then(function () {
-              // 清空当前模型的引用
-              // currentModel.value = null
-              // 隐藏窗体
-              // winVisible.value = false
-              //通过父组件v-if 关闭本组件
-              // proxy.$parent.addModelWinShow = false
-              finish();
-            });
-        } else if (currentModel.value.xbsjType == 'Pin') {
-          const lastIndex = currentModel.value.imageUrl.lastIndexOf('/temp');
-          const ImgUrl = currentModel.value.imageUrl.substring(lastIndex + 1);
-          // 当前模型为Pin类型
-          // 更具创建时选择的模型类型判断，赋予模型类型标识
-          const labelAttr = selectModel.value.value == 'ld' ? 4 : 10; // 雷达字典编号4 微波字典编号10
-          submitObject.value = {
-            mapLabel: {
-              id: null,
-              createBy: null,
-              createTime: null,
-              updateBy: null,
-              updateTime: null,
-              sysOrgCode: null,
-              labelAttr: labelAttr, // 类型标识
-              labelName: name.value, // 名称
-              lineId: selectArea.value?.id ? selectArea.value.id : null, // 所属区域
-              labelLon: LngLatHeight.value[0], // x坐标
-              labelLat: LngLatHeight.value[1], // y坐标
-              labelHeight: LngLatHeight.value[2], // z坐标
-              labelImgUrl: ImgUrl, // 设置url
-              labelStatus: 1, // 启动:1 不启用 0
-              labelCode: selectDeviceNum.value,
-              cameraId: null,
-              cameraName: null,
-              pan: 0,
-              tile: 0,
-              zoom: 0,
-              placements: null,
-            },
-            deviceId: selectHostDevice.value.id,
-          };
-          // console.log("submitObject.value",submitObject.value);
-          // let radarObj = {
-          //             radarCode: selectDeviceNum.value,
-          //             elevation: Number(radarRange.value),
-          //             workingRadius: Number(radarRadius.value),
-          //             angularRadian: Number(radarShifting.value),
-          //             customProp: JSON.stringify({ color: radarColor.value.rgba })
-          //           }
-          //           console.log("radarObj",radarObj);
-          // debugger
-          let request: any = null;
-          let url1, // 提交地址
-            method1 = ''; // 提交方法类型
-          const { eidtId } = props;
-          if (isUpdateModel.value) {
-            // 设置url为编辑地址，设置方法为put 设置记录id
-            url1 = 'military/msMapLabel/editMapLabel';
-            submitObject.value.mapLabel.id = props.eidtId;
-            // console.log('props.eidtId,',props.eidtId);
-
-            request = defHttp.put({ url: url1, params: submitObject.value }, { isTransformResponse: false });
-            // request = putAction(url1, this.submitObject.value)
-          } else {
-            // 设置url为新增地址，设置方法为post
-            url1 = 'military/msMapLabel/addMapLabel';
-            request = defHttp.post({ url: url1, params: submitObject.value }, { isTransformResponse: false });
-            // request = postAction(url1, this.submitObject.value)
-          }
-          // const props = this.getBind()
-          const { setLabelStatus, setIconByRef, el } = props;
-          // 提交pin数据，等待响应
-          request
-            .then((response) => {
-              // 响应，并成功
-              if (response.success) {
-                // 记录虚假节点的Ref
-                const lineId = 'node_' + selectArea.value.id;
-                const ldLineId = 'nodeSecondary_' + selectArea.value.id;
-                // 创建状态下
-                if (!isUpdateModel.value) {
-                  // 该区域的微波集合
-                  const wbParent = window.$earth.sceneTree.$refs[lineId] && window.$earth.sceneTree.$refs[lineId].children[2];
-                  // 该区域的雷达集合
-                  const ldParent = window.$earth.sceneTree.$refs[ldLineId];
-                  // 创建叶子节点
-                  let node = new window.XE.SceneTree.Leaf(currentModel.value);
-                  // 设置节点显示名称
-                  node.title = name.value;
-                  // 设置节点ref
-                  node.ref = response.result;
-                  // name属性用来记录区域id
-                  node.name = submitObject.value.lineId;
-                  // 用户属性用来记录标志类型
-                  currentModel.value.customProp =
-                    '{"labelAttr":' + labelAttr + ',"labelCode":"' + selectDeviceNum.value + '","deviceId":"' + selectHostDevice.value.id + '"}';
-                  setLabelStatus(selectHostDevice.value, selectDeviceNum.value, node.ref, 2).finally(() => {
-                    if (labelAttr == 4) {
-                      // 雷达新增一圆
-                      ldParent.children.push(node);
-                    } else {
-                      // 微波新增一圆
-                      wbParent.children.push(node);
-                    }
-                    // 提示用户
-                    // $mitt.emit('openNotification', '添加成功！', 2, 'info')
-                    $mitt.emit('openNotification', { msg: '添加成功！', dt: 2, type: 'info' });
-                  });
+              //是否为雷达
+              if (labelAttr == 4) {
+                //编辑(存在雷达扫描)
+                if (Object.keys(radarOldObj.value).length > 0) {
+                  let radarObj = {
+                    id: radarOldObj.value.id,
+                    radarCode: selectDeviceNum.value,
+                    elevation: Number(radarRange.value),
+                    workingRadius: Number(radarRadius.value),
+                    angularRadian: Number(radarShifting.value),
+                    customProp: JSON.stringify({ color: radarColor.value.rgba }),
+                  };
+                  defHttp
+                    .put({ url: radarUrl.value.edit, params: radarObj }, { isTransformResponse: false })
+                    // putAction(that.radarUrl.edit, radarObj)
+                    .then((res) => {
+                      // console.log(res,'edit');
+                    });
                 } else {
-                  const node = window.$earth.sceneTree.$refs[eidtId];
-                  node.title = name.value;
-                  // 用户属性用来记录标志类型
-                  currentModel.value.customProp =
-                    '{"labelAttr":' + labelAttr + ',"labelCode":"' + selectDeviceNum.value + '","deviceId":"' + selectHostDevice.value.id + '"}';
-                  setLabelStatus(selectHostDevice.value, selectDeviceNum.value, node.ref, 2).finally(() => {
-                    const hasMoveNode = moveNode(selectModel.value.value);
-                    if (!hasMoveNode) {
-                      setIconByRef(node.ref, el);
-                    }
-                  });
-                  // 提示用户
-                  // $mitt.emit('openNotification', '编辑成功！', 2, 'info')
-                  $mitt.emit('openNotification', { msg: '编辑成功！', dt: 2, type: 'info' });
-                  //-----------------------
-                }
-                //是否为雷达
-                if (labelAttr == 4) {
-                  //编辑(存在雷达扫描)
-                  if (Object.keys(radarOldObj.value).length > 0) {
-                    let radarObj = {
-                      id: radarOldObj.value.id,
-                      radarCode: selectDeviceNum.value,
-                      elevation: Number(radarRange.value),
-                      workingRadius: Number(radarRadius.value),
-                      angularRadian: Number(radarShifting.value),
-                      customProp: JSON.stringify({ color: radarColor.value.rgba }),
-                    };
-                    defHttp
-                      .put({ url: radarUrl.value.edit, params: radarObj }, { isTransformResponse: false })
-                      // putAction(that.radarUrl.edit, radarObj)
-                      .then((res) => {
-                        // console.log(res,'edit');
-                      });
-                  } else {
-                    let radarObj = {
-                      radarCode: selectDeviceNum.value,
-                      elevation: Number(radarRange.value),
-                      workingRadius: Number(radarRadius.value),
-                      angularRadian: Number(radarShifting.value),
-                      customProp: JSON.stringify({ color: radarColor.value.rgba }),
-                    };
-                    defHttp
-                      .post({ url: radarUrl.value.add, params: radarObj }, { isTransformResponse: false })
-                      // postAction(that.radarUrl.add, radarObj)
-                      .then((res) => {
-                        // console.log(res,'add');
-                      });
-                  }
+                  let radarObj = {
+                    radarCode: selectDeviceNum.value,
+                    elevation: Number(radarRange.value),
+                    workingRadius: Number(radarRadius.value),
+                    angularRadian: Number(radarShifting.value),
+                    customProp: JSON.stringify({ color: radarColor.value.rgba }),
+                  };
+                  defHttp
+                    .post({ url: radarUrl.value.add, params: radarObj }, { isTransformResponse: false })
+                    // postAction(that.radarUrl.add, radarObj)
+                    .then((res) => {
+                      // console.log(res,'add');
+                    });
                 }
-              } else {
-                // $mitt.emit('openNotification', response.message, 2, 'error')
-                $mitt.emit('openNotification', { msg: response.message, dt: 2, type: 'error' });
-                currentModel.value.destroy();
               }
-            })
-            .then(() => {
-              // 释放当前模型的引用
-              // currentModel.value = null
-              // 关闭窗体
-              // winVisible.value = false
-              //通过父组件v-if 关闭本组件
-              // proxy.$parent.addModelWinShow = false
-              finish();
-            });
-        }
+            } else {
+              // $mitt.emit('openNotification', response.message, 2, 'error')
+              $mitt.emit('openNotification', { msg: response.message, dt: 2, type: 'error' });
+              currentModel.value.destroy();
+            }
+          })
+          .then(() => {
+            // 释放当前模型的引用
+            // currentModel.value = null
+            // 关闭窗体
+            // winVisible.value = false
+            //通过父组件v-if 关闭本组件
+            // proxy.$parent.addModelWinShow = false
+            finish();
+          });
       }
+    }
 
-      // 更新状态初始值赋予
-      function updateValueSet(props) {
-        // debugger
-        // 设置name为模型的name
-        name.value = currentModel.value.name;
-        // 是否存在当前区域
-        const hasArea = areaList.value.filter((item: any) => {
-          return item.id == props.lineId;
+    // 更新状态初始值赋予
+    function updateValueSet(props) {
+      // debugger
+      // 设置name为模型的name
+      name.value = currentModel.value.name;
+      // 是否存在当前区域
+      const hasArea = areaList.value.filter((item: any) => {
+        return item.id == props.lineId;
+      });
+      // 存在当前区域
+      if (hasArea.length > 0) {
+        // 设置选中区域
+        selectArea.value = hasArea[0];
+      }
+      // 类型为监控点时
+      if (props.type == 'jkd') {
+        // 绑定属性
+        bindModelProps(currentModel.value);
+      } else {
+        previewImgUrl.value = currentModel.value.imageUrl;
+        // console.log('previewImgUrl.value',previewImgUrl.value);
+
+        const jsonObj = JSON.parse(currentModel.value.customProp);
+        const hasHostDevice = hostDeviceList.value.filter((item: any) => {
+          return item.id == jsonObj.deviceId;
         });
-        // 存在当前区域
-        if (hasArea.length > 0) {
-          // 设置选中区域
-          selectArea.value = hasArea[0];
-        }
-        // 类型为监控点时
-        if (props.type == 'jkd') {
-          // 绑定属性
-          bindModelProps(currentModel.value);
+        if (hasHostDevice && hasHostDevice.length > 0) {
+          selectHostDevice.value = hasHostDevice[0];
         } else {
-          previewImgUrl.value = currentModel.value.imageUrl;
-          // console.log('previewImgUrl.value',previewImgUrl.value);
-
-          const jsonObj = JSON.parse(currentModel.value.customProp);
-          const hasHostDevice = hostDeviceList.value.filter((item: any) => {
-            return item.id == jsonObj.deviceId;
-          });
-          if (hasHostDevice && hasHostDevice.length > 0) {
-            selectHostDevice.value = hasHostDevice[0];
-          } else {
-            console.log('没有找到已选择的主机设备');
-          }
-          const labelCode = jsonObj.labelCode;
-          if (labelCode && labelCode != 'null') {
-            selectDeviceNum.value = labelCode;
-            //初始雷达扫描属性值
-            if (jsonObj.labelAttr == 4) {
-              defHttp.get({ url: radarUrl.value.list, params: { radarCode: labelCode } }, { isTransformResponse: false }).then((res) => {
-                if (res.success) {
-                  if (res.result.records.length > 0) {
-                    let data = res.result.records[0];
-                    radarOldObj.value = {
-                      id: data.id,
-                      radarRadius: data.workingRadius,
-                      radarRange: data.elevation,
-                      radarShifting: data.angularRadian,
-                    };
-                    if (data.customProp) {
-                      radarColor.value.rgba = JSON.parse(data.customProp).color;
-                      radarOldObj.value.color = JSON.parse(data.customProp).color;
-                    }
-                    radarRadius.value = data.workingRadius;
-                    radarRange.value = data.elevation;
-                    radarShifting.value = data.angularRadian;
+          console.log('没有找到已选择的主机设备');
+        }
+        const labelCode = jsonObj.labelCode;
+        if (labelCode && labelCode != 'null') {
+          selectDeviceNum.value = labelCode;
+          //初始雷达扫描属性值
+          if (jsonObj.labelAttr == 4) {
+            defHttp.get({ url: radarUrl.value.list, params: { radarCode: labelCode } }, { isTransformResponse: false }).then((res) => {
+              if (res.success) {
+                if (res.result.records.length > 0) {
+                  let data = res.result.records[0];
+                  radarOldObj.value = {
+                    id: data.id,
+                    radarRadius: data.workingRadius,
+                    radarRange: data.elevation,
+                    radarShifting: data.angularRadian,
+                  };
+                  if (data.customProp) {
+                    radarColor.value.rgba = JSON.parse(data.customProp).color;
+                    radarOldObj.value.color = JSON.parse(data.customProp).color;
                   }
+                  radarRadius.value = data.workingRadius;
+                  radarRange.value = data.elevation;
+                  radarShifting.value = data.angularRadian;
                 }
-              });
-            }
+              }
+            });
           }
-          // 绑定属性
-          bindPinProps(currentModel.value);
         }
+        // 绑定属性
+        bindPinProps(currentModel.value);
       }
+    }
 
-      // 克隆dom对象，未调用方法
-      function cloneEl(el) {
-        const selectNode = el.children[2].children[0].children[0].children[5];
-        const parent = selectNode.parentElement;
-        const cloneNode = selectNode.cloneNode(true);
-        cloneNode.children[0].children[0].innerHTML = '岛屿';
-        const inputEl = cloneNode.children[0].children[1];
-        const context = cloneNode.children[0].children[3];
-        const scope = context.attributes[0];
-        inputEl.value = '';
-        inputEl.onclick = function () {
-          const disState = context.style.display;
-          if (disState == 'none') {
-            context.style.display = 'block';
-          } else {
-            context.style.display = 'none';
-          }
-        };
-        const selectItemText = '';
-        defHttp.get({ url: '/military/msMapScene/list', params: { pageNo: 1, pageSize: 999 } }, { isTransformResponse: false }).then((response) => {
-          const records = response.result.records;
-          const fragment = new DocumentFragment();
-          for (const record of records) {
-            const itemEl = document.createElement('div');
-            itemEl.onclick = function () {
-              inputEl.value = record.sceneName;
-              islands.value = record;
-              context.style.display = 'none';
-            };
-            itemEl.id = record.sysOrgCode;
-            itemEl.setAttribute(scope.name, '');
-            itemEl.innerHTML = `<span ${scope.name} >${record.sceneName}</span>`;
-            fragment.append(itemEl);
-          }
-          context.innerHTML = '';
-          context.append(fragment);
-          const beforeNode = el.children[2].children[0].children[0].children[4];
-          parent.insertBefore(cloneNode, beforeNode);
-        });
-      }
-
-      function moveNode(type) {
-        if (!isUpdateModel.value) {
-          return false;
+    // 克隆dom对象，未调用方法
+    function cloneEl(el) {
+      const selectNode = el.children[2].children[0].children[0].children[5];
+      const parent = selectNode.parentElement;
+      const cloneNode = selectNode.cloneNode(true);
+      cloneNode.children[0].children[0].innerHTML = '岛屿';
+      const inputEl = cloneNode.children[0].children[1];
+      const context = cloneNode.children[0].children[3];
+      const scope = context.attributes[0];
+      inputEl.value = '';
+      inputEl.onclick = function () {
+        const disState = context.style.display;
+        if (disState == 'none') {
+          context.style.display = 'block';
+        } else {
+          context.style.display = 'none';
         }
-        // 传入属性
-        // const props = this.getBind()
-        if (props.lineId == selectArea.value.id) {
-          return false;
+      };
+      const selectItemText = '';
+      defHttp.get({ url: '/military/msMapScene/list', params: { pageNo: 1, pageSize: 999 } }, { isTransformResponse: false }).then((response) => {
+        const records = response.result.records;
+        const fragment = new DocumentFragment();
+        for (const record of records) {
+          const itemEl = document.createElement('div');
+          itemEl.onclick = function () {
+            inputEl.value = record.sceneName;
+            islands.value = record;
+            context.style.display = 'none';
+          };
+          itemEl.id = record.sysOrgCode;
+          itemEl.setAttribute(scope.name, '');
+          itemEl.innerHTML = `<span ${scope.name} >${record.sceneName}</span>`;
+          fragment.append(itemEl);
         }
-        // const areaByNodeId = props.areaByNodeId
-        const currentNode = props.node._inner.sn;
-        const newNodel = 'node_' + selectArea.value.id;
-        const moveAreaNode = window.$earth.sceneTree.$refs[newNodel] || window.$earth.sceneTree.$refs['nodeSecondary_' + this.selectArea.id];
-        if (moveAreaNode) {
-          let moveNode = null;
-          if (type == 'Model') {
-            moveNode = moveAreaNode.children[0];
-          } else if (type == 'ld') {
-            moveNode = moveAreaNode;
-          } else {
-            moveNode = moveAreaNode.children[2];
-          }
-          const index = moveNode.children.length + 1;
-          currentNode.moveTo(moveNode, index);
+        context.innerHTML = '';
+        context.append(fragment);
+        const beforeNode = el.children[2].children[0].children[0].children[4];
+        parent.insertBefore(cloneNode, beforeNode);
+      });
+    }
+
+    function moveNode(type) {
+      if (!isUpdateModel.value) {
+        return false;
+      }
+      // 传入属性
+      // const props = this.getBind()
+      if (props.lineId == selectArea.value.id) {
+        return false;
+      }
+      // const areaByNodeId = props.areaByNodeId
+      const currentNode = props.node._inner.sn;
+      const newNodel = 'node_' + selectArea.value.id;
+      const moveAreaNode = window.$earth.sceneTree.$refs[newNodel] || window.$earth.sceneTree.$refs['nodeSecondary_' + this.selectArea.id];
+      if (moveAreaNode) {
+        let moveNode = null;
+        if (type == 'Model') {
+          moveNode = moveAreaNode.children[0];
+        } else if (type == 'ld') {
+          moveNode = moveAreaNode;
+        } else {
+          moveNode = moveAreaNode.children[2];
         }
-        return true;
+        const index = moveNode.children.length + 1;
+        currentNode.moveTo(moveNode, index);
       }
+      return true;
+    }
 
-      function getRadarScan() {
-        if (timer.value) clearTimeout(timer.value);
-        timer.value = setTimeout(() => {
-          let rgb = radarColor.value.rgba;
-          if (currentModel.value.addViewShedReturn) {
-            window.$earth.czm.viewer.entities.remove(currentModel.value.addViewShedReturn);
-          }
-          //计算偏移角
-          let left = Number(radarShifting.value) - Number(radarRange.value) / 2;
-          currentModel.value.addViewShedReturn = addViewShedRadar(
-            currentModel.value.position,
-            radarRadius.value,
-            left,
-            Number(radarRange.value) / 2 + Number(radarShifting.value),
-            [rgb.r / 255, rgb.g / 255, rgb.b / 255, rgb.a]
-          );
-        }, 300);
-      }
+    function getRadarScan() {
+      if (timer.value) clearTimeout(timer.value);
+      timer.value = setTimeout(() => {
+        let rgb = radarColor.value.rgba;
+        if (currentModel.value.addViewShedReturn) {
+          window.$earth.czm.viewer.entities.remove(currentModel.value.addViewShedReturn);
+        }
+        //计算偏移角
+        let left = Number(radarShifting.value) - Number(radarRange.value) / 2;
+        currentModel.value.addViewShedReturn = addViewShedRadar(
+          currentModel.value.position,
+          radarRadius.value,
+          left,
+          Number(radarRange.value) / 2 + Number(radarShifting.value),
+          [rgb.r / 255, rgb.g / 255, rgb.b / 255, rgb.a]
+        );
+      }, 300);
+    }
 
-      return {
-        radarColor,
-        radarRange,
-        radarRadius,
-        radarShifting,
-        radarOldObj,
-        radarUrl,
-        heightCoefficient,
-        widthCoefficient,
-        currentModel,
-        isUpdateModel,
-        modelSelectList,
-        selectModel,
-        name,
-        LngLatHeight,
-        rotation,
-        scale,
-        creating,
-        show,
-        rotationEditing,
-        winVisible,
-        areaList,
-        previewImgUrl,
-        uploadFile,
-        selectArea,
-        submitObject,
-        isFristChangeMethod,
-        revert,
-        islands,
-        minimumPixelSize,
-        hostDeviceList,
-        selectHostDevice,
-        deviceNumList,
-        selectDeviceNum,
-        timer,
-        width,
-        height,
-        top,
-        left,
-        cancel,
-        close,
-        updateClose,
-        ok,
-        bindModelProps,
-        addModel,
-        bindPinProps,
-        addPin,
-        addPolyline,
-        modelState,
-        submitModel,
-        nameChange,
-        getAreas,
-        getHostDeviceList,
-        submitData,
-        updateValueSet,
-        cloneEl,
-        moveNode,
-        getRadarScan,
-        pinIconUpload,
-        uploadFileCount,
-      };
-    },
-  });
+    return {
+      radarColor,
+      radarRange,
+      radarRadius,
+      radarShifting,
+      radarOldObj,
+      radarUrl,
+      heightCoefficient,
+      widthCoefficient,
+      currentModel,
+      isUpdateModel,
+      modelSelectList,
+      selectModel,
+      name,
+      LngLatHeight,
+      rotation,
+      scale,
+      creating,
+      show,
+      rotationEditing,
+      winVisible,
+      areaList,
+      previewImgUrl,
+      uploadFile,
+      selectArea,
+      submitObject,
+      isFristChangeMethod,
+      revert,
+      islands,
+      minimumPixelSize,
+      hostDeviceList,
+      selectHostDevice,
+      deviceNumList,
+      selectDeviceNum,
+      timer,
+      width,
+      height,
+      top,
+      left,
+      cancel,
+      close,
+      updateClose,
+      ok,
+      bindModelProps,
+      addModel,
+      bindPinProps,
+      addPin,
+      addPolyline,
+      addArea,
+      modelState,
+      submitModel,
+      nameChange,
+      getAreas,
+      getHostDeviceList,
+      submitData,
+      updateValueSet,
+      cloneEl,
+      moveNode,
+      getRadarScan,
+      pinIconUpload,
+      uploadFileCount,
+    };
+  },
+});
 </script>
 
 <style scoped>
-  :deep(.custom-item-box > div > input) {
-    width: 45% !important;
-    margin-right: 0% !important;
-  }
+:deep(.custom-item-box > div > input) {
+  width: 45% !important;
+  margin-right: 0% !important;
+}
 
-  :deep(.custom-item-box) {
-    padding-left: 5% !important;
-    width: 80% !important;
-  }
+:deep(.custom-item-box) {
+  padding-left: 5% !important;
+  width: 80% !important;
+}
 
-  :deep(.xbsjselect) {
-    height: 100% !important;
-  }
+:deep(.xbsjselect) {
+  height: 100% !important;
+}
 
-  :deep(.xbsjselect-selectdiv) {
-    left: 0px !important;
-    top: 0px !important;
-    height: 90% !important;
-    display: flex !important;
-    align-items: center !important;
-    line-height: 0% !important;
-    justify-content: space-between !important;
-    padding-left: 5px !important;
-  }
+:deep(.xbsjselect-selectdiv) {
+  left: 0px !important;
+  top: 0px !important;
+  height: 90% !important;
+  display: flex !important;
+  align-items: center !important;
+  line-height: 0% !important;
+  justify-content: space-between !important;
+  padding-left: 5px !important;
+}
 
-  :deep(.xbsjselect-selectButton) {
-    margin-top: 0%;
-  }
+:deep(.xbsjselect-selectButton) {
+  margin-top: 0%;
+}
 
-  :deep(.custom-label) {
-    width: 15% !important;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    color: #ffffff;
-  }
+:deep(.custom-label) {
+  width: 15% !important;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  color: #ffffff;
+}
 
-  :deep(.custom-item) {
-    height: 8%;
-    margin-top: 2%;
-  }
+:deep(.custom-item) {
+  height: 8%;
+  margin-top: 2%;
+}
 
-  :deep(.xbsjselect-selectOption) {
-    width: 100% !important;
-    min-height: auto !important;
-  }
+:deep(.xbsjselect-selectOption) {
+  width: 100% !important;
+  min-height: auto !important;
+}
 
-  .edit-model-btn {
-    cursor: pointer;
-    line-height: 5%;
-  }
+.edit-model-btn {
+  cursor: pointer;
+  line-height: 5%;
+}
 
-  .edit-model-btn-disable {
-    cursor: not-allowed;
-  }
+.edit-model-btn-disable {
+  cursor: not-allowed;
+}
 
-  .object-box {
-    width: 100%;
-    height: 86%;
-    label {
-      color: #ffffff;
-    }
-  }
+.object-box {
+  width: 100%;
+  height: 86%;
 
-  .container-box {
-    width: 100%;
-    height: 100%;
+  label {
+    color: #ffffff;
   }
+}
 
-  :deep(.object-box .custom-item) {
-    height: 10%;
-    margin-top: 2%;
-  }
+.container-box {
+  width: 100%;
+  height: 100%;
+}
 
-  .Mask {
-    width: 100%;
-    height: 80%;
-    position: absolute;
-    top: 10%;
-    left: 0%;
-    display: block;
-  }
+:deep(.object-box .custom-item) {
+  height: 10%;
+  margin-top: 2%;
+}
 
-  .name-input {
-    height: 90%;
-    width: 100%;
-    background: rgba(0, 0, 0, 0.5);
-    border-radius: 3px;
-    border: none;
-    color: #ddd;
-    padding: 5px;
-    outline: none;
-  }
+.Mask {
+  width: 100%;
+  height: 80%;
+  position: absolute;
+  top: 10%;
+  left: 0%;
+  display: block;
+}
 
-  .xyz-input {
-    height: 90%;
-    width: 30%;
-    background: rgba(0, 0, 0, 0.5);
-    border-radius: 3px;
-    border: none;
-    color: #ddd;
-    padding: 5px;
-    outline: none;
-  }
+.name-input {
+  height: 90%;
+  width: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 3px;
+  border: none;
+  color: #ddd;
+  padding: 5px;
+  outline: none;
+}
 
-  .y-margin {
-    margin-left: 5%;
-    margin-right: 5%;
-  }
+.xyz-input {
+  height: 90%;
+  width: 30%;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 3px;
+  border: none;
+  color: #ddd;
+  padding: 5px;
+  outline: none;
+}
 
-  .upload-box {
-    height: 100%;
-    width: 20%;
-  }
+.y-margin {
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.upload-box {
+  height: 100%;
+  width: 20%;
+}
 </style>
diff --git a/src/components/earthMap/toolbar/DrawShape.vue b/src/components/earthMap/toolbar/DrawShape.vue
index 62d9f37..82ab617 100644
--- a/src/components/earthMap/toolbar/DrawShape.vue
+++ b/src/components/earthMap/toolbar/DrawShape.vue
@@ -15,6 +15,9 @@
             </template>
             <a-collapse-panel key="1" header="线" :style="customStyle">
                 <div class="toolBoxImg">
+                    <p class="tb-img-p" title="实线" @click="draw('Polyline')">
+                        <img :src="solidLine" alt="实线" />
+                    </p>
                     <p class="tb-img-p" title="圆弧" @click="draw('GeoArc')">
                         <img :src="arc" alt="圆弧" />
                     </p>
@@ -30,9 +33,7 @@
                     <!-- <p class="tb-img-p" title="曲线箭头" @click="drawCurveArrow">
                         <img :src="curveArrow" alt="曲线箭头" />
                     </p> -->
-                    <p class="tb-img-p" title="实线" @click="draw('Polyline')">
-                        <img :src="solidLine" alt="实线" />
-                    </p>
+
                 </div>
             </a-collapse-panel>
             <a-collapse-panel key="2" header="面" :style="customStyle">
@@ -227,6 +228,10 @@ const props = defineProps({
         type: Boolean,
         default: false,
     },
+    drawShapePackage: {
+        type: Object,
+        default: null,
+    },
 });
 
 const { proxy }: any = getCurrentInstance();
@@ -237,6 +242,19 @@ const activeKey = ref(['1', '2']);
 const customStyle = 'background: rgb(255 255 255 / 0%);border-radius: 4px;border: 0;overflow: hidden';
 const earthUI = window.$uia // 获取地图ui对象
 
+let title = ref(props.title)
+onMounted(() => {
+    //处理选取区域操作
+    if (props.drawShapePackage != null) {
+        console.log("绘画组件正在调用", props.drawShapePackage);
+        if (props.drawShapePackage.title != null)
+            //赋值标题title
+            title.value = props.drawShapePackage.title
+    }
+})
+
+
+
 function draw(type: String = '') {
     let t = null
     switch (type) {
@@ -304,7 +322,15 @@ function draw(type: String = '') {
             console.log("错误");
             break;
     }
-    return editUI(t)
+    //判断是否被创建区域组件调用，有则返回实体 t，交给调用组件处理
+    if (props.drawShapePackage &&
+        props.drawShapePackage.from &&
+        props.drawShapePackage.from == 'addArea') {
+            $mitt.emit('addAreaFinished', t)
+        return
+    }
+    else
+        return editUI(t)
 }
 
 function cancel() {
diff --git a/src/components/earthMap/toolbar/DrawShapeMilitary.vue b/src/components/earthMap/toolbar/DrawShapeMilitary.vue
index 228f5ad..84fc258 100644
--- a/src/components/earthMap/toolbar/DrawShapeMilitary.vue
+++ b/src/components/earthMap/toolbar/DrawShapeMilitary.vue
@@ -40,9 +40,14 @@
                     <p class="tb-img-p" title="曲线箭头" @click="draw('GeoCurveArrow')">
                         <img :src="curveArrow" alt="曲线箭头" />
                     </p>
-                    <p class="tb-img-p" title="单次箭头" @click="draw('GeoSimpleArrow')">
+                    <!-- //排除单次箭头
+                        /**
+                        * 报错Reaction doesn't converge to a stable state after 100 iterations.  
+                        * Probably there is a cycle in the reactive function: Reaction
+                    / -->
+                    <!-- <p class="tb-img-p" title="单次箭头" @click="draw('GeoSimpleArrow')">
                         <img :src="simpleArrow" alt="单次箭头" />
-                    </p>
+                    </p> -->
                     <p class="tb-img-p" title="平尾箭头" @click="draw('GeoArrow')">
                         <img :src="flatArrow" alt="平尾箭头" />
                     </p>
@@ -59,7 +64,7 @@
                     <p class="tb-img-p" title="三角旗帜" @click="draw('GeoTriFlag')">
                         <img :src="triFlag" alt="三角旗帜" />
                     </p>
-                   
+
                     <!-- <p class="tb-img-p" title="圆" @click="drawCircle">
                         <img :src="circle" alt="圆" />
                     </p> -->
@@ -394,8 +399,10 @@ function saveInStore(obj: any) {
 function editUI(obj: any, objConfig: any = null) {
     console.log("obj", obj);
     obj.creating = true;
+    // if (obj.showType == "forkedTail") return
     earthUI.showPropertyWindow(obj)
     nextTick(() => {
+
         // 主要ui窗口
         const mainUI = earthUI._vm.$refs.mainUI
         // 所有打开的ui窗口Ref值