diff --git a/src/api/iot/recipeConfig/index.ts b/src/api/iot/recipeConfig/index.ts index 06931a2d..6ab87269 100644 --- a/src/api/iot/recipeConfig/index.ts +++ b/src/api/iot/recipeConfig/index.ts @@ -176,7 +176,7 @@ export const RecipeConfigApi = { }, getRecipePointDetailPage: async (params: any) => { - return await request.get({ url: `/iot/recipe-device-attribute/page`, params }) + return await request.get({ url: `/iot/recipe-device-attribute/getList`, params }) }, updateRecipeDeviceAttribute: async (data: { recipeId: string | number; ids: number[] }) => { return await request.put({ url: `/iot/recipe-device-attribute/update`, data }) diff --git a/src/locales/en.ts b/src/locales/en.ts index 96e4f225..2d4e749a 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2657,6 +2657,7 @@ export default { readDialogSubmitButtonText: 'Read', readDialogCancelButton: 'Cancel', readDeviceConfirmMessage: 'Do you want to read device data?', + readDialogOverwriteTip: 'Reading again will overwrite existing device data and manual parameters', detailTabDeviceDataLabel: 'Device Data', detailTabManualLabel: 'Manual Parameters', detailDevicePointNameColumn: 'Point Name', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 060387bc..2eab0318 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2240,6 +2240,7 @@ export default { readDialogSubmitButtonText: '读 取', readDialogCancelButton: '取 消', readDeviceConfirmMessage: '是否读取设备数据?', + readDialogOverwriteTip: '再次读取会覆盖已有设备数据和手动录入参数', detailTabDeviceDataLabel: '设备数据', detailTabManualLabel: '手动录入参数', detailDevicePointNameColumn: '点位名称', diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue index 4eb9bbb5..855edfcc 100644 --- a/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue +++ b/src/views/formula/formulaLibrary/components/FormulaLibraryReadDialog.vue @@ -1,6 +1,14 @@