Merge branch 'refs/heads/feature/v7.0/7.0.4' into feature/v8.0/8.0.1

张含笑

2025-11-11 412405a9472ca94e812c848f68137b14c835ab9e

Merge branch 'refs/heads/feature/v7.0/7.0.4' into feature/v8.0/8.0.1

 src/views/layerManagement/components/rightEdit.vue

@@ -1,6 +1,6 @@
<template>
  <div class="rightContainer">
    <div class="contenttitle">{{ layerParams.fenceType === 1 ? '围栏' : '禁飞区' }}信息</div>
    <div class="contenttitle">{{ layerParams.fenceType === 1 ? '识别区' : '禁飞区' }}信息</div>
    <div class="centerBox">
      <div class="itemRow">
        <div class="label">文件夹名称</div>
@@ -22,7 +22,7 @@
        </div>
      </div>
      <div class="itemRow">
        <div class="label">{{ layerParams.fenceType === 1 ? '围栏' : '禁飞区' }}名称</div>
        <div class="label">{{ layerParams.fenceType === 1 ? '识别区' : '禁飞区' }}名称</div>
        <div>
          <el-input
            :disabled="isDisabled"
@@ -49,7 +49,7 @@
        </div>
      </div>
      <div class="itemRow">
        <div class="label">{{ layerParams.fenceType === 1 ? '围栏' : '禁飞区' }}备注</div>
        <div class="label">{{ layerParams.fenceType === 1 ? '识别区' : '禁飞区' }}备注</div>
        <div>
          <el-input
            :disabled="isDisabled"
@@ -64,7 +64,7 @@
    <div class="detailInfo">
      <div class="infpItem" v-if="layerParams.editNest && layerParams.fenceType === 1">
        <div class="itemData">
          <div class="title">围栏面积</div>
          <div class="title">识别区面积</div>
          <div class="num">
            <span class="areaStyle">{{ fenceArea }}</span> m²
          </div>