From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/views/resource/patchManagement.vue | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 75 insertions(+), 24 deletions(-)
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 9783ca5..371c723 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -63,7 +63,6 @@
</el-select>
</el-form-item>
<el-form-item class="center-align">
- <!-- <el-button type="primary"> 图斑上传 </el-button> -->
<el-upload
action="#"
:show-file-list="false"
@@ -83,11 +82,12 @@
v-model:show="uploadPatchDialog"
:title="spotDetailsTitle"
:detailid="detailid"
+ :detailList="detailList"
+ :spotTypeOption="spotTypeOption"
></SpotDetails>
- <!-- <patchDetails ref="patchDetails" /> -->
+
</basic-container>
</template>
-
<script setup>
import {
spotManagementTableApi,
@@ -107,6 +107,7 @@
import patchDetails from '@/views/resource/components/patchDetails.vue';
import SpotDetails from '@/views/resource/components/spotDetails.vue';
const spotDetailsTitle = ref('');
+const detailList = ref('')
const store = useStore();
const router = useRouter();
const ruleFormRef = ref(null);
@@ -141,7 +142,7 @@
currentPage: 1,
total: 0,
lotTypeId: '',
- updateUser: '',
+ createUser: '',
areaCode:'',
fileName:''
});
@@ -149,6 +150,8 @@
const selectionList = ref([]);
const option = ref({
+ align: 'center',
+ headerAlign: 'center',
addBtn: false,
tip: false,
searchShow: true,
@@ -209,8 +212,9 @@
},
{
label: '行政区划',
- prop: 'ossCode111',
+ prop: 'areaName',
span: 24,
+ width:180,
searchLabelWidth: 100,
search: true,
searchSpan: 4,
@@ -225,7 +229,7 @@
},
{
label: '数据来源',
- prop: 'ossCode',
+ prop: 'dataFrom',
span: 24,
rules: [{ required: true, message: '请输入数据来源', trigger: 'blur' }],
},
@@ -260,7 +264,6 @@
// ===== computed =====
const userInfo = computed(() => store.getters.userInfo);
const permission = computed(() => store.getters.permission);
-
const permissionList = computed(() => ({
addBtn: !!permission.value.oss_add,
viewBtn: !!permission.value.oss_view,
@@ -270,12 +273,11 @@
const ids = computed(() => selectionList.value.map(ele => ele.id).join(','));
// 获取行政区划
-
+const regionalData = ref([])
const requestDockInfo = () => {
- getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => {
- const areaCodes = [361104, 361124, 3611040, 361104000000];
- const rawData = res.data.data ? [res.data.data] : [];
- // 过滤函数
+ 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();
@@ -292,6 +294,7 @@
});
};
deptTreeData.value = filterTree(rawData);
+ onLoad(page.value);
});
};
// 获取搜索数据
@@ -304,16 +307,25 @@
uniqueMap.set(key, value);
}
});
+ const creatorOptionuniqueMap = new Map();
+ res.data.data.user_names.forEach(item => {
+ const [key, value] = Object.entries(item)[0];
+ if (!creatorOptionuniqueMap.has(key)) {
+ creatorOptionuniqueMap.set(key, value);
+ }
+ });
spotTypeOption.value = Array.from(uniqueMap).map(([key, value]) => ({
label: value,
value: key,
}));
- creatorOption.value = res.data.data.user_names.map(item => ({
- label: item,
- value: item,
+ creatorOption.value = Array.from(creatorOptionuniqueMap).map(([key, value]) => ({
+ label: value,
+ value: key,
}));
regionalScope.value = res.data.data.area_codes;
requestDockInfo();
+
+
});
};
// ===== watch =====
@@ -372,6 +384,9 @@
};
const searchReset = () => {
+page.value.areaCode=''
+page.value.createUser=''
+page.value.fileName=''
page.value.lotTypeId =''
page.value.currentPage=1
page.value.pageSize=20
@@ -382,7 +397,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
onLoad(page.value);
done();
};
@@ -424,24 +441,59 @@
current: pageInfo.currentPage,
size: pageInfo.pageSize,
lotTypeId: pageInfo.lotTypeId,
-
+ 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;
+ data.value = d.records
+ .map(i=>({
+ ...i,
+ dataFrom:i.date_from === 0? '本地上传':'国土调查云',
+ areaName: findAreaName(i.area_code)
+ }));
+ console.log('表格数据',data.value );
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
};
// 跳转至图斑类型管理页面
@@ -451,7 +503,6 @@
// 下载图斑
const downloadPatch = () => {
-
if (!selectionList.value.length) {
return ElMessage.warning('请选择需要导出的数据');
}
@@ -466,14 +517,11 @@
document.body.appendChild(elink);
elink.click();
document.body.removeChild(elink);
-
loading.value = false;
});
};
// 图斑上传
const uploadFlightFile = (file, t) => {
- console.log('ruleForm', ruleForm, file);
-
const fileSuffix = file.name.substring(file.name.lastIndexOf('.') + 1);
if (!['kmz', 'kml', 'zip'].includes(fileSuffix)) {
return ElMessage.error('请上传zip/kmz/kml格式的文件');
@@ -491,12 +539,15 @@
uploadManagementApi(data).then(res => {
if (res.data.code !== 0) return ElMessage.error('上传失败');
ElMessage.success('上传成功');
-
+box.value = false
+searchReset()
init();
});
};
+provide('searchReset', searchReset);
onMounted(() => {
getsearchManagementApi();
+
});
</script>
--
Gitblit v1.9.3