zwq #63

Merged
zwq merged 5 commits from zwq into develop 2022-03-16 09:00:59 +08:00
6 changed files with 47 additions and 11 deletions
Showing only changes of commit 176fd99cd1 - Show all commits

View File

@ -0,0 +1,16 @@
/*
* @Author: gtz
* @Date: 2022-03-15 16:42:34
* @LastEditors: gtz
* @LastEditTime: 2022-03-15 16:58:26
* @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'
}

View File

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

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: '页'
}

View File

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

View File

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

View File

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