diff --git a/.env.development b/.env.development
index 29f1cad..b734738 100644
--- a/.env.development
+++ b/.env.development
@@ -1,2 +1,2 @@
-VITE_APP_BASE_URL=http://192.168.5.106:48081
-# VITE_APP_BASE_URL=http://47.106.185.127:8089
\ No newline at end of file
+VITE_APP_BASE_URL=http://192.168.43.233:48081
+# VITE_APP_BASE_URL=http://47.106.185.127:8089
\ No newline at end of file
diff --git a/src/api/mes/equipmentInspectionRecord.js b/src/api/mes/equipmentInspectionRecord.js
new file mode 100644
index 0000000..9ad2eac
--- /dev/null
+++ b/src/api/mes/equipmentInspectionRecord.js
@@ -0,0 +1,43 @@
+import upload from '@/utils/upload'
+import request from '@/utils/request'
+
+export function getEquipmentInspectionRecordPage(params = {}) {
+ return request({
+ url: '/admin-api/mes/ticket-management/page',
+ method: 'get',
+ params
+ })
+}
+
+export function batchUpdateEquipmentInspectionRecordStatus(data) {
+ return request({
+ url: '/admin-api/mes/ticket-management/batchUpdateStatus',
+ method: 'put',
+ data
+ })
+}
+
+export function getEquipmentInspectionRecordResultsPage(params = {}) {
+ return request({
+ url: '/admin-api/mes/ticket-results/list',
+ method: 'get',
+ params
+ })
+}
+
+export function batchUpdateEquipmentInspectionRecordResults(data) {
+ return request({
+ url: '/admin-api/mes/ticket-results/batchUpdate',
+ method: 'put',
+ data
+ })
+}
+
+export function uploadEquipmentInspectionRecordImage(filePath, name = 'file') {
+ return upload({
+ url: '/admin-api/infra/file/upload',
+ name,
+ filePath,
+ showLoading: false
+ })
+}
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index 6fa0784..f20510f 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -474,6 +474,47 @@ export default {
createTicketSuccess: 'Work order created successfully',
createTicketFail: 'Work order creation failed'
},
+ equipmentInspectionRecord: {
+ moduleName: 'Equipment Inspection Records',
+ subTitle: 'Equipment inspection record list',
+ detailTitle: 'Equipment Inspection Record Detail',
+ taskType: 'Task Type',
+ taskTypeInspect: 'Inspection',
+ taskTypeMaintain: 'Maintenance',
+ taskTypeInspectShort: 'I',
+ taskTypeMaintainShort: 'M',
+ planNo: 'Task No.',
+ deviceName: 'Device Name',
+ configName: 'Inspection Template',
+ jobStatus: 'Job Status',
+ jobStatusPending: 'Pending',
+ jobStatusProcessing: 'Processing',
+ jobStatusCompleted: 'Completed',
+ jobStatusTimeout: 'Timeout',
+ jobStatusCancelled: 'Cancelled',
+ jobResult: 'Result',
+ jobResultOk: 'Pass',
+ jobResultNg: 'Fail',
+ taskTime: 'Job Time',
+ searchPlaceholder: 'Enter task no.',
+ empty: 'No equipment inspection records',
+ progressTitle: 'Progress',
+ inspectionMethod: 'Inspection Method',
+ judgmentCriteria: 'Criteria',
+ valueType: 'Value Type',
+ resultText: 'Result',
+ requiredText: 'Required',
+ inspectionResultPending: 'Pending',
+ inspectionResultPass: 'Pass',
+ inspectionResultFail: 'Fail',
+ textInput: 'Input Value',
+ inputPlaceholder: 'Please enter',
+ remark: 'Remark',
+ images: 'Images',
+ maxUploadCount: 'You can upload up to 9 images',
+ selectAllDecisionError: 'Please choose a result for all pending items',
+ noResultData: 'No inspection items'
+ },
moldWorkOrder: {
moduleName: 'Inspection Records',
subTitle: 'Mold management inspection records',
diff --git a/src/locales/index.js b/src/locales/index.js
index f814f5a..16b9ab5 100644
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -115,6 +115,8 @@ const literalMap = {
'点检任务详情': 'moldTaskConfig.detailTitle',
'设备点检任务': 'equipmentInspectionTasks.moduleName',
'设备点检任务详情': 'equipmentInspectionTasks.detailTitle',
+ '设备点检记录': 'equipmentInspectionRecord.moduleName',
+ '设备点检记录详情': 'equipmentInspectionRecord.detailTitle',
'点检记录': 'moldWorkOrder.moduleName',
'点检记录详情': 'moldWorkOrder.detailTitle'
}
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index 7c3896a..4d877c5 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -474,6 +474,47 @@ export default {
createTicketSuccess: '工单创建成功',
createTicketFail: '工单创建失败'
},
+ equipmentInspectionRecord: {
+ moduleName: '设备点检记录',
+ subTitle: '设备点检记录查询',
+ detailTitle: '设备点检记录详情',
+ taskType: '任务类型',
+ taskTypeInspect: '点检',
+ taskTypeMaintain: '保养',
+ taskTypeInspectShort: '检',
+ taskTypeMaintainShort: '养',
+ planNo: '任务编号',
+ deviceName: '设备名称',
+ configName: '点检模板',
+ jobStatus: '作业状态',
+ jobStatusPending: '待处理',
+ jobStatusProcessing: '处理中',
+ jobStatusCompleted: '已完成',
+ jobStatusTimeout: '已超时',
+ jobStatusCancelled: '已取消',
+ jobResult: '结果',
+ jobResultOk: '通过',
+ jobResultNg: '不通过',
+ taskTime: '作业时间',
+ searchPlaceholder: '请输入任务编号',
+ empty: '暂无设备点检记录数据',
+ progressTitle: '执行进度',
+ inspectionMethod: '检验方式',
+ judgmentCriteria: '标准要求',
+ valueType: '值类型',
+ resultText: '结果',
+ requiredText: '必检',
+ inspectionResultPending: '待检',
+ inspectionResultPass: '通过',
+ inspectionResultFail: '不通过',
+ textInput: '输入值',
+ inputPlaceholder: '请输入',
+ remark: '备注',
+ images: '图片',
+ maxUploadCount: '最多上传 9 张图片',
+ selectAllDecisionError: '请为所有待检项选择结果',
+ noResultData: '暂无点检项数据'
+ },
moldWorkOrder: {
moduleName: '点检记录',
subTitle: '模具管理点检记录查询',
diff --git a/src/pages.json b/src/pages.json
index 239de0b..6e2378f 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -659,6 +659,20 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "equipmentInspectionRecord/index",
+ "style": {
+ "navigationBarTitleText": "设备点检记录",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "equipmentInspectionRecord/detail",
+ "style": {
+ "navigationBarTitleText": "设备点检记录详情",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "planList/index",
"style": {
diff --git a/src/pages_function/pages/equipmentInspectionRecord/detail.vue b/src/pages_function/pages/equipmentInspectionRecord/detail.vue
new file mode 100644
index 0000000..f3d4e12
--- /dev/null
+++ b/src/pages_function/pages/equipmentInspectionRecord/detail.vue
@@ -0,0 +1,399 @@
+
+
+
+
+
+
+
+
+ {{ taskTypeShortText }}
+
+
+ {{ textValue(detailData.deviceName) }}
+
+ {{ t('equipmentInspectionRecord.taskType') }}:
+ {{ planTypeText }}
+ {{ t('equipmentInspectionRecord.configName') }}:
+ {{ textValue(detailData.configName) }}
+
+
+ {{ t('equipmentInspectionRecord.planNo') }}:
+ {{ textValue(detailData.planNo) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('functionCommon.loading') }}
+ {{ t('equipmentInspectionRecord.noResultData') }}
+
+
+
+
+
+ {{ t('equipmentInspectionRecord.inspectionMethod') }}
+ {{ inspectionMethodText(item.inspectionMethod) }}
+
+
+ {{ t('equipmentInspectionRecord.judgmentCriteria') }}
+ {{ textValue(item.judgmentCriteria) }}
+
+
+ {{ t('equipmentInspectionRecord.valueType') }}
+ {{ valueTypeText(item.valueType) }}
+
+
+
+ {{ t('equipmentInspectionRecord.textInput') }}
+
+ {{ textInputDisplay(item) }}
+
+
+
+ {{ t('equipmentInspectionRecord.images') }}
+
+
+
+ ×
+
+
+ +
+
+
+
+
+
+ {{ t('equipmentInspectionRecord.remark') }}
+ {{ textValue(item.remark) }}
+
+
+
+ {{ t('equipmentInspectionRecord.resultText') }}
+
+
+ {{ t('equipmentInspectionRecord.inspectionResultPass') }}
+
+
+ {{ t('equipmentInspectionRecord.inspectionResultFail') }}
+
+ {{ t('equipmentInspectionRecord.inspectionResultPending') }}
+
+
+
+
+
+
+
+
+
+ {{ t('dashboard.back') }}
+ {{ t('functionCommon.save') }}
+
+
+
+
+
+
+
diff --git a/src/pages_function/pages/equipmentInspectionRecord/index.vue b/src/pages_function/pages/equipmentInspectionRecord/index.vue
new file mode 100644
index 0000000..c094df6
--- /dev/null
+++ b/src/pages_function/pages/equipmentInspectionRecord/index.vue
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+ {{ t('functionCommon.search') }}
+
+
+
+ {{ currentTaskTypeLabel }}
+
+
+ {{ currentJobStatusLabel }}
+
+ {{ t('functionCommon.reset') }}
+
+
+
+
+
+
+
+
+
+ {{ t('equipmentInspectionRecord.deviceName') }}
+ {{ textValue(item.deviceName) }}
+
+
+ {{ t('equipmentInspectionRecord.configName') }}
+ {{ textValue(item.configName) }}
+
+
+ {{ t('equipmentInspectionRecord.jobStatus') }}
+ {{ jobStatusText(item.jobStatus) }}
+
+
+ {{ t('equipmentInspectionRecord.taskTime') }}
+ {{ formatDateTime(item.taskTime) }}
+
+
+ {{ t('equipmentInspectionRecord.jobResult') }}
+ {{ jobResultText(item.jobResult) }}
+
+
+
+
+ {{ t('functionCommon.loading') }}
+ {{ t('equipmentInspectionRecord.empty') }}
+ {{ t('functionCommon.loadingMore') }}
+ {{ t('functionCommon.noMoreData') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages_function/pages/equipmentInspectionTasks/index.vue b/src/pages_function/pages/equipmentInspectionTasks/index.vue
index eb296e7..b94dd68 100644
--- a/src/pages_function/pages/equipmentInspectionTasks/index.vue
+++ b/src/pages_function/pages/equipmentInspectionTasks/index.vue
@@ -38,22 +38,10 @@
{{ t('equipmentInspectionTasks.deviceList') }}
{{ getDeviceNames(item.deviceList) }}
-
- {{ t('equipmentInspectionTasks.projectFormName') }}
- {{ textValue(item.projectFormName) }}
-
{{ t('equipmentInspectionTasks.dateRange') }}
{{ formatDate(item.startDate) }} ~ {{ formatDate(item.endDate) }}
-
- {{ t('equipmentInspectionTasks.enabled') }}
- {{ enabledText(item.enabled) }}
-
-
- {{ t('equipmentInspectionTasks.creatorName') }}
- {{ textValue(item.creatorName) }}
-
diff --git a/src/utils/permissionMenu.js b/src/utils/permissionMenu.js
index d6daa94..1b6b67d 100644
--- a/src/utils/permissionMenu.js
+++ b/src/utils/permissionMenu.js
@@ -46,6 +46,9 @@ const MENU_ROUTE_MAP = {
'设备点检任务': '/pages_function/pages/equipmentInspectionTasks/index',
equipmentinspectiontasks: '/pages_function/pages/equipmentInspectionTasks/index',
taskmanagement: '/pages_function/pages/equipmentInspectionTasks/index',
+ '设备点检记录': '/pages_function/pages/equipmentInspectionRecord/index',
+ equipmentinspectionrecord: '/pages_function/pages/equipmentInspectionRecord/index',
+ equipmentinspectionrecords: '/pages_function/pages/equipmentInspectionRecord/index',
'设备关键件': '/pages_function/pages/criticalComponent/index',
criticalcomponent: '/pages_function/pages/criticalComponent/index',
equipmentkeypart: '/pages_function/pages/equipmentKeypart/index',