Merge branch 'test' of http://git.picaiba.com/mt-ck-00a/mt-ck-wms-ui into zwq
This commit is contained in:
		
							
								
								
									
										16
									
								
								src/lang/i18n/en/module/dashboard.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								src/lang/i18n/en/module/dashboard.js
									
									
									
									
									
										Normal 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'
 | 
			
		||||
}
 | 
			
		||||
@@ -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
									
								
							
							
						
						
									
										16
									
								
								src/lang/i18n/zh/module/dashboard.js
									
									
									
									
									
										Normal 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: '页'
 | 
			
		||||
}
 | 
			
		||||
@@ -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
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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']
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user