diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 663e6b73..78545c1a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -834,7 +834,8 @@ public class DepositoryController { depository_data.put("sourceListByMonth", beforeInventoryByMonth); depository_data.put("ThisWeekInventory", thisWeekInventoryByDName); depository_data.put("MapInventory", beforeInventoryOnMap); - } else { + } + else { // 获取本周至今仓库的入/出库数量 Future futureForBarChartData = completionService.submit(new distributeTasks(depositoryAllNameAndId, type, 1, userByPort, depositoryName)); @@ -1468,7 +1469,7 @@ public class DepositoryController { for (i = days.size() - 1; i > 0; i--) { // 遍历 Map并计算各仓库的入库数 // 获取一段时间内的库存额度 - Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i - 1), days.get(i), Integer.parseInt(type), val); + Double depositoryRecordByDate1 = depositoryRecordService.findApplicationRecordByDate(days.get(i), days.get(i - 1), Integer.parseInt(type), val); drCountbyDrName.add(depositoryRecordByDate1); } map.put("data", drCountbyDrName); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 9f7e7e4c..2a68bc51 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1164,6 +1164,7 @@ public class PageController { public ModelAndView chart_out_back(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/chart/chart-out_back"); + String token = request.getHeader("user-token"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); @@ -1220,6 +1221,12 @@ public class PageController { mv.addObject("allOutPrice", mapForTrueOut.get("price")); // 获取金额比值 mv.addObject("outAllPriceRadio", mapForTrueOut.get("radioForPrice")); + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if (b) { + mv.setViewName("pages/chart/chart-out_mobile"); + } return mv; } diff --git a/src/main/resources/templates/pages/chart/chart-in_mobile.html b/src/main/resources/templates/pages/chart/chart-in_mobile.html index 305f1d9a..5f111cc4 100644 --- a/src/main/resources/templates/pages/chart/chart-in_mobile.html +++ b/src/main/resources/templates/pages/chart/chart-in_mobile.html @@ -46,7 +46,7 @@
数量
- +
金额
@@ -142,7 +142,6 @@ emphasis: { focus: 'ancestor' }, - center:['50%','50%'], levels: [ {}, { @@ -197,7 +196,6 @@ }; - //动态加载相关数据 $.ajax({ url: '/repository/layui/echart_back?type=1', @@ -222,11 +220,11 @@ let keys = Object.keys(depositoryItem); for (let i = 0; i < keys.length; i++) { let key = keys[i]; - $("#selectDepositoryForChart").append(new Option(key,depositoryItem[key])); + $("#selectDepositoryForChart").append(new Option(key, depositoryItem[key])); } - optionSunburstChart.series.data =data.depository_data.sunburstChartData; + optionSunburstChart.series.data = data.depository_data.sunburstChartData; echartSunburstChart.setOption(optionSunburstChart); @@ -295,7 +293,6 @@ }); - }); diff --git a/src/main/resources/templates/pages/chart/chart-out.html b/src/main/resources/templates/pages/chart/chart-out.html deleted file mode 100644 index ffaac8c9..00000000 --- a/src/main/resources/templates/pages/chart/chart-out.html +++ /dev/null @@ -1,621 +0,0 @@ - - - - - 首页三 - - - - - - - - - - -
- - -
-
- -
-
转出物料数量
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
转出物料金额
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
出售物料数量
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
出库物料金额
-
-
-
- -
-
- - -
-
-
-
- -
- -
- -
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
-
-
- - -
- - - - - - - diff --git a/src/main/resources/templates/pages/chart/chart-out_mobile.html b/src/main/resources/templates/pages/chart/chart-out_mobile.html new file mode 100644 index 00000000..6278ad1e --- /dev/null +++ b/src/main/resources/templates/pages/chart/chart-out_mobile.html @@ -0,0 +1,300 @@ + + + + + 首页三 + + + + + + + + + + + + +
+ + +
+
+ +
+
出库物料
+
+
+
+
数量
+ +
+ +
+
金额
+ +
+
+
+
+ +
+
+ +
+
实际物料出库
+
+
+
+
数量
+ +
+
+
金额
+ +
+
+
+
+ +
+
+ +
+ +
+

面积图

+
+ + + +
+
+
+
+ +
+

旭日图

+
+
+
+
+ +
+ +
+ + + + + + + + diff --git a/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java b/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java index 878dc3be..ca2765c3 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SunburstChartTest.java @@ -36,7 +36,7 @@ public class SunburstChartTest { @Test public void main(){ - String type = "1"; + String type = "2"; // 获取本月之前的月份 Map previousMonth = getPreviousMonth(); // 获取月份的时间戳 diff --git a/target/classes/templates/pages/chart/chart-out.html b/target/classes/templates/pages/chart/chart-out.html deleted file mode 100644 index ffaac8c9..00000000 --- a/target/classes/templates/pages/chart/chart-out.html +++ /dev/null @@ -1,621 +0,0 @@ - - - - - 首页三 - - - - - - - - - - -
- - -
-
- -
-
转出物料数量
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
转出物料金额
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
出售物料数量
-
-
-
- -
-
- - -
-
-
-
- -
-
- -
-
出库物料金额
-
-
-
- -
-
- - -
-
-
-
- -
- -
- -
-
- - -
-
-
-
-
-
- - -
-
-
-
-
-
-
-
- - -
- - - - - - -