From 86c3a7f48413b573d9c38f77f283b729394e8a8d Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Wed, 2 Nov 2022 10:35:48 +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/PreassembleController.java | 13 +++++++------ .../MesMaterialStoreStatisticsMapper.java | 1 - .../impl/MesProductionDataServiceImpl.java | 2 +- .../controller/PreassembleController.class | Bin 4695 -> 3750 bytes .../impl/MesProductionDataServiceImpl.class | Bin 9857 -> 10046 bytes .../classes/static/css/foamBox/style.css | 5 ----- .../classes/static/js/aluminumLiner/index.js | 4 ++-- .../static/js/common/echarts.common.js | 2 +- .../target/classes/static/js/foamBox/index.js | 18 ++++++++---------- 9 files changed, 19 insertions(+), 26 deletions(-) diff --git a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java index 878cb92..d51eb31 100644 --- a/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java +++ b/productionboard/src/main/java/com/productionboard/controller/PreassembleController.java @@ -99,17 +99,18 @@ public class PreassembleController { @GetMapping("/getMaterialStoreJson") @ResponseBody public String getMesMaterialStoreStatisticsJson(){ - List mesMaterialStoreStatisticsList = iMesProductionDataService.getMesMaterialStoreStatisticsList("1004"); + List mesMaterialStoreStatisticsList = + iMesProductionDataService.getMesMaterialStoreStatisticsList("1004"); return JSONArray.toJSONString(mesMaterialStoreStatisticsList); } - /** + /* *//** * 根据型号统计产量 * * @author WenJY * @date 2022/4/20 10:15 * @return java.lang.String - */ + *//* @GetMapping("/getStatisticalOutputByModel") @ResponseBody public String getStatisticalOutputByModel() { @@ -127,13 +128,13 @@ public class PreassembleController { return info; } - /** + *//** * 库存 统计 * * @author WenJY * @date 2022/4/20 10:16 * @return java.lang.String - */ + *//* @GetMapping("/getInventoryStatistics") @ResponseBody public String getInventoryStatistics() { @@ -155,5 +156,5 @@ public class PreassembleController { + " ]\n" + "}"; return info; - } + }*/ } diff --git a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java index 461c242..2052afa 100644 --- a/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java +++ b/productionboard/src/main/java/com/productionboard/mapper/MesMaterialStoreStatisticsMapper.java @@ -68,7 +68,6 @@ public interface MesMaterialStoreStatisticsMapper extends BaseMapper getAdsorptionTankStoreStatistics4(@Param("in_id") Integer in_id); @Select("select * from table ( scada_adsorb_fault(#{in_id}) )") List selectDeviceFaultByType1005(int in_id); diff --git a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java index 81e6b97..22648bb 100644 --- a/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java +++ b/productionboard/src/main/java/com/productionboard/service/impl/MesProductionDataServiceImpl.java @@ -165,7 +165,7 @@ public class MesProductionDataServiceImpl implements IMesProductionDataService { public List getMesMaterialStoreStatisticsList(String locationNumber) { List mesMaterialStoreStatistics = new ArrayList<>(); - + System.out.println("数据切换标志: "+this.in_id); switch (locationNumber) { case "1001": mesMaterialStoreStatistics = materialStoreStatisticsMapper.getAdsorptionTankStoreStatistics(this.in_id); diff --git a/productionboard/target/classes/com/productionboard/controller/PreassembleController.class b/productionboard/target/classes/com/productionboard/controller/PreassembleController.class index 848fb81b5512c6499d9820db5aeafc58346c79e8..f8a09d906137245c23a07af30daaf13d8032a6ad 100644 GIT binary patch delta 1051 zcmZ{i$xqW!5XV2S3%~l~NzoWlTtLJP&=x^la6xdxT~XYZ0tJh;Y6}7`)CI+T`<+ZY zdGKbU(UXZD)RQM~UcGVg56}R{d2P|Cm?rPdeBaD`W~RT-#ZRXtKmK_A7O2FrDWt*2 zt}zs_+Z>HP_GGh{ec9~ifH@9Y9P)A4W(-Hnanwi1rio_bv{-~~a%r$>rOjB!d_>IM zZjR$7CTeqnn6Vm6<&#z(r);LAz0*dDTO=$xUOfKfvN{E4apq;heaGc=Wj(2x!(7F< zQ}J*pkqDn?iiQJ`SWCEDGmF`p85Aiz<-uU3MVF?V9*a)RSfJf* zimZW0ZwBr?)AW+mTqK}SL5oY8%Usd)86mGdbS4ythGK1jhK_h7)>hjYiME8L#jBcY z^lPqjLxH((YHktG+$L#pM{}2Zn)~!P!`7ti2lQwj(xa%97A83FRpHBb_Mj_JAUg+_ z{G@plGsVl2yEvuFR2g3e7j>TVb?nq+iDIR$(xgeQ6j8n#7E&Rl zt63t-BHV13;#FdKB&Ii0S`%lnL@1VuYI;s9%fzY{B_HoF6&A}aR@7On9Kx^6{hc|f z&5Rd9P-0gdKqaWjVYMVFYSTSBAN*C)*r0#PA=B7I2}VAQ^h&fWtL`tfQPyP8KGYET zf*u95Hp5w$;Usd4n#~S#WK3w3UG9}Z_NR84rjGkX^|Jmis!=uw)$IAtf$B4yjTz3j r+@h}Ee|D=d+Wy1X^bcbbn@44ANike(6}pRUzq;5i{tn4VuXg883NneW literal 4695 zcmb_fYjYFV8GhCmB#RBkA~rE3t`P|}Sn=AHd?&QV6k=){7g0zcG+9ZCzIP4EzlQUa!ydKA$7``6E zT?PHdvT#;yt5_+xhGm}7T|Fo4O`{+bOf40x4Xqq3<}KYWYL36GEw)meqt%NQ(=|54 zWy3M@B{6TBma9wqj)LhW%U;)*(EiZJ_(bn{WYuQ_x9w=z@71z3L z*rG_Yd&;(0GhS1WT)L@m>RL%R*R`B0Ey>lBhH1E`6toW=zpS8R!74I{?j^$%E0vAB zurKMvB9*OzUb?K?h8$NXJKP%v!A(YnT(C^nwn`;oYpb@<9Y<_Xb0L_e^G?Go3L<-a z=y(*iY-G^4MPAEOF&ytX;V$dtvL90Kx^OQEeIqB?b6lg~oOdi!LC=P88s`<9jD#+@ z5AK%Muvc=_sLcQpWwJTHVR7RWD2obI?nOl})uwuPxLhJ41^fMQE3Q$}PB^Ptnt3B&KkSe0jSV!yCLlF}%s`*wjlE?scEmg2BmMZ^%XAlzDK)X{)$J zmjg8Tyj8KiJ0p*D^WF@Qs1^b~V^@okUlv$g=CCX0Ig%tABS= zwr<{H5lGDrj-^wMUp-T^socW&_*5#L^75NpoRNQb(~+9v&6?9;&C%@4)MyLMOta=p zNOOEh#_MVFC2JMwA`t$i2Y2_ro?yT8 zFq-awKFNQ|WLH9NN%q7zDQjE|n4g*$8Jh~$!h8giJFJn$#>K!|c6uZ;5v=XTT1Fm( zK*MuYvo#as>I3gvr(7k)7l#r`TAA3kiRJkto!@w=i1M#AsN3VQ!o+b?Nj?l z1y3-kG1E8pD884chx`H*ZvCnqSGWb~aE#ZP_t*)tlWC_p7RRB*aBJqr!J?@;!d)n_ zsaxT$D_D(m5EaPoa*ga#=zlfTUG>!2Tr^#=E^GzyvTi$qLkTn@M268#GxH5SnZE}f z6)ZeA7^$9TQRrZ#l;6WPQkX>+m&VBb-Ki!s!h1H#-wp_M`M7JB?Eo4&oO(6% z56Ch9?9>Wz{ijW{;3u~e(io2LKgHi}ZTx3Ff`Vr_+QauTZNV-Wqb~EG(%Yy z1?)ZXA(Ruzw!fhLPo8j^&jc5Neso{}&+<$4MKJ=6BL$-vql7f0aU{)jp7=A`Kj23j zqygz0#8Ox8tSZ-#jdNW=re;V<(ODZLvCik<9eU7t|SbyduznJPGf;{3eMDcWRDt)|vd=(s2D2`A%KN|7OT(?IyKTk diff --git a/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class b/productionboard/target/classes/com/productionboard/service/impl/MesProductionDataServiceImpl.class index d1c8388d5590c4f3381c6a9ae7ba4a413e279bd3..52c4ede32adb8a57fabd20e65aa8723fb810fd9d 100644 GIT binary patch delta 2959 zcmai030PEB7(M@N?=kZl*(Oi~K`{Zr0k;$)mlo5&OhToVA<slf#>kNf)|`f#(EVmO8Jt&%L1=B z@hVI%D4|)_z)ktO7Jm0ap6;Z zCh)m}FPs>OFI9Xcp6v(Co_gqT^rOMKqC+KNi= znCfcZ{DO*_S{|+8SNuk>`v~+V&r7>MCkDJLO%vJ9?5kZ+J(^gjT zlX#+7n$mE$XM$x_{MGt5@k{;VIa3J}pm3&gAaK2qqtLCYGoRWTw<%|F}aI8Ft zR6N9C{RrCdDE`JqJ`5hGNNlDQY@t+arD51cBhXCa(Lx2-LFZv7mEu_=pUp%q3pr0^ zp%|dEv9xOp7|b#w24(>XaJS>4PMPX5uj693zP#rAWjI*2h~4Jh%qevaSTaM6($q#+w*gNxgQAr}5xlFg@MU)*K*c&ynq ztj=x3Erp)Zk(4*`Gj75v?q14q_W~mLTmYJbP86^ML-{geYZ$LP+cDhFM@3c>jwjrT zRa_ZCcnTwPZ9VxPK<I*o%#F#PGp{YH)7OqyVUZf=ICh)#=FPv zaZKk}j~>l&Zv^}p9uPg&wgagrl~_HFdXK$+ZY)lo-H20*8Zj<_)241XJUbMXdU=0y zTRD-Fyb9x>^O0lcoiHCabIpOFycMj*Eyl_>2aQs(#aKMzoqrw2Md)M@JI%JW?3dYg zD|52_&48mF$qH^Wg75aj=nK1oJA{}e2gmIS?gW1_-FcWF6>14LSh#@?m&yOr-o{@s TW>DP4kGflyDvE+)Lj(a)L}LlQw|luH1U~P+{b%l8^cwWN`(!QwSB@HiYSgqle5aeKuz^g92hP7_Ij&%a-1vUt5 z6xbvoMQ&`y76HG&R)J!H5*aOZqYS<`1h)xn7kE=(hlaN#;%ztH!Mg(Q3G5WuC9qq? z9v4!uLc?BZ_X)XQ;C=bu2X1_b18#hTgKm6`PXs58TD;=&7&mI*&n-PZy*QXj3l5H&axQz*Thdk&xKV*b<+@0*}PUm;#&f0(c}SuwOu+a8uYc1sd-gk!q_l&1A+iBc|1b zy#mPr({yh+6Jl0~VwyFDyOv@1v8bt5zSyvtP>jh9%UQ{|gz8qE2`V`gwCXtSzr-qG zrd`o0Gi8^t>H${pV9=F=0ax^GU6FO*a8w>(lv4&Je=BUcMt0IrYG|xX8sbZ6x*2*g z>XaZ+LGEgd;NMkTlF9X{!8J0u&NaAXlWTSvu3inUu^DGe-@rE6!Dji;38DOBHM_M2 z`}wjtinUzC>u?V1aUL7_6y8J{Hd8dVP%KI*17(znZPXRpsT<#FRa-Tu(pk!>%sO?# z^qN^WnHhns$H3>QK#yvB)#FZ;&3gG=GLv0>7_>vLTjmD`g*7h7@+SNp89~wV5Aj zePzYzC1|RkXND})CJPNz#cp2b9zF^7A_n_dyAQC+BCb+A;xL;f^Erb^%)wli8pDq) z!zv5&Tr#8P1*0AbM$O=;z%etMXSH_Cqa65HWjWv)4pw-~!$Ph6m!O#fk*b(d+_QLhfV|b|9;RJ(|CMwA=;F+lnj0{NYFIz82r6I^V{Rw#;*MG1|3tNUx3boYD3& zwCB8B73qj{4)vphH`|Y^{pjdNC;o%Cvwa)7*!)!+ou@a{J5^~ z>WiZ*i_}O;vCfuGeEt>ko%bYPI}Wy?BNlMaiPoH)g)q!wC=D2;VUw9W;_F})76ofi z?6k%fvtQQOQ_RU3I2_IjB&b+o*5lHPNPG>0!2yK__{Qn| YKjY;r*(!=>c-m*poG%Yv-p>L50rBJZ`v3p{ diff --git a/productionboard/target/classes/static/css/foamBox/style.css b/productionboard/target/classes/static/css/foamBox/style.css index 6e10715..1aaaa90 100644 --- a/productionboard/target/classes/static/css/foamBox/style.css +++ b/productionboard/target/classes/static/css/foamBox/style.css @@ -33,11 +33,6 @@ body { } .foamingLineRunStatus { - position: absolute; - width: 40%; - height: 27%; - top: 12%; - left: 30%; } .inventoryStatistics { diff --git a/productionboard/target/classes/static/js/aluminumLiner/index.js b/productionboard/target/classes/static/js/aluminumLiner/index.js index 07e3562..8d7bc47 100644 --- a/productionboard/target/classes/static/js/aluminumLiner/index.js +++ b/productionboard/target/classes/static/js/aluminumLiner/index.js @@ -41,7 +41,7 @@ $(() => { let Res = {} Res.data=res.map(val => { - return [val.spe,val.oq,val.aq,val.cha,val.round,] + return [val["spe"],val["oq"],val["aq"],val["cha"],val.round,] }) Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度'] dynamicTable({ @@ -51,7 +51,7 @@ $(() => { header: Res.header, data: Res.data, index: false, - fontColor: '#B4B7BF ', + fontColor: '#B4B7BF', indexBGC: '#86F3FF', headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', diff --git a/productionboard/target/classes/static/js/common/echarts.common.js b/productionboard/target/classes/static/js/common/echarts.common.js index dd3d183..95169cf 100644 --- a/productionboard/target/classes/static/js/common/echarts.common.js +++ b/productionboard/target/classes/static/js/common/echarts.common.js @@ -1226,7 +1226,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { color: "#fff", fontSize: fontSize, }, - data: ["内胆库", "箱壳库"], + data: ["箱壳库", "内胆库"], }, xAxis: [ { diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index a920f1b..710886f 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -119,16 +119,14 @@ $(() => { }) const deviceStatus = (statusArray) => { - let info = ` - - - - - - - - -
`; + let info = ` + + + + + + +`; $(".foamingLineRunStatus table tr").append(info);