Browse Source

修改图标图例为中文

lwx_dev
erdanergou 2 years ago
parent
commit
24c817c0d6
  1. 4
      src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java
  2. 8
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  3. 4
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  4. 4
      src/main/resources/templates/pages/material/material-view_back.html

4
src/main/java/com/dreamchaser/depository_manage/config/PublicConfig.java

@ -124,7 +124,7 @@ public class PublicConfig {
List<UserByPort> allUserByMainDepartment = FindUserByAdminorg(maindepartment, userKey, userToken);
for (UserByPort userByPort : allUserByMainDepartment) {
int emptype = userByPort.getEmptype();
if(emptype>10){
if (emptype > 10) {
continue;
}
if (Integer.compare(userByPort.getPosition(), position.getId()) == 0) {
@ -343,7 +343,7 @@ public class PublicConfig {
JSONObject jsonObject = JSONObject.parseObject(post);
JSONObject data = (JSONObject) jsonObject.get("data");
UserByPort userByPort = JSONObject.toJavaObject(data, UserByPort.class);
if("300732".equals(userByPort.getNumber())){
if ("300732".equals(userByPort.getNumber())) {
userByPort.setMaindeparment(361);
userByPort.setMaindeparmentname("仓储中心");
}

8
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -2461,8 +2461,8 @@ public class DepositoryRecordController {
// 反转
Collections.reverse(inventoryAmountList);
Collections.reverse(inventoryCountList);
Map<String, Object> countItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("count", inventoryCountList);
Map<String, Object> amountItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("amount", inventoryAmountList);
Map<String, Object> countItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("总数", inventoryCountList);
Map<String, Object> amountItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("总金额", inventoryAmountList);
Map<String, Object> result = new HashMap<>();
result.put("countItemForIn", countItemForIn);
@ -2470,7 +2470,7 @@ public class DepositoryRecordController {
result.put("countItemForOut", countItemForOut);
Map<String, List<String>> legendItem = new HashMap<>();
List<String> legends = new ArrayList<>();
legends.add("count");
legends.add("总数");
legendItem.put("data", legends);
@ -2488,7 +2488,7 @@ public class DepositoryRecordController {
result.put("amountItemForInventory", amountItemForInventory);
result.put("amountItemForOut", amountItemForOut);
result.put("amountItemForIn", amountItemForIn);
legends.add("amount");
legends.add("总金额");
}
result.put("legend", legendItem);
return new RestResponse(result);

4
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@ -2196,8 +2196,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
amountList.add(amount);
}
Map<String, Object> amountItem = createStackedAreaChartSeriesItem("amount", amountList);
Map<String, Object> countItem = createStackedAreaChartSeriesItem("count", countList);
Map<String, Object> amountItem = createStackedAreaChartSeriesItem("总金额", amountList);
Map<String, Object> countItem = createStackedAreaChartSeriesItem("总数", countList);
result.put("amountItem", amountItem);
result.put("countItem", countItem);
return result;

4
src/main/resources/templates/pages/material/material-view_back.html

@ -530,7 +530,7 @@
content:'<div id="fullChart" style="width: 100%;height: 100%;padding:30px 0px"></div>',
success:function(){
var fullchart = echarts.init(window.top.document.getElementById('fullChart'));
fullchart.setOption(optionLineChartIn)
fullchart.setOption(optionLineChartOut)
}
})
}
@ -573,7 +573,7 @@
content:'<div id="fullChart" style="width: 100%;height: 100%;padding:30px 0px"></div>',
success:function(){
var fullchart = echarts.init(window.top.document.getElementById('fullChart'));
fullchart.setOption(optionLineChartIn)
fullchart.setOption(optionLineChartInventory)
}
})
}

Loading…
Cancel
Save