mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zwq #63

Merged
zwq merged 5 commits from zwq into develop 2022-03-16 09:00:59 +08:00
Conversation 0 Commits 5 Files Changed 12 +114 -78
12 changed files with 114 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lang/i18n/en/module/dashboard.js Normal file
View File

@ -0,0 +1,16 @@
/*
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 08:57:49
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
*/
export default {
first: 'First Row',
second: 'Second Row',
title: 'WMS Inventory Information',
pageHeader: 'No.',
pageFooter: ' Page'
}

6
src/lang/i18n/en/module/index.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:12:46
* @LastEditors: gtz
* @LastEditTime: 2021-04-22 19:49:39
* @LastEditTime: 2022-03-15 16:44:11
* @Description: file content
*/
@ -17,6 +17,7 @@ import quality from './quality'
import factory from './factory'
import formManage from './formManage'
import report from './report'
import dashboard from './dashboard'
export default {
basicData,
@ -29,5 +30,6 @@ export default {
quality,
factory,
formManage,
report
report,
dashboard
}

16
src/lang/i18n/zh/module/dashboard.js Normal file
View File

@ -0,0 +1,16 @@
/*
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: gtz
* @LastEditTime: 2022-03-15 16:58:30
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
*/
export default {
first: '第一排',
second: '第二排',
title: 'WMS库存信息',
pageHeader: '第',
pageFooter: '页'
}

6
src/lang/i18n/zh/module/index.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2021-03-04 16:12:46
* @LastEditors: gtz
* @LastEditTime: 2021-04-22 19:49:47
* @LastEditTime: 2022-03-15 16:44:05
* @Description: file content
*/
@ -17,6 +17,7 @@ import quality from './quality'
import factory from './factory'
import formManage from './formManage'
import report from './report'
import dashboard from './dashboard'
export default {
basicData,
@ -29,5 +30,6 @@ export default {
quality,
factory,
formManage,
report
report,
dashboard
}

24
src/views/EquipmentManager/equipmentUtilizationRate/E10.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: DY
* @Date: 2021-12-16 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 15:26:05
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:04:30
* @Description: E10
-->
<template>
@ -84,18 +84,18 @@ export default {
},
created() {
// this.getEqList()
this.getList()
// this.getList()
},
methods: {
async getEqList() {
const res = await equipmentList({
current: 1,
size: 999
})
if (res.code === 0) {
this.eqList = res.data
}
},
// async getEqList() {
// const res = await equipmentList({
// current: 1,
// size: 999
// })
// if (res.code === 0) {
// this.eqList = res.data
// }
// },
toE10() {
this.$router.push({
name: 'E10'

24
src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: DY
* @Date: 2021-12-16 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 15:26:28
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:04:19
* @Description: MCBF
-->
<template>
@ -83,18 +83,18 @@ export default {
},
created() {
// this.getEqList()
this.getList()
// this.getList()
},
methods: {
async getEqList() {
const res = await equipmentList({
current: 1,
size: 999
})
if (res.code === 0) {
this.eqList = res.data
}
},
// async getEqList() {
// const res = await equipmentList({
// current: 1,
// size: 999
// })
// if (res.code === 0) {
// this.eqList = res.data
// }
// },
toE10() {
this.$router.push({
name: 'E10'

24
src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: DY
* @Date: 2021-12-16 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 15:26:44
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:04:09
* @Description: MTTR
-->
<template>
@ -83,18 +83,18 @@ export default {
},
created() {
// this.getEqList()
this.getList()
// this.getList()
},
methods: {
async getEqList() {
const res = await equipmentList({
current: 1,
size: 999
})
if (res.code === 0) {
this.eqList = res.data
}
},
// async getEqList() {
// const res = await equipmentList({
// current: 1,
// size: 999
// })
// if (res.code === 0) {
// this.eqList = res.data
// }
// },
toE10() {
this.$router.push({
name: 'E10'

24
src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: DY
* @Date: 2021-12-16 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 15:26:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:03:58
* @Description: OEE
-->
<template>
@ -83,18 +83,18 @@ export default {
},
created() {
// this.getEqList()
this.getList()
// this.getList()
},
methods: {
async getEqList() {
const res = await equipmentList({
current: 1,
size: 999
})
if (res.code === 0) {
this.eqList = res.data
}
},
// async getEqList() {
// const res = await equipmentList({
// current: 1,
// size: 999
// })
// if (res.code === 0) {
// this.eqList = res.data
// }
// },
toE10() {
this.$router.push({
name: 'E10'

22
src/views/EquipmentManager/equipmentUtilizationRate/components/E10Table.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 16:22:24
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:03:35
* @Description: E10详情表格
-->
<template>
@ -108,15 +108,15 @@ export default {
this.listQuery.startTime = this.time1
this.listQuery.endTime = this.time2
this.listQuery.equipmentName = this.equipmentName
getE10StackDetail(this.listQuery).then(res => {
if (res.data !== []) {
this.list = res.data.detail.records
this.total = res.data.detail.total
this.list.forEach(item => {
item.equipmentName = this.equipmentName
})
}
})
// getE10StackDetail(this.listQuery).then(res => {
// if (res.data !== []) {
// this.list = res.data.detail.records
// this.total = res.data.detail.total
// this.list.forEach(item => {
// item.equipmentName = this.equipmentName
// })
// }
// })
}
}
}

16
src/views/EquipmentManager/equipmentUtilizationRate/components/MttrTable.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: DY
* @LastEditTime: 2022-03-03 16:46:06
* @LastEditors: zwq
* @LastEditTime: 2022-03-04 09:03:23
* @Description: Mttr详情表格
-->
<template>
@ -109,12 +109,12 @@ export default {
this.listQuery.startTime = this.time1
this.listQuery.endTime = this.time2
this.listQuery.equipmentName = this.equipmentName
getMttrDetail(this.listQuery).then(res => {
if (res.data !== []) {
this.list = res.data.detail.records
this.total = res.data.detail.total
}
})
// getMttrDetail(this.listQuery).then(res => {
// if (res.data !== []) {
// this.list = res.data.detail.records
// this.total = res.data.detail.total
// }
// })
}
}
}

10
src/views/dashboard/index.vue
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 09:16:10
* @LastEditors: gtz
* @LastEditTime: 2022-03-14 16:03:15
* @LastEditTime: 2022-03-15 16:47:57
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
-->
@ -11,7 +11,7 @@
<el-card class="dashboard-main">
<el-row class="dashboard-title">
<div class="dashboard-header-line" />
<div class="dashboard-header-title">WMS库存信息</div>
<div class="dashboard-header-title">{{ $t('module.dashboard.title') }}</div>
</el-row>
<el-row class="dashboard-legend">
<div v-for="item in cassetteStatusList" :key="'cassette' + item.id" class="dashboard-legend-cassette">
@ -24,7 +24,7 @@
</div>
<div class="dashboard-legend-search">
<el-select v-model="current" size="mini" placeholder="请选择库存范围" @change="handleChange">
<el-option v-for="item in totalPage" :key="'select' + item" :label="'第' + item + '页'" :value="item" />
<el-option v-for="item in totalPage" :key="'select' + item" :label="$t('module.dashboard.pageHeader') + item + $t('module.dashboard.pageFooter')" :value="item" />
</el-select>
</div>
</el-row>
@ -41,7 +41,7 @@
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
{{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>
@ -68,7 +68,7 @@
</el-col>
</el-row>
<div class="dashboard-layout-footer">
{{ '第' + rowIndex[index] + '排(' + ((current - 1) * 4 + item) + ')' }}
{{ $t(rowIndex[index]) + '(' + ((current - 1) * 4 + item) + ')' }}
</div>
</el-col>
</el-row>

4
src/views/dashboard/testdata.js
View File

@ -2,7 +2,7 @@
* @Author: gtz
* @Date: 2022-03-03 15:47:47
* @LastEditors: gtz
* @LastEditTime: 2022-03-14 16:00:03
* @LastEditTime: 2022-03-15 16:46:04
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
*/
@ -2604,5 +2604,5 @@ export default {
},
current: 1,
totalPage: 1,
rowIndex: ['一', '二']
rowIndex: ['module.dashboard.first', 'module.dashboard.second']
}