穿透内容添加时间筛选结果，异常上报显示修改

src/api/illegalconstruction/statistical.ts

@@ -38,19 +38,19 @@ export const getUserCountApi = (type: string, params) => {
       return GetDealDetailData(params)
   }
 }
-export function GetPunchDetailData(params: { userid: string }) {
+export function GetPunchDetailData(params: { userid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetPunchDetailData,
     params,
   });
 }
-export function GetReportDetailData(params: { userid: string }) {
+export function GetReportDetailData(params: { userid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetReportDetailData,
     params,
   });
 }
-export function GetDealDetailData(params: { userid: string }) {
+export function GetDealDetailData(params: { userid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetDealDetailData,
     params,
@@ -75,19 +75,19 @@ export function GetPointPunchStatistics(params) {
   });
 }
 
-export function GetPointPunchDetailData(params: { pointid: string }) {
+export function GetPointPunchDetailData(params: { pointid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetPointPunchDetailData,
     params,
   });
 }
-export function GetPointReportDetailData(params: { pointid: string }) {
+export function GetPointReportDetailData(params: { pointid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetPointReportDetailData,
     params,
   });
 }
-export function GetPointDealDetailData(params: { pointid: string }) {
+export function GetPointDealDetailData(params: { pointid: string, begindate?: string, enddate?: string }) {
   return defHttp.get({
     url: Api.GetPointDealDetailData,
     params,

src/views/demo/illegalconstruction/inspectionrecordpoint/ShowListModal/index.vue

@@ -9,7 +9,7 @@ import { BasicTable, useTable, TableAction } from '@/components/Table';
 import { getColums, searchFormSchema } from './utils';
 import { getPointCountApi } from '@/api/illegalconstruction/statistical'
 
-const props = defineProps(['title','id','type'])
+const props = defineProps(['title','id','type','timeParams'])
 const [registerTable, { setTableData, reload, clearSelectedRowKeys, setPagination, setLoading }] =useTable({
   title: props.title,
   api: (params) => getPointCountApi(props.type, { ...params, pointid: props.id }),
@@ -26,6 +26,9 @@ const [registerTable, { setTableData, reload, clearSelectedRowKeys, setPaginatio
   handleSearchInfoFn(info) {
     return info;
   },
+  beforeFetch(params) {
+    return { ...params, ...props.timeParams };
+  },
 });
 </script>
 

src/views/demo/illegalconstruction/inspectionrecordpoint/ShowListModal/utils.ts

@@ -1,5 +1,5 @@
 export const punchCountColumns = [
- { 
+  { 
     title: '片区',
     dataIndex: 'CountyName',
   },
@@ -30,6 +30,36 @@ export const punchCountColumns = [
 ]
 export const reportCountColumns = [
   { 
+    title: '片区',
+    dataIndex: 'CountyName',
+  },
+  { 
+    title: '乡镇',
+    dataIndex: 'StreetName',
+  },
+  { 
+    title: '村居',
+    dataIndex: 'CommunityName',
+  },
+  { 
+    title: '点位名称',
+    dataIndex: 'PointName',
+  },
+  { 
+    title: '巡查时间',
+    dataIndex: 'PunchTime',
+  },
+  { 
+    title: '人员',
+    dataIndex: 'UserName',
+  },
+  { 
+    title: '巡查结果',
+    dataIndex: 'StatusName',
+  },
+]
+export const dealCountColumns = [
+    { 
     title: '标题',
     dataIndex: 'Title',
   },
@@ -65,7 +95,7 @@ export const getColums = (type: string) => {
     case "reportCount":
       return reportCountColumns
     case "dealCount":
-      return reportCountColumns
+      return dealCountColumns
   }
 }
 export const searchFormSchema = [

src/views/demo/illegalconstruction/inspectionrecordpoint/index.vue

@@ -18,7 +18,7 @@
       title="列表信息"
       :destroyOnClose="true"
     >
-      <ShowListModal :title="showListModalTitle" :id="showListModalId" :type="showListModalType"/>
+      <ShowListModal :title="showListModalTitle" :id="showListModalId" :type="showListModalType" :timeParams="showListModalTimeParams"/>
     </a-modal>
   </div>
 </template>
@@ -38,6 +38,7 @@ const showListModal = ref(false)
 const showListModalTitle = ref('')
 const showListModalId = ref('')
 const showListModalType = ref('')
+const showListModalTimeParams = ref({})
 const [registerTable, { getForm }] =useTable({
   title: '巡查台账-点位',
   api: GetPointPunchStatistics,
@@ -108,6 +109,15 @@ const onBtnClicked = (domId) => {
   }
 }
 const showRecordList = (record, type) => {
+  const form = getForm();
+  const params = form.getFieldsValue();
+  if(params.begindate){
+    params.begindate = dayjs(params.begindate).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  }
+  if(params.enddate){
+    params.enddate = dayjs(params.enddate).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  }
+  showListModalTimeParams.value = params
   showListModalTitle.value = record.name
   showListModalId.value = record.pointId
   showListModalType.value = type

src/views/demo/illegalconstruction/inspectionrecorduser/index.vue

@@ -108,7 +108,15 @@ const onBtnClicked = (domId) => {
   }
 }
 const showRecordList = (record, type) => {
-  getUserCountApi(type, { userid: record.userId })?.then(res => {
+  const form = getForm();
+  const params = form.getFieldsValue();
+  if(params.begindate){
+    params.begindate = dayjs(params.begindate).startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  }
+  if(params.enddate){
+    params.enddate = dayjs(params.enddate).endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  }
+  getUserCountApi(type, { userid: record.userId, ...params })?.then(res => {
     console.log(111,res)
     modalData.value = res
     mapVisible.value = true