diff --git a/src/views/demo/caseoffence/index.vue b/src/views/demo/caseoffence/index.vue
index 10896baa..73625cb6 100644
--- a/src/views/demo/caseoffence/index.vue
+++ b/src/views/demo/caseoffence/index.vue
@@ -2,11 +2,6 @@
-
- 无人机发现违法行为情况统计明细表
- 土地卫片新增违法占用耕地情况统计表
- 无人机发现违法行为情况统计表
-
@@ -119,6 +114,27 @@
+
+
+
+ 案件信息(execl)
+
+
+ 图斑信息(shp)
+
+
+
+
+ 无人机发现违法行为情况统计明细表
+
+
+ 土地卫片新增违法占用耕地情况统计表
+
+
+ 无人机发现违法行为情况统计表
+
+
+
-
-
-
+
+
-
- 案件信息
- 图斑信息
-
@@ -216,7 +227,6 @@
afterFetch: (res) => {},
});
- const printOpen = ref(false);
const showRecordList = ref(false);
// 标签页面数据
@@ -318,62 +328,67 @@
}
// 穿透显示的明细表导出
function exportList() {
- handleExport(currentListQuery.listQuery, 'chuantou');
+ open.value = true;
}
// 导出种类
- const exportType_mingxi = ref('1');
- const exportType_chuantou = ref('1');
+ const open = ref(false);
// 直接下载接口返回的二进制流
- function handleExport(params, exportType) {
- delete params.limit;
- delete params.page;
-
+ function handleExport(exportType) {
let url = '';
let fileName = '';
- if (exportType == 'mingxi') {
- switch (exportType_mingxi.value) {
- case '1':
- // 无人机发现违法行为情况统计明细表
- url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceToExcel';
- fileName = '无人机发现违法行为情况统计明细表' + new Date().getTime() + '.xls';
- break;
- case '2':
- // 土地卫片新增违法占用耕地情况统计表
- url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceSimpleToExcel';
- fileName = '土地卫片新增违法占用耕地情况统计表' + new Date().getTime() + '.xls';
- break;
- case '3':
- // 无人机发现违法行为情况统计表
- url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceToExcel2';
- fileName = '无人机发现违法行为情况统计表' + new Date().getTime() + '.xls';
- break;
- }
+ let params: any = {};
+
+ switch (exportType) {
+ case 'chuantou_execl':
+ // 穿透-导出案件明细execl
+ url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExprotCaseListByType';
+ fileName =
+ '案件信息 ' +
+ tablist[activeKey.value].countyname +
+ '_' +
+ tablist[activeKey.value].label +
+ '.xls';
+ break;
+ case 'chuantou_shp':
+ // 穿透-导出案件明细shp
+ url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportShapefile';
+ fileName =
+ '图斑信息 ' +
+ tablist[activeKey.value].countyname +
+ '_' +
+ tablist[activeKey.value].label +
+ '.shp';
+ break;
+ case 'mingxi_1':
+ // 无人机发现违法行为情况统计明细表
+ url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceToExcel';
+ fileName = '无人机发现违法行为情况统计明细表' + new Date().getTime() + '.xls';
+ break;
+ case 'mingxi_2':
+ // 土地卫片新增违法占用耕地情况统计表
+ url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceSimpleToExcel';
+ fileName = '土地卫片新增违法占用耕地情况统计表' + new Date().getTime() + '.xls';
+ break;
+ case 'mingxi_3':
+ // 无人机发现违法行为情况统计表
+ url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/CaseOffenceSimpleToExcel2';
+ fileName = '无人机发现违法行为情况统计表' + new Date().getTime() + '.xls';
+ break;
+ default:
+ break;
}
- if (exportType == 'chuantou') {
- switch (exportType_chuantou.value) {
- case '1':
- // 穿透-导出案件明细execl
- url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExprotCaseListByType';
- fileName =
- '案件信息 ' +
- tablist[activeKey.value].countyname +
- '_' +
- tablist[activeKey.value].label +
- '.xls';
- break;
- case '2':
- // 穿透-导出案件明细shp
- url = VITE_GLOB_API_URL + '/api/DroneCaseInfoSingle/ExportShapefile';
- fileName =
- '图斑信息 ' +
- tablist[activeKey.value].countyname +
- '_' +
- tablist[activeKey.value].label +
- '.shp';
- break;
- }
+
+ if (['chuantou_execl', 'chuantou_shp'].includes(exportType)) {
+ params = currentListQuery.listQuery;
+ delete params.limit;
+ delete params.page;
+ } else {
+ params = {
+ startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'),
+ endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD'),
+ };
}
axios({
@@ -399,22 +414,26 @@
const buttonClick = async (type) => {
switch (type) {
case 'btnExport':
- let params = {
- startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'),
- endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD'),
- };
- handleExport(params, 'mingxi');
+ open.value = true;
+ break;
+ default:
break;
}
};
diff --git a/src/views/demo/statistical/patchsummary/index.vue b/src/views/demo/statistical/patchsummary/index.vue
index 39cb6b11..ef101c67 100644
--- a/src/views/demo/statistical/patchsummary/index.vue
+++ b/src/views/demo/statistical/patchsummary/index.vue
@@ -19,6 +19,16 @@
+
+
+
+ 图斑汇总统计报表(execl)
+
+
+ 图斑汇总统计信息(shp)
+
+
+
{
- console.log('excel', res);
- let fileName = '图斑汇总统计报表' + new Date().getTime() + '.xls';
const elink = document.createElement('a');
elink.download = fileName;
elink.style.display = 'none';
@@ -108,10 +126,11 @@
});
}
+ const open = ref(false);
function onBtnClicked(domId) {
switch (domId) {
case 'btnExport':
- handleExport();
+ open.value = true;
break;
default:
break;
@@ -165,4 +184,9 @@
flex: 1;
}
}
+ .exportbutton {
+ width: 510px;
+ height: 60px;
+ margin: 5px;
+ }
diff --git a/src/views/demo/statistical/patchsummary/patchsummary.data.ts b/src/views/demo/statistical/patchsummary/patchsummary.data.ts
index f2859712..11b32a01 100644
--- a/src/views/demo/statistical/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/statistical/patchsummary/patchsummary.data.ts
@@ -164,8 +164,8 @@ export const searchFormSchema: FormSchema[] = [
colProps: { span: 4 },
componentProps: {
options: [
- { label: '拆除复耕', value: '拆除复耕' },
- { label: '补办手续', value: '补办手续' },
+ { label: '拆除复耕', value: '0' },
+ { label: '补办手续', value: '1' },
],
},
},