diff --git a/src/api/demo/system.ts b/src/api/demo/system.ts index 76433d01..a1691025 100644 --- a/src/api/demo/system.ts +++ b/src/api/demo/system.ts @@ -88,9 +88,19 @@ enum Api { UpdateCaseInfo = '/api/DroneCaseInfoSingle/UpdateCaseInfo', // 修改案件-获取案件历史信息 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) => defHttp.get({ 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 }); diff --git a/src/views/demo/caseoffence/index.data.ts b/src/views/demo/caseoffence/index.data.ts index e065e94d..4d891f32 100644 --- a/src/views/demo/caseoffence/index.data.ts +++ b/src/views/demo/caseoffence/index.data.ts @@ -229,10 +229,10 @@ export const searchFormSchema: FormSchema[] = [ component: 'RangePicker', colProps: { span: 8 }, componentProps: { - format: 'YYYY-MM', - picker: 'month', + format: 'YYYY-MM-DD', + // picker: 'month', placeholder: ['开始日期', '结束日期'], - defaultValue: [dayjs(dayjs(), 'YYYY-MM'), dayjs(dayjs(), 'YYYY-MM')] + // defaultValue: [dayjs(dayjs(), 'YYYY-MM'), dayjs(dayjs(), 'YYYY-MM')] }, }, ]; diff --git a/src/views/demo/caseoffence/index.vue b/src/views/demo/caseoffence/index.vue index 388ea2fd..35ca1504 100644 --- a/src/views/demo/caseoffence/index.vue +++ b/src/views/demo/caseoffence/index.vue @@ -280,8 +280,8 @@ beforeFetch: (data) => { // 接口请求前 参数处理 var temp = { - startTime: dayjs(data.startTime).startOf('month').format('YYYY-MM-DD'), - endTime: dayjs(data.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), + startTime: dayjs(data.startTime).startOf('day').format('YYYY-MM-DD'), + endTime: dayjs(data.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'), }; return temp; }, @@ -310,8 +310,8 @@ const searchForm = reactive({ AreaId: record.countyid, CaseType: CaseType, - startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'), - endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), + startTime: dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD'), + endTime: dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'), page: 1, limit: 10, }); @@ -407,15 +407,15 @@ let params: any = {}; let afterTitle = ''; if ( - dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM') === - dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM') + dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD') === + 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 { 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) { case 'chuantou_execl': @@ -468,8 +468,8 @@ } if (['mingxi_1', 'mingxi_2', 'mingxi_3'].includes(exportType)) { params = { - startTime: dayjs(searchParams.value?.startTime).startOf('month').format('YYYY-MM-DD'), - endTime: dayjs(searchParams.value?.endTime).endOf('month').format('YYYY-MM-DD HH:mm:ss'), + startTime: dayjs(searchParams.value?.startTime).startOf('day').format('YYYY-MM-DD'), + endTime: dayjs(searchParams.value?.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'), }; }