diff --git a/nginx.conf b/nginx.conf index bdab8a00..1aa26801 100644 --- a/nginx.conf +++ b/nginx.conf @@ -2,6 +2,9 @@ server { listen 8088; server_name localhost; + # 关键:允许上传最大100MB + client_max_body_size 100m; + location /admin-api/ { proxy_pass http://besure_server:48081; proxy_set_header Host $host; diff --git a/src/api/iot/device/index.ts b/src/api/iot/device/index.ts index 46bc9046..339a517e 100644 --- a/src/api/iot/device/index.ts +++ b/src/api/iot/device/index.ts @@ -151,6 +151,10 @@ export const DeviceApi = { getDeviceAttributePage: async (params) => { return await request.get({ url: `/iot/device/device-attribute/page`, params }) }, + // 获得设备属性列表 + getDeviceAttributeList: async (deviceId: number) => { + return await request.get({ url: `/iot/device/device-attribute/list?deviceId=` + deviceId }) + }, getDeviceContactModelPage: async () => { return await request.get({ url: `/iot/device-contact-model/page` }) diff --git a/src/api/iot/recipeConfig/index.ts b/src/api/iot/recipeConfig/index.ts index f0aabf39..06931a2d 100644 --- a/src/api/iot/recipeConfig/index.ts +++ b/src/api/iot/recipeConfig/index.ts @@ -178,7 +178,6 @@ export const RecipeConfigApi = { getRecipePointDetailPage: async (params: any) => { return await request.get({ url: `/iot/recipe-device-attribute/page`, params }) }, - updateRecipeDeviceAttribute: async (data: { recipeId: string | number; ids: number[] }) => { return await request.put({ url: `/iot/recipe-device-attribute/update`, data }) }, diff --git a/src/api/mold/inspectionItems/index.ts b/src/api/mold/inspectionItems/index.ts index b719aeee..096fb7bd 100644 --- a/src/api/mold/inspectionItems/index.ts +++ b/src/api/mold/inspectionItems/index.ts @@ -23,6 +23,10 @@ export const DvSubjectApi = { return await request.get({ url: `/mes/mold-subject/page`, params }) }, + getMoldSubjectAllList: async () => { + return await request.get({ url: `/mes/mold-subject/getAllList` }) + }, + // 查询维保项目详情 getDvSubject: async (id: number) => { return await request.get({ url: `/mes/mold-subject/get?id=` + id }) diff --git a/src/locales/en.ts b/src/locales/en.ts index 2273fca2..e8e580aa 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1104,6 +1104,7 @@ export default { operate: 'Operate', index: 'No.', deviceList: 'Device List', + moldList: 'Mold List', dateRange: 'Date Range', operableUsers: 'Operable Users', createWorkOrder: 'Create Work Order', @@ -1111,6 +1112,7 @@ export default { placeholderTaskType: 'Please select type', placeholderProjectForm: 'Please select project form', placeholderDeviceList: 'Please select device list', + placeholderMoldList: 'Please select mold list', placeholderStartDate: 'Please select start date', placeholderEndDate: 'Please select end date', placeholderDateRange: 'Please select date range', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b94d1cbf..2bb971b6 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1098,6 +1098,7 @@ export default { operate: '操作', index: '序号', deviceList: '设备列表', + moldList: '模具列表', dateRange: '起止日期', operableUsers: '可操作人', createWorkOrder: '新增工单管理', @@ -1105,6 +1106,7 @@ export default { placeholderTaskType: '请选择类型', placeholderProjectForm: '请选择项目表单', placeholderDeviceList: '请选择设备列表', + placeholderMoldList: '请选择模具列表', placeholderStartDate: '请选择开始日期', placeholderEndDate: '请选择结束日期', placeholderDateRange: '请选择起止日期', diff --git a/src/views/erp/component/product/ProductForm.vue b/src/views/erp/component/product/ProductForm.vue index bf366eac..82be65c1 100644 --- a/src/views/erp/component/product/ProductForm.vue +++ b/src/views/erp/component/product/ProductForm.vue @@ -10,16 +10,15 @@ > - - + + - - + + - @@ -32,25 +31,12 @@ - - - - - {{ dict.label }} - - - - - + @@ -187,6 +188,7 @@ ref="detailRef" :visible="detailVisible" filterable class="!w-full" :loading="deviceLoading" + :disabled="dialogMode == 'update'" > @@ -660,7 +662,7 @@ const buildTransferLabel = (item: any) => { } const loadConfigCandidatesByDevice = async (deviceId: number) => { - const data = await DeviceApi.getDeviceAttributePage({ pageNo: 1, pageSize: 100, deviceId }) + const data = await DeviceApi.getDeviceAttributeList(deviceId) const list = (data?.list ?? data?.data ?? []) as any[] const deviceItems = (list ?? []) .map((item: any) => { diff --git a/src/views/formula/formulaLibrary/index.vue b/src/views/formula/formulaLibrary/index.vue index 140e8350..3bf3e535 100644 --- a/src/views/formula/formulaLibrary/index.vue +++ b/src/views/formula/formulaLibrary/index.vue @@ -99,12 +99,12 @@ {{ scope.row.recipeName ?? '-' }} - + /> --> @@ -182,11 +183,12 @@ clearable filterable class="!w-full" + :disabled="dialogType == 'update'" > - +