From 4f43b434a4adfe057cd5e72a1a05b7fd5536cb54 Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Fri, 23 Oct 2026 17:47:55 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/enterprises-inspected-noft.ts | 5 +- .../efcode/report/registration-statistics.ts | 2 + .../src/api/efcode/report/registration.ts | 17 +++ .../api/efcode/report/statistics-complaint.ts | 31 +++++ .../report/statistics-inspection-plan.ts | 16 +++ .../enterprises_inspected_noft/index.vue | 31 +++-- .../efcode/report/registration/indexList.vue | 73 +++++++++- .../report/registration_statistics/index.vue | 36 ++++- .../index.vue | 126 +++++++++++++++++- .../statistics_inspection_plan/index.vue | 69 +++++++++- 10 files changed, 383 insertions(+), 23 deletions(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts index ce6becb8..eb8382f4 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/enterprises-inspected-noft.ts @@ -8,7 +8,10 @@ export interface EINOFTQuery { pageNum?: number; pageSize?: number; enterpriseName?: string; - num?: string; + /** 执法次数下限 */ + numMin?: string; + /** 执法次数上限 */ + numMax?: string; beginTime?: string; endTime?: string; enterpriseNumber?: string; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration-statistics.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration-statistics.ts index 83c9f8d5..a1247579 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration-statistics.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration-statistics.ts @@ -21,6 +21,8 @@ export interface AnalysisQuery { numRight?: string; num?: string; enterpriseNumber?: string; + orderByColumn?: string; + isAsc?: string; } /** 执法分析行VO */ diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts index 25f07790..c049e5ed 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/registration.ts @@ -170,3 +170,20 @@ export const exportAnalysis = (params: RegistrationReportQuery): AxiosPromise => { + return request({ + url: '/code/registration/unionList', + method: 'get', + params: { unionNo } + }); +}; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-complaint.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-complaint.ts index d3f781c7..3c637759 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-complaint.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-complaint.ts @@ -52,6 +52,28 @@ export interface ComplaintDetailVo { enforceType: number; enforceTypeText: string; complaintTime: string; + /** 投诉内容 */ + complaintContent?: string; + /** 涉事地址 */ + enterpriseAddress?: string; + /** 附件 */ + attachment?: string; + /** 授权状态:1-同意 0-不同意 */ + authStatus?: number | string; + /** 联系人 */ + contactPerson?: string; + /** 联系电话 */ + contactPhone?: string; +} + +/** 处置进度VO */ +export interface ComplaintHandleVo { + /** 处理部门 */ + handleDepartment: string; + /** 处理意见 */ + handleOpinion: string; + /** 处理时间 */ + handleTime: string; } /** Tab2 类型统计VO */ @@ -88,6 +110,15 @@ export const getDetailList = (params: ComplaintQuery): AxiosPromise => { }); }; +/** 投诉举报详情(含处置进度) */ +export const getComplaintDetail = (id: number | string): AxiosPromise => { + return request({ + url: `${BASE_URL}/detail`, + method: 'get', + params: { id } + }); +}; + /** Tab2-投诉类型统计 */ export const getTypeStatList = (params: ComplaintQuery): AxiosPromise => { return request({ diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-inspection-plan.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-inspection-plan.ts index aa12ae3b..2b4cb888 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-inspection-plan.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/efcode/report/statistics-inspection-plan.ts @@ -52,6 +52,12 @@ export interface InspectionPlanDetailVo { bureauDeptName: string; enforcementArea: string; enforcementTime: string; + /** 附件名称 */ + attachment?: string; + /** 附件ID/路径,用于下载 */ + attachmentId?: string | number; + /** 附件完整URL(直链预览用) */ + attachmentUrl?: string; } /** 排行VO */ @@ -139,3 +145,13 @@ export const exportGroupList = (data: InspectionPlanQuery): AxiosPromise = responseType: 'blob' }); }; + +/** 下载执法计划附件 */ +export const downloadAttachment = (id: string): AxiosPromise => { + return request({ + url: `${BASE_URL}/downloadAttachment`, + method: 'get', + params: { id }, + responseType: 'blob' + }); +}; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue index 0f8a7532..ea12726e 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/enterprises_inspected_noft/index.vue @@ -11,7 +11,8 @@ const queryParams = reactive({ pageNum: 1, pageSize: 20, enterpriseName: undefined, - num: undefined, + numMin: undefined, + numMax: undefined, beginTime: `${yearNow}-01-01`, endTime: undefined }); @@ -77,7 +78,8 @@ const resetQuery = () => { pageNum: 1, pageSize: 20, enterpriseName: undefined, - num: undefined, + numMin: undefined, + numMax: undefined, beginTime: undefined, endTime: undefined }); @@ -131,12 +133,23 @@ const loadStatistics = async () => { /** 排序变更 */ const handleSortChange = (sortObj: { prop: string; order: 'ascending' | 'descending' | null }) => { - if (sortObj.prop === 'enforcementTime') { - queryParams.orderByColumn = 'enforcement_time'; - queryParams.isAsc = sortObj.order === 'ascending' ? 'asc' : 'desc'; + if (!sortObj.prop || !sortObj.order) { + queryParams.orderByColumn = undefined; + queryParams.isAsc = undefined; queryParams.pageNum = 1; getList(); + return; } + if (sortObj.prop === 'enforcementTime') { + queryParams.orderByColumn = 'enforcement_time'; + } else if (sortObj.prop === 'num') { + queryParams.orderByColumn = 'num'; + } else { + return; + } + queryParams.isAsc = sortObj.order === 'ascending' ? 'asc' : 'desc'; + queryParams.pageNum = 1; + getList(); }; /** 点击详情 */ @@ -171,8 +184,10 @@ const handleShowDetail = async (row: EnterprisesInspectedVo) => { - - + + + - + @@ -202,7 +217,7 @@ const handleShowDetail = async (row: EnterprisesInspectedVo) => { - +