This commit is contained in:
g7hoo 2022-10-09 13:16:55 +08:00
parent 1047dd78ec
commit 089a6517d3
4 changed files with 22 additions and 6 deletions

View File

@ -35,6 +35,7 @@ t.routes['报表设计'] = 'Report Design'
t.routes['报表预览'] = 'Report Preview' t.routes['报表预览'] = 'Report Preview'
t.routes['质量检测基础数据'] = 'Quality Inspection Basic Data' t.routes['质量检测基础数据'] = 'Quality Inspection Basic Data'
t.routes['当前检测数据'] = 'Current Inspection Data' t.routes['当前检测数据'] = 'Current Inspection Data'
t.routes['检测统计数据'] = 'Statistics Data'
t.routes['质量检查信息记录'] = 'Quality Inspection Records' t.routes['质量检查信息记录'] = 'Quality Inspection Records'
t.routes['用户管理'] = 'User Management' t.routes['用户管理'] = 'User Management'
t.routes['部门管理'] = 'Department Management' t.routes['部门管理'] = 'Department Management'
@ -232,7 +233,7 @@ t.inspect.typetotal = 'Total Inspection Types'
t.inspect.typename = 'Inspection Type' t.inspect.typename = 'Inspection Type'
t.inspect.typecode = 'Inspection Code' t.inspect.typecode = 'Inspection Code'
t.inspect.ioTotal = 'Data of input/output and total inspections' t.inspect.ioTotal = 'Data of input/output and total inspections'
t.inspect.plTotal = 'Inspection types per line' t.inspect.plTotal = 'Inspection contents in each line'
t.inspect.inTotal = 'Up Sum' t.inspect.inTotal = 'Up Sum'
t.inspect.outTotal = 'Down Sum' t.inspect.outTotal = 'Down Sum'
t.inspect.checkTotal = 'Total Inspections' t.inspect.checkTotal = 'Total Inspections'

View File

@ -36,6 +36,7 @@ t.routes['报表设计'] = '报表设计'
t.routes['报表预览'] = '报表预览' t.routes['报表预览'] = '报表预览'
t.routes['质量检测基础数据'] = '质量检测基础数据' t.routes['质量检测基础数据'] = '质量检测基础数据'
t.routes['当前检测数据'] = '当前检测数据' t.routes['当前检测数据'] = '当前检测数据'
t.routes['检测统计数据'] = '检测统计数据'
t.routes['质量检查信息记录'] = '质量检查信息记录' t.routes['质量检查信息记录'] = '质量检查信息记录'
t.routes['用户管理'] = '用户管理' t.routes['用户管理'] = '用户管理'
t.routes['部门管理'] = '部门管理' t.routes['部门管理'] = '部门管理'
@ -234,7 +235,7 @@ t.inspect.typetotal = '检测类型总数'
t.inspect.typename = '检测类型名称' t.inspect.typename = '检测类型名称'
t.inspect.typecode = '检测类型编码' t.inspect.typecode = '检测类型编码'
t.inspect.ioTotal = '上下片及检测总数统计' t.inspect.ioTotal = '上下片及检测总数统计'
t.inspect.plTotal = '各产线检测类型统计' t.inspect.plTotal = '各产线检测内容统计'
t.inspect.inTotal = '上片总数' t.inspect.inTotal = '上片总数'
t.inspect.outTotal = '下片总数' t.inspect.outTotal = '下片总数'
t.inspect.checkTotal = '检测总数' t.inspect.checkTotal = '检测总数'

View File

@ -221,11 +221,25 @@ export default {
] ]
}, },
echartCategories: null, echartCategories: null,
echartCheckTypes: [] echartCheckTypes: [],
interval: null
} }
}, },
mounted() { mounted() {
this.getDataList() this.getDataList()
this.interval = setInterval(() => {
this.$message.info(i18n.t('refresh'))
this.dataListStatic.splice(0)
this.dataListDynamic.splice(0)
this.getDataList()
}, 1000 * 5 * 60)
},
deactivated() {
if (this.interval) {
clearInterval(this.interval)
this.interval = null
}
}, },
methods: { methods: {
handleOperations() {}, handleOperations() {},
@ -251,12 +265,12 @@ export default {
/** [1] 获取上下片数据 */ /** [1] 获取上下片数据 */
this.fetchList('sx', startTime, endTime).then(({ data: res }) => { this.fetchList('sx', startTime, endTime).then(({ data: res }) => {
console.log('sx: ', res) // console.log('sx: ', res)
this.dataListStatic = res.data || [] this.dataListStatic = res.data || []
}) })
/** [2] 获取产线检测类型 */ /** [2] 获取产线检测类型 */
this.fetchList('pl', startTime, endTime).then(({ data: res }) => { this.fetchList('pl', startTime, endTime).then(({ data: res }) => {
console.log('pl: ', res) // console.log('pl: ', res)
/** TODO: 解析 nameData */ /** TODO: 解析 nameData */
this.parseTableProps(res.data.nameData) this.parseTableProps(res.data.nameData)

View File

@ -24,7 +24,7 @@
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle" style="width: 100%;">
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column> <el-table-column prop="dictName" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column>
<el-table-column prop="dictType" :label="$t('dict.dictName')" header-align="center" align="center"></el-table-column> <el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center"> <!-- <el-table-column prop="dictType" :label="$t('dict.dictType')" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button> <el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>