From 6c220d64befec39fb2b982558eb837ab6da8087d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 18 Sep 2025 10:06:45 +0800
Subject: [PATCH] Merge branch 'feature/v5.0/5.0.5' into feature/v6.0/6.0.2
---
src/views/resource/patchManagement.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 1a9c4a3..601062f 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -89,7 +89,7 @@
</basic-container>
</template>
<script setup>
-import {findAreaName} from '@/utils/areaUtils'
+import { findAreaName } from '@/utils/areaUtils';
import {
spotManagementTableApi,
searchManagementApi,
@@ -161,7 +161,7 @@
border: true,
index: true,
indexLabel: '序号',
- indexWidth: 60,
+ indexWidth: 60,
selection: true,
grid: false,
menuWidth: 240,
@@ -468,7 +468,7 @@
data.value = d.records.map(i => ({
...i,
dataFrom: i.date_from === 0 ? '本地上传' : '国土调查云',
- areaName: findAreaName(i.area_code, regionalData.value, true)
+ areaName: findAreaName(i.area_code, regionalData.value, true),
}));
loading.value = false;
selectionClear();
@@ -510,12 +510,14 @@
};
// 图斑上传
const uploadFlightFile = (file, t) => {
-loading.value = true
+ loading.value = true;
const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1);
if (!['kmz', 'kml', 'zip'].includes(fileSuffix)) {
return ElMessage.error('请上传zip/kmz/kml格式的文件');
}
-
+ if (file) {
+ box.value = false;
+ }
let data = new FormData();
let type = t === '3' ? '' : t;
const params = {
@@ -535,15 +537,14 @@
ElMessage.success('上传成功');
- box.value = false;
-
+ loading.value = false;
ruleForm.name = '';
ruleForm.region = '';
if (ruleFormRef.value) {
ruleFormRef.value.resetFields();
}
-loading.value = true
+
searchReset();
});
};
--
Gitblit v1.9.3