From 5f0fa0407e68fe36b2bfa8722843bab421ade017 Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Fri, 14 Oct 2022 17:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=93=9D=E5=86=85?= =?UTF-8?q?=E8=83=86=E8=AE=BE=E5=A4=87=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FoamBoxController.java | 106 +++++++++--------- .../controller/StorageController.java | 4 +- .../static/js/common/echarts.common.js | 4 +- .../controller/FoamBoxController.class | Bin 6198 -> 5253 bytes .../controller/StorageController.class | Bin 2897 -> 2001 bytes .../static/js/common/echarts.common.js | 6 +- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/FoamBoxController.java b/productionboard/src/main/java/com/productionboard/controller/FoamBoxController.java index 2285227..2b691ff 100644 --- a/productionboard/src/main/java/com/productionboard/controller/FoamBoxController.java +++ b/productionboard/src/main/java/com/productionboard/controller/FoamBoxController.java @@ -183,57 +183,57 @@ public class FoamBoxController { return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } - /** - * 根据型号统计产量 - * - * @author WenJY - * @date 2022/4/20 10:15 - * @return java.lang.String - */ - @GetMapping("/getStatisticalOutputByModel") - @ResponseBody - public String getStatisticalOutputByModel() { - String info = - "{\n" - + "\t\"datas\":[\n" - + " {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n" - + " {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n" - + " {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n" - + " {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n" - + " {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n" - + " ],\n" - + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n" - + "}"; - return info; - } - - /** - * 库存 统计 - * - * @author WenJY - * @date 2022/4/20 10:16 - * @return java.lang.String - */ - @GetMapping("/getInventoryStatistics") - @ResponseBody - public String getInventoryStatistics() { - String info = - "{\n" - + "\t\"datas\":[\n" - + " {\n" - + " \"name\": \"SC528\",\n" - + " \"value\": 175.17\n" - + " },\n" - + " {\n" - + " \"name\": \"SC529\",\n" - + " \"value\": 148.35\n" - + " },\n" - + " {\n" - + " \"name\": \"SC327\",\n" - + " \"value\": 95.36\n" - + " }\n" - + " ]\n" - + "}"; - return info; - } +// /** +// * 根据型号统计产量 +// * +// * @author WenJY +// * @date 2022/4/20 10:15 +// * @return java.lang.String +// */ +// @GetMapping("/getStatisticalOutputByModel") +// @ResponseBody +// public String getStatisticalOutputByModel() { +// String info = +// "{\n" +// + "\t\"datas\":[\n" +// + " {\"ranking\": 1,\"station\":\"SC227\",\"value\": 199999},\n" +// + " {\"ranking\": 2,\"station\":\"SC228\",\"value\": 104970},\n" +// + " {\"ranking\": 3,\"station\":\"SC229\",\"value\": 29034},\n" +// + " {\"ranking\": 4,\"station\":\"SC223\",\"value\": 23489},\n" +// + " {\"ranking\": 5,\"station\":\"SC224\",\"value\": 18203}\n" +// + " ],\n" +// + "\t\"plan\":[290000, 290000, 290000, 290000, 290000, 290000]\n" +// + "}"; +// return info; +// } + +// /** +// * 库存 统计 +// * +// * @author WenJY +// * @date 2022/4/20 10:16 +// * @return java.lang.String +// */ +// @GetMapping("/getInventoryStatistics") +// @ResponseBody +// public String getInventoryStatistics() { +// String info = +// "{\n" +// + "\t\"datas\":[\n" +// + " {\n" +// + " \"name\": \"SC528\",\n" +// + " \"value\": 175.17\n" +// + " },\n" +// + " {\n" +// + " \"name\": \"SC529\",\n" +// + " \"value\": 148.35\n" +// + " },\n" +// + " {\n" +// + " \"name\": \"SC327\",\n" +// + " \"value\": 95.36\n" +// + " }\n" +// + " ]\n" +// + "}"; +// return info; +// } } diff --git a/productionboard/src/main/java/com/productionboard/controller/StorageController.java b/productionboard/src/main/java/com/productionboard/controller/StorageController.java index 558bd48..1078d4e 100644 --- a/productionboard/src/main/java/com/productionboard/controller/StorageController.java +++ b/productionboard/src/main/java/com/productionboard/controller/StorageController.java @@ -47,7 +47,7 @@ public class StorageController { return prefix; } - @GetMapping("/getProductionPlan") + /* @GetMapping("/getProductionPlan") @ResponseBody() public String productionPlan(){ String info = @@ -99,7 +99,7 @@ public class StorageController { + "}"; return info; - } + }*/ /** * 库存统计 diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index 7c75747..dd3d183 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -364,10 +364,10 @@ const threeDimensionalCylindrical = (res, ids) => { }, axisLabel: { show: true, + rotate:-30, margin: 25, - align: "center", textStyle: { - fontSize: 14, + fontSize: 10, color: "#A8A6AB", rich: { a: { diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index 33f4f1706827825d11c61e9eeb7b8941ab873f0f..d02c0a24536b022ca2449d867edb522b8f04effc 100644 GIT binary patch delta 1729 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 diff --git a/productionboard/target/classes/com/productionboard/controller/StorageController.class b/productionboard/target/classes/com/productionboard/controller/StorageController.class index ca48389bc5285a088d77d6c4ace21ed8e850de13..a67def66478662d62463d6d144d0e8442da09be1 100644 GIT binary patch delta 662 zcmaiw%T5$Q6o$X59_*f`TLcG08AOzeGU$wQ7e-LQTLL@)D-wvAgfQr^aOFIMsdsQK z2@7@Mj*UB>f%j1V>LIuwgmk*@+PL8iHONOF;fxKF*D4@ z%<&NI&&r08>H?_aP+Q=>xQ(kU;nuIe!E=T-P-Qfem ztMabs?#NX2)}52D(K-w6dsHlSON&*3v>d(k$VwDNy>7@y_DyanR&al#HPh|Z@&iqu zb%#J_^)$;{eH63GD*fD6&jH2T2#RT{WXM}(pcrRlgR<{>->UGQ{-H*eWBh*VUr=ma zo&2P9?2xeZgUHfc9sef9@}GWBydN_97FT-4l`^W$jpCO3vTO#^W+b;jx+D$y*&CP! v4;Yhf{M%jtkhe|F1ANwi=A{7RmjgV^04$HP4a?bEdBlqR$1Tj9IG_9jKT175 literal 2897 zcmeHJOK%%h6h7CFIB~{#xFyi0(9{rc9(2-Br)kp^l0b`#-9!xvi;BhAbK~6Bo|(>! z6C%VzY^VfM5fYmsA+do4QdA@$P*t#J%WrU1{siK?Gb7uHrwuHTn9)4Wx#ynmJCC_{ ze*f#qp5~KufnM&WSEO>GmlkPB-d;`6YYDo@sK08K zHCLF%Dz`U9nKPO$l+BuI*`{7E%Yl-q*}CfZ!)ks}b9iCzoH<5EuGS4#)cBfkM5)Rb z48wFiw+^G(f@xP&$FhY{S+}(s-!knRYKd!xqpoXZ*R;1)tvNwmsJrHtu(=MmU6#$) z#XF4Bh3nd;rdBnhqOQ8qlN>!S4B=j26wQvUF^VmjI{5b&gu$=WYb9>Ksey}}48GMh z%@$G)lreWhfLwUAWz%qNvs&dg&`eva@TH~(z;R*d9IR%t`Ow(vLM?(zwWwKhV`0oA zLTAMC;9RR|7NZjfx?z-Bb+z&hxC{aqC~|kh)K@f_QkUBZ=5(l=EnZSfVBDVMOWcJg z%gIYnBd|J=fwAShI; z5xP|wBD!6nLv$D|7l^9Y?+Oi4no-g+9U&Knyq=&-3cXJG1YK6>4Jxq6AMYkdaAY>P zrgJ-U?wTihs)svYH*S62`0A6!?cL1ee*J?l?*94lZRmS?GL4;2AKdz^sgbkgk!kGi zH12=Y`0#$`^oPHF*|_&j#`F5N?>wVxuGY?=#l`bBJvDu5s?C$9%ynp{bNg*NHMyx# zA6ohd;N|Q8h%yT!ng3>1{bowOr%;Oe5>!-Zf+iK3qDe+mVSD7`b`3@YtsQK+be)%7 zMuRO?-f($^+l&(4a=E;Y^&p#XUyT9_EM~{U_S3dK2OFYQhx^&~_07keYg_RGO*=-Q zdPIDW`v;&C_`gu_9}>Zdd=b`5NL_dicv`F-c*Y@PX~F#oNM~Wo@a!GmB{rUp{7BL7 zJ>wzVlNclz$LJ|~5^suc3h4+WMn`EFW75qXisB@iAN~$^qBFSUTzL%Rk`QB)=~(n< zivL7iZ+%OHkYY_KI{pJi@4_fb68I=s6OGa_dI4va#&PCQ`&m*wA|pOnKm@R`eA)w< zr)TImphqx2PSInj6w*S}6M+R`jG8&g;Qd)#eKG;h;Tm;38*ECzjCf(qLoLIIrxS$< zNiX8j^YfAe3GUGu@{IyIQAk;&+E0HPQbu~eM$Dlx1R}G6HpXn3xn+#Y%%zZl?ulO{ z)8gcQC<~Rn*%o=K8F`9c^q_j-<|N)CUbt}vwIAwUd^Nzw7xW1HWElSY!2jSt{8I { }, axisLabel: { show: true, + rotate:-30, margin: 25, - // align: "center", textStyle: { - fontSize: 14, + fontSize: 10, color: "#A8A6AB", rich: { a: { @@ -382,7 +382,7 @@ const threeDimensionalCylindrical = (res, ids) => { }, }, }, - interval: 3, + interval: 0, }, yAxis: { splitLine: {