From ca7fda73e3ad7f349ebbbe4ad4994ed18f15454e Mon Sep 17 00:00:00 2001 From: g7hoo Date: Mon, 17 Oct 2022 16:52:07 +0800 Subject: [PATCH 1/5] update i18n --- src/i18n/en.js | 42 +++++++++++ src/i18n/zh-CN.js | 40 +++++++++++ .../monitoring/equipmentEfficiency.vue | 58 ++++++++-------- .../monitoring/equipmentEfficiencyGraph.vue | 69 +++++++++++-------- .../modules/monitoring/equipmentException.vue | 20 +++--- 5 files changed, 160 insertions(+), 69 deletions(-) diff --git a/src/i18n/en.js b/src/i18n/en.js index 5a42fed..9ea8ddd 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -162,6 +162,10 @@ t.all = 'All' t.reset = 'Reset' t.preview = 'Preview' t.design = 'Design' +t.timetype = 'Time Type' +t.reftimerange = 'By time range' +t.refdate = 'By date' +t.hour = 'Hour(s)' t.errors = {} t.errors.nosection = 'There is no sections on this product line.' @@ -316,6 +320,40 @@ t.eq.port = 'Port' t.eq.type = 'Type' t.eq.typecode = 'Type Code' t.eq.parent = 'Parent' +t.eq.mtbf = '平均故障间隔时间[MTBF] (h)' +t.eq.mttr = '平均维修时间[MTTR] (h)' +t.eq.efficienttimeh = '有效时间(h)' +t.eq.shutdowntimeh = '关机时间(h)' +t.eq.worktimeh = '工作时长(h)' +t.eq.downtimeh = '故障时长(h)' +t.eq.stoptimeh = '停机时长(h)' +t.eq.worktime = '工作时长' +t.eq.stoptime = '停机时长' +t.eq.downtime = '故障时长' +t.eq.downcount = '故障次数' +t.eq.downrate = '故障比率' +t.eq.stoplost = '中断损失' +t.eq.ratio = '百分比' +t.eq.time = '时间' +t.eq.timetrend = '时间区间走势' +t.eq.nogap = '无间隔' +t.eq.monthgap = '按月' +t.eq.daygap = '按天' +t.eq.weekgap = '按周' +t.eq.hourgap = '按小时' +t.eq.workdurationratio = '工作时长比率' +t.eq.stopdurationratio = '停机时长比率' +t.eq.stopratio = '停机比率' +t.eq.downdurationratio = '故障时长比率' +t.eq.speedefficiency = '速度开动率' +t.eq.speedlost = '速度损失' +t.eq.timeefficiency = '时间开动率' +t.eq.year='年' +t.eq.month='月' +t.eq.realyield = '实际加工速度' +t.eq.designyield = '理论加工速度' +t.eq.viewtrend = '查看趋势' + t.pl = {} @@ -328,6 +366,7 @@ t.pl.belong = 'Product Line' t.pl.tvalue = 'TT Value' t.pl.factoryHints = 'Please select a factory' + t.prompt = {} t.prompt.title = 'Prompt' t.prompt.info = 'Are you sure to {handle}?' @@ -335,6 +374,7 @@ t.prompt.sure = 'Are you sure to delete this record?' t.prompt.success = 'success' t.prompt.failed = 'failed' t.prompt.deleteBatch = 'Please choose items to delete.' +t.prompt.month = 'Please choose month' t.validate = {} t.validate.required = 'This is required.' @@ -350,6 +390,8 @@ t.datePicker = {} t.datePicker.range = 'to' t.datePicker.start = 'Start Time' t.datePicker.end = 'End Time' +t.datePicker.starttime = 'Start Time' +t.datePicker.endtime = 'End Time' t.fullscreen = {} t.fullscreen.prompt = 'This operation is not supported by your browser.' diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 4cbf1a4..6e3db79 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -163,6 +163,10 @@ t.all = '全部' t.reset = '重置' t.preview = '预览' t.design = '设计' +t.timetype = '时间类型' +t.reftimerange = '按时间段' +t.refdate = '按日期' +t.hour = '小时' t.errors = {} t.errors.nosection = '该产线没有工段' @@ -318,6 +322,39 @@ t.eq.port = '端口' t.eq.type = '类型名称' t.eq.typecode = '类型编码' t.eq.parent = '父类' +t.eq.mtbf = '平均故障间隔时间[MTBF] (h)' +t.eq.mttr = '平均维修时间[MTTR] (h)' +t.eq.efficienttimeh = '有效时间(h)' +t.eq.shutdowntimeh = '关机时间(h)' +t.eq.worktimeh = '工作时长(h)' +t.eq.downtimeh = '故障时长(h)' +t.eq.stoptimeh = '停机时长(h)' +t.eq.worktime = '工作时长' +t.eq.stoptime = '停机时长' +t.eq.downtime = '故障时长' +t.eq.downcount = '故障次数' +t.eq.downrate = '故障比率' +t.eq.stoplost = '中断损失' +t.eq.ratio = '百分比' +t.eq.time = '时间' +t.eq.timetrend = '时间区间走势' +t.eq.nogap = '无间隔' +t.eq.monthgap = '按月' +t.eq.daygap = '按天' +t.eq.weekgap = '按周' +t.eq.hourgap = '按小时' +t.eq.workdurationratio = '工作时长比率' +t.eq.stopdurationratio = '停机时长比率' +t.eq.stopratio = '停机比率' +t.eq.downdurationratio = '故障时长比率' +t.eq.speedefficiency = '速度开动率' +t.eq.speedlost = '速度损失' +t.eq.timeefficiency = '时间开动率' +t.eq.year='年' +t.eq.month='月' +t.eq.realyield = '实际加工速度' +t.eq.designyield = '理论加工速度' +t.eq.viewtrend = '查看趋势' t.pl = {} @@ -337,6 +374,7 @@ t.prompt.sure = '确定删除这条记录吗?' t.prompt.success = '操作成功' t.prompt.failed = '操作失败' t.prompt.deleteBatch = '请选择删除项' +t.prompt.month = '请选择月份' t.validate = {} t.validate.required = '必填项不能为空' @@ -352,6 +390,8 @@ t.datePicker = {} t.datePicker.range = '至' t.datePicker.start = '开始日期' t.datePicker.end = '结束日期' +t.datePicker.starttime = '开始时间' +t.datePicker.endtime = '结束时间' t.fullscreen = {} t.fullscreen.prompt = '您的浏览器不支持此操作' diff --git a/src/views/modules/monitoring/equipmentEfficiency.vue b/src/views/modules/monitoring/equipmentEfficiency.vue index 1db061e..f0f63cf 100644 --- a/src/views/modules/monitoring/equipmentEfficiency.vue +++ b/src/views/modules/monitoring/equipmentEfficiency.vue @@ -5,27 +5,27 @@ - + - + - - - + + + - + @@ -33,9 +33,9 @@ key="time-picker" v-model="rawTime" type="daterange" - :range-separator="'至'" - :start-placeholder="'开始时间'" - :end-placeholder="'结束时间'" + :range-separator="$t('datePicker.range')" + :start-placeholder="$t('datePicker.starttime')" + :end-placeholder="$t('datePicker.endtime')" format="yyyy-MM-dd" /> @@ -81,39 +81,39 @@ const tableConfigs = [ { // name: i18n.t('createTime'), prop: 'factoryName', - name: '工厂' + name: i18n.t('factory.title') }, - { prop: 'pdName', name: '产线' }, - { prop: 'wsName', name: '工段' }, - { prop: 'eqName', name: '设备' }, + { prop: 'pdName', name: i18n.t('pl.title') }, + { prop: 'wsName', name: i18n.t('ws.title') }, + { prop: 'eqName', name: i18n.t('eq.title') }, { - name: '有效时间(h)', + name: i18n.t('eq.efficienttimeh'), children: [ - { prop: 'workTime', name: '工作时长(h)', width: 120, filter: val => `${val} 小时` }, - { prop: 'workRate', name: '工作时长比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' } + { prop: 'workTime', name: i18n.t('eq.worktimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') }, + { prop: 'workRate', name: i18n.t('eq.workdurationratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' } ] }, { - name: '关机时间(h)', + name: i18n.t('eq.shutdowntimeh'), children: [ - { prop: 'stopTime', name: '停机时长(h)', width: 120, filter: val => `${val} 小时` }, - { prop: 'stopRate', name: '停机比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' } + { prop: 'stopTime', name: i18n.t('eq.stoptimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') }, + { prop: 'stopRate', name: i18n.t('eq.stopratio'), width: 120, filter: val => (val * 100).toFixed(2) + '%' } ] }, { - name: '中断损失', + name: i18n.t('eq.stoplost'), children: [ - { prop: 'downTime', name: '故障时长(h)', width: 120, filter: val => `${val} 小时` }, - { prop: 'downRate', name: '故障比率', width: 120, filter: val => (val * 100).toFixed(2) + '%' }, - { prop: 'timeEfficiency', name: '时间开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' } + { prop: 'downTime', name: i18n.t('eq.downtimeh'), width: 120, filter: val => `${val} `+i18n.t('hour') }, + { prop: 'downRate', name: i18n.t('eq.downrate'), width: 120, filter: val => (val * 100).toFixed(2) + '%' }, + { prop: 'timeEfficiency', name: i18n.t('eq.timeefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' } ] }, { - name: '速度损失', + name: i18n.t('eq.speedlost'), children: [ - { prop: 'realYield', name: '实际加工速度', width: 120, filter: val => `${val} 小时` }, - { prop: 'designYield', name: '理论加工速度', width: 120, filter: val => `${val} 小时` }, - { prop: 'peEfficiency', name: '速度开动率', width: 120, filter: val => (val * 100).toFixed(2) + '%' } + { prop: 'realYield', name: i18n.t('eq.realyield'), width: 120, filter: val => `${val} `+i18n.t('hour') }, + { prop: 'designYield', name: i18n.t('eq.designyield'), width: 120, filter: val => `${val} `+i18n.t('hour') }, + { prop: 'peEfficiency', name: i18n.t('eq.speedefficiency'), width: 120, filter: val => (val * 100).toFixed(2) + '%' } ] }, { @@ -134,7 +134,7 @@ const tableConfigs = [ subcomponent: TableTextComponent, // options: ['edit', 'delete'] // options: ['view-trend'] // 查看趋势 - buttonContent: '查看趋势', + buttonContent: i18n.t('eq.viewtrend'), actionName: 'view-trend', emitFullData: true } @@ -301,7 +301,7 @@ export default { console.clear() console.log('inject data: ', injectData) - + setTimeout(() => { // console.log('befoer graph: ', this.$refs.eegraph) this.$refs.eegraph.init(injectData) // 注入初始数据，这些数据在组件内部用作条件，有可能会被更改 diff --git a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue index cb2b236..08b6e37 100644 --- a/src/views/modules/monitoring/equipmentEfficiencyGraph.vue +++ b/src/views/modules/monitoring/equipmentEfficiencyGraph.vue @@ -17,8 +17,8 @@
- - + + @@ -34,12 +34,13 @@ import * as echarts from 'echarts' import moment from 'moment' import { pick } from 'lodash/object' +import i18n from '../../../i18n' class EchartConfigs { constructor() { this.color = ['#e91e63', '#4caf50', '#3f51b5', '#ffc107', '#607d8b'] this.title = { - text: '时间区间走势', + text: i18n.t('eq.timetrend'), top: 0, left: 'center', textStyle: { @@ -113,10 +114,10 @@ export default { props: {}, data() { return { - searchType: '无间隔', - searchRadioOptions: ['无间隔', '按月', '按周', '按天'], - dataType: '时间', - dataRadioOptions: ['时间', '百分比'], + searchType: i18n.t('eq.nogap'), + searchRadioOptions: [i18n.t('eq.nogap'), i18n.t('eq.monthgap'), i18n.t('eq.weekgap'), i18n.t('eq.daygap')], + dataType: i18n.t('eq.time'), + dataRadioOptions: [i18n.t('eq.time'), i18n.t('eq.ratio')], config: new EchartConfigs(), chart: null, rateList: [], // 对请求来的数据分流 @@ -127,7 +128,7 @@ export default { }, methods: { async initChart() { - this.config.setTitle(this.injectData.equipmentName + '时间区间走势') + this.config.setTitle(this.injectData.equipmentName + i18n.t('eq.timetrend')) await this.getList() this.setLegend() }, @@ -146,11 +147,11 @@ export default { makeQuerys() { const searchTypeMap = { - 无间隔: 1, - 按月: 2, - 按周: 3, - 按天: 4, - 按小时: 5 + [i18n.t('eq.nogap')]: 1, + [i18n.t('eq.monthgap')]: 2, + [i18n.t('eq.weekgap')]: 3, + [i18n.t('eq.daygap')]: 4, + [i18n.t('eq.hourgap')]: 5 } return { @@ -189,11 +190,11 @@ export default { // 分流 datalist.map(item => { const time = moment(item.time) - if (this.searchType === '按月') { - this.xAxis.push(`${time.year()}年${time.month() + 1}月`) - } else if (this.searchType === '按周') { + if (this.searchType === i18n.t('eq.monthgap')) { + this.xAxis.push(`${time.year()}${i18n.t('eq.year')}${time.month() + 1}${i18n.t('eq.month')}`) + } else if (this.searchType === i18n.t('eq.weekgap')) { this.xAxis.push(`${time.format('YYYY-MM-DD')}`) - } else if (this.searchType === '按天') { + } else if (this.searchType === i18n.t('eq.daygap')) { this.xAxis.push(`${time.format('YY-M-D')}`) } else { this.xAxis.push(`${time.format('YYYY-MM-DD')}`) @@ -218,8 +219,16 @@ export default { setLegend() { // 设置legend const legendMap = { - 百分比: ['工作时长比率', '停机时长比率', '故障时长比率', '速度开动率', '时间开动率', 'OEE', 'TEEP'], - 时间: ['工作时长', '停机时长', '故障时长'] + [i18n.t('eq.ratio')]: [ + i18n.t('eq.workdurationratio'), + i18n.t('eq.stopdurationratio'), + i18n.t('eq.downdurationratio'), + i18n.t('eq.speedefficiency'), + i18n.t('eq.timeefficiency'), + 'OEE', + 'TEEP' + ], + [i18n.t('eq.time')]: [i18n.t('eq.worktime'), i18n.t('eq.stoptime'), i18n.t('eq.downtime')] } this.config.setLegend(legendMap[this.dataType]) this.setData() @@ -228,7 +237,7 @@ export default { }, setData() { - if (this.dataType === '时间') { + if (this.dataType === i18n.t('eq.time')) { const workTimeList = [] const stopTimeList = [] const downTimeList = [] @@ -238,9 +247,9 @@ export default { downTimeList.push(item.downTime) }) this.config.setSeries([ - { name: '工作时长', type: 'bar', data: workTimeList }, - { name: '停机时长', type: 'bar', data: stopTimeList }, - { name: '故障时长', type: 'bar', data: downTimeList } + { name: i18n.t('eq.worktime'), type: 'bar', data: workTimeList }, + { name: i18n.t('eq.stoptime'), type: 'bar', data: stopTimeList }, + { name: i18n.t('eq.downtime'), type: 'bar', data: downTimeList } ]) } else { // 百分比 @@ -261,11 +270,11 @@ export default { teepList.push(item.teep) }) this.config.setSeries([ - { name: '工作时长比率', type: 'bar', data: workRateList }, - { name: '停机时长比率', type: 'bar', data: stopRateList }, - { name: '故障时长比率', type: 'bar', data: downRateList }, - { name: '速度开动率', type: 'bar', data: peEfficiencyList }, - { name: '时间开动率', type: 'bar', data: timeEfficiencyList }, + { name: i18n.t('eq.workdurationratio'), type: 'bar', data: workRateList }, + { name: i18n.t('eq.stopdurationratio'), type: 'bar', data: stopRateList }, + { name: i18n.t('eq.downdurationratio'), type: 'bar', data: downRateList }, + { name: i18n.t('eq.speedefficiency'), type: 'bar', data: peEfficiencyList }, + { name: i18n.t('eq.timeefficiency'), type: 'bar', data: timeEfficiencyList }, { name: 'OEE', type: 'bar', data: oeeList }, { name: 'TEEP', type: 'bar', data: teepList } ]) @@ -278,8 +287,8 @@ export default { this.$nextTick(() => { // this.chart.setOption(this.config) this.chart.setOption(this.config, { - notMerge: true - }) + notMerge: true + }) }) } } diff --git a/src/views/modules/monitoring/equipmentException.vue b/src/views/modules/monitoring/equipmentException.vue index c568466..e897618 100644 --- a/src/views/modules/monitoring/equipmentException.vue +++ b/src/views/modules/monitoring/equipmentException.vue @@ -4,11 +4,11 @@ - + - + @@ -49,14 +49,14 @@ const tableConfigs = [ name: i18n.t('index') }, // { prop: 'time', name: '时间', filter: timeFilter }, - { prop: 'pdName', name: '产线名称' }, - { prop: 'wsName', name: '工序' }, - { prop: 'eqName', name: '设备' }, - { prop: 'mtbf', name: '平均故障间隔时间[MTBF] (h)', width: 220 }, - { prop: 'mttr', name: '平均维修时间[MTTR] (h)', width: 190 }, - { prop: 'workTime', name: '工作时长 (h)' }, - { prop: 'downTime', name: '故障时长 (h)' }, - { prop: 'downCount', name: '故障次数' }, + { prop: 'pdName', name: i18n.t('pl.name') }, + { prop: 'wsName', name: i18n.t('ws.title') }, + { prop: 'eqName', name: i18n.t('eq.title') }, + { prop: 'mtbf', name: i18n.t('eq.mtbf'), width: 220 }, + { prop: 'mttr', name: i18n.t('eq.mttr'), width: 190 }, + { prop: 'workTime', name: i18n.t('eq.worktimeh') }, + { prop: 'downTime', name: i18n.t('eq.downtimeh') }, + { prop: 'downCount', name: i18n.t('eq.downcount') } // { // prop: 'operations', // name: i18n.t('handle'), -- 2.45.2 From 15210c2f12ab3abf48b60209b68aceffd26fd7c5 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Tue, 18 Oct 2022 14:42:48 +0800 Subject: [PATCH 2/5] update --- src/i18n/en.js | 88 +++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/i18n/en.js b/src/i18n/en.js index 9ea8ddd..b7a28a7 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -256,17 +256,17 @@ t.realtime.num = 'scrap quantity' t.realtime.rate = 'scrap rate' t.realtime.total = 'total production' t.realtime.goodrate = 'Passed Rate' -t.realtime.runState = '是否运行' -t.realtime.state = '状态' -t.realtime.hasFault = '是否故障' -t.realtime.recentParamValue = '参数近期值' -t.realtime.view = '查看' -t.realtime.input = '投入数' -t.realtime.output = '产出数' -t.realtime.eqName = '设备名称' -t.realtime.eqCode = '设备编码' -t.realtime.productionSnapshotTime = '生产量记录时间' -t.realtime.statusSnapshotTime = '状态记录时间' +t.realtime.runState = 'running state' +t.realtime.state = 'status' +t.realtime.hasFault = 'malfunction' +t.realtime.recentParamValue = 'recent parameters' +t.realtime.view = 'view' +t.realtime.input = 'input' //'投入数' +t.realtime.output = 'output' //'产出数' +t.realtime.eqName = 'Equipment name' +t.realtime.eqCode = 'Equipment cdoe' +t.realtime.productionSnapshotTime = 'production recording time' // '生产量记录时间' +t.realtime.statusSnapshotTime = 'status recording time' // '状态记录时间' t.realtime.refresh = 'Refresh data...' @@ -320,39 +320,39 @@ t.eq.port = 'Port' t.eq.type = 'Type' t.eq.typecode = 'Type Code' t.eq.parent = 'Parent' -t.eq.mtbf = '平均故障间隔时间[MTBF] (h)' -t.eq.mttr = '平均维修时间[MTTR] (h)' -t.eq.efficienttimeh = '有效时间(h)' -t.eq.shutdowntimeh = '关机时间(h)' -t.eq.worktimeh = '工作时长(h)' -t.eq.downtimeh = '故障时长(h)' -t.eq.stoptimeh = '停机时长(h)' -t.eq.worktime = '工作时长' -t.eq.stoptime = '停机时长' -t.eq.downtime = '故障时长' -t.eq.downcount = '故障次数' -t.eq.downrate = '故障比率' -t.eq.stoplost = '中断损失' -t.eq.ratio = '百分比' -t.eq.time = '时间' -t.eq.timetrend = '时间区间走势' -t.eq.nogap = '无间隔' -t.eq.monthgap = '按月' -t.eq.daygap = '按天' -t.eq.weekgap = '按周' -t.eq.hourgap = '按小时' -t.eq.workdurationratio = '工作时长比率' -t.eq.stopdurationratio = '停机时长比率' -t.eq.stopratio = '停机比率' -t.eq.downdurationratio = '故障时长比率' -t.eq.speedefficiency = '速度开动率' -t.eq.speedlost = '速度损失' -t.eq.timeefficiency = '时间开动率' -t.eq.year='年' -t.eq.month='月' -t.eq.realyield = '实际加工速度' -t.eq.designyield = '理论加工速度' -t.eq.viewtrend = '查看趋势' +t.eq.mtbf = 'Mean time between failures[MTBF] (h)' +t.eq.mttr = 'Mean time to repair[MTTR] (h)' +t.eq.efficienttimeh = 'Working time(h)' +t.eq.shutdowntimeh = 'Off time(h)' +t.eq.worktimeh = 'Working time(h)' +t.eq.downtimeh = 'Malfunction duration(h)' +t.eq.stoptimeh = 'Halt duration(h)' +t.eq.worktime = 'Functioning duration' +t.eq.stoptime = 'Halt duration' +t.eq.downtime = 'Malfunction duration' +t.eq.downcount = 'Malfunction counts' +t.eq.downrate = 'Malfunction rates' +t.eq.stoplost = 'Lost' +t.eq.ratio = 'percentage' +t.eq.time = 'time' +t.eq.timetrend = 'trend' +t.eq.nogap = 'no interval' +t.eq.monthgap = 'by month' +t.eq.daygap = 'by day' +t.eq.weekgap = 'by week' +t.eq.hourgap = 'by hour' +t.eq.workdurationratio = 'Functioning duration ratio' // '工作时长比率' +t.eq.stopdurationratio = 'Halt duration ratio' // '停机时长比率' +t.eq.stopratio = 'Halt ratio' // '停机比率' +t.eq.downdurationratio = 'Malfunction duration ratio' // '故障时长比率' +t.eq.speedefficiency = 'Speed launch rate' //'速度开动率' +t.eq.speedlost = 'Speed lost' +t.eq.timeefficiency = 'Time launch rate' //'时间开动率' +t.eq.year='year' +t.eq.month='month' +t.eq.realyield = 'Actual processing speed' +t.eq.designyield = 'Theoretical processing speed' +t.eq.viewtrend = 'View Trends' -- 2.45.2 From 92f52ab55301624deb5643cf8a13e96bb9961b4d Mon Sep 17 00:00:00 2001 From: g7hoo Date: Fri, 28 Oct 2022 14:50:09 +0800 Subject: [PATCH 3/5] update productLine --- src/views/modules/monitoring/productionLine.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/monitoring/productionLine.vue b/src/views/modules/monitoring/productionLine.vue index a35a31d..3f1c42f 100644 --- a/src/views/modules/monitoring/productionLine.vue +++ b/src/views/modules/monitoring/productionLine.vue @@ -52,7 +52,7 @@ const tableConfigs = [ { prop: 'factoryName', name: i18n.t('factory.title') }, { prop: 'name', name: i18n.t('pl.name') }, { prop: 'code', name: i18n.t('pl.code') }, - { prop: 'status', name: i18n.t('pl.status') }, + { prop: 'status', name: i18n.t('pl.status'), filter: val => (val === 0 || val === 1 || val === 2) && ['停止', '运行', '未知'][val] }, { prop: 'description', 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'] } -- 2.45.2 From 14b933fb0c3872e8e665ef0b0bcc4d1eb393f57e Mon Sep 17 00:00:00 2001 From: g7hoo Date: Wed, 2 Nov 2022 13:15:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update=20=E5=AE=89=E7=81=AF=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E7=9B=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/en.js | 19 +- src/i18n/zh-CN.js | 7 +- .../monitoring/qualityInspectionBoxBtn.vue | 368 ++++++++++++++++++ 3 files changed, 386 insertions(+), 8 deletions(-) create mode 100644 src/views/modules/monitoring/qualityInspectionBoxBtn.vue diff --git a/src/i18n/en.js b/src/i18n/en.js index b7a28a7..077c677 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -62,9 +62,13 @@ t.routes['设备分组报警信息'] = 'Equipment Group Alarm' t.routes['设备历史参数'] = 'Equipment Historical Parameters' t.routes['质量检测类型'] = 'Quality Inpection Types' t.routes['质量检测信息'] = 'Quality Inpection Details' +t.routes['安灯检测盒'] = 'Andeng inspection box' - +t.andeng = {} +t.andeng.inspectContent = 'Inspection Content' +t.andeng.btnVal = 'Button Value' +t.andeng.btnBoxModel = 'Button Box Model' t.dictValueList = 'View Details' @@ -178,6 +182,7 @@ t.hints.select = 'Please select ' t.hints.date = 'Please select date' t.hints.checktime = 'Please select inspection time' t.hints.number = 'Please input correct number' +t.hints.integer = 'Please input correct integer' t.hints.addr = 'Please input address' t.hints.upload2m = 'File size cannot be larger than 2MB (2048KB)' t.hints.upload2mPic = 'Image files only. File size cannot be larger than 2MB (2048KB)' @@ -263,10 +268,10 @@ t.realtime.recentParamValue = 'recent parameters' t.realtime.view = 'view' t.realtime.input = 'input' //'投入数' t.realtime.output = 'output' //'产出数' -t.realtime.eqName = 'Equipment name' +t.realtime.eqName = 'Equipment name' t.realtime.eqCode = 'Equipment cdoe' t.realtime.productionSnapshotTime = 'production recording time' // '生产量记录时间' -t.realtime.statusSnapshotTime = 'status recording time' // '状态记录时间' +t.realtime.statusSnapshotTime = 'status recording time' // '状态记录时间' t.realtime.refresh = 'Refresh data...' @@ -348,11 +353,11 @@ t.eq.downdurationratio = 'Malfunction duration ratio' // '故障时长比率' t.eq.speedefficiency = 'Speed launch rate' //'速度开动率' t.eq.speedlost = 'Speed lost' t.eq.timeefficiency = 'Time launch rate' //'时间开动率' -t.eq.year='year' -t.eq.month='month' +t.eq.year = 'year' +t.eq.month = 'month' t.eq.realyield = 'Actual processing speed' -t.eq.designyield = 'Theoretical processing speed' -t.eq.viewtrend = 'View Trends' +t.eq.designyield = 'Theoretical processing speed' +t.eq.viewtrend = 'View Trends' diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js index 6e3db79..c2e8255 100644 --- a/src/i18n/zh-CN.js +++ b/src/i18n/zh-CN.js @@ -63,8 +63,12 @@ t.routes['设备分组报警信息'] = '设备分组报警信息' t.routes['设备历史参数'] = '设备历史参数' t.routes['质量检测类型'] = '质量检测类型' t.routes['质量检测信息'] = '质量检测信息' +t.routes['安灯检测盒'] = '安灯检测盒' - +t.andeng = {} +t.andeng.inspectContent = '检测内容' +t.andeng.btnVal = '按钮值' +t.andeng.btnBoxModel = '按钮盒模式' t.dictValueList = '查看值列表' @@ -179,6 +183,7 @@ t.hints.select = '请选择' t.hints.date = '请选择日期' t.hints.checktime = '请选择检测时间' t.hints.number = '请输入正确的数值' +t.hints.integer = '请输入正确的整数' t.hints.addr = '请输入地址' t.hints.upload2m = '上传文件大小不要超过 2MB (2048KB)' t.hints.upload2mPic = '上传图片文件，且大小不要超过 2MB (2048KB)' diff --git a/src/views/modules/monitoring/qualityInspectionBoxBtn.vue b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue new file mode 100644 index 0000000..33674ce --- /dev/null +++ b/src/views/modules/monitoring/qualityInspectionBoxBtn.vue @@ -0,0 +1,368 @@ + + + -- 2.45.2 From 5d36eb676cbe93b6459ffd7b5bc49d235fc7ad50 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Thu, 10 Nov 2022 15:12:23 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update=20=E5=B0=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base-dialog/addOrUpdate/index.vue | 1 + src/i18n/en.js | 3 +++ src/i18n/zh-CN.js | 2 ++ src/views/modules/monitoring/equipmentGroupAlarm.vue | 8 ++++++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/base-dialog/addOrUpdate/index.vue b/src/components/base-dialog/addOrUpdate/index.vue index 9d8177e..b95c620 100644 --- a/src/components/base-dialog/addOrUpdate/index.vue +++ b/src/components/base-dialog/addOrUpdate/index.vue @@ -47,6 +47,7 @@ :options="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].options" :props="configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)].props" :disabled="isDetail" + clearable />