diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index e9112b9..74b456f 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -1,5 +1,39 @@
// en.js
export default {
+ viewsMain: {
+ systemTitle: 'Fortucky Management System',
+ title: 'Home',
+ inboundOrders: 'Inbound Orders',
+ outboundOrders: 'Outbound Orders',
+ inventoryOrders: 'Inventory Orders',
+ totalOrders: 'Total Orders',
+ weeklyStats: 'Weekly In/Out Statistics',
+ locationStats: 'Location Statistics',
+ documentList: 'Document List',
+ documentId: 'Document ID',
+ type: 'Type',
+ status: 'Status',
+ executingTasks: 'Executing Tasks',
+ taskId: 'Task ID',
+ pendingTasks: 'Pending Tasks',
+ priority: 'Priority',
+ // Document Types
+ inbound: 'Inbound',
+ outbound: 'Outbound',
+ inventory: 'Inventory',
+ // Document Status
+ unexecuted: 'Unexecuted',
+ reviewing: 'Reviewing',
+ executing: 'Executing',
+
+ emptyLocation:"emptyLocation",
+ fullLocation:"fullLocation",
+ inboundAllocated:"inboundAllocated",
+ outboundAllocated:"outboundAllocated",
+ inboundNeedCheck:"inboundNeedCheck",
+ outboundNeedCheck:"outboundNeedCheck",
+ },
+
login: {
title: 'FORTUCKY WMS SYSTEM',
@@ -628,23 +662,7 @@ export default {
},
- viewsMain: {
- systemTitle: 'RuoYi Admin',
- title: 'homePage',
- unfinishedInboundTask: 'Unfinished Inbound Task Overview',
- taskKey: 'Task Key',
- unfinishedInboundTaskName: 'Unfinished Inbound Task',
- totalUnfinishedCount: 'Total Unfinished Count',
- todayUnfinishedCount: 'Today Unfinished Count',
- finishedInboundTask: 'Finished Inbound Task Overview',
- finishedInboundTaskName: 'Finished Inbound Task',
- totalFinishedCount: 'Total Finished Count',
- todayFinishedCount: 'Today Finished Count',
- unfinishedOutboundTask: 'Unfinished Outbound Task Overview',
- unfinishedOutboundTaskName: 'Unfinished Outbound Task',
- finishedOutboundTask: 'Finished Outbound Task Overview',
- finishedOutboundTaskName: 'Finished Outbound Task'
- },
+
searchViewStockSecure: {
stockId: 'Stock ID',
@@ -1241,7 +1259,7 @@ export default {
},
//=====================基础信息:容器管理=====================
- bas_ContainerManagement: {
+ bas_ContainerManagement: {
//--------------标题--------------
addContainerItem: 'Add Container Item',
editContainerItem: 'Edit Container Item',
diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js
index 99f8d3c..23d2f28 100644
--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -635,23 +635,7 @@ export default {
},
- viewsMain: {
- systemTitle: '福莱瑞达管理系统',
- title: '首页',
- unfinishedInboundTask: '未完成入库任务概览',
- taskKey: '任务键值',
- unfinishedInboundTaskName: '未完成入库任务',
- totalUnfinishedCount: '全部未完成数量',
- todayUnfinishedCount: '今日未完成数量',
- finishedInboundTask: '已完成入库任务概览',
- finishedInboundTaskName: '已完成入库任务',
- totalFinishedCount: '全部已完成数量',
- todayFinishedCount: '今日已完成数量',
- unfinishedOutboundTask: '未完成出库任务概览',
- unfinishedOutboundTaskName: '未完成出库任务',
- finishedOutboundTask: '已完成出库任务概览',
- finishedOutboundTaskName: '已完成出库任务'
- },
+
searchViewStockSecure: {
stockId: '库存ID',
@@ -1251,7 +1235,7 @@ export default {
},
//=====================基础信息:容器管理=====================
- bas_ContainerManagement: {
+ bas_ContainerManagement: {
//--------------标题--------------
addContainerItem: '添加容器管理',
editContainerItem: '修改容器管理',
@@ -3171,5 +3155,38 @@ export default {
editSuccess: '修改成功',
deleteSuccess: '删除成功',
deleteConfirm: '是否确认删除客户编号为"{ids}"的数据项？'
+ },
+ viewsMain: {
+ systemTitle: '福莱瑞达管理系统',
+ title: '首页',
+ inboundOrders: '入库单数',
+ outboundOrders: '出库单数',
+ inventoryOrders: '盘点单数',
+ totalOrders: '总单据数',
+ weeklyStats: '近一周入库出库统计',
+ locationStats: '库位统计',
+ documentList: '单据列表',
+ documentId: '单据编号',
+ type: '类型',
+ status: '状态',
+ executingTasks: '正执行任务',
+ taskId: '任务编号',
+ pendingTasks: '待执行任务',
+ priority: '优先级',
+ // 单据类型
+ inbound: '入库',
+ outbound: '出库',
+ inventory: '盘点',
+ // 单据状态
+ unexecuted: '未执行',
+ reviewing: '审核中',
+ executing: '正执行',
+ // 饼图
+ emptyLocation:"空货位",
+ fullLocation:"满货位",
+ inboundAllocated:"入库已分配",
+ outboundAllocated:"出库已分配",
+ inboundNeedCheck:"入库需盘点",
+ outboundNeedCheck:"出库需盘点",
}
}
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 21bb3cb..3d1f6ef 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -8,7 +8,7 @@
-
入库单数
+
{{ $t('viewsMain.inboundOrders') }}
-
出库单数
+
{{ $t('viewsMain.outboundOrders') }}
-
盘点单数
+
{{ $t('viewsMain.inventoryOrders') }}
-
总单据数
+
{{ $t('viewsMain.totalOrders') }}
@@ -61,7 +61,7 @@
@@ -73,39 +73,39 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -140,7 +140,14 @@ export default {
actualData: []
},
pieChartData: {
- labels: ['空货位', '满货位', '入库已分配', '出库已分配', '入库需盘点', '出库需盘点'],
+ labels: [
+ this.$t('viewsMain.emptyLocation'), // 空货位
+ this.$t('viewsMain.fullLocation'), // 满货位
+ this.$t('viewsMain.inboundAllocated'), // 入库已分配
+ this.$t('viewsMain.outboundAllocated'), // 出库已分配
+ this.$t('viewsMain.inboundNeedCheck'), // 入库需盘点
+ this.$t('viewsMain.outboundNeedCheck') // 出库需盘点
+ ],
datasets: [{
data: [],
backgroundColor: ['#36f7c4', '#ffc240', '#34bfa3', '#ff5f5f', '#ffd700', '#c669cd']
@@ -197,22 +204,22 @@ export default {
type_(row, column) {
const type = row.type
if (type == 1) {
- return "入库"
+ return this.$t('viewsMain.inbound') // 入库
} else if (type == 2) {
- return "出库"
+ return this.$t('viewsMain.outbound') // 出库
} else if (type == 3) {
- return "盘点"
+ return this.$t('viewsMain.inventory') // 盘点
}
return ""
},
status_(row, column) {
const status = row.status
if (status == 1) {
- return "未执行"
+ return this.$t('viewsMain.unexecuted') // 未执行
} else if (status == 2) {
- return "审核中"
+ return this.$t('viewsMain.reviewing') // 审核中
} else if (status == 3) {
- return "正执行"
+ return this.$t('viewsMain.executing') // 正执行
}
return ""
}