From 30fc245a012523d4f33f52e17617edf2ee6ae6dd Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Sat, 8 Feb 2025 17:33:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterpriseinspections/index.ts | 46 ++++ src/api/system/taglibrary/index.ts | 1 + src/utils/dict.ts | 1 + .../EnterpriseInspectionsForm.vue | 96 +++++++++ src/views/enterpriseinspections/detail.vue | 134 ++++++++++++ src/views/enterpriseinspections/index.vue | 201 ++++++++++++++++++ src/views/system/taglibrary/form.vue | 5 + src/views/system/user/UserForm.vue | 4 + 8 files changed, 488 insertions(+) create mode 100644 src/api/enterpriseinspections/index.ts create mode 100644 src/views/enterpriseinspections/EnterpriseInspectionsForm.vue create mode 100644 src/views/enterpriseinspections/detail.vue create mode 100644 src/views/enterpriseinspections/index.vue diff --git a/src/api/enterpriseinspections/index.ts b/src/api/enterpriseinspections/index.ts new file mode 100644 index 0000000..9b799e7 --- /dev/null +++ b/src/api/enterpriseinspections/index.ts @@ -0,0 +1,46 @@ +import request from '@/config/axios' + +// 企业检查记录表，用于记录与企业相关的环保检查信息。 VO +export interface EnterpriseInspectionsVO { + id: number // 检查记录ID，主键 + taskId: number // 任务ID + enterpriseId: number // 企业ID +} + +// 企业检查记录表，用于记录与企业相关的环保检查信息。 API +export const EnterpriseInspectionsApi = { + // 查询企业检查记录表，用于记录与企业相关的环保检查信息。分页 + getEnterpriseInspectionsPage: async (params: any) => { + return await request.get({ url: `/system/enterprise-inspections/page`, params }) + }, + + // 查询企业检查记录表，用于记录与企业相关的环保检查信息。详情 + getEnterpriseInspections: async (id: number) => { + return await request.get({ url: `/system/enterprise-inspections/get?id=` + id }) + }, + + // 新增企业检查记录表，用于记录与企业相关的环保检查信息。 + createEnterpriseInspections: async (data: EnterpriseInspectionsVO) => { + return await request.post({ url: `/system/enterprise-inspections/create`, data }) + }, + + // 修改企业检查记录表，用于记录与企业相关的环保检查信息。 + updateEnterpriseInspections: async (data: EnterpriseInspectionsVO) => { + return await request.put({ url: `/system/enterprise-inspections/update`, data }) + }, + + // 删除企业检查记录表，用于记录与企业相关的环保检查信息。 + deleteEnterpriseInspections: async (id: number) => { + return await request.delete({ url: `/system/enterprise-inspections/delete?id=` + id }) + }, + + // 导出企业检查记录表，用于记录与企业相关的环保检查信息。 Excel + exportEnterpriseInspections: async (params) => { + return await request.download({ url: `/system/enterprise-inspections/export-excel`, params }) + }, + + // 导出企业检查记录表，用于记录与企业相关的环保检查信息。 Excel + inspectionsLogList: async (params:any) => { + return await request.get({ url: `/system/inspections-log/list`, params }) + }, +} diff --git a/src/api/system/taglibrary/index.ts b/src/api/system/taglibrary/index.ts index 9062c28..06ffa81 100644 --- a/src/api/system/taglibrary/index.ts +++ b/src/api/system/taglibrary/index.ts @@ -8,6 +8,7 @@ export interface TagLibraryVO { tagLevel: number // 标签层级（一级、二级、三级） tagType: number // 1、企业标签2、执法标签 sort: number + tagCode: string } // 企业标签 API diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 4b9f63f..e84af37 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -139,6 +139,7 @@ export enum DICT_TYPE { TASK_PRIORITY = 'task_priority', TASK_EXEC_TIME = 'task_exec_time', TASK_STATE = 'task_state', + INSPECTIONS_STATUS = 'Inspections_status', // ========== INFRA 模块 ========== INFRA_BOOLEAN_STRING = 'infra_boolean_string', INFRA_JOB_STATUS = 'infra_job_status', diff --git a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue new file mode 100644 index 0000000..46a0a9b --- /dev/null +++ b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue @@ -0,0 +1,96 @@ + + \ No newline at end of file diff --git a/src/views/enterpriseinspections/detail.vue b/src/views/enterpriseinspections/detail.vue new file mode 100644 index 0000000..dacf6b4 --- /dev/null +++ b/src/views/enterpriseinspections/detail.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue new file mode 100644 index 0000000..a35b6fd --- /dev/null +++ b/src/views/enterpriseinspections/index.vue @@ -0,0 +1,201 @@ + + + \ No newline at end of file diff --git a/src/views/system/taglibrary/form.vue b/src/views/system/taglibrary/form.vue index c9918c7..dfff1b2 100644 --- a/src/views/system/taglibrary/form.vue +++ b/src/views/system/taglibrary/form.vue @@ -26,6 +26,10 @@ + + + + @@ -55,6 +59,7 @@ const formData = ref({ tagLevel: undefined, tagType: null as any, sort: undefined, + tagCode:undefined, id: null as any }) const formRules = reactive({}) diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index 630688a..5c4195a 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -12,6 +12,9 @@ + + + @@ -115,6 +118,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加 const formType = ref('') // 表单的类型：create - 新增；update - 修改 const formData = ref({ nickname: '', + realName: '', deptId: '', mobile: '', email: '', From ebd8d39959cd5680b931cbeb211bf494660b97aa Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Mon, 10 Feb 2025 14:06:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=A7=E6=B3=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterpriseinspections/index.ts | 7 + src/api/system/user/index.ts | 8 +- .../EnterpriseInspectionsForm.vue | 98 +++++---- .../changeInspections.vue | 187 ++++++++++++++++++ src/views/enterpriseinspections/detail.vue | 11 +- src/views/enterpriseinspections/index.vue | 35 +++- 6 files changed, 299 insertions(+), 47 deletions(-) create mode 100644 src/views/enterpriseinspections/changeInspections.vue diff --git a/src/api/enterpriseinspections/index.ts b/src/api/enterpriseinspections/index.ts index 9b799e7..6f3adc3 100644 --- a/src/api/enterpriseinspections/index.ts +++ b/src/api/enterpriseinspections/index.ts @@ -5,6 +5,7 @@ export interface EnterpriseInspectionsVO { id: number // 检查记录ID，主键 taskId: number // 任务ID enterpriseId: number // 企业ID + tagList: String } // 企业检查记录表，用于记录与企业相关的环保检查信息。 API @@ -43,4 +44,10 @@ export const EnterpriseInspectionsApi = { inspectionsLogList: async (params:any) => { return await request.get({ url: `/system/inspections-log/list`, params }) }, + + //根据 用户id和任务名称查询可以转发的任务 + inspectionsLogListByUserAndTaskName: async (params:any) => { + return await request.get({ url: `/system/enterprise-inspections/getListByUserIdAndTaskName`, params }) + }, + } diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index 94b67e2..0a440f6 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -4,6 +4,7 @@ export interface UserVO { id: number username: string nickname: string + realName: string deptId: number postIds: string[] email: string @@ -80,7 +81,12 @@ export const updateUserStatus = (id: number, status: number) => { // 获取用户精简信息列表 export const getSimpleUserList = (): Promise => { return request.get({ url: '/system/user/simple-list' }) -} +} + +// 获取用户精简信息列表 +export const getSimpleUserZGList = (): Promise => { + return request.get({ url: '/system/user/simple-zg-list' }) +} /** * 查询审核列表 diff --git a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue index 46a0a9b..1f86e7b 100644 --- a/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue +++ b/src/views/enterpriseinspections/EnterpriseInspectionsForm.vue @@ -1,19 +1,14 @@