diff --git a/package-lock.json b/package-lock.json index cba14c83b..b127185b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.36.0", "camunda-bpmn-moddle": "^7.0.1", + "cronstrue": "^3.9.0", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", @@ -8440,6 +8441,15 @@ "license": "MIT", "peer": true }, + "node_modules/cronstrue": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/cronstrue/-/cronstrue-3.9.0.tgz", + "integrity": "sha512-T3S35zmD0Ai2B4ko6+mEM+k9C6tipe2nB9RLiGT6QL2Wn0Vsn2cCZAC8Oeuf4CaE00GZWVdpYitbpWCNlIWqdA==", + "license": "MIT", + "bin": { + "cronstrue": "bin/cli.js" + } + }, "node_modules/cropperjs": { "version": "1.6.2", "resolved": "https://mirrors.huaweicloud.com/repository/npm/cropperjs/-/cropperjs-1.6.2.tgz", diff --git a/package.json b/package.json index e8cb03d84..e89b79217 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.36.0", "camunda-bpmn-moddle": "^7.0.1", + "cronstrue": "^3.9.0", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", diff --git a/src/api/crm/project/inspection/record/index.ts b/src/api/crm/project/inspection/record/index.ts index d7dd31249..927f1417b 100644 --- a/src/api/crm/project/inspection/record/index.ts +++ b/src/api/crm/project/inspection/record/index.ts @@ -4,12 +4,14 @@ import request from '@/config/axios' export interface ProjectInspectionRecordVO { id: number // 主键ID projectId: number // 项目ID - inspectionDate: Date // 巡检日期 + inspectionDate: Date // 巡检日期时间 inspector: number // 巡检人 overallStatus: number // 总体状态 summary: string // 巡检总结 remark: string // 备注 status: number // 状态 + configType: number[] // 配置类型列表 + updateTime: Date // 更新时间 } // 查询巡检记录分页 @@ -17,6 +19,11 @@ export const getProjectInspectionRecordPage = async (params: any) => { return await request.get({ url: `/crm/project-inspection-record/page`, params }) } +// 根据更新时间查询巡检记录分页 +export const getProjectInspectionRecordPageByUpdateTime = async (params: any) => { + return await request.get({ url: `/crm/project-inspection-record/page-by-update-time`, params }) +} + // 查询巡检记录详情 export const getProjectInspectionRecord = async (id: number) => { return await request.get({ url: `/crm/project-inspection-record/get?id=` + id }) diff --git a/src/components/Crontab/src/Crontab.vue b/src/components/Crontab/src/Crontab.vue index 0914bb710..9a4595e35 100644 --- a/src/components/Crontab/src/Crontab.vue +++ b/src/components/Crontab/src/Crontab.vue @@ -512,12 +512,7 @@ const inputChange = () => { - + @@ -161,6 +177,7 @@ \ No newline at end of file + + + \ No newline at end of file