Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

src/views/demo/jobarea/index.vue

@@ -269,7 +269,7 @@
       .areaInfoDiv {
         position: relative;
         height: 100%;
-        width: 320px;
+        width: 350px;
       }
   
     }

src/views/demo/jobarea/pathAreaInfo.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="areaInfo">
+    <!-- 关闭按钮 -->
+    <div class="closeButton">
+      <CloseOutlined @click="closePathAreaInfo" style="font-size: 20px; color: white" />
+    </div>
     <a-row>
       <a-col :span="24">
         <div class="annotationTitle"> 自定义飞行区 </div>
@@ -104,13 +108,7 @@
         <div class="annotationTitle">绘制者</div>
       </a-col>
       <a-col :span="18">
-        <div class="annotationContent"> {{ props.nowShowAreaData.createdUser }}</div>
-      </a-col>
-      <a-col :span="24">
-        <div class="area_buttons">
-          <div class="cancelDiv" @click="closePathAreaInfo">取消</div>
-          <div class="startDiv" :class="{ disabled: props.nowShowAreaData }">确认</div>
-        </div>
+        <div class="annotationContent"> {{ props.nowShowAreaData.createUserName }}</div>
       </a-col>
     </a-row>
   </div>
@@ -144,7 +142,7 @@
   const { createMessage, createConfirm } = useMessage();
 
   const props = defineProps(['allAreaDataList', 'nowShowAreaData']);
-  console.log('nowShowAreaData',props.nowShowAreaData)
+
   const emits = defineEmits([
     'setNowShowAreaData',
     'closePathAreaInfo',
@@ -239,7 +237,7 @@
     min-height: 45px;
     height: auto;
     width: 100%;
-    flex-wrap: wrap;
+
 
     .annotationTitleButton_right {
       height: 20px;
@@ -260,6 +258,14 @@
       font-size: 18px;
     }
   }
+  // 关闭按钮
+  .closeButton {
+    position: absolute;
+    top: 30px;
+    right: 20px;
+    z-index: 200;
+    cursor: pointer;
+  }
 
   .annotationContent {
     display: flex;