From d29da8b98ae400c33891c7d33b92578671063d32 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Tue, 11 Mar 2025 14:44:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/axios/service.ts | 1 + src/utils/dict.ts | 1 + src/views/task/create copy.vue | 134 +++++++++++++++++----------- src/views/task/createEnterprise.vue | 6 +- 4 files changed, 88 insertions(+), 54 deletions(-) diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 618f14a..bfbf2f1 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -12,6 +12,7 @@ import { deleteUserCache } from '@/hooks/web/useCache' const tenantEnable = import.meta.env.VITE_APP_TENANT_ENABLE const { result_code, base_url, request_timeout } = config + // 需要忽略的提示。忽略后，自动 Promise.reject('error') const ignoreMsgs = [ '无效的刷新令牌', // 刷新令牌被删除时，不用提示 diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7b23207..c8d323f 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -144,6 +144,7 @@ export enum DICT_TYPE { TASK_EXEC_TIME = 'task_exec_time', TASK_STATE = 'task_state', INSPECTIONS_STATUS = 'Inspections_status', + AIR_COLLECTION_TYPE = 'air_collection_type', // ========== INFRA 模块 ========== INFRA_BOOLEAN_STRING = 'infra_boolean_string', INFRA_JOB_STATUS = 'infra_job_status', diff --git a/src/views/task/create copy.vue b/src/views/task/create copy.vue index bdbcce0..6833895 100644 --- a/src/views/task/create copy.vue +++ b/src/views/task/create copy.vue @@ -14,8 +14,8 @@ format="YYYY年MM月DD日" range-separator="至" size="large" - start-placeholder="选择任务计划开始时间" - end-placeholder="选择任务计划结束时间" + start-placeholder="选择开始时间" + end-placeholder="选择结束时间" value-format="YYYY-MM-DD" /> @@ -24,23 +24,22 @@ type="textarea" v-model="formData.description" :autosize="{ - minRows: 4 + minRows: 5 }" placeholder="请输入描述" /> - + + + - + - + @@ -149,10 +148,10 @@ /> - - 搜索 + + 查询 - + 重置 @@ -175,10 +174,7 @@ }" > @@ -264,8 +260,8 @@
- 提 交 - 返回列表 + 创建任务 + 返回列表 i.id) + // data.enterpriseIds = formData.value.enterprises.map((i) => i.id) - if (data.enterpriseIds.length == 0) { + if (enterprise.value.list.length == 0) { message.success('温馨提示：请您选择执法对象') } else { if (data.status < 2) { data.startDate = data.planTime[0] data.endDate = data.planTime[1] + data.enterpriseIds = enterprise.value.list.map(i=>i.id) + console.log('data', data) - // if (data.id) { - // TaskInfoApi.updateTaskInfo(data).then(() => { - // message.success('操作成功') - // tagView.delView(route) - // router.go(-1) - // }) - // } else { - // TaskInfoApi.createTaskInfo(data).then(() => { - // message.success('操作成功') - // tagView.delView(route) - // router.go(-1) - // }) - // } + if (data.id) { + TaskInfoApi.updateTaskInfo(data).then(() => { + message.success('操作成功') + tagView.delView(route) + router.go(-1) + }) + } else { + TaskInfoApi.createTaskInfo(data).then(() => { + message.success('操作成功') + tagView.delView(route) + router.go(-1) + }) + } } else { message.success('温馨提示：该任务已经执行,无法再进行修改') } } } } + +// async function taskTopType() { +// const data = TagLibraryApi.getTagLibraryPage() +// } + +//任务顶级标签列表 +const taskTagTopList:any = ref([]) +//任务二级标签列表 +const tagChildList:any = ref([]) + +async function taskTopQuery() { + const params = { + tagType: 2 + } + + const data = await TagLibraryApi.getTagLibraryPage(params) + taskTagTopList.value = data +} + async function init() { + //执法人员列表 const userData = await getSimpleUserZGList() userList.value = userData + //任务类型列表 + taskTopQuery() + if (query.id) { TaskInfoApi.getTaskInfo(query.id).then((res) => { formData.value = res @@ -594,6 +618,12 @@ async function init() { } } +const selectChild = (value: any) => { + const data = taskTagTopList.value.find(item=>item.id == value) + console.log('daratata', data.children) + tagChildList.value = data.children +} + function getList(data) { enterprise.value.list.push(...data) //去重 @@ -634,6 +664,8 @@ onMounted(() => { .descClass { grid-row: span 2; + flex: 1 0 0; + align-self: stretch; } @@ -762,7 +794,7 @@ onMounted(() => { .form-container { display: grid; grid-template-columns: repeat(4, 1fr); - gap: 24px; + gap: 20px; margin-bottom: 20px; } diff --git a/src/views/task/createEnterprise.vue b/src/views/task/createEnterprise.vue index c62f72a..1202bce 100644 --- a/src/views/task/createEnterprise.vue +++ b/src/views/task/createEnterprise.vue @@ -80,10 +80,10 @@ - + 搜索 - + 重置 @@ -220,7 +220,7 @@ const queryParams = ref({ }) // 控制弹窗显示 -const visible = ref(true) // 弹窗的是否展示 +const visible = ref(false) // 弹窗的是否展示 // ... 其他变量保持不变 ... // 关闭弹窗 const handleClose = () => { From 69892acae4f30a9801377a468a293c576d5bd0a8 Mon Sep 17 00:00:00 2001 From: dx <1242347652@qq.com> Date: Thu, 13 Mar 2025 14:34:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/airqualitycollection/index.ts | 52 ++ src/api/enterprises/index.ts | 3 +- src/api/system/user/index.ts | 1 + .../QualityCollectionForm.vue | 159 ++++ src/views/airqualitycollection/index.vue | 259 ++++++ src/views/enterpriseinspections/index.vue | 2 +- src/views/enterprises/index.vue | 30 +- src/views/enterprises/update.vue | 2 +- src/views/qualification/index.vue | 47 +- src/views/system/user/UserForm.vue | 17 +- src/views/system/user/index.vue | 4 +- src/views/task/create copy 2.vue | 745 ++++++++++++++++++ src/views/task/createEnterprise2.vue | 397 ++++++++++ src/views/task/index.vue | 66 +- 14 files changed, 1723 insertions(+), 61 deletions(-) create mode 100644 src/api/airqualitycollection/index.ts create mode 100644 src/views/airqualitycollection/QualityCollectionForm.vue create mode 100644 src/views/airqualitycollection/index.vue create mode 100644 src/views/task/create copy 2.vue create mode 100644 src/views/task/createEnterprise2.vue diff --git a/src/api/airqualitycollection/index.ts b/src/api/airqualitycollection/index.ts new file mode 100644 index 0000000..2935677 --- /dev/null +++ b/src/api/airqualitycollection/index.ts @@ -0,0 +1,52 @@ +import request from '@/config/axios' + +// 空气质量采集 VO +export interface QualityCollectionVO { + id: number // 主键 + siteName: string // 站点名称 + city: string // 城市 + type: number // 数据类型 + pm25: number // PM2.s(ugim3) + pm10: number // PMo(ug/m3 + so2: number // sOz(ug/m3) + no2: number // NOz(ug/m3) + no: number // NO(Hg/m3) + nOx: number // NOx(Hg/m3) + co: number // CO(mg/m3) + o3: number // 0з(ug/m3) + remark: string // 备用1 + remark2: string // 备用2 +} + +// 空气质量采集 API +export const QualityCollectionApi = { + // 查询空气质量采集分页 + getQualityCollectionPage: async (params: any) => { + return await request.get({ url: `/system/quality-collection/page`, params }) + }, + + // 查询空气质量采集详情 + getQualityCollection: async (id: number) => { + return await request.get({ url: `/system/quality-collection/get?id=` + id }) + }, + + // 新增空气质量采集 + createQualityCollection: async (data: QualityCollectionVO) => { + return await request.post({ url: `/system/quality-collection/create`, data }) + }, + + // 修改空气质量采集 + updateQualityCollection: async (data: QualityCollectionVO) => { + return await request.put({ url: `/system/quality-collection/update`, data }) + }, + + // 删除空气质量采集 + deleteQualityCollection: async (id: number) => { + return await request.delete({ url: `/system/quality-collection/delete?id=` + id }) + }, + + // 导出空气质量采集 Excel + exportQualityCollection: async (params) => { + return await request.download({ url: `/system/quality-collection/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/enterprises/index.ts b/src/api/enterprises/index.ts index 4ddd013..604e631 100644 --- a/src/api/enterprises/index.ts +++ b/src/api/enterprises/index.ts @@ -17,7 +17,8 @@ export interface EnterprisesVO { establishmentDate: Date // 企业成立时间 gpsLocation: string // 企业经纬度 signRadius:string//签到半径 - managerDeptId: number // 管理部门 + managerDeptId: number, // 管理部门 + tagList: any } // 企业 API diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index fa7d4fb..9e9a8b4 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -16,6 +16,7 @@ export interface UserVO { remark: string loginDate: Date createTime: Date + area: string } diff --git a/src/views/airqualitycollection/QualityCollectionForm.vue b/src/views/airqualitycollection/QualityCollectionForm.vue new file mode 100644 index 0000000..b53ac2a --- /dev/null +++ b/src/views/airqualitycollection/QualityCollectionForm.vue @@ -0,0 +1,159 @@ + + \ No newline at end of file diff --git a/src/views/airqualitycollection/index.vue b/src/views/airqualitycollection/index.vue new file mode 100644 index 0000000..d09af9d --- /dev/null +++ b/src/views/airqualitycollection/index.vue @@ -0,0 +1,259 @@ + + + + \ No newline at end of file diff --git a/src/views/enterpriseinspections/index.vue b/src/views/enterpriseinspections/index.vue index 0204ffb..fde4a14 100644 --- a/src/views/enterpriseinspections/index.vue +++ b/src/views/enterpriseinspections/index.vue @@ -1,5 +1,5 @@ + + diff --git a/src/views/task/createEnterprise2.vue b/src/views/task/createEnterprise2.vue new file mode 100644 index 0000000..d1e5f5e --- /dev/null +++ b/src/views/task/createEnterprise2.vue @@ -0,0 +1,397 @@ + + + diff --git a/src/views/task/index.vue b/src/views/task/index.vue index c73361e..6621305 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -1,27 +1,23 @@ --> - + { loading.value = true @@ -276,6 +275,15 @@ const getList = async () => { const data = await TaskInfoApi.getTaskInfoPage(queryParams) list.value = data.list total.value = data.total + + //任务标签 + const params = { + tagType: 2 + } + + const tag = await TagLibraryApi.getTagLibraryPage(params) + taskTypeList.value = tag[0].children + } finally { loading.value = false } @@ -350,3 +358,15 @@ onMounted(() => { getList() }) +