HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

统计报表筛选改为到日期

dianlixunjian
滕嵩 2024-08-16 18:15:55 +08:00
parent 2e756ae5be
commit aa6335b9dd
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/api/demo/system.ts
View File

@ -88,9 +88,19 @@ enum Api {
UpdateCaseInfo = '/api/DroneCaseInfoSingle/UpdateCaseInfo', UpdateCaseInfo = '/api/DroneCaseInfoSingle/UpdateCaseInfo',
// 修改案件-获取案件历史信息 // 修改案件-获取案件历史信息
LoadCaseHistoryInfoList = '/api/DroneCaseInfoSingle/LoadCaseHistoryInfoList', LoadCaseHistoryInfoList = '/api/DroneCaseInfoSingle/LoadCaseHistoryInfoList',
// geo服务增加
ShpGeoLayerAdd = '/api/ShpGeoLayer/Add',
// geo列表
ShpGeoLayerLoadPage = '/api/ShpGeoLayer/LoadPage',
// geo获取
ShpGeoLayerGet = '/api/ShpGeoLayer/Get',
// geo更新
ShpGeoLayerUpdateLayer = '/api/ShpGeoLayer/UpdateLayer',
// geo删除
ShpGeoLayerDelete = '/api/ShpGeoLayer/Delete',
// geo解析shp文件
ShpGeoLayerParseShpInfo = '/api/ShpGeoLayer/ParseShpInfo',
} }
export const getPositionsTree = (params?: AccountParams) => export const getPositionsTree = (params?: AccountParams) =>
defHttp.get<AccountListGetResultModel>({ url: Api.PositionsTree, params }); defHttp.get<AccountListGetResultModel>({ url: Api.PositionsTree, params });
@ -390,6 +400,22 @@ export function LoadCaseHistoryInfoList(params:{key: string}) {
}); });
} }
export const ShpGeoLayerAdd = (params) =>
defHttp.post({ url: Api.ShpGeoLayerAdd, params });
export const ShpGeoLayerLoadPage = (params) =>
defHttp.get({ url: Api.ShpGeoLayerLoadPage, params });
export const ShpGeoLayerGet = (params) =>
defHttp.get({ url: Api.ShpGeoLayerGet, params });
export const ShpGeoLayerUpdateLayer = (params) =>
defHttp.post({ url: Api.ShpGeoLayerUpdateLayer, params });
export const ShpGeoLayerDelete = (params) =>
defHttp.post({ url: Api.ShpGeoLayerDelete, params });
export const ShpGeoLayerParseShpInfo = (params) =>
defHttp.post({ url: Api.ShpGeoLayerParseShpInfo + "?srid=" + params.srid + "&tableName=" + params.tableName + "&zipFilePath=" + params.zipFilePath });

6
src/views/demo/caseoffence/index.data.ts
View File

@ -229,10 +229,10 @@ export const searchFormSchema: FormSchema[] = [
component: 'RangePicker', component: 'RangePicker',
colProps: { span: 8 }, colProps: { span: 8 },
componentProps: { componentProps: {
format: 'YYYY-MM', format: 'YYYY-MM-DD',
picker: 'month', // picker: 'month',
placeholder: ['开始日期', '结束日期'], placeholder: ['开始日期', '结束日期'],
defaultValue: [dayjs(dayjs(), 'YYYY-MM'), dayjs(dayjs(), 'YYYY-MM')] // defaultValue: [dayjs(dayjs(), 'YYYY-MM'), dayjs(dayjs(), 'YYYY-MM')]
}, },
}, },
]; ];

22
src/views/demo/caseoffence/index.vue
View File

@ -280,8 +280,8 @@
beforeFetch: (data) => { beforeFetch: (data) => {
// 接口请求前 参数处理 // 接口请求前 参数处理
var temp = { var temp = {
startTime: dayjs(data.startTime).startOf('month').format('YYYY-MM-DD'), startTime: dayjs(data.startTime).startOf('day').format('YYYY-MM-DD'),
endTime: dayjs(data.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
}; };
return temp; return temp;
}, },
@ -310,8 +310,8 @@
const searchForm = reactive<searchListSchema>({ const searchForm = reactive<searchListSchema>({
AreaId: record.countyid, AreaId: record.countyid,
CaseType: CaseType, CaseType: CaseType,
startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'), startTime: dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD'),
endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
page: 1, page: 1,
limit: 10, limit: 10,
}); });
@ -407,15 +407,15 @@
let params: any = {}; let params: any = {};
let afterTitle = ''; let afterTitle = '';
if ( if (
dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM') === dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD') ===
dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM') dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD')
) { ) {
afterTitle = dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM'); afterTitle = dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD');
} else { } else {
afterTitle = afterTitle =
dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM') + dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD') +
'至' + '至' +
dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM'); dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD');
} }
switch (exportType) { switch (exportType) {
case 'chuantou_execl': case 'chuantou_execl':
@ -468,8 +468,8 @@
} }
if (['mingxi_1', 'mingxi_2', 'mingxi_3'].includes(exportType)) { if (['mingxi_1', 'mingxi_2', 'mingxi_3'].includes(exportType)) {
params = { params = {
startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'), startTime: dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD'),
endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), endTime: dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
}; };
} }