diff --git a/src/components/base-dialog/AttrForm/index.vue b/src/components/base-dialog/AttrForm/index.vue index 0abe88f..0ab0631 100644 --- a/src/components/base-dialog/AttrForm/index.vue +++ b/src/components/base-dialog/AttrForm/index.vue @@ -40,7 +40,7 @@ - 取消 + {{ $t('cancel') }} {{ $t('save') }} diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 8ead8ac..be7aa9d 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -103,9 +103,17 @@ t.loaddone = '加载完成' t.produceTime = '生产日期' t.enterTime = '进厂日期' t.manufacturer = '制造商' +t.success = '修改成功!' +t.all = '全部' + +t.errors = {} +t.errors.nosection = '该产线没有工段' +t.errors.numsection = '该产线有{num}条工段' +t.errors.nodata = '没有查询到相关数据!' t.hints = {} t.hints.date = '请选择日期' +t.hints.checktime = '请选择检测时间' t.hints.number = '请输入正确的数值' t.hints.addr = '请输入地址' t.hints.upload2m = '上传文件大小不要超过 2mb (2048kb)' @@ -149,10 +157,15 @@ t.alarm.det = '报警详细内容' t.report = {} t.report.name = '报表名称' t.report.det = '报表内容' +t.report.type = '报表分类' +t.report.code = '报表编码' +t.report.lnk = '链接地址' t.inspect = {} t.inspect.type = '检测类型' +t.inspect.code = '检测编码' t.inspect.det = '检测内容' +t.inspect.detcode = '内容编码' t.inspect.people = '检测人员' t.inspect.time = '检测时间' t.inspect.typetotal = '检测类型总数' @@ -160,6 +173,11 @@ t.inspect.typename = '检测类型名称' t.inspect.typecode = '检测类型编码' t.inspect.ioTotal = '上下片及检测总数统计' t.inspect.plTotal = '各产线检测类型统计' +t.inspect.inTotal = '上片总数' +t.inspect.outTotal = '下片总数' +t.inspect.checkTotal = '检测总数' +t.inspect.rate = '比例' +t.inspect.typeCount = '检测类型统计数据' t.realtime = {} @@ -168,11 +186,16 @@ t.realtime.pl = '产线生产实时数据' t.realtime.inspect = '质量检查实时数据' t.realtime.in = '进数据' t.realtime.out = '出数据' +t.realtime.data = '报废数据' +t.realtime.num = '报废数量' t.realtime.rate = '报废比例' +t.realtime.total = '总产量' +t.realtime.goodrate = '良品率' t.ws = {} t.ws.title = '工段' +t.ws.id = '工段ID' t.ws.name = '工段名称' t.ws.code = '工段编码' t.ws.binded = '已绑定的设备' @@ -223,6 +246,7 @@ t.eq.parent = '父类' t.pl = {} t.pl.title = '产线' +t.pl.id = '产线ID' t.pl.name = '产线名称' t.pl.code = '产线编码' t.pl.status = '产线状态' @@ -233,6 +257,7 @@ t.pl.factoryHints = '请选择所属工厂' t.prompt = {} t.prompt.title = '提示' t.prompt.info = '确定进行[{handle}]操作?' +t.prompt.sure = '确定删除这条记录吗?' t.prompt.success = '操作成功' t.prompt.failed = '操作失败' t.prompt.deleteBatch = '请选择删除项' diff --git a/src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue b/src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue index 9891aa5..3d11493 100644 --- a/src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog-add-or-update.vue @@ -19,31 +19,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentAttr-add-or-update.vue b/src/views/modules/monitoring/equipmentAttr-add-or-update.vue index 3e9b339..3ea5b7c 100644 --- a/src/views/modules/monitoring/equipmentAttr-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentAttr-add-or-update.vue @@ -16,31 +16,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentFile-add-or-update.vue b/src/views/modules/monitoring/equipmentFile-add-or-update.vue index 02a8538..9ba0af5 100644 --- a/src/views/modules/monitoring/equipmentFile-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentFile-add-or-update.vue @@ -7,8 +7,8 @@ - - + + @@ -19,26 +19,26 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -51,8 +51,8 @@ - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue b/src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue index 018dd39..cf7494f 100644 --- a/src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentPlcParam-add-or-update.vue @@ -31,8 +31,8 @@ - - + + @@ -43,26 +43,26 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -81,8 +81,8 @@ - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentQuantity-add-or-update.vue b/src/views/modules/monitoring/equipmentQuantity-add-or-update.vue index 57a1dc4..2840161 100644 --- a/src/views/modules/monitoring/equipmentQuantity-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentQuantity-add-or-update.vue @@ -28,34 +28,34 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue b/src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue index 4471bd8..db82068 100644 --- a/src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentStatusLog-add-or-update.vue @@ -28,31 +28,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue b/src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue index c5be639..2a42d6c 100644 --- a/src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue +++ b/src/views/modules/monitoring/equipmentTypeFile-add-or-update.vue @@ -16,8 +16,8 @@ - - + + @@ -28,31 +28,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/productionLineRecSch.vue b/src/views/modules/monitoring/productionLineRecSch.vue index c52b199..5cee30a 100644 --- a/src/views/modules/monitoring/productionLineRecSch.vue +++ b/src/views/modules/monitoring/productionLineRecSch.vue @@ -37,7 +37,7 @@ import TableTextComponent from '@/components/base-table/components/detailCompone const tableConfigs = [ { prop: 'id', name: 'ID' }, - { prop: 'productionLineId', name: '产线id' }, + { prop: 'productionLineId', name: i18n.t('pl.id') }, { prop: 'inputNum', name: '上一次记录时间至该条记录时间端内上片数量' }, { prop: 'outputNum', name: '上一次记录时间至该条记录时间端内下片数量' }, { prop: 'recordTime', name: i18n.t('recordTime') }, diff --git a/src/views/modules/monitoring/productionlinerecsch-add-or-update.vue b/src/views/modules/monitoring/productionlinerecsch-add-or-update.vue index ee113ee..2e60f24 100644 --- a/src/views/modules/monitoring/productionlinerecsch-add-or-update.vue +++ b/src/views/modules/monitoring/productionlinerecsch-add-or-update.vue @@ -24,8 +24,8 @@ - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/qualityInspectionCurrent.vue b/src/views/modules/monitoring/qualityInspectionCurrent.vue index fb423c9..2c59361 100644 --- a/src/views/modules/monitoring/qualityInspectionCurrent.vue +++ b/src/views/modules/monitoring/qualityInspectionCurrent.vue @@ -70,17 +70,17 @@ import * as echarts from 'echarts' const tableConfigStatic = [ { type: 'index', width: 100, name: i18n.t('index') }, - { name: '上片总数', prop: 'sumUp' }, - { name: '下片总数', prop: 'sumDown' }, - { name: '检测总数', prop: 'sumCheck' }, - { name: '比例', prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') } + { name: i18n.t('inspect.inTotal'), prop: 'sumUp' }, + { name: i18n.t('inspect.outTotal'), prop: 'sumDown' }, + { name: i18n.t('inspect.checkTotal'), prop: 'sumCheck' }, + { name: i18n.t('inspect.rate'), prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') } ] const tableConfigDynamic = [ { type: 'index', width: 100, name: i18n.t('index') }, - { name: '检测类型', prop: 'inspectionContent' }, + { name: i18n.t('inspect.type'), prop: 'inspectionContent' }, /** dynamic */ - { name: '检测类型总数', prop: '' }, - { name: '比例', prop: '' } + { name: i18n.t('inspect.typetotal'), prop: '' }, + { name: i18n.t('inspect.rate'), prop: '' } ] const FakeChart = { @@ -105,7 +105,7 @@ const FakeChart = { chart: null, defaultOpts: { title: { - text: '检测类型统计数据' + text: i18n.t('inspect.typeCount') }, tooltip: {}, legend: { @@ -281,10 +281,10 @@ export default { this.tableConfigDynamic = [ { type: 'index', width: 100, name: i18n.t('index') }, - { name: '检测类型', prop: 'inspectionContent' }, + { name: i18n.t('inspect.type'), prop: 'inspectionContent' }, ...subProps, - { name: '检测类型总数', prop: 'sumInput' }, - { name: '比例', prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') } + { name: i18n.t('inspect.typetotal'), prop: 'sumInput' }, + { name: i18n.t('inspect.rate'), prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') } ] /** echarts related */ diff --git a/src/views/modules/monitoring/qualityInspectionDet.vue b/src/views/modules/monitoring/qualityInspectionDet.vue index cfbb8bd..99b3f47 100644 --- a/src/views/modules/monitoring/qualityInspectionDet.vue +++ b/src/views/modules/monitoring/qualityInspectionDet.vue @@ -38,9 +38,9 @@ import TableOperateComponent from '@/components/base-table/components/operationC const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'typeName', name: '检测类型' }, - { prop: 'content', name: '检测内容' }, - { prop: 'code', name: '检测编码' }, + { prop: 'typeName', name: i18n.t('inspect.type') }, + { prop: 'content', name: i18n.t('inspect.det') }, + { prop: 'code', name: i18n.t('inspect.code') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] @@ -49,9 +49,9 @@ const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/qualityInspectionDet', fields: [ - { name: 'typeId', label: '检测类型', type: 'select', options: [] }, - { name: 'content', label: '检测内容' }, - { name: 'code', label: '内容编码', api: '/monitoring/qualityInspectionDet/getCode' }, + { name: 'typeId', label: i18n.t('inspect.type'), type: 'select', options: [] }, + { name: 'content', label: i18n.t('inspect.det') }, + { name: 'code', label: i18n.t('inspect.detcode'), api: '/monitoring/qualityInspectionDet/getCode' }, 'remark' ], operations: [ diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue index 16da791..2e85ef5 100644 --- a/src/views/modules/monitoring/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -49,13 +49,13 @@ const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, { prop: 'inspectionDetContent', - name: '检测内容' + name: i18n.t('inspect.det') }, - { prop: 'checkTime', name: '检测时间', filter: timeFilter }, - { prop: 'productionId', name: '产线id' }, - { prop: 'sectionId', name: '工段id' }, - { prop: 'checkPerson', name: '检测人员' }, - { prop: 'source', name: '来源', filter: val => ({ 1: '手动', 2: '自动' }[val]) }, + { prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter }, + { prop: 'productionId', name: i18n.t('pl.id') }, + { prop: 'sectionId', name: i18n.t('ws.id') }, + { prop: 'checkPerson', name: i18n.t('inspect.people') }, + { prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) }, { prop: 'explainText', name: i18n.t('desc') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } @@ -65,20 +65,20 @@ const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/qualityInspectionRecord', fields: [ - { name: 'checkTime', label: '检测时间', type: 'date', props: { style: 'width: 100%', type: 'datetime' }, placeholder: '请选择检测时间' }, + { name: 'checkTime', label: i18n.t('inspect.time'), type: 'date', props: { style: 'width: 100%', type: 'datetime' }, placeholder: i18n.t('hints.checktime') }, { name: 'productionId', label: i18n.t('pl.title'), type: 'select', options: [] }, { name: 'sectionId', label: i18n.t('ws.title'), type: 'select', options: [] }, { name: 'source', - label: '来源', + label: i18n.t('source'), type: 'select', options: [ - { value: 1, label: '手动', default: true }, - { value: 2, label: '自动' } + { value: 1, label: i18n.t('manual'), default: true }, + { value: 2, label: i18n.t('auto') } ] }, - { name: 'inspectionDetId', label: '检测内容', type: 'select', options: [] }, - { name: 'checkPerson', label: '检测人员' }, + { name: 'inspectionDetId', label: i18n.t('inspect.det'), type: 'select', options: [] }, + { name: 'checkPerson', label: i18n.t('inspect.people') }, { name: 'explainText', label: i18n.t('desc') }, 'remark' ], @@ -176,9 +176,9 @@ export default { }).then(({ data: res }) => { if (this.addOrUpdateVisible) { if (res.data.total === 0) { - this.$message.error('该产线没有工段') + this.$message.error(i18n.t('errors.nosection')) } else { - this.$message.success(`该产线有 ${res.data.total} 条工段`) + this.$message.success(i18n.t('errors.numsection', { num: res.data.total })) } } const wsOpt = this.addOrUpdateConfigs.fields.find(item => item.name === 'sectionId') @@ -247,7 +247,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/qualityInspectionType.vue b/src/views/modules/monitoring/qualityInspectionType.vue index 3a18527..51378b5 100644 --- a/src/views/modules/monitoring/qualityInspectionType.vue +++ b/src/views/modules/monitoring/qualityInspectionType.vue @@ -37,8 +37,8 @@ import { calcMaxHeight } from '@/utils' import { timeFilter } from '@/utils/filters' const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'name', name: '检测类型名称' }, - { prop: 'code', name: '检测类型编码' }, + { prop: 'name', name: i18n.t('inspect.typename') }, + { prop: 'code', name: i18n.t('inspect.typename') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] @@ -46,7 +46,7 @@ const tableConfigs = [ const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/qualityInspectionType', - fields: [{ name: 'name', label: '检测类型' }, { name: 'code', label: '检测类型编码', api: '/monitoring/qualityInspectionType/getCode' }, 'remark'], + fields: [{ name: 'name', label: i18n.t('inspect.type') }, { name: 'code', label: i18n.t('inspect.typename'), api: '/monitoring/qualityInspectionType/getCode' }, 'remark'], operations: [ { name: 'cancel', showAlways: true }, { name: 'save', url: '/monitoring/qualityInspectionType', permission: 'monitoring:qualityinspectiontype:save', showOnEdit: false }, diff --git a/src/views/modules/monitoring/realtimeEquipment.vue b/src/views/modules/monitoring/realtimeEquipment.vue index 1d44251..5cee31d 100644 --- a/src/views/modules/monitoring/realtimeEquipment.vue +++ b/src/views/modules/monitoring/realtimeEquipment.vue @@ -126,10 +126,10 @@ export default { this.tableProps.push({ label: moment(obj.recordTime).format('YYYY-MM-DD HH:mm:ss'), children: [ - { prop: obj.recordTime + '-inputNum', label: '进数据' }, - { prop: obj.recordTime + '-outputNum', label: '出数据' }, - { prop: obj.recordTime + '-scrapNum', label: '报废数据' }, - { prop: obj.recordTime + '-scrapRate', label: '报废比例' } + { prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') }, + { prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') }, + { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.data') }, + { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } ] }) } @@ -176,7 +176,7 @@ export default { const staticTableProps = [ { prop: 'lineName', label: i18n.t('pl.title'), fixed: true }, { prop: 'equName', label: i18n.t('equipment'), fixed: true }, - { prop: 'totalProduction', label: '总产量', fixed: true } + { prop: 'totalProduction', label: i18n.t('realtime.total'), fixed: true } ] this.tableProps = staticTableProps }, diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue index d59a4fa..e248d2c 100644 --- a/src/views/modules/monitoring/realtimeProductLine.vue +++ b/src/views/modules/monitoring/realtimeProductLine.vue @@ -87,7 +87,7 @@ export default { if (this.tableData.length > 0) this.loadTable = true else { this.$message({ - message: '没有查询到相关数据!', + message: i18n.t('errors.nodata'), type: 'error', duration: 2000 }) @@ -111,11 +111,11 @@ export default { this.tableProps.push({ label: moment(obj.recordTime).format('YYYY-MM-DD HH:mm:ss'), children: [ - { prop: obj.recordTime + '-inputNum', label: '进数据' }, - { prop: obj.recordTime + '-outputNum', label: '出数据' }, - { prop: obj.recordTime + '-passArea', label: '良品率' }, - { prop: obj.recordTime + '-scrapNum', label: '报废数量' }, - { prop: obj.recordTime + '-scrapRate', label: '报废比例' } + { prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') }, + { prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') }, + { prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') }, + { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') }, + { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } ] }) } diff --git a/src/views/modules/monitoring/realtimeQualityInspection.vue b/src/views/modules/monitoring/realtimeQualityInspection.vue index 6fe82cb..ea7bfeb 100644 --- a/src/views/modules/monitoring/realtimeQualityInspection.vue +++ b/src/views/modules/monitoring/realtimeQualityInspection.vue @@ -138,7 +138,7 @@ export default { dynamicPropNames.push(prop) } - return [{ prop: 'checkType', label: '检查类型', isFixed: true }, ...dynamicPropNames] + return [{ prop: 'checkType', label: i18n.t('inspect.type'), isFixed: true }, ...dynamicPropNames] } } } diff --git a/src/views/modules/monitoring/reportCategory.vue b/src/views/modules/monitoring/reportCategory.vue index ee58493..97e5d58 100644 --- a/src/views/modules/monitoring/reportCategory.vue +++ b/src/views/modules/monitoring/reportCategory.vue @@ -38,14 +38,14 @@ import { calcMaxHeight } from '@/utils' import { timeFilter } from '@/utils/filters' const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'name', name: '分类名称' }, + { prop: 'name', name: i18n.t('categoryName.type') }, { prop: 'operations', name: i18n.t('handle'), width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/reportSheetCategory', - fields: [{ name: 'name', label: '分类名称', required: true, span: 24 }], + fields: [{ name: 'name', label: i18n.t('categoryName.type'), required: true, span: 24 }], operations: [ { name: 'cancel', url: true, showAlways: true }, { name: 'save', url: '/monitoring/reportSheetCategory', permission: 'monitoring:reportsheetcategory:save', showOnEdit: false }, diff --git a/src/views/modules/monitoring/reportDetail.vue b/src/views/modules/monitoring/reportDetail.vue index 5a1e930..74cee5f 100644 --- a/src/views/modules/monitoring/reportDetail.vue +++ b/src/views/modules/monitoring/reportDetail.vue @@ -76,7 +76,7 @@ const CategoryList = { const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/reportSheet', - fields: [{ name: 'fileName', label: '报表名称', required: true, span: 24 }], + fields: [{ name: 'fileName', label: i18n.t('report.name'), required: true, span: 24 }], operations: [ { name: 'cancel', url: true, showAlways: true }, { name: 'save', url: '/monitoring/reportSheet', permission: 'monitoring:reportsheet:save', showOnEdit: false }, @@ -119,8 +119,8 @@ export default { this.tableConfigs = [ { type: 'index', width: 100, name: i18n.t('index') }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter, width: 200 }, - { prop: 'fileName', name: '报表名称' }, - { prop: 'category', name: '报表分类', subcomponent: CategoryList, options: categories }, + { prop: 'fileName', name: i18n.t('report.name') }, + { prop: 'category', name: i18n.t('report.type'), subcomponent: CategoryList, options: categories }, { prop: 'operations', name: i18n.t('handle'), @@ -170,7 +170,7 @@ export default { category: categoryId } }).then(({ data: res }) => { - this.$message.success('修改成功!') + this.$message.success(i18n.t('success')) }) }, // 获取数据列表 diff --git a/src/views/modules/monitoring/reportList.vue b/src/views/modules/monitoring/reportList.vue index a65ef88..ff2b455 100644 --- a/src/views/modules/monitoring/reportList.vue +++ b/src/views/modules/monitoring/reportList.vue @@ -5,7 +5,7 @@
-

全部

+

{{ $t('all') }}

{{ allNum }} {{ allNum > 1 ? 'Reports' : 'Report' }}
diff --git a/src/views/modules/monitoring/reportPreview.vue b/src/views/modules/monitoring/reportPreview.vue index ddbdc7b..7f18ab2 100644 --- a/src/views/modules/monitoring/reportPreview.vue +++ b/src/views/modules/monitoring/reportPreview.vue @@ -52,7 +52,6 @@ export default { } const ifream = document.getElementById('reportView') ifream.onload = function() { - console.log('加载完成') vm.loading = false } }, diff --git a/src/views/modules/monitoring/reportSheet-add-or-update.vue b/src/views/modules/monitoring/reportSheet-add-or-update.vue index 1dcaef9..49d46d6 100644 --- a/src/views/modules/monitoring/reportSheet-add-or-update.vue +++ b/src/views/modules/monitoring/reportSheet-add-or-update.vue @@ -16,8 +16,8 @@ - - + + @@ -28,34 +28,34 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/reportSheet.vue b/src/views/modules/monitoring/reportSheet.vue index 8addd9b..b7e532c 100644 --- a/src/views/modules/monitoring/reportSheet.vue +++ b/src/views/modules/monitoring/reportSheet.vue @@ -37,14 +37,14 @@ 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: 'category', name: '报表分类' }, + { prop: 'name', name: i18n.t('report.name') }, + { prop: 'code', name: i18n.t('report.code') }, + { prop: 'category', name: i18n.t('report.type') }, { prop: 'fileName', name: i18n.t('file.name') }, - { prop: 'url', name: '链接地址' }, + { prop: 'url', name: i18n.t('report.lnk') }, { prop: 'description', name: i18n.t('desc') }, { prop: 'remark', name: i18n.t('remark') }, - { prop: 'content', name: '报表内容' }, + { prop: 'content', name: i18n.t('report.det') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] diff --git a/src/views/modules/monitoring/reportSheetCategory-add-or-update.vue b/src/views/modules/monitoring/reportSheetCategory-add-or-update.vue index d14820e..718ef16 100644 --- a/src/views/modules/monitoring/reportSheetCategory-add-or-update.vue +++ b/src/views/modules/monitoring/reportSheetCategory-add-or-update.vue @@ -7,8 +7,8 @@ - - + + @@ -22,31 +22,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/sysfile-add-or-update.vue b/src/views/modules/monitoring/sysfile-add-or-update.vue index ff509ae..3a9988f 100644 --- a/src/views/modules/monitoring/sysfile-add-or-update.vue +++ b/src/views/modules/monitoring/sysfile-add-or-update.vue @@ -19,31 +19,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/sysfiletype-add-or-update.vue b/src/views/modules/monitoring/sysfiletype-add-or-update.vue index f41a56e..e23c3c1 100644 --- a/src/views/modules/monitoring/sysfiletype-add-or-update.vue +++ b/src/views/modules/monitoring/sysfiletype-add-or-update.vue @@ -13,31 +13,31 @@ - - + + - - + + - - + + - - + + - - + + - - + + - 取消 - 确定 + {{ $t('cancel') }} + {{ $t('confirm') }} diff --git a/src/views/modules/monitoring/testMultiBaseTable.vue b/src/views/modules/monitoring/testMultiBaseTable.vue index c2a6415..4685b4c 100644 --- a/src/views/modules/monitoring/testMultiBaseTable.vue +++ b/src/views/modules/monitoring/testMultiBaseTable.vue @@ -14,7 +14,7 @@ export default { data() { return { configs: [ - { prop: 'createTime', name: '创建日期' }, + { prop: 'createTime', name: i18n.t('createDate') }, { prop: 'name', name: i18n.t('name') }, { label: i18n.t('addr'), diff --git a/src/views/modules/monitoring/workShopSection.vue b/src/views/modules/monitoring/workShopSection.vue index 5d717b1..9c92302 100644 --- a/src/views/modules/monitoring/workShopSection.vue +++ b/src/views/modules/monitoring/workShopSection.vue @@ -38,8 +38,8 @@ 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('ws.name') }, + { prop: 'code', name: i18n.t('ws.code') }, { prop: 'productionLineName', name: i18n.t('pl.title') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } @@ -49,9 +49,9 @@ const addOrUpdateConfigs = { type: 'dialog', infoUrl: '/monitoring/workshopSection', fields: [ - { name: 'name', label: '工段名称' }, - { name: 'code', label: '工段编码', api: '/monitoring/workshopSection/getCode' }, - { name: 'productionLineId', label: '所属产线', type: 'select', options: [] }, + { name: 'name', label: i18n.t('ws.name') }, + { name: 'code', label: i18n.t('ws.code'), api: '/monitoring/workshopSection/getCode' }, + { name: 'productionLineId', label: i18n.t('ws.belong'), type: 'select', options: [] }, 'description', 'remark' ], diff --git a/src/views/modules/monitoring/workShopSectionEquipment.vue b/src/views/modules/monitoring/workShopSectionEquipment.vue index 7445858..0f8232d 100644 --- a/src/views/modules/monitoring/workShopSectionEquipment.vue +++ b/src/views/modules/monitoring/workShopSectionEquipment.vue @@ -36,9 +36,9 @@ import { calcMaxHeight } from '@/utils' import { timeFilter } from '@/utils/filters' const tableConfigs = [ { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, - { prop: 'workshopSectionId', name: '工段ID' }, + { prop: 'workshopSectionId', name: i18n.t('ws.id') }, { prop: 'equipmentId', name: '设备ID' }, - { prop: 'sort', name: '排序' }, + { prop: 'sort', name: i18n.t('dept.sort') }, { prop: 'remark', name: i18n.t('remark') }, { prop: 'operations', name: i18n.t('handle'), fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } ] diff --git a/src/views/modules/monitoring/workshopSectionDialog.vue b/src/views/modules/monitoring/workshopSectionDialog.vue index f7fd6a8..2067fb3 100644 --- a/src/views/modules/monitoring/workshopSectionDialog.vue +++ b/src/views/modules/monitoring/workshopSectionDialog.vue @@ -67,8 +67,8 @@ import TableOperateComponent from '@/components/base-table/components/operationC import AttrForm from './workshopSectionDialogAttrForm.vue' const tableProps = [ - { name: '设备名', prop: 'equipmentName' }, - { name: '排序', prop: 'sort' }, + { name: i18n.t('eq.name'), prop: 'equipmentName' }, + { name: i18n.t('dept.sort'), prop: 'sort' }, { name: i18n.t('handle'), prop: 'operations', @@ -218,7 +218,7 @@ export default { } }, handleDeleteEq(id) { - this.$confirm(`确定删除这条记录吗?`, i18n.t('prompt.title'), { + this.$confirm(i18n.t('prompt.sure'), i18n.t('prompt.title'), { // this.$confirm(`确定删除 ${id} 吗?`, i18n.t('prompt.title'), { confirmButtonText: i18n.t('confirm'), cancelButtonText: i18n.t('cancel'), diff --git a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue index 3e16afa..efd7492 100644 --- a/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue +++ b/src/views/modules/monitoring/workshopSectionDialogAttrForm.vue @@ -24,6 +24,8 @@