diff --git a/src/api/mes/dvsubject/index.ts b/src/api/mes/dvsubject/index.ts index dfbfe8f3..200eae35 100644 --- a/src/api/mes/dvsubject/index.ts +++ b/src/api/mes/dvsubject/index.ts @@ -11,6 +11,7 @@ export interface DvSubjectVO { isEnable: string // 是否启用 inspectionMethod: string // 检验方式 valueType: string // 值类型 + jobType:string // 作业类型 judgmentCriteria: string // 判定基准 creator?: string // 创建人 createTime?: string | number | Date // 创建时间 diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index a52b9f2f..62865f31 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1300,6 +1300,7 @@ export default { name: '名称', inspectionMethod: '作业方式', valueType: '结果类型', + JobType:'作业类型', judgmentCriteria: '判定基准', upperVal: '上限值', lowerVal: '下限值', @@ -1319,14 +1320,15 @@ export default { placeholderProjectName: '请输入项目名称', placeholderInspectionMethod: '请选择检验方式', placeholderValueType: '请选择值类型', + placeholderJobType: '请选择作业类型', placeholderUpperVal: '请输入上限值', placeholderLowerVal: '请输入下限值' }, // 方案维护 PlanMaintenance: { - planName: '方案名称', - planType: '方案类型', + planName: '模板名称', + planType: '模板类型', planTypeMaintain: '保养', planTypeInspect: '点检', description: '描述', @@ -1340,14 +1342,14 @@ export default { inspectionMethod: '检验方式', judgmentCriteria: '判定基准', batchDelete: '批量删除', - placeholderPlanName: '请输入方案名称', + placeholderPlanName: '请输入模板名称', placeholderDescription: '请输入描述', - placeholderPlanType: '请选择方案类型', + placeholderPlanType: '请选择模板类型', placeholderSubjectName: '请输入名称', placeholderSubjectDescription: '请输入描述', placeholderSubjectSelect: '请选择关联项目', selectDeleteTip: '请选择需要删除的数据', - exportFilename: '方案维护.xls' + exportFilename: '模板维护.xls' }, // 任务管理 @@ -1459,7 +1461,7 @@ export default { repairLineTitle: '设备维修项目行', lineSubjectCode: '维修编码', lineSubjectName: '维修名称', - lineSubjectContent: '维修内容', + lineSubjectContent: '维修方法', lineRemark: '备注', lineResult: '结果', lineResultOk: '通过', @@ -1520,7 +1522,7 @@ export default { deviceType: '设备类型', device: '设备', component: '关键件', - projectContent: '维修内容', + projectContent: '维修方法', createTime: '创建时间', deviceName: '设备名称', componentName: '关键件名称', @@ -1534,7 +1536,7 @@ export default { placeholderSubjectCode: '请输入维修编码', placeholderSubjectName: '请输入维修名称', placeholderDeviceType: '请选择设备类型', - placeholderProjectContent: '请输入维修内容', + placeholderProjectContent: '请输入维修方法', placeholderCreateTimeStart: '开始日期', placeholderCreateTimeEnd: '结束日期', placeholderDevice: '请选择设备', diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 2f5e6e86..0fd92e59 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -268,6 +268,7 @@ export enum DICT_TYPE { MES_ZJ_PRODUCT = "mes_zj_product", FILE_STATUS = "file_status", Classification = "classification", + MES_JOB_TYPE = "mes_job_type", //====iot IOT_SIEMENS_TYPE = "iot_siemens_type", IOT_MODBUS_TYPE = "iot_modbus_type", diff --git a/src/views/mes/dvsubject/DvSubjectForm.vue b/src/views/mes/dvsubject/DvSubjectForm.vue index d65bc88e..3b04db2a 100644 --- a/src/views/mes/dvsubject/DvSubjectForm.vue +++ b/src/views/mes/dvsubject/DvSubjectForm.vue @@ -42,6 +42,21 @@ + + + + +