From 6e99a53ee4c5ff9414f67ed07f0a1a7c98d74507 Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Fri, 15 Dec 2023 15:03:48 +0800
Subject: [PATCH] =?UTF-8?q?window=E7=BB=84=E4=BB=B6=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B1=95=E5=BC=80=E9=9D=A2=E6=9D=BF=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/earthMap/components/Window.vue | 29 +++++++++++++++----
 .../earthMap/toolbar/AddModelWin.vue          | 12 +++++---
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/components/earthMap/components/Window.vue b/src/components/earthMap/components/Window.vue
index 9bdb006..5542627 100644
--- a/src/components/earthMap/components/Window.vue
+++ b/src/components/earthMap/components/Window.vue
@@ -46,7 +46,7 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
-    showcloseButton:{
+    showcloseButton: {
       type: Boolean,
       default: true,
     },
@@ -90,8 +90,15 @@ export default defineComponent({
       type: Function,
       default: null,
     },
+    /**
+     * @description 是否展开
+     */
+    expand: {
+      type: Boolean,
+      default: true
+    }
   },
-  emits:['cancel','ok','contextMenu','showclick'],
+  emits: ['cancel', 'ok', 'contextMenu', 'showclick'],
   setup(props, ctx) {
     const { proxy }: any = getCurrentInstance();
     let langs = ref({
@@ -104,7 +111,8 @@ export default defineComponent({
         cancel: "Cancel"
       }
     })
-    let collapsed = ref(false);
+    // let collapsed = ref(false);
+    let collapsed = ref(!props.expand); //初始化展开状态
     let width_ = ref(0);
     let height_ = ref(0);
     let left_ = ref(0);
@@ -128,8 +136,19 @@ export default defineComponent({
       return props.confirmtext;
     });
 
+    watch(
+      () => props.expand,
+      (value) => {
+        // 监听父组件展开状态
+        // console.log(value);
+        collapsed.value = !value;
+      }
+    );
+    
+
 
     onMounted(() => {
+      // console.log("props",props)
       // console.log(earth.czm.viewer.container)
       // console.log("window.$uia", window.$uia);
       // console.log("window.", window);
@@ -278,7 +297,7 @@ export default defineComponent({
         }
         // console.log('w',w);
         // console.log('h',h);
-        
+
         updateStyle();
       }
 
@@ -299,7 +318,7 @@ export default defineComponent({
       document.addEventListener("mouseup", up);
     }
 
-    
+
     return {
       contextMenu,
       updateStyle,
diff --git a/src/components/earthMap/toolbar/AddModelWin.vue b/src/components/earthMap/toolbar/AddModelWin.vue
index ff825dd..c658121 100644
--- a/src/components/earthMap/toolbar/AddModelWin.vue
+++ b/src/components/earthMap/toolbar/AddModelWin.vue
@@ -1,7 +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">
+      :top="top" :floatright="false" :footervisible="true" v-show="!creating" :expand="expand">
       <div style="display: flex" class="custom-item" v-if="!isUpdateModel">
         <label class="custom-label">模型类型:</label>
         <div class="custom-item-box">
@@ -283,10 +283,11 @@ export default defineComponent({
     const { createMessage } = useMessage();
     // const $mitt = mitt();
     const userStore = useUserStore();
-
+    let expand = ref(true); //是否展开
     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);
     //雷达扫描编辑、取消使用
@@ -461,14 +462,16 @@ export default defineComponent({
           try {
             if (selectModel.value.value === 'jkd') {
               // console.log("jkd");
+              expand.value = true;// 折叠面板
               currentModel.value = addModel();
               // console.log(" currentModel.value", currentModel.value);
             } else if (selectModel.value.value === 'qy') {
-
+              expand.value = false;// 折叠面板
               currentModel.value = addArea();
               // currentModel.value = addPolyline();
               // console.log(" currentModel.value", currentModel.value);
             } else {
+              expand.value = true;// 折叠面板
               currentModel.value = addPin();
             }
           } catch (e) {
@@ -659,7 +662,7 @@ export default defineComponent({
       bindModelProps(model);
       minimumPixelSize.value = 80;
       // 切换为创建状态
-      modelState('creating');
+      // modelState('creating');
       // model.flyTo()
       return model;
     }
@@ -1520,6 +1523,7 @@ export default defineComponent({
       getRadarScan,
       pinIconUpload,
       uploadFileCount,
+      expand,
     };
   },
 });