diff --git a/src/lang/i18n-en-US.js b/src/lang/i18n-en-US.js index 83ad181..80e60ed 100644 --- a/src/lang/i18n-en-US.js +++ b/src/lang/i18n-en-US.js @@ -287,7 +287,7 @@ export default { "待机时长(min)": "Standby time(min)", "设备版本": "Version", "厂家电话": "MFR Phone", - "设备负责人": "Leader", + "负责人": "Leader", "生产日期": "Produce Date", "投产日期": "Start Date", "设备位置": "Location", @@ -491,5 +491,41 @@ export default { '异常停机分类统计':'Exceptional Stop Classification', '次':'times', '报警':'Alarm', + '扫描速度':'Scan Speed', + '识别状态':'Recognition Status', + '扫描次数':'Scan Count', + '识别数量':'Recognition Count', + '总识别时长':'Total Recognition Time', + '耗电量':'Power Consumption', + '异常次数':'Exception Count', + '检测结果':'Detection Result', + '识别记录':'Recognition Record', + '工作记录':'Work Record', + '设备视图':'Device View', + '保养提醒':'Maintenance Reminder', + '花版名称':'Pattern Name', + '进度':'Progress', + '编码':'Code', + '保养内容':'Maintenance Content', + '图片名称':'Image Name', + '重新打开图片次数':'Reopen Image Count', + '裁片名称':'Cutting Name', + '总用时':'Total Time', + '修改次数':'Modify Count', + '检测结果占比':'Detection Result Ratio', + '检查结果':'Check Result', + '偏差值':'Deviation Value', + '检测时间':'Check Time', + '检测数量':'Check Count', + '报警内容':'Alarm Content', + '报警时间':'Alarm Time', + '总工作时长':'Total Working Time', + '总待机时长':'Total Standby Time', + '总停机时长':'Total Stop Time', + '总故障时长':'Total Fault Time', + '设备状态分析':'Device Status Analysis', + '总耗电量':'Total Power Consumption', + '产量统计':'Output Statistics' + } } \ No newline at end of file diff --git a/src/lang/i18n-zh-CN.js b/src/lang/i18n-zh-CN.js index f20401d..713a69c 100644 --- a/src/lang/i18n-zh-CN.js +++ b/src/lang/i18n-zh-CN.js @@ -486,5 +486,44 @@ export default { '异常停机分类统计':'异常停机分类统计', '次':'次', '报警':'报警', + '扫描速度':'扫描速度', + '识别状态':'识别状态', + '扫描次数':'扫描次数', + '识别数量':'识别数量', + '总识别时长':'总识别时长', + '耗电量':'耗电量', + '异常次数':'异常次数', + '检测结果':'检测结果', + '识别记录':'识别记录', + '工作记录':'工作记录', + '设备视图':'设备视图', + '保养提醒':'保养提醒', + '花版名称':'花版名称', + '进度':'进度', + '编码':'编码', + '保养内容':'保养内容', + '图片名称':'图片名称', + '重新打开图片次数':'重新打开图片次数', + '裁片名称':'裁片名称', + '总用时':'总用时', + '修改次数':'修改次数', + '检测结果占比':'检测结果占比', + '检查结果':'检查结果', + '偏差值':'偏差值', + '检测时间':'检测时间', + '检测数量':'检测数量', + '报警内容':'报警内容', + '报警时间':'报警时间', + '总工作时长':'总工作时长', + '总待机时长':'总待机时长', + '总停机时长':'总停机时长', + '总故障时长':'总故障时长', + '设备状态分析':'设备状态分析', + '总耗电量':'总耗电量', + '产量统计':'产量统计' + + + + } } \ No newline at end of file diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index e48034c..463584a 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -61,9 +61,9 @@ let gridData = ref([ function timeFrameChange(val) { timeFrame.value = val if (val == 'd') { - router.push({ path: '/index' }) + router.push({ path: '/index',query:route.query }) } else{ - router.push({ path: '/history_'+val }) + router.push({ path: '/history_'+val,query:route.query }) } } diff --git a/src/views/history/components/lcenter.vue b/src/views/history/components/lcenter.vue index f20d9b1..de51984 100644 --- a/src/views/history/components/lcenter.vue +++ b/src/views/history/components/lcenter.vue @@ -1,7 +1,7 @@ diff --git a/src/views/screen/components/imageCard.vue b/src/views/screen/components/imageCard.vue index a7f4f88..6716ac3 100644 --- a/src/views/screen/components/imageCard.vue +++ b/src/views/screen/components/imageCard.vue @@ -13,8 +13,11 @@ diff --git a/src/views/screen/components/lcenter1.vue b/src/views/screen/components/lcenter1.vue index 00913c6..c6629f4 100644 --- a/src/views/screen/components/lcenter1.vue +++ b/src/views/screen/components/lcenter1.vue @@ -161,7 +161,7 @@ function ignoreError(item) { margin: 0 20px; } .text1 { - font-size: 18px; + font-size: 14px; display: flex; justify-content: flex-start; align-items: center; diff --git a/src/views/screen/components/lcenter2.vue b/src/views/screen/components/lcenter2.vue index ed3db43..046adf1 100644 --- a/src/views/screen/components/lcenter2.vue +++ b/src/views/screen/components/lcenter2.vue @@ -77,6 +77,7 @@