From 1e1de438120c1e6a40fab8ad13a901f9e9392412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 10 Jun 2022 14:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/css/adsorptionTank/style.css | 4 ++++ .../static/css/aluminumTank/style.css | 4 ++++ .../static/css/preassemble/style.css | 4 ++++ .../resources/static/css/tankShell/style.css | 5 +++++ .../resources/static/js/common/ondutyplan.js | 2 +- .../main/resources/static/js/foamBox/index.js | 12 ++++++++---- .../resources/templates/foamBox/index.html | 4 +++- .../controller/FoamBoxController.class | Bin 4443 -> 4448 bytes .../static/css/adsorptionTank/style.css | 4 ++++ .../classes/static/css/aluminumTank/style.css | 4 ++++ .../classes/static/css/preassemble/style.css | 4 ++++ .../classes/static/css/tankShell/style.css | 5 +++++ .../classes/static/js/common/ondutyplan.js | 2 +- .../target/classes/static/js/foamBox/index.js | 12 ++++++++---- .../classes/templates/foamBox/index.html | 4 +++- 15 files changed, 58 insertions(+), 12 deletions(-) diff --git a/productionboard/src/main/resources/static/css/adsorptionTank/style.css b/productionboard/src/main/resources/static/css/adsorptionTank/style.css index aca4413..185c824 100644 --- a/productionboard/src/main/resources/static/css/adsorptionTank/style.css +++ b/productionboard/src/main/resources/static/css/adsorptionTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/aluminumTank/style.css b/productionboard/src/main/resources/static/css/aluminumTank/style.css index 3c4d776..54b4ca8 100644 --- a/productionboard/src/main/resources/static/css/aluminumTank/style.css +++ b/productionboard/src/main/resources/static/css/aluminumTank/style.css @@ -32,4 +32,8 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/preassemble/style.css b/productionboard/src/main/resources/static/css/preassemble/style.css index 0865699..70685ad 100644 --- a/productionboard/src/main/resources/static/css/preassemble/style.css +++ b/productionboard/src/main/resources/static/css/preassemble/style.css @@ -32,4 +32,8 @@ body { height: 32%; top: 23%; left: 3.5%; +} +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/css/tankShell/style.css b/productionboard/src/main/resources/static/css/tankShell/style.css index e84e37e..2b61a0a 100644 --- a/productionboard/src/main/resources/static/css/tankShell/style.css +++ b/productionboard/src/main/resources/static/css/tankShell/style.css @@ -32,4 +32,9 @@ body { height: 32%; bottom: 4.5%; left: 3.5%; +} + +.span_c{ + margin-left: 5%; + margin-right: 10% !important; } \ No newline at end of file diff --git a/productionboard/src/main/resources/static/js/common/ondutyplan.js b/productionboard/src/main/resources/static/js/common/ondutyplan.js index 4bab15c..24007b6 100644 --- a/productionboard/src/main/resources/static/js/common/ondutyplan.js +++ b/productionboard/src/main/resources/static/js/common/ondutyplan.js @@ -3,7 +3,7 @@ $(() =>{ let html = `
- - - - + - -
diff --git a/productionboard/src/main/resources/static/js/foamBox/index.js b/productionboard/src/main/resources/static/js/foamBox/index.js index 41ce396..1bed0f4 100644 --- a/productionboard/src/main/resources/static/js/foamBox/index.js +++ b/productionboard/src/main/resources/static/js/foamBox/index.js @@ -1,4 +1,5 @@ $(() => { + //班组计划统计 // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { @@ -6,11 +7,13 @@ $(() => { }); //设备运行状态 - let statusArray = [0, 0, 0, 0, 1, 0]; - deviceStatus(statusArray); + $.getJSON(`/foamBox/getRunStatusJson?ids=${ids}`, function (result) { + deviceStatus(result); + }); + //库存统计 - $.getJSON('/foamBox/getMaterialStoreJson', function (result) { + $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); @@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => { $(".foamingLineRunStatus table tr").append(info); -} \ No newline at end of file +} + diff --git a/productionboard/src/main/resources/templates/foamBox/index.html b/productionboard/src/main/resources/templates/foamBox/index.html index fb2b052..784e3d5 100644 --- a/productionboard/src/main/resources/templates/foamBox/index.html +++ b/productionboard/src/main/resources/templates/foamBox/index.html @@ -1,5 +1,5 @@ - + @@ -67,6 +67,8 @@ disableOnInteraction: false, }, }); + + const ids = [[${positionId}]]; // let info = ` // diff --git a/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class b/productionboard/target/classes/com/productionboard/controller/FoamBoxController.class index d94df6e83446f5ee85a78a0c3bcfee2459cf7b79..d3b75bb279f6e9809b1283abe332880a49bf5aae 100644 GIT binary patch literal 4448 zcmbtXU2_vv7=BLDk`U5Dqg0>>B?uN;yKR!vFF>IP7F&vh4-rr|$+j#cyJ2@zD9DUn zc*VV=H{LpWr86p^GyVX7ljHcD-R*YM?pBm^x|?&(`|-Tb`<`>&{Q389e*h@qaS926 zk*e8HnwD8>RUO?lDyC}Hl&WbsmRYZBmU7lq8>h_&Gr>#>9RfSjv7 zIs&`(dCk5U7&@amYFV?E^{OT?J{RT1_Lh~|IK^pNz0@)sy`f#zZM{<0P8o*js1m3x zFfnIZON!mJbYp4JQXATR)4HovG}W+`MYZaf){3GA3d*ULW8T*-twyt3nwGYxKM=^x ztwmCHq$Rm}TsL&*q(E}u$W?)k8MCHkki_;ZwjrBFk3iR=$BUvHHSNJx2)vTTR%8UW z&*_GCq1C8p)@7BDr4O^J)~~9TF30|4hjUwJ424K$Hshc8I$fs%#|CC2DQM}+JR#TT z)#mh(r~pfmYWKB@QlaTEY3DSDR+=6!`SxU7R3+(-X0>JI*bCdfq}^+2w&R+SQ7x(5v<7jWc0~zL0>JW$iQ?YE$4qBq<@EjK8bw zsMWh<+pmxv^O|$ptOYEyT6QjJ&Sgz)P}0$DN3YuFZPO5Vbs!8NsN-HGM*hF#$Zm48 zX{XKF%Cs!=@hm#AC5=hOHaap=*oJAGNa47^*#Fw&S)9b%0=tNm$3S~nSE~UXth3(s<7lP1dL&&~Cwn~dYCiwsAZu^9u9jvw8^;_b~_mY z2N~|aOWk~_m^ZWU2JUBVRj$mdSX%??omp<~+ay+FzMDlol>0WBH7j0y%j|9{@N(IW zG3^G~$CLzc)cQip;e~N}#l3k2_R6%zEvI1#QGb-#ny;}BWpOrbEIAIiJ;oLrogpT|RynuYb66JgDf(&YF^jAn7Y=442-Fga2z z#VD56D;C3w#nMC^*0J@9rI6z2L}8@(*p2bl5cz7d=OkSO!p~6ui@k4U9`gp!jYX5E zAJZ~xEb|m&dl=-0ck631VG%27+!y#OI#&VrGI@D}-4GMQOpO)Dcl%B6vAOckfX>sNW~9^`U9S@4j(>9Z8bEW)l2kTf$L_ zBl%9dv+T(EPIJu0ozE_gPEc0xz3u2zbRW&__yxJ2T;W&w>~_udp#%L??ZZyaNkxjI z7q9WnUIn|kzUpWX=lb~HEv@e5|LZpPaV%YZMQak?WZw^b0!8;JZNRm4XehTo`3whs z#hcf@Lk~wC!65?Gcave=# zm^umSfE*=vb#+k@*qU%*4)ZI2hR{;N4JpU>9vQ_A2%FZ&xGqC^!ubT>gM@V~H}M=( z3Cs;X$2$VwqI)p;9A^`FhVwuEj*Hiy;*$JI@eUV!j&ERwOr9awcggKJ7j&;@(g&Tz zew1;U&aY5fvhK}XdzCZT>D0kurm zmkIF-xwsaBdMJRp8=tI$DrY_oL*3&+Rb!x50;o59s6DGts}iaY%S(U8WvWJ4iy=5Y z0h~_Gw=*YamIz1Sb_@VL9>AR#02Tq*F#sAH05o8@0L&Nw%>aN*sjRNf+`YL$SvLu{ zZoJ+21xKH=yq|;|clwbhxn^^x$~c`EH?0Ua%NyN%LsMVV&G(zSN#KDCZzb3*4>^8B J_uh{A>>qr!aC!g$ literal 4443 zcmb_f+j7%Z6kW0tY#axY0O8sY%%uqlkz*$$AwZjin`uHQ=28l@m2D*mY{^J+AkcLB z(kFhP(}%uxI(?xtZGm>CAJA`NI$cLnWZ99q43)>0&N=(C_BuyO;f4FBeorx8x(U;}CEi8%ElbWvCrzJ!O2CqwK zn=?ubV(Yx7tCwn(f@)q>h(#zHMWuXQF*PyvCfn@08o^~kLoOP+Z5rjWYRcyfr7~+g zn)7GqxLwmrDp4ID$c4sM)8qwWDK9A1>A^7M5v?Ra$`Ny=qEsauc%vB!oq1a+-ls_~ zfUX7AzH5{&D}qv6H5trUsF{aqK`sz+kmU2KO-ogm$5i9y`4$^?@%UTYzM?*;sg~`S z5oE0>C@9O+@mwOMI7%!kX7ZIq0SnmRl@J1!3##s zbY4pF&NMUBM=DwfxSZU0uQ*$nX29Gu5p9EjyJ;y-FDN{9no@3w`yg>Q2ss(29-RyR z_IrVUoqZ>Q-6DbpDM7It#R0KY$Czg-QtR+s8A1NKdXvEaL4FI? zrHv$>fUItF%9oS0W=vCA6-OtDuVE#z#&xOuB(XVFVlB2(CvGMBz3WNJRP_5y(y0^u zqr)l7Evcy!sr+0fGm#ojIjL1FPKj%6I8-y!tT`FfOpi@Xq+4ian>D8bnwhC|cC3Zs zShHd_sF)p_Y=w2aS#d0&I69e0XV;tESv2afJI)3HtDaB#egz{Kmdk!Y<}Q7Kp}9zzz0L z5RKQ8dcK3bNt>lTX1ZjD%5E=8bF8V2MED^41W2W<6_kR)#@Mp&u|JY8<`*wHDMLci zHpIwvCgDgBfoCNcz27H$Wv-!&*HgY5&Jj1#^=ec9gU~Ga`kE<>;Q;@u?BpMs2tUlR zkg$iNO}y`QW|^6Jk8{k#&EI~GrYI}%-f{Ffq@z8N-x2+l!w8K53En~FHj1YBlypUL z5QjLDa2Q9NHQ)zC`2kMt{e{241iwO8T*A3Pw3{T%^yXN{)Xr? z3Pl~qdx#o1##$odL!@yO8H^)~Ng5VF`dw!p5W1z*faBy81}PoE5T)7?-PhTPVLon- zP=XNnUFYN&pGWxJA_$QAOs3jihoSSMG~l$|i#kfF^L&xRTwL&67WU0ifrMDU3Ncity@f#XXA{ let html = `
- - - - + - -
diff --git a/productionboard/target/classes/static/js/foamBox/index.js b/productionboard/target/classes/static/js/foamBox/index.js index 41ce396..b17ecc5 100644 --- a/productionboard/target/classes/static/js/foamBox/index.js +++ b/productionboard/target/classes/static/js/foamBox/index.js @@ -1,4 +1,5 @@ $(() => { + //班组计划统计 // onDutyPlan(1234, 1202, 33); $.getJSON('/foamBox/getTeamStatisticsJson', function (result) { @@ -6,11 +7,13 @@ $(() => { }); //设备运行状态 - let statusArray = [0, 0, 0, 0, 1, 0]; - deviceStatus(statusArray); + $.getJSON(`/foamBox/getRunStatusJson?id=${ids}`, function (result) { + deviceStatus(result); + }); + //库存统计 - $.getJSON('/foamBox/getMaterialStoreJson', function (result) { + $.getJSON(`/foamBox/getMaterialStoreJson`, function (result) { threeDimensionalCylindrical(result, document.getElementById("inventoryStatistics")); }); @@ -141,4 +144,5 @@ const deviceStatus = (statusArray) => { $(".foamingLineRunStatus table tr").append(info); -} \ No newline at end of file +} + diff --git a/productionboard/target/classes/templates/foamBox/index.html b/productionboard/target/classes/templates/foamBox/index.html index fb2b052..784e3d5 100644 --- a/productionboard/target/classes/templates/foamBox/index.html +++ b/productionboard/target/classes/templates/foamBox/index.html @@ -1,5 +1,5 @@ - + @@ -67,6 +67,8 @@ disableOnInteraction: false, }, }); + + const ids = [[${positionId}]]; // let info = ` //