From 155456293343b4618eba21f3428bd08021945090 Mon Sep 17 00:00:00 2001 From: g7hoo Date: Mon, 26 Sep 2022 17:01:15 +0800 Subject: [PATCH] update --- src/views/modules/monitoring/qualityInspectionRecord.vue | 6 ++++-- src/views/modules/monitoring/realtimeProductLine.vue | 6 +++--- src/views/modules/monitoring/realtimeQualityInspection.vue | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/views/modules/monitoring/qualityInspectionRecord.vue b/src/views/modules/monitoring/qualityInspectionRecord.vue index 32400f8..d0505eb 100644 --- a/src/views/modules/monitoring/qualityInspectionRecord.vue +++ b/src/views/modules/monitoring/qualityInspectionRecord.vue @@ -56,8 +56,10 @@ const tableConfigs = [ name: i18n.t('inspect.det') }, { prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter }, - { prop: 'productionId', name: i18n.t('pl.id') }, - { prop: 'sectionId', name: i18n.t('ws.id') }, + { prop: 'productionName', name: i18n.t('pl.title') }, + { prop: 'sectionName', name: i18n.t('ws.title') }, + // { 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') }, diff --git a/src/views/modules/monitoring/realtimeProductLine.vue b/src/views/modules/monitoring/realtimeProductLine.vue index d733e9b..7348835 100644 --- a/src/views/modules/monitoring/realtimeProductLine.vue +++ b/src/views/modules/monitoring/realtimeProductLine.vue @@ -113,9 +113,9 @@ export default { children: [ { 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') } + // { 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 ea7bfeb..ff28cce 100644 --- a/src/views/modules/monitoring/realtimeQualityInspection.vue +++ b/src/views/modules/monitoring/realtimeQualityInspection.vue @@ -131,7 +131,8 @@ export default { // 保存为 props for (const key of sortedTime) { - const prop = { label: key, children: [] } + // const prop = { label: key, children: [] } + const prop = { label: moment(key).format('YYYY-MM-DD HH:mm:ss'), children: [] } for (const subKey in timeMap[key]) { prop.children.push({ label: subKey, prop: key + subKey }) }