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 | 294 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 219 insertions(+), 75 deletions(-)
diff --git a/src/views/resource/patchManagement.vue b/src/views/resource/patchManagement.vue
index 903ffce..371c723 100644
--- a/src/views/resource/patchManagement.vue
+++ b/src/views/resource/patchManagement.vue
@@ -35,7 +35,9 @@
<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">删除 </el-button>
+ <el-button type="primary" text icon="el-icon-delete" @click="rowDel(scope.row)"
+ >删除
+ </el-button>
</template>
</avue-crud>
@@ -51,13 +53,24 @@
<el-input v-model="ruleForm.name" />
</el-form-item>
<el-form-item label="图斑类型" prop="region">
- <el-select v-model="ruleForm.region" placeholder="Activity zone">
- <el-option label="Zone one" value="shanghai" />
- <el-option label="Zone two" value="beijing" />
+ <el-select v-model="ruleForm.region" placeholder="请选择图斑类型">
+ <el-option
+ v-for="item in spotTypeOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
</el-select>
</el-form-item>
<el-form-item class="center-align">
- <el-button type="primary"> 图斑上传 </el-button>
+ <el-upload
+ action="#"
+ :show-file-list="false"
+ :before-upload="e => uploadFlightFile(e, '1')"
+ accept=".kmz, .kml, .zip"
+ >
+ <el-button type="primary"> 图斑上传 </el-button>
+ </el-upload>
</el-form-item>
<el-form-item class="center-align">
<span>注：仅支持gis平台导出的zip压缩文件</span>
@@ -65,18 +78,24 @@
</el-form>
</el-dialog>
<!-- 图斑详情 -->
- <SpotDetails v-model:show="uploadPatchDialog" :title="spotDetailsTitle"></SpotDetails>
- <!-- <patchDetails ref="patchDetails" /> -->
+ <SpotDetails
+ v-model:show="uploadPatchDialog"
+ :title="spotDetailsTitle"
+ :detailid="detailid"
+ :detailList="detailList"
+ :spotTypeOption="spotTypeOption"
+ ></SpotDetails>
+
</basic-container>
</template>
-
<script setup>
import {
spotManagementTableApi,
searchManagementApi,
uploadManagementApi,
tableMapListApi,
- exportExcel
+ exportExcel,
+ patchDeleteApi,
} from '@/api/patchManagement/index';
import { getRegionTreeAll } from '@/api/job/task';
import { ref, computed, watch } from 'vue';
@@ -88,32 +107,25 @@
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);
let deptTreeData = ref([]);
+const regionalScope = ref([]);
+const spotTypeOption = ref([]);
+const creatorOption = ref([]);
const userAreaCode = computed(() => store.getters.userInfo.detail.areaCode);
const ruleForm = reactive({
- name: 'Hello',
+ name: '',
region: '',
- count: '',
- date1: '',
- date2: '',
- delivery: false,
- location: '',
- type: [],
- resource: '',
- desc: '',
});
const rules = reactive({
- name: [
- { required: true, message: 'Please input Activity name', trigger: 'blur' },
- { min: 3, max: 5, message: 'Length should be 3 to 5', trigger: 'blur' },
- ],
+ name: [{ required: true, message: '请输入', trigger: 'blur' }, { trigger: 'blur' }],
region: [
{
required: true,
- message: 'Please select Activity zone',
+ message: '请选择',
trigger: 'change',
},
],
@@ -126,14 +138,20 @@
const box = ref(false);
const page = ref({
- pageSize: 10,
+ pageSize: 20,
currentPage: 1,
total: 0,
+ lotTypeId: '',
+ createUser: '',
+ areaCode:'',
+ fileName:''
});
const selectionList = ref([]);
const option = ref({
+ align: 'center',
+ headerAlign: 'center',
addBtn: false,
tip: false,
searchShow: true,
@@ -159,7 +177,7 @@
column: [
{
label: '文件名称',
- prop: 'name',
+ prop: 'file_name',
span: 24,
search: true,
searchSpan: 4,
@@ -167,75 +185,69 @@
},
{
label: '图斑类型',
- prop: 'ossCode',
+ prop: 'patches_type_desc',
span: 24,
searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'select',
- dicData: [
- { label: 'Zone one', value: 'shanghai' },
- { label: 'Zone two', value: 'beijing' },
- ],
+ dicData: spotTypeOption,
props: {
label: 'label',
value: 'value',
},
- rules: [{ required: true, message: '请输入图斑类型', trigger: 'blur' }],
+ rules: [{ required: true, message: '请选择图斑类型', trigger: 'blur' }],
},
{
label: '图斑数量',
- prop: 'ossCode',
+ prop: 'patches_num',
span: 24,
rules: [{ required: true, message: '请输入图斑数量', trigger: 'blur' }],
},
{
label: '异常图斑数量',
- prop: 'ossCode',
+ prop: 'exception_num',
span: 24,
rules: [{ required: true, message: '请输入异常图斑数量', trigger: 'blur' }],
},
{
label: '行政区划',
- prop: 'ossCode111',
+ prop: 'areaName',
span: 24,
+ width:180,
searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'tree',
dicData: deptTreeData,
props: {
- label: 'name',
- value: 'id',
- children: 'childrens',
+ label: 'name',
+ value: 'id',
+ children: 'childrens',
},
rules: [{ required: true, message: '请选择行政区划', trigger: 'blur' }],
},
{
label: '数据来源',
- prop: 'ossCode',
+ prop: 'dataFrom',
span: 24,
rules: [{ required: true, message: '请输入数据来源', trigger: 'blur' }],
},
{
label: '创建时间',
- prop: 'ossCode',
+ prop: 'create_time',
span: 24,
rules: [{ required: true, message: '请输入创建时间', trigger: 'blur' }],
},
{
label: '创建人',
- prop: 'bucketName',
+ prop: 'user_name',
span: 24,
searchLabelWidth: 100,
search: true,
searchSpan: 4,
type: 'select',
- dicData: [
- { label: '张三', value: 'zhangsan' },
- { label: '李四', value: 'lisi' },
- { label: '王五', value: 'wangwu' },
- ],
+ dicData: creatorOption,
props: {
label: 'label',
value: 'value',
@@ -246,14 +258,12 @@
});
const data = ref([]);
-// ===== refs =====
const crudRef = ref(null);
const uploadPatchDialog = ref(null);
-
+const detailid = ref(null);
// ===== 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,
@@ -263,11 +273,59 @@
const ids = computed(() => selectionList.value.map(ele => ele.id).join(','));
// 获取行政区划
+const regionalData = ref([])
const requestDockInfo = () => {
- getRegionTreeAll({ parentCode: userAreaCode.value }).then(res => {
- deptTreeData.value = 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();
+ const isMatched = regionalScope.value.some(
+ code => nodeCodeStr.startsWith(code.toString()) || code.toString().startsWith(nodeCodeStr)
+ );
- console.log('xingzhengquhua', deptTreeData.value);
+ if (node.childrens && node.childrens.length) {
+ node.childrens = filterTree(node.childrens);
+ if (node.childrens.length) return true;
+ }
+
+ return isMatched;
+ });
+ };
+ deptTreeData.value = filterTree(rawData);
+ onLoad(page.value);
+ });
+};
+// 获取搜索数据
+const getsearchManagementApi = () => {
+ searchManagementApi().then(res => {
+ const uniqueMap = new Map();
+ res.data.data.lot_values.forEach(item => {
+ const [key, value] = Object.entries(item)[0];
+ if (!uniqueMap.has(key)) {
+ 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 = Array.from(creatorOptionuniqueMap).map(([key, value]) => ({
+ label: value,
+ value: key,
+ }));
+ regionalScope.value = res.data.data.area_codes;
+ requestDockInfo();
+
+
});
};
// ===== watch =====
@@ -312,30 +370,39 @@
};
const rowDel = row => {
- ElMessageBox.confirm('确定将选择数据删除?', '提示', {
+
+ ElMessageBox.confirm('确定将选择数据删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
- });
- // .then(() => remove(row.id))
- // .then(() => {
- // onLoad(page.value);
- // ElMessage.success('操作成功!');
- // });
+ })
+ .then(() => patchDeleteApi(row.id)) // 直接传递ID
+ .then(() => {
+ onLoad(page.value)
+ ElMessage.success('操作成功!')
+ })
};
const searchReset = () => {
- query.value = {};
+page.value.areaCode=''
+page.value.createUser=''
+page.value.fileName=''
+ page.value.lotTypeId =''
+page.value.currentPage=1
+page.value.pageSize=20
onLoad(page.value);
};
const searchChange = (params, done) => {
- query.value = params;
page.value.currentPage = 1;
- onLoad(page.value, params);
+ 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();
};
-
const selectionChange = list => {
selectionList.value = list;
};
@@ -366,31 +433,67 @@
};
const refreshChange = () => {
- onLoad(page.value, query.value);
+ onLoad(page.value);
};
const onLoad = (pageInfo, params = {}) => {
- console.log('参数', pageInfo);
const searchparams = {
current: pageInfo.currentPage,
size: pageInfo.pageSize,
+ lotTypeId: pageInfo.lotTypeId,
+ fileName:pageInfo.fileName,
+ areaCode:pageInfo.areaCode,
+ createUser:pageInfo.createUser
};
loading.value = true;
- getListPage(pageInfo.currentPage, pageInfo.pageSize, Object.assign({}, params, query.value)).then(
- res => {
- const d = res.data.data;
- page.value.total = d.total;
- data.value = d.records;
- loading.value = false;
- selectionClear();
- }
- );
+ spotManagementTableApi(searchparams).then(res => {
+ const d = res.data.data;
+ page.value.total = d.total;
+ 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
};
// 跳转至图斑类型管理页面
@@ -400,10 +503,51 @@
// 下载图斑
const downloadPatch = () => {
- crudRef.value?.download();
+ if (!selectionList.value.length) {
+ return ElMessage.warning('请选择需要导出的数据');
+ }
+ exportExcel(selectionList.value?.map(i => i.id).join(',')).then(res => {
+ const elink = document.createElement('a');
+ elink.download = new Date().getTime() + '.xls';
+ elink.style.display = 'none';
+ const blob = new Blob([res.data], {
+ type: 'application/x-msdownload',
+ });
+ elink.href = URL.createObjectURL(blob);
+ document.body.appendChild(elink);
+ elink.click();
+ document.body.removeChild(elink);
+ loading.value = false;
+ });
};
+// 图斑上传
+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('上传失败');
+ ElMessage.success('上传成功');
+box.value = false
+searchReset()
+ init();
+ });
+};
+provide('searchReset', searchReset);
onMounted(() => {
- requestDockInfo();
+ getsearchManagementApi();
+
});
</script>
--
Gitblit v1.9.3