From e99ca4acbcfc08b45234e1796a9da4f74bca9f22 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 31 Oct 2025 14:42:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/图层管理' into 图层管理
---
src/views/layerManagement/components/rightEdit.vue | 39 +++++++++++++++----
src/views/layerManagement/components/folderFile.vue | 25 ++++++++----
2 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/src/views/layerManagement/components/folderFile.vue b/src/views/layerManagement/components/folderFile.vue
index c794153..da5cd02 100644
--- a/src/views/layerManagement/components/folderFile.vue
+++ b/src/views/layerManagement/components/folderFile.vue
@@ -8,7 +8,7 @@
<el-input class="ztzf-input inputName" v-model="formData.name" placeholder="请输入" />
</div>
</div>
- <div class="itemRow" v-if="!itSLandPlanning">
+ <div class="itemRow" v-if="layerParams.addAnEditingFolder === 1 && layerParams.fileType !==2 && !itSLandPlanning">
<div class="label">关联算法</div>
<div>
<el-select
@@ -55,7 +55,7 @@
<div class="itemData">
<div class="title">围栏总面积</div>
<div class="num">
- <span>{{ formData.total_area }}</span> m²
+ <span class="areaStyle">{{ formData.total_area }}</span> m²
</div>
</div>
</div>
@@ -156,11 +156,13 @@
return;
}
if(!itSLandPlanning){
- if (!formData.value.event_type) {
- return ElMessage.warning('请选择类型');
+ if (!formData.value.event_type && layerParams.value.fileType === 1) {
+ ElMessage.warning('请选择类型');
+ return;
}
- if (!formData.value.algorithm_name) {
- return ElMessage.warning('请选择算法')
+ if (!formData.value.algorithm_name && layerParams.value.fileType === 1) {
+ ElMessage.warning('请选择算法');
+ return;
}
}
const params = {
@@ -261,18 +263,25 @@
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
- color: #ffffff;
+ color: #DFDFDF;
margin-bottom: 23px;
.num {
span {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
- font-size: 20px;
+ font-size: 14px;
color: #ffffff;
}
+ .areaStyle {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: bold;
+ font-size: 20px;
+ color: #FFFFFF;
+ }
}
.itemData {
width: 50%;
+
}
}
}
diff --git a/src/views/layerManagement/components/rightEdit.vue b/src/views/layerManagement/components/rightEdit.vue
index 7a2522e..9acf3e3 100644
--- a/src/views/layerManagement/components/rightEdit.vue
+++ b/src/views/layerManagement/components/rightEdit.vue
@@ -50,19 +50,25 @@
</div>
</div>
<div class="detailInfo">
- <div class="infpItem" v-if="layerParams.editNest">
+ <div class="infpItem" v-if="layerParams.editNest && layerParams.fenceType === 1">
<div class="itemData">
<div class="title">围栏面积</div>
<div class="num">
- <span>{{ fenceArea }}</span> m²
+ <span class="areaStyle">{{ fenceArea }}</span> m²
+ </div>
+ </div>
+ <div class="itemData">
+ <div class="title">创建人</div>
+ <div class="num">
+ <span>{{ formData?.create_name }}</span>
</div>
</div>
</div>
<div class="infpItem" v-if="layerParams.fenceType === 2">
- <div class="itemData" v-if="layerParams.editNest">
+ <div class="itemData" v-if="layerParams.editNest && layerParams.fenceType === 2">
<div class="title">禁飞区面积</div>
<div class="num">
- <span>{{ fenceArea }}</span> m²
+ <span class="areaStyle">{{ fenceArea }}</span> m²
</div>
</div>
<div class="itemData">
@@ -73,11 +79,11 @@
class="ztzf-input inputName"
v-model="formData.altitude"
placeholder="请输入" /></span
- >米
+ > 米
</div>
</div>
</div>
- <div class="infpItem" v-if="layerParams.editNest">
+ <div class="infpItem" v-if="layerParams.editNest && layerParams.fenceType === 2">
<div class="itemData">
<div class="title">创建时间</div>
<div class="num">
@@ -90,6 +96,15 @@
<span>{{ formData?.create_name }}</span>
</div>
</div>
+ </div>
+ <div class="infpItem" v-if="layerParams.editNest && layerParams.fenceType === 1">
+ <div class="itemData">
+ <div class="title">创建时间</div>
+ <div class="num">
+ <span>{{ formData?.create_time }}</span>
+ </div>
+ </div>
+
</div>
</div>
<div class="btnGroups">
@@ -296,15 +311,21 @@
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 14px;
- color: #ffffff;
+ color: #DFDFDF;
margin-bottom: 23px;
.num {
span {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: bold;
- font-size: 20px;
+ font-size: 14px;
color: #ffffff;
}
+ .areaStyle {
+ font-family: Source Han Sans CN, Source Han Sans CN;
+ font-weight: bold;
+ font-size: 20px;
+ color: #FFFFFF;
+ }
}
.noFly {
display: flex;
@@ -319,7 +340,7 @@
display: flex;
justify-content: center;
position: absolute;
- bottom: 59px;
+ bottom: 29px;
left: 0;
right: 0;
img {
--
Gitblit v1.9.3