From d62b2d02a09806d3e3ff0aebc8e5f3fa5f5473ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Thu, 29 Aug 2024 15:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=BF=E4=BA=A7=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/minerals/index.ts                     | 10 +++
 .../demo/minerals/miningstatistics/index.vue  | 18 ++---
 .../miningstatistics/miningstatistics.data.ts | 69 ++++++++-----------
 .../patchsummary/patchsummary.data.ts         | 41 +++++------
 .../minerals/processingstatistics/index.vue   |  9 +--
 .../processingstatistics.data.ts              | 32 ++++-----
 6 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/src/api/minerals/index.ts b/src/api/minerals/index.ts
index 271eb5d7..cc8d96cf 100644
--- a/src/api/minerals/index.ts
+++ b/src/api/minerals/index.ts
@@ -4,8 +4,18 @@ import { tubanListParams } from './model/index';
 enum Api {
   // 获取待办任务统计数据
   LoadCaseInfoMineralsTuBanList = '/api/DroneCaseInfoMinerals/LoadCaseInfoMineralsTuBanList',
+  LoadMineralsLedger = '/api/DroneCaseInfoMinerals/LoadMineralsLedger',
+  LoadMineralsProcess = '/api/DroneCaseInfoMinerals/LoadMineralsProcess',
 }
 
 export function getLoadCaseInfoMineralsTuBanList(params?: tubanListParams) {
   return defHttp.get({ url: Api.LoadCaseInfoMineralsTuBanList, params });
 }
