diff --git a/rc_autoplc_front/src/api/tb/recorddeal.ts b/rc_autoplc_front/src/api/tb/recorddeal.ts new file mode 100644 index 0000000..1d0e1a9 --- /dev/null +++ b/rc_autoplc_front/src/api/tb/recorddeal.ts @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +export function recordDealadd(data: any) { + return request({ + url: '/recordDeal/add', + method: 'post', + data, + }) +} + +export function recordDealdel(id: string | number) { + return request({ + url: `/recordDeal/del/${id}`, + method: 'delete', + }) +} + +export function recordDealbyid(id: string | number) { + return request({ + url: `/recordDeal/getById/${id}`, + method: 'get', + }) +} + +export function recordDeallistByRecordId(recordId: string | number) { + return request({ + url: `/recordDeal/listByRecordId/${recordId}`, + method: 'get', + }) +} + +export function recordDeallist(data: any) { + return request({ + url: '/recordDeal/listPage', + method: 'get', + params: data, + }) +} + +export function recordDealupd(data: any) { + return request({ + url: '/recordDeal/update', + method: 'put', + data, + }) +} diff --git a/rc_autoplc_front/src/api/tb/recordinfo.ts b/rc_autoplc_front/src/api/tb/recordinfo.ts new file mode 100644 index 0000000..e85b6e2 --- /dev/null +++ b/rc_autoplc_front/src/api/tb/recordinfo.ts @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function recordInfoadd(data: any) { + return request({ + url: '/recordInfo/add', + method: 'post', + data, + }) +} + +export function recordInfodel(id: string | number) { + return request({ + url: `/recordInfo/del/${id}`, + method: 'delete', + }) +} + +export function recordInfobyid(id: string | number) { + return request({ + url: `/recordInfo/getById/${id}`, + method: 'get', + }) +} + +export function recordInfolist(data: any) { + return request({ + url: '/recordInfo/listPage', + method: 'get', + params: data, + }) +} + +export function recordInfoupd(data: any) { + return request({ + url: '/recordInfo/update', + method: 'put', + data, + }) +} diff --git a/rc_autoplc_front/src/router/index.ts b/rc_autoplc_front/src/router/index.ts index 3140a3d..47ac47c 100644 --- a/rc_autoplc_front/src/router/index.ts +++ b/rc_autoplc_front/src/router/index.ts @@ -109,6 +109,12 @@ const router = createRouter({ component: () => import('../views/sampleinjection/index.vue'), meta: { permission: 'tb:goodcontrol' }, }, + { + path: '/record-info', + name: 'record-info', + component: () => import('../views/recordinfo/index.vue'), + meta: { permission: 'tb:goodrecord' }, + }, ], }, ], diff --git a/rc_autoplc_front/src/views/Layout.vue b/rc_autoplc_front/src/views/Layout.vue index 0f7ef22..e6f0147 100644 --- a/rc_autoplc_front/src/views/Layout.vue +++ b/rc_autoplc_front/src/views/Layout.vue @@ -108,6 +108,10 @@ 样品记录 + + + 异常记录 + diff --git a/rc_autoplc_front/src/views/devinfo/index.vue b/rc_autoplc_front/src/views/devinfo/index.vue index 2d8f92a..764f1c2 100644 --- a/rc_autoplc_front/src/views/devinfo/index.vue +++ b/rc_autoplc_front/src/views/devinfo/index.vue @@ -360,6 +360,7 @@ const formData = reactive({ islandId: undefined as number | undefined, devDesc: '', remark: '', + devModel: 'OTHER', status: 0, // 状态自动设置为0 }) @@ -594,6 +595,7 @@ const resetForm = () => { formData.islandId = undefined formData.devDesc = '' formData.remark = '' + formData.devModel = 'OTHER' formData.status = 0 formRef.value?.clearValidate() } @@ -611,6 +613,7 @@ const handleEdit = async (item: any) => { formData.islandId = data.islandId ?? undefined formData.devDesc = data.devDesc ?? '' formData.remark = data.remark ?? '' + formData.devModel = data.devModel ?? 'OTHER' formData.status = data.status ?? 0 isEdit.value = true @@ -683,6 +686,7 @@ const handleSubmit = async () => { devName: formData.devName, plcAddr: formData.plcAddr, islandId: formData.islandId, + devModel: formData.devModel || 'OTHER', } if (formData.devDesc) submitData.devDesc = formData.devDesc @@ -959,7 +963,7 @@ const setSelectedParams = () => { } // 参数选择变化 -const handleParamSelectionChange = (selection: any[]) => { +const handleParamSelectionChange = (_selection: any[]) => { // noop } diff --git a/rc_autoplc_front/src/views/recordinfo/index.vue b/rc_autoplc_front/src/views/recordinfo/index.vue new file mode 100644 index 0000000..605365e --- /dev/null +++ b/rc_autoplc_front/src/views/recordinfo/index.vue @@ -0,0 +1,575 @@ + + + + +