From 5808f76456ca0d40de5074f132b73a5a488e3e13 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 09 Dec 2025 09:12:03 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into test
---
src/views/resource/patchManagement.vue | 208 +++++++++++++++++++++++++--------------------------
1 files changed, 101 insertions(+), 107 deletions(-)
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 1d88a2f..1d73c99 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -35,13 +35,13 @@
<el-button type="primary" text icon="el-icon-edit" @click="uploadPatch(scope.row, 'edit')"
>编辑
</el-button>
- <el-button type="primary" text icon="el-icon-delete" @click="rowDel(scope.row)"
+ <el-button :disabled="scope.row.patches_type_desc==='综合类'" type="primary" text icon="el-icon-delete" @click="rowDel(scope.row)"
>删除
</el-button>
</template>
</avue-crud>
- <el-dialog title="上传图斑" append-to-body align-center v-model="box" width="550px">
+ <el-dialog title="上传图斑" class="ztzf-dialog-mange" append-to-body align-center v-model="box" width="550px">
<el-form
ref="ruleFormRef"
style="max-width: 600px"
@@ -55,7 +55,7 @@
<el-form-item label="图斑类型" prop="region">
<el-select v-model="ruleForm.region" placeholder="请选择图斑类型">
<el-option
- v-for="item in spotTypeOption"
+ v-for="item in allspotTypeOption"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -83,12 +83,13 @@
:title="spotDetailsTitle"
:detailid="detailid"
:detailList="detailList"
- :spotTypeOption="spotTypeOption"
+ :spotTypeOption="allspotTypeOption"
+ :regionalData="regionalData"
></SpotDetails>
-
</basic-container>
</template>
<script setup>
+import { findAreaName } from '@/utils/areaUtils';
import {
spotManagementTableApi,
searchManagementApi,
@@ -96,6 +97,7 @@
tableMapListApi,
exportExcel,
patchDeleteApi,
+ listOfSpotTypesApi,
} from '@/api/patchManagement/index';
import { getRegionTreeAll } from '@/api/job/task';
import { ref, computed, watch } from 'vue';
@@ -107,7 +109,7 @@
import patchDetails from '@/views/resource/components/patchDetails.vue';
import SpotDetails from '@/views/resource/components/spotDetails.vue';
const spotDetailsTitle = ref('');
-const detailList = ref('')
+const detailList = ref('');
const store = useStore();
const router = useRouter();
const ruleFormRef = ref(null);
@@ -143,22 +145,24 @@
total: 0,
lotTypeId: '',
createUser: '',
- areaCode:'',
- fileName:''
+ areaCode: '',
+ fileName: '',
});
const selectionList = ref([]);
-
const option = ref({
- align: 'center',
+ align: 'center',
headerAlign: 'center',
addBtn: false,
tip: false,
searchShow: true,
- searchMenuSpan: 8,
- searchMenuPosition: 'right',
+ searchGutter: 30,
+ searchMenuPosition: 'left',
+ searchMenuSpan: 4,
border: true,
index: true,
+ indexLabel: '序号',
+ indexWidth: 60,
selection: true,
grid: false,
menuWidth: 240,
@@ -180,8 +184,8 @@
prop: 'file_name',
span: 24,
search: true,
- overHidden: true,
- showOverflowTooltip: true,
+ overHidden: true,
+ showOverflowTooltip: true,
searchSpan: 4,
rules: [{ required: true, message: '请输入文件名称', trigger: 'blur' }],
},
@@ -189,7 +193,7 @@
label: '图斑类型',
prop: 'patches_type_desc',
span: 24,
- searchLabelWidth: 100,
+ // searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'select',
@@ -216,8 +220,8 @@
label: '行政区划',
prop: 'areaName',
span: 24,
- width:180,
- searchLabelWidth: 100,
+ width: 180,
+ // searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'tree',
@@ -245,7 +249,7 @@
label: '创建人',
prop: 'user_name',
span: 24,
- searchLabelWidth: 100,
+ // searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'select',
@@ -275,11 +279,11 @@
const ids = computed(() => selectionList.value.map(ele => ele.id).join(','));
// 获取行政区划
-const regionalData = ref([])
+const regionalData = ref([]);
const requestDockInfo = () => {
- getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => {
- const rawData = res.data.data ? [res.data.data] : [];
- regionalData.value = rawData;
+ getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => {
+ const rawData = res.data.data ? [res.data.data] : [];
+ regionalData.value = rawData;
const filterTree = nodes => {
return nodes.filter(node => {
const nodeCodeStr = node.id.toString();
@@ -296,7 +300,7 @@
});
};
deptTreeData.value = filterTree(rawData);
- onLoad(page.value);
+ onLoad(page.value);
});
};
// 获取搜索数据
@@ -309,7 +313,7 @@
uniqueMap.set(key, value);
}
});
- const creatorOptionuniqueMap = new Map();
+ const creatorOptionuniqueMap = new Map();
res.data.data.user_names.forEach(item => {
const [key, value] = Object.entries(item)[0];
if (!creatorOptionuniqueMap.has(key)) {
@@ -326,8 +330,20 @@
}));
regionalScope.value = res.data.data.area_codes;
requestDockInfo();
-
-
+ });
+};
+const allspotTypeOption = ref([]);
+// 获取上传图斑类型
+const getlistOfSpotTypesApi = () => {
+ const searchparams = {
+ current: 1,
+ size: 9999,
+ };
+ listOfSpotTypesApi(searchparams).then(res => {
+ allspotTypeOption.value = res.data.data.records.map(item => ({
+ label: item.patches_type,
+ value: item.id,
+ }));
});
};
// ===== watch =====
@@ -372,26 +388,25 @@
};
const rowDel = row => {
-
- ElMessageBox.confirm('确定将选择数据删除?', '提示', {
+ ElMessageBox.confirm('确定将选择数据删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
- .then(() => patchDeleteApi(row.id)) // 直接传递ID
- .then(() => {
- onLoad(page.value)
- ElMessage.success('操作成功!')
- })
+ .then(() => patchDeleteApi(row.id)) // 直接传递ID
+ .then(() => {
+ onLoad(page.value);
+ ElMessage.success('操作成功!');
+ });
};
const searchReset = () => {
-page.value.areaCode=''
-page.value.createUser=''
-page.value.fileName=''
- page.value.lotTypeId =''
-page.value.currentPage=1
-page.value.pageSize=20
+ page.value.areaCode = '';
+ page.value.createUser = '';
+ page.value.fileName = '';
+ page.value.lotTypeId = '';
+ page.value.currentPage = 1;
+ page.value.pageSize = 20;
onLoad(page.value);
};
@@ -399,9 +414,9 @@
page.value.currentPage = 1;
page.value.lotTypeId = params.patches_type_desc;
page.value.createUser = params.user_name;
- page.value.fileName=params.file_name
- page.value.areaCode=params.areaName
- page.value.createUser= params.user_name
+ page.value.fileName = params.file_name;
+ page.value.areaCode = params.areaName;
+ page.value.createUser = params.user_name;
onLoad(page.value);
done();
};
@@ -443,58 +458,30 @@
current: pageInfo.currentPage,
size: pageInfo.pageSize,
lotTypeId: pageInfo.lotTypeId,
- fileName:pageInfo.fileName,
- areaCode:pageInfo.areaCode,
- createUser:pageInfo.createUser
+ fileName: pageInfo.fileName,
+ areaCode: pageInfo.areaCode,
+ createUser: pageInfo.createUser,
};
loading.value = true;
spotManagementTableApi(searchparams).then(res => {
const d = res.data.data;
page.value.total = d.total;
- data.value = d.records
- .map(i=>({
+ data.value = d.records.map(i => ({
...i,
- dataFrom:i.date_from === 0? '本地上传':'国土调查云',
- areaName: findAreaName(i.area_code)
+ dataFrom: i.date_from === 0 ? '本地上传' : '国土调查云',
+ areaName: findAreaName(i.area_code, regionalData.value, true),
}));
loading.value = false;
selectionClear();
});
};
-const findAreaName = (areaCode) => {
- const nodes = regionalData.value;
- if (!nodes || nodes.length === 0) return areaCode;
- const normalizeCode = (code) => {
- if (!code) return '';
- const strCode = String(code).replace(/0+$/, '');
- return strCode.length >= 6 ? strCode : '';
- };
- const targetCode = normalizeCode(areaCode);
- const findInTree = (treeNodes, needFullPath = false, parentPath = []) => {
- for (const node of treeNodes) {
- const currentPath = [...parentPath, node.name];
-
- if (normalizeCode(node.id) === targetCode) {
- return needFullPath ? currentPath.join('/') : node.name;
- }
-
- if (node.childrens?.length > 0) {
- const found = findInTree(node.childrens, needFullPath, currentPath);
- if (found) return found;
- }
- }
- return null;
- };
-
- return findInTree(nodes, true) || areaCode;
-};
// 图斑详情/编辑
const uploadPatch = (row, type = 'detail') => {
detailid.value = row.id;
uploadPatchDialog.value = true;
spotDetailsTitle.value = type === 'detail' ? '图斑详情' : '图斑编辑';
- detailList.value = row
+ detailList.value = row;
};
// 跳转至图斑类型管理页面
@@ -507,7 +494,8 @@
if (!selectionList.value.length) {
return ElMessage.warning('请选择需要导出的数据');
}
- exportExcel(selectionList.value?.map(i => i.id).join(',')).then(res => {
+ const a = selectionList.value.map(i => Number(i.id));
+ exportExcel(a).then(res => {
const elink = document.createElement('a');
elink.download = new Date().getTime() + '.xls';
elink.style.display = 'none';
@@ -522,47 +510,53 @@
});
};
// 图斑上传
-const uploadFlightFile = (file, t) => {
- const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1);
- if (!['kmz', 'kml', 'zip'].includes(fileSuffix)) {
- return ElMessage.error('请上传zip/kmz/kml格式的文件');
- }
-
- let data = new FormData();
- let type = t === '3' ? '' : t;
- const params = {
- file: file,
- fileName: ruleForm.name,
- LotTypeId: ruleForm.region,
- };
-
- Object.keys(params).forEach(key => {
- data.append(key, params[key]);
- });
-
- uploadManagementApi(data).then(res => {
- if (res.data.code !== 0) {
- return ElMessage.error('上传失败');
+const uploadFlightFile = async (file, t) => {
+ loading.value = true;
+ try {
+ const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1);
+ if (!['kmz', 'kml', 'zip'].includes(fileSuffix)) {
+ ElMessage.error('请上传zip/kmz/kml格式的文件');
+ return;
}
-
- ElMessage.success('上传成功');
-
- box.value = false;
+ box.value = false;
+ let data = new FormData();
+ let type = t === '3' ? '' : t;
+ const params = {
+ file: file,
+ fileName: ruleForm.name,
+ LotTypeId: ruleForm.region,
+ };
+ Object.keys(params).forEach(key => {
+ data.append(key, params[key]);
+ });
+
+ const res = await uploadManagementApi(data);
+ if (res.data.code !== 0) {
+ ElMessage.error('上传失败');
+ return;
+ }
+
+ ElMessage.success('上传成功');
+
+ // 重置表单
ruleForm.name = '';
ruleForm.region = '';
-
if (ruleFormRef.value) {
ruleFormRef.value.resetFields();
}
-
+
searchReset();
- });
+ } catch (error) {
+ loading.value = false;
+ } finally {
+ loading.value = false;
+ }
};
provide('searchReset', searchReset);
onMounted(() => {
getsearchManagementApi();
-
+ getlistOfSpotTypesApi();
});
</script>
--
Gitblit v1.9.3