+
+export function getLoadMineralsLedger(params?: tubanListParams) {
+  return defHttp.get({ url: Api.LoadMineralsLedger, params });
+}
+
+export function getLoadMineralsProcess(params?: tubanListParams) {
+  return defHttp.get({ url: Api.LoadMineralsProcess, params });
+}
diff --git a/src/views/demo/minerals/miningstatistics/index.vue b/src/views/demo/minerals/miningstatistics/index.vue
index 2493ac7b..20f992e1 100644
--- a/src/views/demo/minerals/miningstatistics/index.vue
+++ b/src/views/demo/minerals/miningstatistics/index.vue
@@ -52,7 +52,7 @@
 <script lang="ts" setup>
   import { ref, reactive, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { LoadCaseInfoWpxfTuBanList } from '@/api/illegalmining/index.ts';
+  import { getLoadMineralsLedger } from '@/api/minerals/index';
   import { PermissionBtn } from '@/components/PermissionBtn/index';
   import { columns } from './miningstatistics.data';
   import { getAppEnvConfig } from '@/utils/env';
@@ -74,7 +74,7 @@
   const showInfoOpen = ref(false);
   const searchParams = ref({
     page: 1,
-    limit: 10,
+    limit: 20,
   });
   const areaParams = ref({
     tubanArea1: null,
@@ -87,11 +87,11 @@
   const tableData = ref([]);
   const tablePaginationRight = ref({
     current: 1,
-    pageSize: 10,
+    pageSize: 20,
     size: 'small',
-    defaultPageSize: 10,
+    defaultPageSize: 20,
     showSizeChanger: true,
-    pageSizeOptions: ['10', '50', '80', '100'],
+    pageSizeOptions: ['20', '50', '80', '100'],
     showQuickJumper: true,
     total: 0,
   });
@@ -119,7 +119,7 @@
     let url = '';
     let fileName = '';
     if (exportType == 'excel') {
-      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfTuBanList';
+      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoMinerals/ExprotMineralsLedger';
       fileName = '图斑汇总统计报表' + new Date().getTime() + '.xls';
     } else if (exportType == 'shp') {
       url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfShapefile';
@@ -149,7 +149,8 @@
   function onBtnClicked(domId) {
     switch (domId) {
       case 'btnExport':
-        open.value = true;
+        // open.value = true;
+        handleExport('excel');
         break;
       default:
         break;
@@ -178,7 +179,8 @@
   }
   function getTableData(querys) {
     setLoading(true);
-    LoadCaseInfoWpxfTuBanList(querys).then((res) => {
+    getLoadMineralsLedger(querys).then((res) => {
+      console.log(res)
       tableData.value = res.items;
       tablePaginationRight.value.total = res.total;
       setTableData(tableData.value);
diff --git a/src/views/demo/minerals/miningstatistics/miningstatistics.data.ts b/src/views/demo/minerals/miningstatistics/miningstatistics.data.ts
index 2155ea21..f85e77a6 100644
--- a/src/views/demo/minerals/miningstatistics/miningstatistics.data.ts
+++ b/src/views/demo/minerals/miningstatistics/miningstatistics.data.ts
@@ -3,131 +3,122 @@ import { BasicColumn } from '@/components/Table';
 export const columns: BasicColumn[] = [
   {
     title: '年',
-    dataIndex: 'year',
+    dataIndex: 'syear_base',
   },
   {
     title: '接收时间',
-    dataIndex: 'caseno',
-    width: 200,
+    dataIndex: 'xiafatime_base',
   },
   {
     title: '编号',
-    dataIndex: 'countyname',
-    width: 100,
+    dataIndex: 'tubannum_base',
   },
   {
     title: '线索来源',
-    dataIndex: 'streetname',
+    dataIndex: 'laiyuan_base',
   },
   {
     title: '线索描述',
-    dataIndex: 'communityname',
+    dataIndex: 'miaoshu_base',
   },
   {
     title: '县区',
-    dataIndex: 'communityname',
+    dataIndex: 'weizhixianname_base',
   },
   {
     title: '乡镇',
-    dataIndex: 'typename',
+    dataIndex: 'weizhizhenname_base',
   },
   {
     title: '村居',
-    dataIndex: 'typename',
+    dataIndex: 'weizhicunname_base',
   },
   {
     title: '开采主体',
-    dataIndex: 'typename',
+    dataIndex: 'kaicaizhuti_kcfill',
   },
   {
     title: '主体类型',
-    dataIndex: 'typename',
+    dataIndex: 'zhutitype_kcfill',
   },
   {
     title: '违法行为发生时间',
-    dataIndex: 'typename',
+    dataIndex: 'fashentime_kcfill',
   },
   {
     title: '违法行为结束时间',
-    dataIndex: 'area',
-    width: 110,
+    dataIndex: 'endtime_kcfill',
   },
   {
     title: '矿种',
-    dataIndex: 'gengdiarea',
-    width: 110,
+    dataIndex: 'kuangzhong_kcfill',
   },
   {
     title: '开采面积',
-    dataIndex: 'handlestatusname',
-    width: 80,
+    dataIndex: 'kaicaiarea_kcfill',
   },
   {
     title: '方量',
-    dataIndex: 'handlestatusname',
-    width: 80,
+    dataIndex: 'fangliang_kcfill',
   },
   {
     title: '采出的矿产品查封方量',
-    dataIndex: 'handlestatusname',
-    width: 80,
+    dataIndex: 'chafengliang_kcfill',
   },
   {
     title: '采出的矿产品价值',
-    dataIndex: 'handlestatusname',
-    width: 80,
+    dataIndex: 'caichujiazhi_kcfill',
   },
   {
     title: '是否村民自采自用',
-    dataIndex: 'isillegal',
-    width: 80,
+    dataIndex: 'hefaqingxing_kcfill',
   },
   {
     title: '是否河道采砂',
-    dataIndex: 'identificationtime',
+    dataIndex: 'ishedaocaisha_kcfill',
   },
   {
     title: '是否非法采矿行为',
-    dataIndex: 'xiangmuzhuti',
+    dataIndex: 'hefapanding_fill',
   },
   {
     title: '是否符合立案条件',
-    dataIndex: 'actualuseto',
+    dataIndex: 'islian_punish',
   },
   {
     title: '是否新增',
-    dataIndex: 'weifaleixing',
+    dataIndex: 'isnewadd_kcfill',
   },
   {
     title: '违法类型',
-    dataIndex: 'measurename',
+    dataIndex: 'wefatype_kcfill',
   },
   {
     title: '是否重大典型问题',
-    dataIndex: 'measurename',
+    dataIndex: 'iszhongda_kcfill',
   },
   {
     title: '是否位于重点敏感区域',
-    dataIndex: 'measurename',
+    dataIndex: 'iszhongdian_kcfill',
   },
   {
     title: '是否涉刑',
-    dataIndex: 'measurename',
+    dataIndex: 'isshexing',
   },
   {
     title: '核查人员名单',
-    dataIndex: 'measurename',
+    dataIndex: 'tianbaoren_fill',
   },
   {
     title: '审核人员名单',
-    dataIndex: 'measurename',
+    dataIndex: 'xianshenheren_fill',
   },
   {
     title: '办理时间限定',
-    dataIndex: 'measurename',
+    dataIndex: 'chulishixian_base',
   },
   {
     title: '是否提交核查报告',
-    dataIndex: 'measurename',
+    dataIndex: 'shuoming_fill',
   },
 ];
diff --git a/src/views/demo/minerals/patchsummary/patchsummary.data.ts b/src/views/demo/minerals/patchsummary/patchsummary.data.ts
index f91ee573..cdcfda37 100644
--- a/src/views/demo/minerals/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/minerals/patchsummary/patchsummary.data.ts
@@ -17,21 +17,21 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '图斑编号',
-    dataIndex: 'caseno',
+    dataIndex: 'tubannum_base',
     width: 200,
   },
   {
     title: '区县',
-    dataIndex: 'countyname',
+    dataIndex: 'weizhixianname_base',
     width: 100,
   },
   {
     title: '乡镇',
-    dataIndex: 'streetname',
+    dataIndex: 'weizhizhenname_base',
   },
   {
     title: '社区/村',
-    dataIndex: 'communityname',
+    dataIndex: 'weizhicunname_base',
   },
   {
     title: '行政区划编码',
@@ -43,38 +43,38 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '矿种',
-    dataIndex: 'typename',
+    dataIndex: 'kuangzhong_kcfill',
   },
   {
     title: '图斑变化情况说明',
-    dataIndex: 'typename',
+    dataIndex: 'shuoming_fill',
   },
   {
     title: '所属重点矿区名称',
-    dataIndex: 'typename',
+    dataIndex: 'zhongdianname_base',
   },
   {
     title: '所在国家自热保护区名称',
-    dataIndex: 'typename',
+    dataIndex: 'ziranbaohuname_base',
   },
   {
     title: '图斑面积',
-    dataIndex: 'area',
+    dataIndex: 'weifaarea_base',
     width: 110,
   },
   {
     title: '耕地面积',
-    dataIndex: 'gengdiarea',
+    dataIndex: 'jbntarea_base',
     width: 110,
   },
   {
     title: '违法开采面积',
-    dataIndex: 'handlestatusname',
+    dataIndex: 'kaicaiarea_kcfill',
     width: 80,
   },
   {
     title: '违法占地面积',
-    dataIndex: 'handlestatusname',
+    dataIndex: 'weifaarea_punish',
     width: 80,
   },
   {
@@ -84,38 +84,39 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '当前状态',
-    dataIndex: 'handlestatusname',
+    dataIndex: 'status_base',
     width: 80,
   },
   {
     title: '判定结果',
-    dataIndex: 'isillegal',
+    dataIndex: 'hefapanding_fill',
     width: 80,
   },
   {
     title: '下发时间',
-    dataIndex: 'identificationtime',
+    dataIndex: 'xiafatime_base',
   },
   {
     title: '项目主体',
-    dataIndex: 'xiangmuzhuti',
+    dataIndex: 'kaicaizhuti_kcfill',
   },
   {
     title: '开发违法类型',
-    dataIndex: 'actualuseto',
+    dataIndex: 'wefatype_kcfill',
   },
   {
     title: '加工违法类型',
-    dataIndex: 'weifaleixing',
+    dataIndex: 'weifatype_jgfill',
   },
   {
     title: '整改措施',
-    dataIndex: 'measurename',
+    dataIndex: 'zhenggaitype_jgzhg',
   },
   {
     title: '处理时限',
-    dataIndex: 'measurename',
+    dataIndex: 'chulishixian_base',
   },
+  // 表里没有备注
   {
     title: '备注',
     dataIndex: 'measurename',
diff --git a/src/views/demo/minerals/processingstatistics/index.vue b/src/views/demo/minerals/processingstatistics/index.vue
index 52eaf176..3de0813a 100644
--- a/src/views/demo/minerals/processingstatistics/index.vue
+++ b/src/views/demo/minerals/processingstatistics/index.vue
@@ -52,7 +52,7 @@
 <script lang="ts" setup>
   import { ref, reactive, onMounted } from 'vue';
   import { BasicTable, useTable, TableAction } from '@/components/Table';
-  import { LoadCaseInfoWpxfTuBanList } from '@/api/illegalmining/index.ts';
+  import { getLoadMineralsProcess } from '@/api/minerals/index';
   import { PermissionBtn } from '@/components/PermissionBtn/index';
   import { columns } from './processingstatistics.data';
   import { getAppEnvConfig } from '@/utils/env';
@@ -119,7 +119,7 @@
     let url = '';
     let fileName = '';
     if (exportType == 'excel') {
-      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfTuBanList';
+      url = VITE_GLOB_API_URL + '/api/DroneCaseInfoMinerals/ExprotMineralsProcess';
       fileName = '图斑汇总统计报表' + new Date().getTime() + '.xls';
     } else if (exportType == 'shp') {
       url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSatellite/ExportCaseInfoWpxfShapefile';
@@ -149,7 +149,8 @@
   function onBtnClicked(domId) {
     switch (domId) {
       case 'btnExport':
-        open.value = true;
+        // open.value = true;
+        handleExport('excel');
         break;
       default:
         break;
@@ -178,7 +179,7 @@
   }
   function getTableData(querys) {
     setLoading(true);
-    LoadCaseInfoWpxfTuBanList(querys).then((res) => {
+    getLoadMineralsProcess(querys).then((res) => {
       tableData.value = res.items;
       tablePaginationRight.value.total = res.total;
       setTableData(tableData.value);
diff --git a/src/views/demo/minerals/processingstatistics/processingstatistics.data.ts b/src/views/demo/minerals/processingstatistics/processingstatistics.data.ts
index 40bae47c..f2d44692 100644
--- a/src/views/demo/minerals/processingstatistics/processingstatistics.data.ts
+++ b/src/views/demo/minerals/processingstatistics/processingstatistics.data.ts
@@ -3,64 +3,62 @@ import { BasicColumn } from '@/components/Table';
 export const columns: BasicColumn[] = [
   {
     title: '年',
-    dataIndex: 'year',
+    dataIndex: 'syear_base',
   },
   {
     title: '接收时间',
-    dataIndex: 'caseno',
-    width: 200,
+    dataIndex: 'xiafatime_base',
   },
   {
     title: '编号',
-    dataIndex: 'countyname',
-    width: 100,
+    dataIndex: 'tubannum_base',
   },
   {
     title: '线索来源',
-    dataIndex: 'streetname',
+    dataIndex: 'laiyuan_base',
   },
   {
     title: '线索描述',
-    dataIndex: 'communityname',
+    dataIndex: 'miaoshu_base',
   },
   {
     title: '县区',
-    dataIndex: 'communityname',
+    dataIndex: 'weizhixianname_base',
   },
   {
     title: '乡镇',
-    dataIndex: 'typename',
+    dataIndex: 'weizhizhenname_base',
   },
   {
     title: '村居',
-    dataIndex: 'typename',
+    dataIndex: 'weizhicunname_base',
   },
   {
     title: '开采主体',
-    dataIndex: 'typename',
+    dataIndex: 'danweiname_jgzhg',
   },
   {
     title: '违法类型',
-    dataIndex: 'typename',
+    dataIndex: 'weifatype_jgfill',
   },
   {
     title: '整改类型',
-    dataIndex: 'typename',
+    dataIndex: 'zhenggaitype_jgzhg',
   },
   {
     title: '核查人员名单',
-    dataIndex: 'measurename',
+    dataIndex: 'tianbaoren_fill',
   },
   {
     title: '审核人员名单',
-    dataIndex: 'measurename',
+    dataIndex: 'xianshenheren_fill',
   },
   {
     title: '办理时间限定',
-    dataIndex: 'measurename',
+    dataIndex: 'chulishixian_base',
   },
   {
     title: '是否提交核查报告',
-    dataIndex: 'measurename',
+    dataIndex: 'shuoming_fill',
   },
 ];