KPI前后端国际化
This commit is contained in:
@@ -9,6 +9,7 @@ import cn.hutool.core.date.DateUtil;
|
|||||||
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
|
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
|
||||||
import com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper;
|
import com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.utils.MessageUtils;
|
||||||
import com.ruoyi.job.mydojob.domain.MydoJob;
|
import com.ruoyi.job.mydojob.domain.MydoJob;
|
||||||
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
|
import com.ruoyi.job.mydojobfinish.domain.MydoJobFinish;
|
||||||
import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
|
import com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper;
|
||||||
@@ -76,7 +77,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
List<Integer> counts = new ArrayList<>();
|
List<Integer> counts = new ArrayList<>();
|
||||||
|
|
||||||
for (Map.Entry<String, Integer> entry : roadwayCount.entrySet()) {
|
for (Map.Entry<String, Integer> entry : roadwayCount.entrySet()) {
|
||||||
tunnels.add(entry.getKey() + "巷道");
|
tunnels.add(entry.getKey() + MessageUtils.message("kpi.spacePlan.roadway"));
|
||||||
counts.add(entry.getValue());
|
counts.add(entry.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -132,7 +133,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
List<Integer> counts = new ArrayList<>();
|
List<Integer> counts = new ArrayList<>();
|
||||||
|
|
||||||
for (Map.Entry<String, Integer> entry : roadwayCount.entrySet()) {
|
for (Map.Entry<String, Integer> entry : roadwayCount.entrySet()) {
|
||||||
tunnels.add(entry.getKey() + "巷道");
|
tunnels.add(entry.getKey() + MessageUtils.message("kpi.spacePlan.roadway"));
|
||||||
counts.add(entry.getValue());
|
counts.add(entry.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,7 +207,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
List<Integer> outCountsList = new ArrayList<>();
|
List<Integer> outCountsList = new ArrayList<>();
|
||||||
|
|
||||||
for (String roadwayId : allRoadways) {
|
for (String roadwayId : allRoadways) {
|
||||||
tunnels.add(roadwayId + "巷道");
|
tunnels.add(roadwayId + MessageUtils.message("kpi.spacePlan.roadway"));
|
||||||
inCountsList.add(inCounts.getOrDefault(roadwayId, 0));
|
inCountsList.add(inCounts.getOrDefault(roadwayId, 0));
|
||||||
outCountsList.add(outCounts.getOrDefault(roadwayId, 0));
|
outCountsList.add(outCounts.getOrDefault(roadwayId, 0));
|
||||||
}
|
}
|
||||||
@@ -273,7 +274,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
|
|
||||||
// 为每个巷道添加数量,如果没有数据则为0
|
// 为每个巷道添加数量,如果没有数据则为0
|
||||||
for (String roadwayId : roadwayIds) {
|
for (String roadwayId : roadwayIds) {
|
||||||
statusData.put("巷道" + roadwayId, entry.getValue().getOrDefault(roadwayId, 0));
|
statusData.put(MessageUtils.message("kpi.spacePlan.roadway") + roadwayId, entry.getValue().getOrDefault(roadwayId, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
result.add(statusData);
|
result.add(statusData);
|
||||||
@@ -306,7 +307,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
for (String roadwayId : roadwaySet) {
|
for (String roadwayId : roadwaySet) {
|
||||||
Map<String, String> roadway = new HashMap<>();
|
Map<String, String> roadway = new HashMap<>();
|
||||||
roadway.put("value", roadwayId);
|
roadway.put("value", roadwayId);
|
||||||
roadway.put("label", "巷道" + roadwayId);
|
roadway.put("label", MessageUtils.message("kpi.spacePlan.roadway") + roadwayId);
|
||||||
roadways.add(roadway);
|
roadways.add(roadway);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -337,7 +338,7 @@ public class KpiServiceImpl implements KpiService
|
|||||||
for (Long platoon : platoonSet) {
|
for (Long platoon : platoonSet) {
|
||||||
Map<String, String> platoonMap = new HashMap<>();
|
Map<String, String> platoonMap = new HashMap<>();
|
||||||
platoonMap.put("value", platoon.toString());
|
platoonMap.put("value", platoon.toString());
|
||||||
platoonMap.put("label", platoon + "排");
|
platoonMap.put("label", platoon + MessageUtils.message("kpi.spacePlan.platoon"));
|
||||||
platoons.add(platoonMap);
|
platoons.add(platoonMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,13 +392,13 @@ public class KpiServiceImpl implements KpiService
|
|||||||
// 构建列和层的标签
|
// 构建列和层的标签
|
||||||
StringBuilder columnLabels = new StringBuilder();
|
StringBuilder columnLabels = new StringBuilder();
|
||||||
for (Long col : columnSet) {
|
for (Long col : columnSet) {
|
||||||
columnLabels.append("'").append(col).append("列',");
|
columnLabels.append("'").append(col).append(MessageUtils.message("kpi.spacePlan.column")).append("',");
|
||||||
}
|
}
|
||||||
String column = "[" + columnLabels.toString() + "]";
|
String column = "[" + columnLabels.toString() + "]";
|
||||||
|
|
||||||
StringBuilder floorLabels = new StringBuilder();
|
StringBuilder floorLabels = new StringBuilder();
|
||||||
for (Long floor : floorSet) {
|
for (Long floor : floorSet) {
|
||||||
floorLabels.append("'").append(floor).append("层',");
|
floorLabels.append("'").append(floor).append(MessageUtils.message("kpi.spacePlan.floor")).append("',");
|
||||||
}
|
}
|
||||||
String floor = "[" + floorLabels.toString() + "]";
|
String floor = "[" + floorLabels.toString() + "]";
|
||||||
|
|
||||||
@@ -433,16 +434,16 @@ public class KpiServiceImpl implements KpiService
|
|||||||
StringBuilder info = new StringBuilder();
|
StringBuilder info = new StringBuilder();
|
||||||
|
|
||||||
// 拼接货位信息
|
// 拼接货位信息
|
||||||
info.append("货位名称:").append(space.getCargoSpaceName()).append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.CargoSpaceName")).append(space.getCargoSpaceName()).append("<br>");
|
||||||
info.append("货位类型:").append(space.getTheTypeName()).append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.TheTypeName")).append(space.getTheTypeName()).append("<br>");
|
||||||
info.append("是否锁定:").append("Y".equals(space.getLocked()) ? "是" : "否").append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.Locked")).append("Y".equals(space.getLocked()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
|
||||||
info.append("托盘条码:").append(space.getTrayCode() != null ? space.getTrayCode() : "无").append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.TrayCode")).append(space.getTrayCode() != null ? space.getTrayCode() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
|
||||||
info.append("货位高度:").append(space.getCargoHight() != null ? space.getCargoHight() : "无").append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.CargoHight")).append(space.getCargoHight() != null ? space.getCargoHight() : MessageUtils.message("kpi.spacePlan.W")).append("<br>");
|
||||||
info.append("是否双伸:").append("Y".equals(space.getIssDouble()) ? "是" : "否").append("<br>");
|
info.append(MessageUtils.message("kpi.spacePlan.IssDouble")).append("Y".equals(space.getIssDouble()) ? MessageUtils.message("kpi.spacePlan.Y") : MessageUtils.message("kpi.spacePlan.N")).append("<br>");
|
||||||
|
|
||||||
response.put("msg", info.toString());
|
response.put("msg", info.toString());
|
||||||
} else {
|
} else {
|
||||||
response.put("msg", "未找到货位信息");
|
response.put("msg", MessageUtils.message("kpi.spacePlan.msg"));
|
||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
|||||||
@@ -98,6 +98,22 @@ error.message31=此起点无料架,请检查
|
|||||||
|
|
||||||
stock.Maintain.createTime=Create Time
|
stock.Maintain.createTime=Create Time
|
||||||
|
|
||||||
|
#KPI后台国际化
|
||||||
|
kpi.spacePlan.CargoSpaceName=CargoSpaceName:
|
||||||
|
kpi.spacePlan.TheTypeName=TheTypeName:
|
||||||
|
kpi.spacePlan.Locked=Locked:
|
||||||
|
kpi.spacePlan.Y=YES
|
||||||
|
kpi.spacePlan.N=NO
|
||||||
|
kpi.spacePlan.W=NULL
|
||||||
|
kpi.spacePlan.TrayCode=TrayCode:
|
||||||
|
kpi.spacePlan.CargoHight=CargoHight:
|
||||||
|
kpi.spacePlan.IssDouble=IssDouble:
|
||||||
|
kpi.spacePlan.msg=Cargo Space Is Not Fined
|
||||||
|
kpi.spacePlan.roadway=roadway
|
||||||
|
kpi.spacePlan.platoon=platoon
|
||||||
|
kpi.spacePlan.column=column
|
||||||
|
kpi.spacePlan.floor=floor
|
||||||
|
|
||||||
#ViewStockWarning
|
#ViewStockWarning
|
||||||
search.ViewStockWarning.stockId=Stock ID
|
search.ViewStockWarning.stockId=Stock ID
|
||||||
search.ViewStockWarning.cargoSpaceId=Cargo Space ID
|
search.ViewStockWarning.cargoSpaceId=Cargo Space ID
|
||||||
|
|||||||
@@ -97,6 +97,23 @@ error.message31=此起点无料架,请检查
|
|||||||
|
|
||||||
stock.Maintain.createTime=创建时间
|
stock.Maintain.createTime=创建时间
|
||||||
|
|
||||||
|
#KPI后台国际化
|
||||||
|
kpi.spacePlan.CargoSpaceName=货位名称:
|
||||||
|
kpi.spacePlan.TheTypeName=货位类型:
|
||||||
|
kpi.spacePlan.Locked=是否锁定:
|
||||||
|
kpi.spacePlan.Y=是
|
||||||
|
kpi.spacePlan.N=否
|
||||||
|
kpi.spacePlan.W=无
|
||||||
|
kpi.spacePlan.TrayCode=托盘条码:
|
||||||
|
kpi.spacePlan.CargoHight=货位高度:
|
||||||
|
kpi.spacePlan.IssDouble=是否双伸:
|
||||||
|
kpi.spacePlan.msg=未找到货位信息
|
||||||
|
kpi.spacePlan.roadway=巷道
|
||||||
|
kpi.spacePlan.platoon=排
|
||||||
|
kpi.spacePlan.column=列
|
||||||
|
kpi.spacePlan.floor=层
|
||||||
|
|
||||||
|
|
||||||
#ViewStockWarning
|
#ViewStockWarning
|
||||||
search.ViewStockWarning.stockId=库存ID
|
search.ViewStockWarning.stockId=库存ID
|
||||||
search.ViewStockWarning.cargoSpaceId=货位ID
|
search.ViewStockWarning.cargoSpaceId=货位ID
|
||||||
|
|||||||
@@ -1249,32 +1249,32 @@ export default {
|
|||||||
|
|
||||||
// ***************入库分析*************
|
// ***************入库分析*************
|
||||||
inAnalysis: {
|
inAnalysis: {
|
||||||
warehouse: '仓库', // 仓库
|
warehouse: 'warehouse', // 仓库
|
||||||
selectWarehouse: '请选择仓库', // 请选择仓库
|
selectWarehouse: 'selectWarehouse', // 请选择仓库
|
||||||
timeRange: '时间范围', // 时间范围
|
timeRange: 'timeRange', // 时间范围
|
||||||
startDate: '开始日期', // 开始日期
|
startDate: 'startDate', // 开始日期
|
||||||
endDate: '结束日期', // 结束日期
|
endDate: 'endDate', // 结束日期
|
||||||
query: '查询', // 查询
|
query: 'query', // 查询
|
||||||
inboundQuantityStatistics: '入库数量统计', // 入库数量统计
|
inboundQuantityStatistics: 'inboundQuantityStatistics', // 入库数量统计
|
||||||
inboundQuantity: '入库数量', // 入库数量
|
inboundQuantity: 'inboundQuantity', // 入库数量
|
||||||
selectTimeRange: '请选择时间范围', // 请选择时间范围
|
selectTimeRange: 'selectTimeRange', // 请选择时间范围
|
||||||
getWarehouseListFailed: '获取仓库列表失败', // 获取仓库列表失败
|
getWarehouseListFailed: 'getWarehouseListFailed', // 获取仓库列表失败
|
||||||
getStatisticsDataFailed: '获取统计数据失败' // 获取统计数据失败
|
getStatisticsDataFailed: 'getStatisticsDataFailed' // 获取统计数据失败
|
||||||
},
|
},
|
||||||
|
|
||||||
// ***************出库分析*************
|
// ***************出库分析*************
|
||||||
outAnalysis: {
|
outAnalysis: {
|
||||||
warehouse: '仓库', // 仓库
|
warehouse: 'warehouse', // 仓库
|
||||||
selectWarehouse: '请选择仓库', // 请选择仓库
|
selectWarehouse: 'selectWarehouse', // 请选择仓库
|
||||||
timeRange: '时间范围', // 时间范围
|
timeRange: 'timeRange', // 时间范围
|
||||||
startDate: '开始日期', // 开始日期
|
startDate: 'startDate', // 开始日期
|
||||||
endDate: '结束日期', // 结束日期
|
endDate: 'endDate', // 结束日期
|
||||||
query: '查询', // 查询
|
query: 'query', // 查询
|
||||||
outboundQuantityStatistics: '出库数量统计', // 出库数量统计
|
outboundQuantityStatistics: 'outboundQuantityStatistics', // 出库数量统计
|
||||||
outboundQuantity: '出库数量', // 出库数量
|
outboundQuantity: 'outboundQuantity', // 出库数量
|
||||||
selectTimeRange: '请选择时间范围', // 请选择时间范围
|
selectTimeRange: 'selectTimeRange', // 请选择时间范围
|
||||||
getWarehouseListFailed: '获取仓库列表失败', // 获取仓库列表失败
|
getWarehouseListFailed: 'getWarehouseListFailed', // 获取仓库列表失败
|
||||||
getStatisticsDataFailed: '获取统计数据失败' // 获取统计数据失败
|
getStatisticsDataFailed: 'getStatisticsDataFailed' // 获取统计数据失败
|
||||||
},
|
},
|
||||||
|
|
||||||
menu: {
|
menu: {
|
||||||
@@ -3166,35 +3166,35 @@ export default {
|
|||||||
|
|
||||||
// ***************KPI分析:货位分析***************
|
// ***************KPI分析:货位分析***************
|
||||||
KPIAnalysis_CargoSpace: {
|
KPIAnalysis_CargoSpace: {
|
||||||
warehouse: '仓库',
|
warehouse: 'warehouse',
|
||||||
|
|
||||||
placeholderWarehouse: '请选择仓库',
|
placeholderWarehouse: 'placeholderWarehouse',
|
||||||
|
|
||||||
btnSearch: '查询',
|
btnSearch: 'Search',
|
||||||
btnReset: '重置',
|
btnReset: 'Reset',
|
||||||
|
|
||||||
//---handleQuery---
|
//---handleQuery---
|
||||||
errorGetData: '获取数据失败',
|
errorGetData: 'errorGetData',
|
||||||
|
|
||||||
//---updateChart---
|
//---updateChart---
|
||||||
warnInvalidChartData: '无效的图表数据',
|
warnInvalidChartData: 'warnInvalidChartData',
|
||||||
roadway: '巷道',
|
roadway: 'roadway',
|
||||||
roadway1: '巷道1',
|
roadway1: 'roadway1',
|
||||||
roadway2: '巷道2',
|
roadway2: 'roadway2',
|
||||||
roadway3: '巷道3',
|
roadway3: 'roadway3',
|
||||||
roadway4: '巷道4',
|
roadway4: 'roadway4',
|
||||||
config: '生成的系列配置',
|
config: 'generated series configuration',
|
||||||
|
|
||||||
textChartCargoSpace: '货位分析',
|
textChartCargoSpace: 'ChartCargoSpace',
|
||||||
textValue: '数量',
|
textValue: 'quantity',
|
||||||
|
|
||||||
// 货位状态国际化 - 对应后台返回的中文状态
|
// 货位状态国际化 - 对应后台返回的中文状态
|
||||||
statusEmpty: '空货位', // 空货位
|
statusEmpty: 'Empty', // 空货位
|
||||||
statusFull: '满货位', // 满货位
|
statusFull: 'Full', // 满货位
|
||||||
statusInboundAllocated: '入库分配', // 入库分配
|
statusInboundAllocated: 'InboundAllocated', // 入库分配
|
||||||
statusOutboundAllocated: '出库分配', // 出库分配
|
statusOutboundAllocated: 'OutboundAllocated', // 出库分配
|
||||||
statusInboundNeedCheck: '入库需盘点', // 入库需盘点
|
statusInboundNeedCheck: 'InboundNeedCheck', // 入库需盘点
|
||||||
statusOutboundNeedCheck: '出库需盘点', // 出库需盘点
|
statusOutboundNeedCheck: 'OutboundNeedCheck', // 出库需盘点
|
||||||
|
|
||||||
lblWidthSearch: '68px'
|
lblWidthSearch: '68px'
|
||||||
|
|
||||||
@@ -3202,25 +3202,26 @@ export default {
|
|||||||
|
|
||||||
// ***************KPI分析:库存平面图***************
|
// ***************KPI分析:库存平面图***************
|
||||||
KPIAnalysis_CargoPlan: {
|
KPIAnalysis_CargoPlan: {
|
||||||
warehouse: '仓库',
|
warehouse: 'warehouse',
|
||||||
raodway: '巷道',
|
raodway: 'raodway',
|
||||||
row: '排',
|
row: 'row',
|
||||||
column: '列',
|
column: 'column',
|
||||||
floor: '层',
|
floor: 'floor',
|
||||||
|
txtLoading: 'Loading...',
|
||||||
|
|
||||||
placeholderWarehouse: '请选择仓库',
|
placeholderWarehouse: 'please select warehouse',
|
||||||
|
|
||||||
//---updateNormalChart---
|
//---updateNormalChart---
|
||||||
title: '库位分布平面图',
|
title: 'KPIAnalysis CargoPlan',
|
||||||
legendEmpty: '空位',
|
legendEmpty: 'legendEmpty',
|
||||||
legendOccupied: '满位',
|
legendOccupied: 'legendOccupied',
|
||||||
legendStockInAssigned: '入库已分配',
|
legendStockInAssigned: 'legendStockInAssigned',
|
||||||
legendStockOutAssigned: '出库已分配',
|
legendStockOutAssigned: 'legendStockOutAssigned',
|
||||||
legendStockInException: '入库需盘点',
|
legendStockInException: 'legendStockInException',
|
||||||
legendStockOutException: '出库需盘点',
|
legendStockOutException: 'legendStockOutException',
|
||||||
|
|
||||||
//---formatTooltip---
|
//---formatTooltip---
|
||||||
failGetCargoSpace: '获取货位信息失败',
|
failGetCargoSpace: 'failGetCargoSpace',
|
||||||
|
|
||||||
lblWidthSearch: '68px'
|
lblWidthSearch: '68px'
|
||||||
|
|
||||||
@@ -3965,7 +3966,7 @@ export default {
|
|||||||
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
|
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
|
||||||
callCancelled: '已取消呼叫'
|
callCancelled: '已取消呼叫'
|
||||||
},
|
},
|
||||||
|
|
||||||
// **************Interface Log****************
|
// **************Interface Log****************
|
||||||
interfaceLog: {
|
interfaceLog: {
|
||||||
// Query Form
|
// Query Form
|
||||||
@@ -3977,7 +3978,7 @@ export default {
|
|||||||
selectIsSuccess: 'Please select success status',
|
selectIsSuccess: 'Please select success status',
|
||||||
search: 'Search',
|
search: 'Search',
|
||||||
reset: 'Reset',
|
reset: 'Reset',
|
||||||
|
|
||||||
// Table Columns
|
// Table Columns
|
||||||
requestId: 'Request ID',
|
requestId: 'Request ID',
|
||||||
requestTime: 'Request Time',
|
requestTime: 'Request Time',
|
||||||
|
|||||||
@@ -3208,6 +3208,7 @@ export default {
|
|||||||
row: '排',
|
row: '排',
|
||||||
column: '列',
|
column: '列',
|
||||||
floor: '层',
|
floor: '层',
|
||||||
|
txtLoading: '加载中,请稍候...',
|
||||||
|
|
||||||
placeholderWarehouse: '请选择仓库',
|
placeholderWarehouse: '请选择仓库',
|
||||||
|
|
||||||
@@ -3967,47 +3968,6 @@ export default {
|
|||||||
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
|
shelfCalledSuccess: '料架 {containerCode} 已从 {sourcePortName} 呼叫到 {currentPortName}',
|
||||||
callCancelled: '已取消呼叫'
|
callCancelled: '已取消呼叫'
|
||||||
},
|
},
|
||||||
|
|
||||||
// **************接口日志****************
|
|
||||||
interfaceLog: {
|
|
||||||
// 查询表单
|
|
||||||
requestParam: '请求参数',
|
|
||||||
inputRequestParam: '请输入请求参数',
|
|
||||||
errorInfo: '错误信息',
|
|
||||||
inputErrorInfo: '请输入错误信息',
|
|
||||||
isSuccess: '是否成功',
|
|
||||||
selectIsSuccess: '请选择是否成功',
|
|
||||||
search: '搜索',
|
|
||||||
reset: '重置',
|
|
||||||
|
|
||||||
// 表格列
|
|
||||||
requestId: '请求id',
|
|
||||||
requestTime: '请求时间',
|
|
||||||
sourceSystem: '来源系统',
|
|
||||||
targetSystem: '目标系统',
|
|
||||||
interfaceName: '接口名称',
|
|
||||||
requestUrl: '请求URL',
|
|
||||||
requestMethod: '请求方式',
|
|
||||||
requestHeaders: '请求头信息',
|
|
||||||
requestBody: '请求参数',
|
|
||||||
responseTime: '响应时间',
|
|
||||||
responseBody: '响应主体',
|
|
||||||
responseStatus: '响应状态',
|
|
||||||
errorDetails: '错误信息',
|
|
||||||
duration: '耗时',
|
|
||||||
isSuccessful: '是否成功',
|
|
||||||
|
|
||||||
// 弹窗
|
|
||||||
add: '添加接口记录',
|
|
||||||
edit: '修改接口记录',
|
|
||||||
inputContent: '请输入内容',
|
|
||||||
confirm: '确 定',
|
|
||||||
cancel: '取 消',
|
|
||||||
deleteConfirm: '是否确认删除接口记录编号为"{0}"的数据项?',
|
|
||||||
addSuccess: '新增成功',
|
|
||||||
editSuccess: '修改成功',
|
|
||||||
deleteSuccess: '删除成功'
|
|
||||||
},
|
|
||||||
dict: {
|
dict: {
|
||||||
is_available: {
|
is_available: {
|
||||||
n: '否',
|
n: '否',
|
||||||
|
|||||||
@@ -15,8 +15,8 @@
|
|||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="-"
|
||||||
:start-placeholder="$t('inAnalysis.startDate')"
|
:start-placeholder="$t('inAnalysis.startDate')"
|
||||||
:end-placeholder="$t('inAnalysis.endDate')"
|
:end-placeholder="$t('inAnalysis.endDate')"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
@change="handleDateRangeChange"
|
@change="handleDateRangeChange"
|
||||||
@@ -154,7 +154,7 @@ export default {
|
|||||||
this.$message.warning(this.$t('inAnalysis.selectTimeRange')) // 请选择时间范围
|
this.$message.warning(this.$t('inAnalysis.selectTimeRange')) // 请选择时间范围
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await getInAnalysisData(this.queryParams)
|
const response = await getInAnalysisData(this.queryParams)
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
|
|||||||
@@ -15,8 +15,8 @@
|
|||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="dateRange"
|
v-model="dateRange"
|
||||||
type="daterange"
|
type="daterange"
|
||||||
range-separator="至"
|
range-separator="-"
|
||||||
:start-placeholder="$t('outAnalysis.startDate')"
|
:start-placeholder="$t('outAnalysis.startDate')"
|
||||||
:end-placeholder="$t('outAnalysis.endDate')"
|
:end-placeholder="$t('outAnalysis.endDate')"
|
||||||
value-format="yyyy-MM-dd"
|
value-format="yyyy-MM-dd"
|
||||||
@change="handleDateRangeChange"
|
@change="handleDateRangeChange"
|
||||||
@@ -154,7 +154,7 @@ export default {
|
|||||||
this.$message.warning(this.$t('outAnalysis.selectTimeRange')) // 请选择时间范围
|
this.$message.warning(this.$t('outAnalysis.selectTimeRange')) // 请选择时间范围
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const response = await getInAnalysisData(this.queryParams)
|
const response = await getInAnalysisData(this.queryParams)
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
|
|||||||
@@ -324,13 +324,13 @@ this.getWarehouseList()
|
|||||||
},
|
},
|
||||||
// 格式化普通仓库提示信息
|
// 格式化普通仓库提示信息
|
||||||
formatTooltip(params) {
|
formatTooltip(params) {
|
||||||
if (params.seriesName !== '满位') {
|
if (params.seriesName !== this.$t('KPIAnalysis_CargoPlan.legendOccupied')) {
|
||||||
// 排
|
// 排
|
||||||
if (this.$i18n.locale ==='zh-cn') {
|
if (this.$i18n.locale ==='zh-cn') {
|
||||||
return params.seriesName + '<br>' + this.queryParams.thePlatoon + '排' + (params.data[0] + 1) + '列' + (params.data[1] + 1) + '层';
|
return params.seriesName + '<br>' + this.$t("KPIAnalysis_CargoPlan.row")+ this.queryParams.thePlatoon + this.$t('KPIAnalysis_CargoPlan.column')+ (params.data[0] + 1) + this.$t('KPIAnalysis_CargoPlan.floor')+ (params.data[1] + 1);
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
return params.seriesName + '<br>' + this.$t('KPIAnalysis_CargoPlan.row') + ':' + this.queryParams.thePlatoon + ' ' + this.$t('KPIAnalysis_CargoPlan.column') + ':' + (params.data[0] + 1) + ' ' + this.$t('KPIAnalysis_CargoPlan.floor') + ': ' + (params.data[1] + 1);
|
return params.seriesName+ '<br>'+ this.queryParams.thePlatoon + this.$t('KPIAnalysis_CargoPlan.row') + ' ' + (params.data[0] + 1)+ this.$t('KPIAnalysis_CargoPlan.column') + ' '+ (params.data[1] + 1) + this.$t('KPIAnalysis_CargoPlan.floor');
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -347,11 +347,15 @@ this.getWarehouseList()
|
|||||||
|
|
||||||
// 如果已经在加载中,返回基本信息
|
// 如果已经在加载中,返回基本信息
|
||||||
if (this.loadingKeys && this.loadingKeys[key]) {
|
if (this.loadingKeys && this.loadingKeys[key]) {
|
||||||
return `${params.seriesName}<br>${this.queryParams.thePlatoon}排${params.data[0] + 1}列${params.data[1] + 1}层<br>加载中...`;
|
if (this.$i18n.locale === 'zh-cn') {
|
||||||
|
return `${params.seriesName}<br>${this.queryParams.thePlatoon}${this.$t('KPIAnalysis_CargoPlan.row')}${params.data[0] + 1}${this.$t('KPIAnalysis_CargoPlan.column')}${params.data[1] + 1}${this.$t('KPIAnalysis_CargoPlan.floor')}<br>${this.$t('KPIAnalysis_CargoPlan.txtLoading')}`;
|
||||||
|
} else {
|
||||||
|
return `${params.seriesName}<br>${this.queryParams.thePlatoon}${this.$t('KPIAnalysis_CargoPlan.row')} ${params.data[0] + 1}${this.$t('KPIAnalysis_CargoPlan.column')} ${params.data[1] + 1}${this.$t('KPIAnalysis_CargoPlan.floor')}<br>${this.$t('KPIAnalysis_CargoPlan.txtLoading')}`;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 返回基本信息
|
// 返回基本信息
|
||||||
const baseStr = `${params.seriesName}<br>${this.queryParams.thePlatoon}排${params.data[0] + 1}列${params.data[1] + 1}层`;
|
const baseStr = `${params.seriesName}<br>${this.queryParams.thePlatoon}${this.$t('KPIAnalysis_CargoPlan.row')}${params.data[0] + 1}${this.$t('KPIAnalysis_CargoPlan.column')}${params.data[1] + 1}${this.$t('KPIAnalysis_CargoPlan.floor')}`;
|
||||||
|
|
||||||
// 设置加载状态
|
// 设置加载状态
|
||||||
if (!this.loadingKeys) this.loadingKeys = {};
|
if (!this.loadingKeys) this.loadingKeys = {};
|
||||||
|
|||||||
Reference in New Issue
Block a user