diff --git a/src/views/demo/minerals/patchsummaryData/detail/index.vue b/src/views/demo/minerals/patchsummaryData/detail/index.vue
new file mode 100644
index 00000000..3bd45c4d
--- /dev/null
+++ b/src/views/demo/minerals/patchsummaryData/detail/index.vue
@@ -0,0 +1,1180 @@
+
+
+
+
+
+
+
+
+
+ {{ caseInfo.case_no }}
+ {{ caseInfo.syear_base }}
+ {{ caseInfo.jieshou_time }}
+ {{
+ caseInfo.fafangpici_base
+ }}
+ {{ caseInfo.centerlng_base }} / {{ caseInfo.centerlat_base }}
+ {{ caseInfo.tubanlaiyuan }}
+ {{
+ // dataProcessing(caseInfo.weifaarea_base)
+ caseInfo.weifaarea_base
+ }}
+ {{
+ caseInfo.case_description
+ }}
+ {{
+ caseInfo.zhongdianflag_base
+ }}
+ {{
+ caseInfo.zhongdianname_base
+ }}
+ {{
+ getLabel('ziranbaohuflag_base', caseInfo.ziranbaohuflag_base)
+ }}
+ {{
+ caseInfo.ziranbaohuname_base
+ }}
+ {{
+ caseInfo.weifakaicaiarea_base
+ }}
+ {{
+ caseInfo.xiafatime_base
+ }}
+ {{ caseInfo.countyname }}
+ {{ caseInfo.streetname }}
+ {{ caseInfo.communityname }}
+ {{
+ caseInfo.jbntarea_base
+ }}
+ {{
+ caseInfo.cskfbjarea_base
+ }}
+ {{
+ caseInfo.stbhhxarea_base
+ }}
+ {{
+ caseInfo.tudiliyongflag_base
+ }}
+ {{
+ caseInfo.weifazhandiarea_base
+ }}
+ {{
+ caseInfo.chulishixian_base
+ }}
+
+
+
+
+
+
+
+ {{ caseInfo.typename }}
+ {{
+ getLabel('hefapanding_fill', caseInfo.hefapanding_fill)
+ }}
+
+
+
+
+ {{
+ getLabel('hefaqingxing_kcfill', caseInfo.hefaqingxing_kcfill)
+ }}
+ {{
+ caseInfo.shenpitype_kcfill
+ }}
+ {{
+ caseInfo.shenpitime_kcfill
+ }}
+ {{
+ caseInfo.shenpinum_kcfill
+ }}
+ {{
+ caseInfo.youxiaoqi_kcfill
+ }}
+
+
+
+ {{
+ getLabel('weifaleixing', caseInfo.weifaleixing)
+ }}
+ {{
+ caseInfo.isguihua_kcfill
+ }}
+ {{
+ caseInfo.iszhongda_kcfill
+ }}
+ {{
+ caseInfo.iszhongdian_kcfill
+ }}
+ {{
+ caseInfo.kaicaizhuti_kcfill
+ }}
+ {{
+ getLabel('zhutitype_kcfill', caseInfo.zhutitype_kcfill)
+ }}
+ {{
+ caseInfo.fashentime_kcfill
+ }}
+ {{
+ caseInfo.endtime_kcfill
+ }}
+ {{
+ caseInfo.kuangzhong_kcfill
+ }}
+ {{
+ caseInfo.kaicaiarea_kcfill
+ }}
+ {{
+ caseInfo.fangliang_kcfill
+ }}
+ {{
+ caseInfo.chafengliang_kcfill
+ }}
+ {{
+ caseInfo.caichujiazhi_kcfill
+ }}
+ {{
+ caseInfo.isnewadd_kcfill
+ }}
+
+
+
+ {{
+ caseInfo.ishedaocaisha_kcfill
+ }}
+
+
+
+
+ {{
+ getLabel('weifatype_jgfill', caseInfo.weifatype_jgfill)
+ }}
+ {{
+ caseInfo.shejichanneng_base
+ }}
+
+ {{
+ caseInfo.shuoming_fill
+ }}
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+ {{ caseInfo.tianbaoren_fill }}
+ {{
+ caseInfo.tianbaotime_fill
+ }}
+
+
+
+
+ 县级审核
+
+ {{
+ caseInfo.xianshenhejieguo_fill
+ }}
+ {{
+ caseInfo.xianbohuinote_fill
+ }}
+ {{
+ caseInfo.xianshenheren_fill
+ }}
+ {{
+ caseInfo.xianshenhetime_fill
+ }}
+
+ 市级审核
+
+ {{
+ caseInfo.shishenheren_fill
+ }}
+ {{
+ caseInfo.shishenhetime_fill
+ }}
+ {{
+ caseInfo.shishenhejieguo_fill
+ }}
+ {{
+ caseInfo.shibohuinote_fill
+ }}
+
+
+
+
+ {{
+ getName(caseInfo.islian_punish)
+ }}
+ {{
+ caseInfo.liantime_punish
+ }}
+ {{
+ caseInfo.lianjiguan_punish
+ }}
+ {{
+ caseInfo.isjiean_punish
+ }}
+ {{
+ caseInfo.weifazhuti_punish
+ }}
+ {{
+ caseInfo.weifashuliang_punish
+ }}
+ {{
+ caseInfo.weifajiazhi_punish
+ }}
+ {{
+ caseInfo.weifaarea_punish
+ }}
+ {{
+ caseInfo.xiangguandilei_punish
+ }}
+ {{
+ caseInfo.isyisongsifa_punish
+ }}
+ {{
+ caseInfo.dangjichufen_punish
+ }}
+ {{
+ caseInfo.isxingzhengchufa_punish
+ }}
+ {{
+ caseInfo.xingzhengchufanum_punish
+ }}
+ {{
+ caseInfo.moshoujine_punish
+ }}
+ {{
+ caseInfo.fakuanjine_punish
+ }}
+ {{
+ caseInfo.moshoushuliang_punish
+ }}
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+ {{
+ caseInfo.isqiangzhizhixing_punish
+ }}
+ {{
+ caseInfo.chachuren_punish
+ }}
+ {{
+ caseInfo.chachutime_punish
+ }}
+
+
+
+
+
+ {{
+ caseInfo.qingkuangnote_reform
+ }}
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+ {{
+ caseInfo.zhenggairen_reform
+ }}
+ {{
+ caseInfo.zhenggaitime_reform
+ }}
+
+
+
+ 县级审核
+
+ {{
+ caseInfo.xianshenhejieguo_reform
+ }}
+ {{
+ caseInfo.xianbohuinote_reform
+ }}
+ {{
+ caseInfo.xianshenheren_reform
+ }}
+ {{
+ caseInfo.xianshenhetime_reform
+ }}
+
+ 市级审核
+
+ {{
+ caseInfo.shishenhejieguo_reform
+ }}
+ {{
+ caseInfo.shibohuinote_reform
+ }}
+ {{
+ caseInfo.shishenheren_reform
+ }}
+ {{
+ caseInfo.shishenhetime_reform
+ }}
+
+
+
+
+ 县级审核
+
+ {{
+ caseInfo.xianshenheren_fill
+ }}
+ {{
+ caseInfo.xianshenhetime_fill
+ }}
+ {{
+ caseInfo.xianshenhejieguo_fill
+ }}
+ {{
+ caseInfo.xianbohuinote_fill
+ }}
+
+ 市级审核
+
+ {{
+ caseInfo.shishenheren_fill
+ }}
+ {{
+ caseInfo.shishenhetime_fill
+ }}
+ {{
+ caseInfo.shishenhejieguo_fill
+ }}
+ {{
+ caseInfo.shibohuinote_fill
+ }}
+
+
+
+
+
+
+
+ {{
+ caseInfo.zhenggaitype_jgzhg
+ }}
+ {{
+ caseInfo.baoliuchengnuo_jgzhg
+ }}
+ {{
+ caseInfo.danweiname_jgzhg
+ }}
+ {{
+ caseInfo.jutiweizhi_jgzhg
+ }}
+ {{
+ caseInfo.cunzaiwenti_jgzhg
+ }}
+ {{
+ caseInfo.shuoming_jgzhg
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item }}
+
+
+
+
+ {{
+ caseInfo.zhenggairen_jgzhg
+ }}
+ {{
+ caseInfo.zhenggaitime_jgzhg
+ }}
+
+
+
+ 县级审核
+
+ {{
+ caseInfo.xianshenhejieguo_fill
+ }}
+ {{
+ caseInfo.xianbohuinote_fill
+ }}
+ {{
+ caseInfo.xianshenheren_fill
+ }}
+ {{
+ caseInfo.xianshenhetime_fill
+ }}
+
+ 市级审核
+
+ {{
+ caseInfo.shishenhejieguo_fill
+ }}
+ {{
+ caseInfo.shibohuinote_fill
+ }}
+ {{
+ caseInfo.shishenheren_fill
+ }}
+ {{
+ caseInfo.shishenhetime_fill
+ }}
+
+
+
+
+
+
+
+
+
+ 取消
+ 下载
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+ {{ dataProcessingCount(record[column.key]) }}
+
+
+
+
+
+
+
+
+
+
+ 图斑汇总统计报表(execl)
+
+
+ 图斑汇总矢量数据(shp)
+
+
+
+
+
+
+
+
+
+
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 },
+ },
+];
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 @@
+
+