From b71a61191bbf37e251462503b13b9eab2e508635 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Thu, 1 Sep 2022 16:45:29 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90te?= =?UTF-8?q?mplate=E9=87=8C=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base-dialog/AttrForm/index.vue | 2 +- .../base-dialog/addOrUpdate/index.vue | 2 +- src/i18n/zh-CN.js | 75 +++++++++++++++++++ src/views/main-sidebar.vue | 2 +- src/views/modules/monitoring/equipment.vue | 4 +- .../modules/monitoring/equipmentAlarmLog.vue | 4 +- .../modules/monitoring/equipmentFile.vue | 4 +- .../modules/monitoring/equipmentGroup.vue | 4 +- .../monitoring/equipmentGroupAlarm.vue | 8 +- src/views/modules/monitoring/equipmentPlc.vue | 6 +- .../monitoring/equipmentPlcConnect.vue | 8 +- .../modules/monitoring/equipmentPlcParam.vue | 6 +- .../modules/monitoring/equipmentQuantity.vue | 4 +- .../modules/monitoring/equipmentStatusLog.vue | 4 +- .../modules/monitoring/equipmentType.vue | 4 +- .../modules/monitoring/equipmentTypeFile.vue | 4 +- .../modules/monitoring/equipmentattr.vue | 6 +- src/views/modules/monitoring/factory.vue | 4 +- src/views/modules/monitoring/product.vue | 12 +-- src/views/modules/monitoring/productArrt.vue | 4 +- .../modules/monitoring/productionLine.vue | 4 +- .../monitoring/productionLineRecSch.vue | 4 +- .../monitoring/qualityInspectionCurrent.vue | 24 +++--- .../monitoring/qualityInspectionDet.vue | 4 +- .../monitoring/qualityInspectionRecord.vue | 4 +- .../monitoring/qualityInspectionType.vue | 4 +- .../modules/monitoring/realtimeEquipment.vue | 2 +- .../monitoring/realtimeProductLine.vue | 2 +- .../monitoring/realtimeQualityInspection.vue | 2 +- .../modules/monitoring/reportCategory.vue | 4 +- src/views/modules/monitoring/reportDesign.vue | 1 - src/views/modules/monitoring/reportDetail.vue | 6 +- .../modules/monitoring/reportPreview.vue | 2 +- src/views/modules/monitoring/reportSheet.vue | 4 +- .../monitoring/reportSheetCategory.vue | 8 +- src/views/modules/monitoring/sysfile.vue | 4 +- src/views/modules/monitoring/sysfileType.vue | 4 +- .../modules/monitoring/workShopSection.vue | 4 +- .../monitoring/workShopSectionEquipment.vue | 4 +- .../monitoring/workshopSectionDialog.vue | 24 +++--- .../workshopSectionDialogAttrForm.vue | 8 +- 41 files changed, 182 insertions(+), 108 deletions(-) diff --git a/src/components/base-dialog/AttrForm/index.vue b/src/components/base-dialog/AttrForm/index.vue index d3718fe..f54a0e2 100644 --- a/src/components/base-dialog/AttrForm/index.vue +++ b/src/components/base-dialog/AttrForm/index.vue @@ -41,7 +41,7 @@ 取消 - 保存 + {{ $t('save') }} diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index 96fcd63..174403c 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -97,7 +97,7 @@ >{{ btnName[operate.name] }} - 返回 + {{ $t('cancel') }} diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 028811a..3afdf01 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -9,7 +9,12 @@ t.brand.mini = '监控' // 1 代表 '' 号的替换完成 // 2 代表 "" 号的替换完成 +// 3 代表不带引号,或 {{ }} 的替换,这三种替换需按顺序执行 // ? 代表需要单独review +// 基本上完成了template模板里的替换工作 + +// 对比 v2, v3 的结果,补充此文件和 en.js 文件 +// 然后替换vue文件的内容 t.add = '新增' // 1 t.delete = '删除' // 1 @@ -78,27 +83,88 @@ t.addr = '地址' // 1 t.planStop = '计划停机' // ? t.startTime = '开始时间' // 1 t.endTime = '结束时间' // 1 +t.to = '至' // 1 t.today = '今天' // 1 +t.graph = '图形' +t.category = '分类' +t.categoryName = '分类名称' +t.categoryCode = '分类编码' +t.rate = '比例' +t.link = '链接地址' +t.refresh = '刷新' +t.abbr = '缩写' +t.detail = '详情' +t.edit = '编辑' +t.source = '来源' +t.auto = '自动' +t.manual = '手动' +t.loaddone = '加载完成' +t.produceTime = '生产日期' +t.enterTime = '进厂日期' +t.manufacturer = '制造商' + +t.factory = {} +t.factory.title = '工厂' +t.factory.name = '工厂名称' +t.factory.code = '工厂编码' + +t.prod = {} +t.prod.name = '产品名称' +t.prod.code = '产品编码' t.alarm = {} t.alarm.info = '报警信息' t.alarm.eq = '报警设备' +t.alarm.type = '报警类型' +t.alarm.code = '报警编码' +t.alarm.level = '报警级别' +t.alarm.content = '报警内容' +t.alarm.source = '报警来源' +t.alarm.det = '报警详细内容' t.report = {} t.report.name = '报表名称' +t.report.det = '报表内容' t.inspect = {} t.inspect.type = '检测类型' t.inspect.det = '检测内容' +t.inspect.people = '检测人员' +t.inspect.time = '检测时间' +t.inspect.typetotal = '检测类型总数' +t.inspect.typename = '检测类型名称' +t.inspect.typecode = '检测类型编码' +t.inspect.ioTotal = '上下片及检测总数统计' +t.inspect.plTotal = '各产线检测类型统计' + + +t.realtime = {} +t.realtime.eq = '设备生产实时数据' +t.realtime.pl = '产线生产实时数据' +t.realtime.inspect = '质量检查实时数据' +t.realtime.in = '进数据' +t.realtime.out = '出数据' +t.realtime.rate = '报废比例' + t.ws = {} t.ws.title = '工段' t.ws.name = '工段名称' +t.ws.code = '工段编码' +t.ws.binded = '已绑定的设备' +t.ws.unbind = '选择一个设备进行绑定' +t.ws.sort = '排序' +t.ws.setorder = '请输入工段中设备的顺序' +t.ws.bind = '绑定' +t.ws.eqbind = '设备绑定' +t.ws.belong = '所属产线' t.file = {} t.file.title = '文件' t.file.name = '文件名称' +t.file.code = '文件编号' +t.file.typeName = '文件类型名称' t.file.typeCode = '文件类型编号' t.eq = {} @@ -106,9 +172,18 @@ t.eq.title = '设备' t.eq.name = '设备名称' t.eq.code = '设备编码' t.eq.type = '设备类型' +t.eq.grade = '设备规格' +t.eq.group = '设备分组' +t.eq.groupname = '分组名称' +t.eq.groupcode = '分组编码' +t.eq.excode = '设备外部代码' +t.eq.input = '上片数据设备' +t.eq.output = '下片数据设备' t.pl = {} t.pl.title = '产线' +t.pl.name = '产线名称' +t.pl.belong = '所属产线' t.prompt = {} t.prompt.title = '提示' diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 2441158..6b6cf48 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -46,7 +46,7 @@ export default { } list.push(newRouteItem) } else { - console.log(menu.name, '是应该被隐藏的路由') + // console.log(menu.name, '是应该被隐藏的路由') } }) } diff --git a/src/views/modules/monitoring/equipment.vue b/src/views/modules/monitoring/equipment.vue index 7028c31..30731a9 100644 --- a/src/views/modules/monitoring/equipment.vue +++ b/src/views/modules/monitoring/equipment.vue @@ -2,7 +2,7 @@
- + {{ $t('search') }} @@ -209,7 +209,7 @@ const addOrUpdateConfigs = { url: '/monitoring/equipmentAttr', relatedField: 'equipmentId', tableConfigs: [ - { type: 'index', name: i18n.t('index') }, + { type: 'index', width: 100, name: i18n.t('index') }, { prop: 'createTime', name: i18n.t('createTime'), filter: timeFilter }, { prop: 'attrName', name: i18n.t('attrName'), formField: true }, { prop: 'attrValue', name: i18n.t('attrValue'), formField: true }, diff --git a/src/views/modules/monitoring/equipmentAlarmLog.vue b/src/views/modules/monitoring/equipmentAlarmLog.vue index f454dea..3024f1f 100644 --- a/src/views/modules/monitoring/equipmentAlarmLog.vue +++ b/src/views/modules/monitoring/equipmentAlarmLog.vue @@ -2,11 +2,11 @@
- + {{ $t('query') }} - 新增 + {{ $t('add') }} diff --git a/src/views/modules/monitoring/equipmentFile.vue b/src/views/modules/monitoring/equipmentFile.vue index ead306f..03fb88e 100644 --- a/src/views/modules/monitoring/equipmentFile.vue +++ b/src/views/modules/monitoring/equipmentFile.vue @@ -2,11 +2,11 @@
- + {{ $t('query') }} - 新增 + {{ $t('add') }} diff --git a/src/views/modules/monitoring/equipmentGroup.vue b/src/views/modules/monitoring/equipmentGroup.vue index b0bdbed..21e602c 100644 --- a/src/views/modules/monitoring/equipmentGroup.vue +++ b/src/views/modules/monitoring/equipmentGroup.vue @@ -2,11 +2,11 @@
- + {{ $t('query') }} - 新增 + {{ $t('add') }} diff --git a/src/views/modules/monitoring/equipmentGroupAlarm.vue b/src/views/modules/monitoring/equipmentGroupAlarm.vue index f003e12..001dd08 100644 --- a/src/views/modules/monitoring/equipmentGroupAlarm.vue +++ b/src/views/modules/monitoring/equipmentGroupAlarm.vue @@ -1,20 +1,20 @@