diff --git a/src/views/demo/dailycheck/ShowInfoModal/index.vue b/src/views/demo/dailycheck/ShowInfoModal/index.vue index da785c46..7bdc2f47 100644 --- a/src/views/demo/dailycheck/ShowInfoModal/index.vue +++ b/src/views/demo/dailycheck/ShowInfoModal/index.vue @@ -79,7 +79,7 @@ - 确认 + 确认 @@ -258,11 +258,11 @@ MapboxComponent.value.handlerDraw('Details', geoms, false); } else { geomsList.value = null; - createMessage.error('当前数据没有线索!'); + // createMessage.error('当前数据没有线索!'); } }); } else { - createMessage.error('当前数据没有线索!'); + // createMessage.error('当前数据没有线索!'); } } diff --git a/src/views/demo/dailycheck/index.vue b/src/views/demo/dailycheck/index.vue index 4e37beb6..39dbdc11 100644 --- a/src/views/demo/dailycheck/index.vue +++ b/src/views/demo/dailycheck/index.vue @@ -45,6 +45,7 @@ import { BasicTable, useTable, TableAction } from '@/components/Table'; import { columns, searchFormSchema, typenameOptions, tubanlaiyuanOptions } from './utils'; import { LoadRcxjCaseinfo } from '@/api/dailycheck/index' import ShowInfoModal from '@/views/demo/dailycheck/ShowInfoModal/index.vue' +import dayjs from "dayjs"; const showInfoOpen = ref(false) const showInfoData = ref(); @@ -69,6 +70,18 @@ const [registerTable, { getForm, reload }] = useTable({ dataIndex: 'action', fixed: 'right', }, + beforeFetch: (params) => { + let resultParams = { + ...params + } + if(resultParams.synchronoustimebegin){ + resultParams.synchronoustimebegin = dayjs(resultParams.synchronoustimebegin).startOf('day').format('YYYY-MM-DD HH:mm:ss'); + } + if(resultParams.synchronoustimeend){ + resultParams.synchronoustimeend = dayjs(resultParams.synchronoustimeend).endOf('day').format('YYYY-MM-DD HH:mm:ss'); + } + return resultParams + }, }); function handleInfo(record) { showInfoData.value = record diff --git a/src/views/demo/dailycheck/utils.ts b/src/views/demo/dailycheck/utils.ts index d374de24..0e69b656 100644 --- a/src/views/demo/dailycheck/utils.ts +++ b/src/views/demo/dailycheck/utils.ts @@ -8,6 +8,10 @@ export const typenameOptions = await asyncGetOptions('rcxjxslx'); export const tubanlaiyuanOptions = await asyncGetOptions('rcxjxsly'); export const columns: BasicColumn[] = [ + { + title: '线索来源', + dataIndex: 'tubanlaiyuan', + }, { title: '线索编号', dataIndex: 'case_no', @@ -32,9 +36,14 @@ export const columns: BasicColumn[] = [ dataIndex: 'typename', }, { - title: '线索来源', - dataIndex: 'tubanlaiyuan', + title: '线索描述', + dataIndex: 'case_description', }, + { + title: '线索状态', + dataIndex: 'biaozhu', + }, + { title: '上报时间', dataIndex: 'createtime', @@ -47,14 +56,7 @@ export const columns: BasicColumn[] = [ title: '纬度', dataIndex: 'lat', }, - { - title: '线索描述', - dataIndex: 'case_description', - }, - { - title: '线索状态', - dataIndex: 'biaozhu', - }, + ]; export const searchFormSchema: FormSchema[] = [ @@ -129,7 +131,7 @@ export const searchFormSchema: FormSchema[] = [ field: 'biaozhu', label: '线索状态', component: 'Select', - colProps: { span: 5 }, + colProps: { span: 4 }, componentProps: { options: [ { label: '未确认', value: 0},