mt-fe-group/mt-yd-ui
12
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fzq #31

Closed
fanzhiqin wants to merge 215 commits from fzq into test
pull from: fzq
merge into: mt-fe-group:test
Conversation 0 Commits 215 Files Changed 195 +9 -6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1554562933 - Show all commits

6
src/views/modules/monitoring/qualityInspectionRecord.vue
View File

@ -56,8 +56,10 @@ const tableConfigs = [
name: i18n.t('inspect.det') name: i18n.t('inspect.det')
}, },
{ prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter }, { prop: 'checkTime', name: i18n.t('inspect.time'), filter: timeFilter },
{ prop: 'productionId', name: i18n.t('pl.id') }, { prop: 'productionName', name: i18n.t('pl.title') },
{ prop: 'sectionId', name: i18n.t('ws.id') }, { 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: 'checkPerson', name: i18n.t('inspect.people') },
{ prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) }, { prop: 'source', name: i18n.t('source'), filter: val => ({ 1: i18n.t('manual'), 2: i18n.t('auto') }[val]) },
{ prop: 'explainText', name: i18n.t('desc') }, { prop: 'explainText', name: i18n.t('desc') },

6
src/views/modules/monitoring/realtimeProductLine.vue
View File

@ -113,9 +113,9 @@ export default {
children: [ children: [
{ prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') }, { prop: obj.recordTime + '-inputNum', label: i18n.t('realtime.in') },
{ prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') }, { prop: obj.recordTime + '-outputNum', label: i18n.t('realtime.out') },
{ prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') }, // { prop: obj.recordTime + '-passArea', label: i18n.t('realtime.goodrate') },
{ prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') }, // { prop: obj.recordTime + '-scrapNum', label: i18n.t('realtime.num') },
{ prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') } // { prop: obj.recordTime + '-scrapRate', label: i18n.t('realtime.rate') }
] ]
}) })
} }

3
src/views/modules/monitoring/realtimeQualityInspection.vue
View File

@ -131,7 +131,8 @@ export default {
// 保存为 props // 保存为 props
for (const key of sortedTime) { 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]) { for (const subKey in timeMap[key]) {
prop.children.push({ label: subKey, prop: key + subKey }) prop.children.push({ label: subKey, prop: key + subKey })
} }