From 744f288b70dff852fab6d24935d37f0a310e5000 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Fri, 2 Sep 2022 10:59:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0qualityInspectionCurrent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base-detail-page/index.vue | 4 +-- .../base-dialog/addOrUpdate/index.vue | 4 +-- src/i18n/zh-CN.js | 32 +++++++++++++++++++ .../modules/monitoring/equipmentAlarmLog.vue | 14 ++++---- .../modules/monitoring/equipmentFile.vue | 16 +++++----- .../modules/monitoring/equipmentGroup.vue | 12 +++---- .../monitoring/equipmentGroupAlarm.vue | 16 +++++----- src/views/modules/monitoring/equipmentPlc.vue | 12 +++---- .../monitoring/equipmentPlcConnect.vue | 24 +++++++------- .../modules/monitoring/equipmentPlcParam.vue | 10 +++--- .../modules/monitoring/equipmentQuantity.vue | 14 ++++---- .../modules/monitoring/equipmentStatusLog.vue | 14 ++++---- .../modules/monitoring/equipmentType.vue | 14 ++++---- .../modules/monitoring/equipmentTypeFile.vue | 20 ++++++------ .../modules/monitoring/equipmentattr.vue | 8 ++--- src/views/modules/monitoring/factory.vue | 10 +++--- src/views/modules/monitoring/product.vue | 24 +++++++------- src/views/modules/monitoring/productArrt.vue | 18 +++++------ .../modules/monitoring/productionLine.vue | 20 ++++++------ .../monitoring/productionLineRecSch.vue | 2 +- .../monitoring/qualityInspectionRecord.vue | 4 +-- .../modules/monitoring/realtimeEquipment.vue | 2 +- .../monitoring/realtimeProductLine.vue | 2 +- src/views/modules/monitoring/reportSheet.vue | 2 +- src/views/modules/monitoring/sysfile.vue | 16 +++++----- src/views/modules/monitoring/sysfileType.vue | 14 ++++---- .../modules/monitoring/workShopSection.vue | 2 +- 27 files changed, 180 insertions(+), 150 deletions(-) diff --git a/src/components/base-detail-page/index.vue b/src/components/base-detail-page/index.vue index 59aa109..8944aec 100644 --- a/src/components/base-detail-page/index.vue +++ b/src/components/base-detail-page/index.vue @@ -144,7 +144,7 @@ export default { code: i18n.t('code'), remark: i18n.t('remark'), description: i18n.t('desc'), - specifications: '规格' + specifications: i18n.t('prod.spec') // add more... } @@ -168,7 +168,7 @@ export default { code: i18n.t('code'), remark: i18n.t('remark'), description: i18n.t('desc'), - specifications: '规格' + specifications: i18n.t('prod.spec') // add more... }, defaultPlaceholders: {}, // 自动根据 defaultNames 计算得来 diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index d62fba8..1aed3d1 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -159,7 +159,7 @@ export default { code: i18n.t('code'), remark: i18n.t('remark'), description: i18n.t('desc'), - specifications: '规格' + specifications: i18n.t('prod.spec') // add more... } @@ -183,7 +183,7 @@ export default { code: i18n.t('code'), remark: i18n.t('remark'), description: i18n.t('desc'), - specifications: '规格' + specifications: i18n.t('prod.spec') // add more... }, defaultPlaceholders: {}, // 自动根据 defaultNames 计算得来 diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index ff6d384..8ead8ac 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -107,6 +107,7 @@ t.manufacturer = '制造商' t.hints = {} t.hints.date = '请选择日期' t.hints.number = '请输入正确的数值' +t.hints.addr = '请输入地址' t.hints.upload2m = '上传文件大小不要超过 2mb (2048kb)' t.hints.upload2mPic = '上传图片文件，且大小不要超过 2mb (2048kb)' @@ -116,11 +117,27 @@ t.factory.name = '工厂名称' t.factory.code = '工厂编码' t.prod = {} +t.prod.id = '产品ID' t.prod.name = '产品名称' t.prod.code = '产品编码' +t.prod.type = '产品类型' +t.prod.area = '单位平方数' +t.prod.spec = '规格' +t.prod.attr = '动态属性' +t.prod.attrcode = '属性编码' +t.prod.attrcodeHints = '请输入属性编码' +t.prod.attrname = '属性名称' +t.prod.attrnameHints = '请输入属性名称' +t.prod.attrvalueHints = '请输入属性值' +t.prod.descHints = '请输入描述' +t.prod.processTime = '加工时间' +t.prod.processTimeHints = '请输入加工时间' +t.prod.relatedPid = '关联产品' t.alarm = {} +t.alarm.name = '报警' t.alarm.info = '报警信息' +t.alarm.view = '查看报警' t.alarm.eq = '报警设备' t.alarm.type = '报警类型' t.alarm.code = '报警编码' @@ -175,6 +192,7 @@ t.file.typeCode = '文件类型编号' t.eq = {} t.eq.title = '设备' +t.eq.id = '设备ID' t.eq.name = '设备名称' t.eq.code = '设备编码' t.eq.type = '设备类型' @@ -194,12 +212,23 @@ t.eq.dtypeoutput = '下片数据设备' t.eq.upload = '上传资料' t.eq.image = '设备图片' t.eq.viewattr = '查看设备属性' +t.eq.plcbarcode = 'plc条码' +t.eq.plccode = 'PLC编码' +t.eq.plcname = 'PLC名称' +t.eq.port = '端口' +t.eq.type = '类型名称' +t.eq.typecode = '类型编码' +t.eq.parent = '父类' t.pl = {} t.pl.title = '产线' t.pl.name = '产线名称' +t.pl.code = '产线编码' +t.pl.status = '产线状态' t.pl.belong = '所属产线' +t.pl.tvalue = '产线TT值(每小时下片数量)' +t.pl.factoryHints = '请选择所属工厂' t.prompt = {} t.prompt.title = '提示' @@ -407,6 +436,9 @@ t.params.name = '参数名称' t.params.code = '参数编码' t.params.paramCode = '编码' t.params.paramValue = '值' +t.params.paramStdValue = '参数设定标准值' +t.params.plctitle = 'PLC采集参数' +t.params.plcid = 'PLC连接表ID' t.params.remark = '备注' t.role = {} diff --git a/src/views/modules/monitoring/equipmentAlarmLog.vue b/src/views/modules/monitoring/equipmentAlarmLog.vue index bbd3a97..1dea355 100644 --- a/src/views/modules/monitoring/equipmentAlarmLog.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog.vue @@ -41,14 +41,14 @@ const tableConfigs = [ { prop: 'alarmContent', name: '报警详细内容' }, { prop: 'alarmEquipmentId', name: '报警设备id 关联equipment表' }, { prop: 'remark', name: i18n.t('remark') }, - { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, - { prop: 'creatorId', name: '创建人' }, - { prop: 'creatorName', name: '创建人姓名' }, + { prop: 'valid', name: i18n.t('delMark') }, + { prop: 'creatorId', name: i18n.t('creator') }, + { prop: 'creatorName', name: i18n.t('creatorName') }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'updaterId', name: '更新人' }, - { prop: 'updaterName', name: '更新人姓名' }, - { prop: 'updateTime', name: '更新时间', filter: timeFilter }, - { prop: 'version', name: '版本号' }, + { prop: 'updaterId', name: i18n.t('updator') }, + { prop: 'updaterName', name: i18n.t('updatorName') }, + { prop: 'updateTime', name: i18n.t('updateTime'), filter: timeFilter }, + { prop: 'version', name: i18n.t('version') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] diff --git a/src/views/modules/monitoring/equipmentFile.vue b/src/views/modules/monitoring/equipmentFile.vue index 4e7dc39..3fe7857 100644 --- a/src/views/modules/monitoring/equipmentFile.vue +++ b/src/views/modules/monitoring/equipmentFile.vue @@ -39,16 +39,16 @@ const tableConfigs = [ { prop: 'equipmentId', name: '设备ID' }, { prop: 'fileId', name: '文件ID' }, { prop: 'description', name: i18n.t('desc') }, - { prop: 'enabled', name: '启用状态:0 、停用，1、启用' }, + { prop: 'enabled', name: i18n.t('enabled') }, { prop: 'remark', name: i18n.t('remark') }, - { prop: 'valid', name: '删除标志，是否有效:1 可用 0不可用' }, - { prop: 'creatorId', name: '创建人' }, - { prop: 'creatorName', name: '创建人姓名' }, + { prop: 'valid', name: i18n.t('delMark') }, + { prop: 'creatorId', name: i18n.t('creator') }, + { prop: 'creatorName', name: i18n.t('creatorName') }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'updaterId', name: '更新人' }, - { prop: 'updaterName', name: '更新人姓名' }, - { prop: 'updateTime', name: '更新时间', filter: timeFilter }, - { prop: 'version', name: '版本号' }, + { prop: 'updaterId', name: i18n.t('updator') }, + { prop: 'updaterName', name: i18n.t('updatorName') }, + { prop: 'updateTime', name: i18n.t('updateTime'), filter: timeFilter }, + { prop: 'version', name: i18n.t('version') }, { prop: 'typeCode', name: '文件类型编号' }, { prop: 'fileName', name: '文件名字' }, { prop: 'fileUrl', name: i18n.t('downloadurl') }, diff --git a/src/views/modules/monitoring/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue index a74f9e8..8236fd3 100644 --- a/src/views/modules/monitoring/equipmentGroup.vue +++ b/src/views/modules/monitoring/equipmentGroup.vue @@ -2,7 +2,7 @@
- + {{ $t('query') }} @@ -38,17 +38,17 @@ import TableTextComponent from '@/components/base-table/components/detailCompone const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'name', name: '分组名称' }, - { prop: 'code', name: '分组编码' }, + { prop: 'name', name: i18n.t('eq.groupname') }, + { prop: 'code', name: i18n.t('eq.groupcode') }, { prop: 'remark', name: i18n.t('remark') }, - { prop: 'alarm', name: '报警', buttonContent: '查看报警', subcomponent: TableTextComponent, actionName: 'view-alarm' }, + { prop: 'alarm', name: i18n.t('alarm.name'), buttonContent: i18n.t('alarm.view'), subcomponent: TableTextComponent, actionName: 'view-alarm' }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/equipmentGroup', - fields: [{ name: 'name', label: '分组名称' }, { name: 'code', label: '分组编码' }, 'remark'], + fields: [{ name: 'name', label: i18n.t('eq.groupname') }, { name: 'code', label: i18n.t('eq.groupcode') }, 'remark'], operations: [ { name: 'cancel', showAlways: true }, { name: 'save', url: '/monitoring/equipmentGroup', permission: 'monitoring:equipmentgroup:save', showOnEdit: false }, @@ -153,7 +153,7 @@ export default { : this.dataListSelections.map(item => { return item.id }) - this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), { + this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), { confirmButtonText: i18n.t('confirm'), cancelButtonText: i18n.t('cancel'), type: 'warning' diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue index fa94b02..844e509 100644 --- a/src/views/modules/monitoring/equipmentGroupAlarm.vue +++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue @@ -56,10 +56,10 @@ const dictEntries = { const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'code', name: '报警编码' }, - { prop: 'typeDictValue', name: '报警类型' }, - { prop: 'gradeDictValue', name: '报警级别' }, - { prop: 'alarmContent', name: '报警内容' }, + { prop: 'code', name: i18n.t('alarm.code') }, + { prop: 'typeDictValue', name: i18n.t('alarm.type') }, + { prop: 'gradeDictValue', name: i18n.t('alarm.level') }, + { prop: 'alarmContent', name: i18n.t('alarm.content') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] @@ -67,10 +67,10 @@ const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/equipmentGroupAlarm', fields: [ - { name: 'code', label: '报警编码', required: true }, - { name: 'typeDictValue', label: '报警类型', type: 'select', options: [] }, - { name: 'gradeDictValue', label: '报警级别', type: 'select', options: [] }, - { name: 'alarmContent', label: '报警内容', required: true } + { name: 'code', label: i18n.t('alarm.code'), required: true }, + { name: 'typeDictValue', label: i18n.t('alarm.type'), type: 'select', options: [] }, + { name: 'gradeDictValue', label: i18n.t('alarm.level'), type: 'select', options: [] }, + { name: 'alarmContent', label: i18n.t('alarm.content'), required: true } ], operations: [ { name: 'cancel', showAlways: true }, diff --git a/src/views/modules/monitoring/equipmentPlc.vue b/src/views/modules/monitoring/equipmentPlc.vue index 6f7ef18..9d3feb0 100644 --- a/src/views/modules/monitoring/equipmentPlc.vue +++ b/src/views/modules/monitoring/equipmentPlc.vue @@ -34,7 +34,7 @@ import AddOrUpdate from '@/components/base-dialog/addOrUpdate' import i18n from '@/i18n' import BaseTable from '@/components/base-table' import TableOperateComponent from '@/components/base-table/components/operationComponent' -import TableTextComponent from '@/components/base-table/components/detailComponent' +// import TableTextComponent from '@/components/base-table/components/detailComponent' const tableConfigs = [ { type: 'index', width: 100, name: i18n.t('index') }, @@ -42,10 +42,10 @@ const tableConfigs = [ { prop: 'name', name: i18n.t('name') }, { prop: 'enName', name: i18n.t('enname') }, { prop: 'description', name: i18n.t('desc') }, - { prop: 'barcode', name: 'plc条码' }, + { prop: 'barcode', name: i18n.t('eq.plcbarcode') }, { prop: 'collection', name: i18n.t('collectOrNot'), filter: val => ({ 0: i18n.t('notCollect'), 1: i18n.t('collect') }[val]) }, { prop: 'ip', name: 'IP' }, - { prop: 'port', name: '端口号' }, + { prop: 'port', name: i18n.t('eq.port') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] @@ -68,10 +68,10 @@ const addOrUpdateConfigs = { ] }, { name: 'ip', label: 'IP', required: true, placeholder: '0.0.0.0' }, - { name: 'port', label: '端口', placeholder: '443' }, + { name: 'port', label: i18n.t('eq.port'), placeholder: '443' }, 'description', 'remark', - { name: 'barcode', label: 'plc条码', span: 24 } + { name: 'barcode', label: i18n.t('eq.plcbarcode'), span: 24 } ], operations: [ { name: 'cancel', url: true, showAlways: true }, @@ -166,7 +166,7 @@ export default { : this.dataListSelections.map(item => { return item.id }) - this.$confirm(`${ i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() }) }`, i18n.t('prompt.title'), { + this.$confirm(`${i18n.t('prompt.info', { handle: id ? i18n.t('delete').toLowerCase() : i18n.t('deleteBatch').toLowerCase() })}`, i18n.t('prompt.title'), { confirmButtonText: i18n.t('confirm'), cancelButtonText: i18n.t('cancel'), type: 'warning' diff --git a/src/views/modules/monitoring/equipmentPlcConnect.vue b/src/views/modules/monitoring/equipmentPlcConnect.vue index a47d47b..21d0ec5 100644 --- a/src/views/modules/monitoring/equipmentPlcConnect.vue +++ b/src/views/modules/monitoring/equipmentPlcConnect.vue @@ -29,7 +29,7 @@