diff --git a/src/api/erp/mold/index.ts b/src/api/erp/mold/index.ts index 775bd7ae..dc34c093 100644 --- a/src/api/erp/mold/index.ts +++ b/src/api/erp/mold/index.ts @@ -81,6 +81,10 @@ export const MoldBrandApi = { getMoldPage: async (params) => { return await request.get({ url: `/erp/mold-brand/mold/page`, params }) }, + + getMoldPageWithoutPaging: async () => { + return await request.get({ url: `/erp/mold-brand/mold/page` }) + }, // 新增模具 createMold: async (data) => { return await request.post({ url: `/erp/mold-brand/mold/create`, data }) diff --git a/src/api/mes/energydevice/index.ts b/src/api/mes/energydevice/index.ts index 5164e784..2f6932ef 100644 --- a/src/api/mes/energydevice/index.ts +++ b/src/api/mes/energydevice/index.ts @@ -25,6 +25,23 @@ export interface EnergyDeviceVO { operationRulesVOList?: EnergyDeviceOperationRuleVO[] } +export interface EnergyDeviceDataRecordVO { + id: number + name?: string + deviceTypeName?: string + orgId?: number | string + orgName?: string + operationRulesVOMap?: Record + energyConsumption?: string | number + energyAllocationConsumption?: string | number + energyActualConsumption?: string | number + shift?: string + startTime?: string + endTime?: string + earliestDataTime?: string + latestDataTime?: string +} + // 能源设备 API export const EnergyDeviceApi = { // 查询能源设备分页 @@ -41,6 +58,14 @@ export const EnergyDeviceApi = { return await request.get({ url: `/mes/energy-device/getList`, params }) }, + queryDataRecords: async (params: any) => { + return await request.get({ url: `/mes/energy-device/queryDataRecords`, params }) + }, + + exportQueryDataRecords: async (params: any) => { + return await request.download({ url: `/mes/energy-device/record-export-excel`, params }) + }, + // 新增能源设备 createEnergyDevice: async (data: EnergyDeviceVO) => { return await request.post({ url: `/mes/energy-device/create`, data }) diff --git a/src/views/iot/deviceParamAnalysis/index.vue b/src/views/iot/deviceParamAnalysis/index.vue index 493a93ac..e5fada9a 100644 --- a/src/views/iot/deviceParamAnalysis/index.vue +++ b/src/views/iot/deviceParamAnalysis/index.vue @@ -4,7 +4,8 @@
-
@@ -14,7 +15,8 @@ - diff --git a/src/views/mes/energydevice/EnergyDeviceForm.vue b/src/views/mes/energydevice/EnergyDeviceForm.vue index ea720e55..b1abd534 100644 --- a/src/views/mes/energydevice/EnergyDeviceForm.vue +++ b/src/views/mes/energydevice/EnergyDeviceForm.vue @@ -10,28 +10,33 @@ - -
-
-