From 48b160914e24e3d2860c7939dbcc031714b7cf7e Mon Sep 17 00:00:00 2001 From: zch Date: Thu, 27 Mar 2025 15:43:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(dms):=20=E7=A7=BB=E6=A4=8D=E4=BA=AC?= =?UTF-8?q?=E6=BA=90cron=E7=94=9F=E6=88=90=E5=99=A8=EF=BC=88VUE2=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E5=81=9C=E6=9C=BA=E8=AE=B0=E5=BD=95=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E5=81=9C=E6=9C=BA=E7=B1=BB=E5=9E=8B=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E5=81=9C=E6=9C=BA=E5=8E=9F=E5=9B=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E4=B8=8D=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — 物料、机台统一更正为"设备" --- src/api/dms/baseDeviceType/types.ts | 6 +- src/api/dms/dmsBaseDeviceBom/types.ts | 6 +- .../dms/dmsBaseDeviceDepreciation/types.ts | 6 +- src/api/dms/dmsBaseDeviceFiles/types.ts | 6 +- src/api/dms/dmsBaseDeviceInstall/types.ts | 6 +- src/api/dms/dmsBaseDevicePurchase/types.ts | 6 +- src/api/dms/dmsBaseMachineInfo/index.ts | 12 +- src/api/dms/dmsBaseMachineInfo/types.ts | 36 +- src/api/dms/dmsBaseTransferInfo/types.ts | 6 +- src/api/dms/dmsInspectProjectDevice/index.ts | 12 +- src/components/Crontab/day.vue | 161 +++++ src/components/Crontab/hour.vue | 114 ++++ src/components/Crontab/index.vue | 430 +++++++++++++ src/components/Crontab/min.vue | 116 ++++ src/components/Crontab/month.vue | 114 ++++ src/components/Crontab/result.vue | 567 ++++++++++++++++++ src/components/Crontab/second.vue | 123 ++++ src/components/Crontab/week.vue | 202 +++++++ src/components/Crontab/year.vue | 131 ++++ .../dms/dmsInspectProjectDevice/index.vue | 10 +- src/views/dms/dmsRecordShutDown/index.vue | 2 +- 21 files changed, 2015 insertions(+), 57 deletions(-) create mode 100644 src/components/Crontab/day.vue create mode 100644 src/components/Crontab/hour.vue create mode 100644 src/components/Crontab/index.vue create mode 100644 src/components/Crontab/min.vue create mode 100644 src/components/Crontab/month.vue create mode 100644 src/components/Crontab/result.vue create mode 100644 src/components/Crontab/second.vue create mode 100644 src/components/Crontab/week.vue create mode 100644 src/components/Crontab/year.vue diff --git a/src/api/dms/baseDeviceType/types.ts b/src/api/dms/baseDeviceType/types.ts index e001799..4e6970b 100644 --- a/src/api/dms/baseDeviceType/types.ts +++ b/src/api/dms/baseDeviceType/types.ts @@ -1,6 +1,6 @@ export interface BaseDeviceTypeVO { /** - * 物料类型ID + * 设备类型ID */ deviceTypeId: string | number; @@ -45,7 +45,7 @@ export interface BaseDeviceTypeVO { export interface BaseDeviceTypeForm extends BaseEntity { /** - * 物料类型ID + * 设备类型ID */ deviceTypeId?: string | number; @@ -91,7 +91,7 @@ export interface BaseDeviceTypeForm extends BaseEntity { export interface BaseDeviceTypeQuery extends PageQuery { /** - * 物料类型ID + * 设备类型ID */ deviceTypeId?: string | number; diff --git a/src/api/dms/dmsBaseDeviceBom/types.ts b/src/api/dms/dmsBaseDeviceBom/types.ts index 99747ff..41f04de 100644 --- a/src/api/dms/dmsBaseDeviceBom/types.ts +++ b/src/api/dms/dmsBaseDeviceBom/types.ts @@ -35,7 +35,7 @@ export interface DmsBaseDeviceBomVO { remark: string; /** - * 机台名称 + * 设备名称 */ machineName: string;//join @@ -82,7 +82,7 @@ export interface DmsBaseDeviceBomForm extends BaseEntity { remark?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -126,7 +126,7 @@ export interface DmsBaseDeviceBomQuery { params?: any; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join diff --git a/src/api/dms/dmsBaseDeviceDepreciation/types.ts b/src/api/dms/dmsBaseDeviceDepreciation/types.ts index 14a8229..04f46a1 100644 --- a/src/api/dms/dmsBaseDeviceDepreciation/types.ts +++ b/src/api/dms/dmsBaseDeviceDepreciation/types.ts @@ -45,7 +45,7 @@ export interface DmsBaseDeviceDepreciationVO { activeFlag: string; /** - * 机台名称 + * 设备名称 */ machineName: string; @@ -98,7 +98,7 @@ export interface DmsBaseDeviceDepreciationForm extends BaseEntity { activeFlag?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string; @@ -152,7 +152,7 @@ export interface DmsBaseDeviceDepreciationQuery extends PageQuery { params?: any; /** - * 机台名称 + * 设备名称 */ machineName?: string; } diff --git a/src/api/dms/dmsBaseDeviceFiles/types.ts b/src/api/dms/dmsBaseDeviceFiles/types.ts index 9bd90f7..cd50a6c 100644 --- a/src/api/dms/dmsBaseDeviceFiles/types.ts +++ b/src/api/dms/dmsBaseDeviceFiles/types.ts @@ -35,7 +35,7 @@ export interface DmsBaseDeviceFilesVO { remark: string; /** - * 机台名称 + * 设备名称 */ machineName: string;//join @@ -80,7 +80,7 @@ export interface DmsBaseDeviceFilesForm extends BaseEntity { remark?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -129,7 +129,7 @@ export interface DmsBaseDeviceFilesQuery extends PageQuery { params?: any; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join diff --git a/src/api/dms/dmsBaseDeviceInstall/types.ts b/src/api/dms/dmsBaseDeviceInstall/types.ts index 02eed78..c2d2f85 100644 --- a/src/api/dms/dmsBaseDeviceInstall/types.ts +++ b/src/api/dms/dmsBaseDeviceInstall/types.ts @@ -30,7 +30,7 @@ export interface DmsBaseDeviceInstallVO { activeFlag: string; /** - * 机台名称 + * 设备名称 */ machineName: string;//join @@ -68,7 +68,7 @@ export interface DmsBaseDeviceInstallForm extends BaseEntity { activeFlag?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -112,7 +112,7 @@ export interface DmsBaseDeviceInstallQuery extends PageQuery { params?: any; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join diff --git a/src/api/dms/dmsBaseDevicePurchase/types.ts b/src/api/dms/dmsBaseDevicePurchase/types.ts index 4df553b..fde1504 100644 --- a/src/api/dms/dmsBaseDevicePurchase/types.ts +++ b/src/api/dms/dmsBaseDevicePurchase/types.ts @@ -35,7 +35,7 @@ export interface DmsBaseDevicePurchaseVO { remark: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -78,7 +78,7 @@ export interface DmsBaseDevicePurchaseForm extends BaseEntity { remark?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -122,7 +122,7 @@ export interface DmsBaseDevicePurchaseQuery extends PageQuery { params?: any; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join } diff --git a/src/api/dms/dmsBaseMachineInfo/index.ts b/src/api/dms/dmsBaseMachineInfo/index.ts index d4a87cd..cbe2be7 100644 --- a/src/api/dms/dmsBaseMachineInfo/index.ts +++ b/src/api/dms/dmsBaseMachineInfo/index.ts @@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios'; import { ProdBaseMachineInfoVO, ProdBaseMachineInfoForm, ProdBaseMachineInfoQuery } from '@/api/dms/dmsBaseMachineInfo/types'; /** - * 查询机台信息列表 + * 查询设备信息列表 * @param query * @returns {*} */ @@ -17,7 +17,7 @@ export const listDmsBaseMachineInfoIn = (query?: ProdBaseMachineInfoQuery): Axio }; /** - * 查询机台信息详细 + * 查询设备信息详细 * @param machineId */ export const getDmsBaseMachineInfo = (machineId: string | number): AxiosPromise => { @@ -28,7 +28,7 @@ export const getDmsBaseMachineInfo = (machineId: string | number): AxiosPromise }; /** - * 新增机台信息 + * 新增设备信息 * @param data */ /*export const addProdBaseMachineInfo = (data: ProdBaseMachineInfoForm) => { @@ -40,7 +40,7 @@ export const getDmsBaseMachineInfo = (machineId: string | number): AxiosPromise };*/ /** - * 修改机台信息 + * 修改设备信息 * @param data */ /*export const updateProdBaseMachineInfo = (data: ProdBaseMachineInfoForm) => { @@ -52,7 +52,7 @@ export const getDmsBaseMachineInfo = (machineId: string | number): AxiosPromise };*/ /** - * 删除机台信息 + * 删除设备信息 * @param machineId */ /*export const delDmsBaseMachineInfo = (machineId: string | number | Array) => { @@ -64,7 +64,7 @@ export const getDmsBaseMachineInfo = (machineId: string | number): AxiosPromise /** - * 下拉框查询机台信息列表 + * 下拉框查询设备信息列表 * @param query * @returns {*} */ diff --git a/src/api/dms/dmsBaseMachineInfo/types.ts b/src/api/dms/dmsBaseMachineInfo/types.ts index ebcfdb2..3f448f5 100644 --- a/src/api/dms/dmsBaseMachineInfo/types.ts +++ b/src/api/dms/dmsBaseMachineInfo/types.ts @@ -10,12 +10,12 @@ export interface ProdBaseMachineInfoVO { tenantId: string | number; /** - * 机台编号 + * 设备编号 */ machineCode: string; /** - * 机台名称 + * 设备名称 */ machineName: string; @@ -25,17 +25,17 @@ export interface ProdBaseMachineInfoVO { assetNumber: string; /** - * 机台位置 + * 设备位置 */ machineLocation: string; /** - * 机台类型 + * 设备类型 */ machineType: string; /** - * 机台规格 + * 设备规格 */ machineSpec: string; @@ -45,7 +45,7 @@ export interface ProdBaseMachineInfoVO { supplierId: string | number; /** - * 机台状态(0停用 1启用 2报废) + * 设备状态(0停用 1启用 2报废) */ machineStatus: string; @@ -88,12 +88,12 @@ export interface ProdBaseMachineInfoForm extends BaseEntity { machineId?: string | number; /** - * 机台编号 + * 设备编号 */ machineCode?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string; @@ -103,17 +103,17 @@ export interface ProdBaseMachineInfoForm extends BaseEntity { assetNumber?: string; /** - * 机台位置 + * 设备位置 */ machineLocation?: string; /** - * 机台类型 + * 设备类型 */ machineType?: string; /** - * 机台规格 + * 设备规格 */ machineSpec?: string; @@ -123,7 +123,7 @@ export interface ProdBaseMachineInfoForm extends BaseEntity { supplierId?: string | number; /** - * 机台状态(0停用 1启用 2报废) + * 设备状态(0停用 1启用 2报废) */ machineStatus?: string; @@ -144,12 +144,12 @@ export interface ProdBaseMachineInfoQuery extends PageQuery { machineId?: string | number; /** - * 机台编号 + * 设备编号 */ machineCode?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string; @@ -159,17 +159,17 @@ export interface ProdBaseMachineInfoQuery extends PageQuery { assetNumber?: string; /** - * 机台位置 + * 设备位置 */ machineLocation?: string; /** - * 机台类型 + * 设备类型 */ machineType?: string; /** - * 机台规格 + * 设备规格 */ machineSpec?: string; @@ -179,7 +179,7 @@ export interface ProdBaseMachineInfoQuery extends PageQuery { supplierId?: string | number; /** - * 机台状态(0停用 1启用 2报废) + * 设备状态(0停用 1启用 2报废) */ machineStatus?: string; diff --git a/src/api/dms/dmsBaseTransferInfo/types.ts b/src/api/dms/dmsBaseTransferInfo/types.ts index b0a1a53..1a7a93e 100644 --- a/src/api/dms/dmsBaseTransferInfo/types.ts +++ b/src/api/dms/dmsBaseTransferInfo/types.ts @@ -45,7 +45,7 @@ export interface DmsBaseTransferInfoVO { activeFlag: string; /** - * 机台名称 + * 设备名称 */ machineName: string;//join @@ -98,7 +98,7 @@ export interface DmsBaseTransferInfoForm extends BaseEntity { activeFlag?: string; /** - * 机台名称 + * 设备名称 */ machineName?: string;//join @@ -153,7 +153,7 @@ export interface DmsBaseTransferInfoQuery extends PageQuery { /** - * 机台名称 + * 设备名称 */ machineName?: string;//join } diff --git a/src/api/dms/dmsInspectProjectDevice/index.ts b/src/api/dms/dmsInspectProjectDevice/index.ts index 169e0d3..f76ac81 100644 --- a/src/api/dms/dmsInspectProjectDevice/index.ts +++ b/src/api/dms/dmsInspectProjectDevice/index.ts @@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios'; import { DmsInspectProjectDeviceVO, DmsInspectProjectDeviceForm, DmsInspectProjectDeviceQuery } from '@/api/dms/dmsInspectProjectDevice/types'; /** - * 查询点巡检项目关联物料信息列表 + * 查询点巡检项目关联设备信息列表 * @param query * @returns {*} */ @@ -17,7 +17,7 @@ export const listDmsInspectProjectDevice = (query?: DmsInspectProjectDeviceQuery }; /** - * 查询点巡检项目关联物料信息详细 + * 查询点巡检项目关联设备信息详细 * @param inspectProjectId */ export const getDmsInspectProjectDevice = (inspectProjectId: string | number): AxiosPromise => { @@ -28,7 +28,7 @@ export const getDmsInspectProjectDevice = (inspectProjectId: string | number): A }; /** - * 新增点巡检项目关联物料信息 + * 新增点巡检项目关联设备信息 * @param data */ export const addDmsInspectProjectDevice = (data: DmsInspectProjectDeviceForm) => { @@ -40,7 +40,7 @@ export const addDmsInspectProjectDevice = (data: DmsInspectProjectDeviceForm) => }; /** - * 修改点巡检项目关联物料信息 + * 修改点巡检项目关联设备信息 * @param data */ export const updateDmsInspectProjectDevice = (data: DmsInspectProjectDeviceForm) => { @@ -52,7 +52,7 @@ export const updateDmsInspectProjectDevice = (data: DmsInspectProjectDeviceForm) }; /** - * 删除点巡检项目关联物料信息 + * 删除点巡检项目关联设备信息 * @param inspectProjectId */ export const delDmsInspectProjectDevice = (inspectProjectId: string | number | Array) => { @@ -64,7 +64,7 @@ export const delDmsInspectProjectDevice = (inspectProjectId: string | number | A /** - * 下拉框查询点巡检项目关联物料信息列表 + * 下拉框查询点巡检项目关联设备信息列表 * @param query * @returns {*} */ diff --git a/src/components/Crontab/day.vue b/src/components/Crontab/day.vue new file mode 100644 index 0000000..fe3eaf0 --- /dev/null +++ b/src/components/Crontab/day.vue @@ -0,0 +1,161 @@ + + + diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue new file mode 100644 index 0000000..4b1f1fc --- /dev/null +++ b/src/components/Crontab/hour.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/components/Crontab/index.vue b/src/components/Crontab/index.vue new file mode 100644 index 0000000..3963df2 --- /dev/null +++ b/src/components/Crontab/index.vue @@ -0,0 +1,430 @@ + + + + diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue new file mode 100644 index 0000000..43cab90 --- /dev/null +++ b/src/components/Crontab/min.vue @@ -0,0 +1,116 @@ + + + \ No newline at end of file diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue new file mode 100644 index 0000000..fd0ac38 --- /dev/null +++ b/src/components/Crontab/month.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/components/Crontab/result.vue b/src/components/Crontab/result.vue new file mode 100644 index 0000000..7f83080 --- /dev/null +++ b/src/components/Crontab/result.vue @@ -0,0 +1,567 @@ + + + diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue new file mode 100644 index 0000000..9bf9746 --- /dev/null +++ b/src/components/Crontab/second.vue @@ -0,0 +1,123 @@ + + + diff --git a/src/components/Crontab/week.vue b/src/components/Crontab/week.vue new file mode 100644 index 0000000..1cec700 --- /dev/null +++ b/src/components/Crontab/week.vue @@ -0,0 +1,202 @@ + + + diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue new file mode 100644 index 0000000..5487a6c --- /dev/null +++ b/src/components/Crontab/year.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/dms/dmsInspectProjectDevice/index.vue b/src/views/dms/dmsInspectProjectDevice/index.vue index a240d45..824f84e 100644 --- a/src/views/dms/dmsInspectProjectDevice/index.vue +++ b/src/views/dms/dmsInspectProjectDevice/index.vue @@ -62,7 +62,7 @@ - + @@ -145,7 +145,7 @@ const data = reactive { loading.value = true; const res = await listDmsInspectProjectDevice(queryParams.value); @@ -189,7 +189,7 @@ const handleSelectionChange = (selection: DmsInspectProjectDeviceVO[]) => { const handleAdd = () => { reset(); dialog.visible = true; - dialog.title = "添加点巡检项目关联物料信息"; + dialog.title = "添加点巡检项目关联设备信息"; } /** 修改按钮操作 */ @@ -199,7 +199,7 @@ const handleUpdate = async (row?: DmsInspectProjectDeviceVO) => { const res = await getDmsInspectProjectDevice(_inspectProjectId); Object.assign(form.value, res.data); dialog.visible = true; - dialog.title = "修改点巡检项目关联物料信息"; + dialog.title = "修改点巡检项目关联设备信息"; } /** 提交按钮 */ @@ -222,7 +222,7 @@ const submitForm = () => { /** 删除按钮操作 */ const handleDelete = async (row?: DmsInspectProjectDeviceVO) => { const _inspectProjectIds = row?.inspectProjectId || ids.value; - await proxy?.$modal.confirm('是否确认删除点巡检项目关联物料信息编号为"' + _inspectProjectIds + '"的数据项？').finally(() => loading.value = false); + await proxy?.$modal.confirm('是否确认删除点巡检项目关联设备信息编号为"' + _inspectProjectIds + '"的数据项？').finally(() => loading.value = false); await delDmsInspectProjectDevice(_inspectProjectIds); proxy?.$modal.msgSuccess("删除成功"); await getList(); diff --git a/src/views/dms/dmsRecordShutDown/index.vue b/src/views/dms/dmsRecordShutDown/index.vue index be7476e..d479936 100644 --- a/src/views/dms/dmsRecordShutDown/index.vue +++ b/src/views/dms/dmsRecordShutDown/index.vue @@ -130,7 +130,7 @@ - +