Merge branch 'master' of http://124.70.32.114:3100/woka/cesium-map-object into ctw

# Conflicts:
#	ruoyi-ui/src/views/cesiumMap/index.vue

ruoyi-ui/src/views/childRoom/index.vue

@@ -4,7 +4,7 @@
     <!-- 地图背景 -->
     <div id="gis-map-background" class="map-background">
       <!-- cesiummap组件 -->
-      <cesiumMap/>
+      <cesiumMap :drawDomClick="drawDom"/>
       <div class="map-overlay-text">
         <i class="el-icon-location-outline text-3xl mb-2 block"></i>
         <p>二维GIS地图区域</p>
@@ -430,6 +430,7 @@ export default {
   },
   data() {
     return {
+      drawDom:false,
       // 顶部导航
       activeTopNav: 'file',
       topNavItems: [
@@ -605,7 +606,10 @@ export default {
     
     selectMenu(item) {
       this.activeMenu = item.id;
-      
+      if(item.id === 'modify'){
+          this.drawDom = !this.drawDom
+          console.log(this.drawDom,999999)
+        }
       if (item.id === 'deduction') {
         // 点击推演按钮，显示/隐藏K时弹出框
         this.showKTimePopup = !this.showKTimePopup;
@@ -617,6 +621,7 @@ export default {
       } else {
         // 其他菜单的原有逻辑
         this.$message.info(`选择菜单: ${item.name}`);
+        
       }
     },