From 4bae5dab64eb643de6900fbff48a62f8eef01363 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Tue, 13 May 2025 11:18:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=86=9C=E5=8F=91?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96=E7=A7=BB=E6=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sys/exception/Converge.vue | 19 +- src/views/sys/exception/Converge/config.ts | 2 +- src/views/sys/exception/Converge/index.vue | 259 ++++++++++----------- 3 files changed, 147 insertions(+), 133 deletions(-) diff --git a/src/views/sys/exception/Converge.vue b/src/views/sys/exception/Converge.vue index 59d14256..057dd25e 100644 --- a/src/views/sys/exception/Converge.vue +++ b/src/views/sys/exception/Converge.vue @@ -1,4 +1,5 @@ + + diff --git a/src/views/demo/minerals/patchsummaryData/index.vue b/src/views/demo/minerals/patchsummaryData/index.vue new file mode 100644 index 00000000..24ac3206 --- /dev/null +++ b/src/views/demo/minerals/patchsummaryData/index.vue @@ -0,0 +1,538 @@ + + + diff --git a/src/views/demo/minerals/patchsummaryData/patchsummary.data.ts b/src/views/demo/minerals/patchsummaryData/patchsummary.data.ts new file mode 100644 index 00000000..59df81bb --- /dev/null +++ b/src/views/demo/minerals/patchsummaryData/patchsummary.data.ts @@ -0,0 +1,327 @@ +import { BasicColumn, FormSchema } from '@/components/Table'; +import { getChildrenTree } from '@/api/demo/system'; +import { yearOptions } from '@/utils/global'; +import { getLoad } from '@/api/sys/sysDataItemDetail'; + +export const columns: BasicColumn[] = [ + { + title: '年度', + dataIndex: 'syear_base', + }, + { + title: '图斑编号', + dataIndex: 'tubannum_base', + width: 200, + }, + { + title: '区县', + dataIndex: 'weizhixianname_base', + width: 100, + }, + { + title: '乡镇', + dataIndex: 'weizhizhenname_base', + }, + { + title: '社区/村', + dataIndex: 'weizhicunname_base', + }, + { + title: '行政区划编码', + dataIndex: 'communityname', + }, + { + title: '图斑类型', + dataIndex: 'type_base', + }, + { + title: '矿种', + dataIndex: 'kuangzhong_kcfill', + }, + { + title: '图斑变化情况说明', + dataIndex: 'shuoming_fill', + }, + { + title: '所属重点矿区名称', + dataIndex: 'zhongdianname_base', + }, + { + title: '所在国家自热保护区名称', + dataIndex: 'ziranbaohuname_base', + width: 200, + }, + { + title: '图斑面积', + dataIndex: 'weifaarea_base', + }, + { + title: '耕地面积', + dataIndex: 'gengdi_area', + }, + { + title: '违法开采面积', + dataIndex: 'kaicaiarea_kcfill', + }, + { + title: '违法占地面积', + dataIndex: 'weifaarea_punish', + }, + { + title: '是否持续违法', + dataIndex: 'handlestatusname', + }, + { + title: '当前状态', + dataIndex: 'status_base', + }, + { + title: '判定结果', + dataIndex: 'hefapanding_fill', + }, + { + title: '下发时间', + dataIndex: 'xiafatime_base', + }, + { + title: '项目主体', + dataIndex: 'kaicaizhuti_kcfill', + }, + { + title: '开采违法类型', + dataIndex: 'wefatype_kcfill', + }, + { + title: '加工违法类型', + dataIndex: 'weifatype_jgfill', + }, + { + title: '整改措施', + dataIndex: 'zhenggaitype_jgzhg', + }, + { + title: '处理时限', + dataIndex: 'chulishixian_base', + }, + // 表里没有备注 + // { + // title: '备注', + // dataIndex: 'measurename', + // }, +]; +export const searchFormSchema: FormSchema[] = [ + { + field: 'syear_base', + component: 'Select', + colProps: { span: 4 }, + label: '年度', + componentProps: { + options: yearOptions, + }, + }, + { + field: 'tubanlaiyuan', + label: '图斑来源', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'tubanlaiyuan' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + mode: 'multiple', + maxTagCount: 1 + }; + }, + }, + { + field: 'type_base', + label: '图斑类型', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kctubanleixing' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + { + field: 'countyid', + label: '区县', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ tableAction, formModel }) => { + return { + api: getChildrenTree, + params: { parentId: 371300 }, + // 接口参数 + resultField: 'result', + labelField: 'name', + valueField: 'id', + onChange: () => { + formModel.streetid = ''; + }, + }; + }, + }, + { + field: 'streetid', + label: '乡镇', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: formModel.countyid && getChildrenTree, + params: { parentId: formModel.countyid }, + // 接口参数 + resultField: 'result', + labelField: 'name', + valueField: 'id', + }; + }, + }, + { + field: 'status_base', + label: '当前状态', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kcdangqianzhuangtai' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + slot: 'dangqianzhuangtai', + }, + + { + field: 'hefapanding_fill', + label: '判定结果', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kcpandingjieguo' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + + { + field: 'zhenggaitype_jgzhg', + label: '整改措施', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kczhenggaicuoshi' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + + { + field: 'wefatype_kcfill', + label: '开采违法类型', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kaicaiweifa' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + { + field: 'weifatype_jgfill', + label: '加工违法类型', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'jiagongweifa' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + // 增加图斑面积、耕地面积、永农面积的筛选项； + { + field: 'tubanmianji', + label: '图斑面积', + colProps: { span: 4 }, + slot: 'tubanmianji', + }, + { + field: 'zhongdianflag_base', + label: '是否重点矿区', + component: 'Select', + colProps: { span: 4 }, + componentProps: { + options: [ + { label: '全部', value: null }, + { label: '是', value: '是' }, + { label: '否', value: '否' }, + ], + }, + }, + { + field: 'kuangzhong_kcfill', + label: '权属矿种', + component: 'ApiSelect', + colProps: { span: 4 }, + componentProps: ({ formModel }) => { + return { + api: getLoad, + params: { code: 'kuangzhong' }, + // 接口参数 + resultField: 'result', + labelField: 'itemName', + valueField: 'itemValue', + }; + }, + }, + { + field: '[startTime, endTime]', + label: '日期范围', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + placeholder: ['开始日期', '结束日期'], + }, + colProps: { span: 6 }, + }, + { + field: 'tubannum_base', + label: '图斑编号', + component: 'Input', + colProps: { span: 6 }, + }, +]; From d5e48575fb936ff30249679c801d744f56d9995f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=95=E5=B5=A9?= <17854119262@163.com> Date: Thu, 22 May 2025 13:47:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A0=8F=E8=BE=93=E5=85=A5=E5=9D=90=E6=A0=87=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sys/exception/Converge/SearchComponent.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/sys/exception/Converge/SearchComponent.vue b/src/views/sys/exception/Converge/SearchComponent.vue index ef67ef9a..e5a5b9b4 100644 --- a/src/views/sys/exception/Converge/SearchComponent.vue +++ b/src/views/sys/exception/Converge/SearchComponent.vue @@ -112,7 +112,6 @@ }, ]); - const showSearchResult = ref(false); const showFilterOptions = ref(false); const currentFilter = ref('全部'); @@ -177,6 +176,13 @@ }); } showSearchResult.value = true; + } else if (keyword.value.includes(',')) { + // 通过坐标直接移动 + let location = keyword.value.split(','); + let newCoord = transformGCJ2WGS(location[1], location[0]); + if (newCoord) { + emits('toPosition', [newCoord.lon, newCoord.lat]); + } } else { // 地名搜索 axios