From 8c55198470b0343f6588af2fbc71cbabc508df33 Mon Sep 17 00:00:00 2001 From: hzz Date: Fri, 12 Apr 2024 18:59:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A6=96=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20=E4=BF=AE=E6=94=B9=E5=85=B6=E5=AE=83=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/casm/quality.js | 2 +- src/api/home.js | 31 ++ src/assets/iconfont/iconfont.css | 42 +- src/assets/iconfont/iconfont.ttf | Bin 3496 -> 6584 bytes src/assets/iconfont/iconfont.woff | Bin 2396 -> 4408 bytes src/assets/iconfont/iconfont.woff2 | Bin 1920 -> 3640 bytes src/assets/icons/svg/renyuanxinxi.svg | 1 + src/assets/icons/svg/shengchanxinxi.svg | 1 + src/lang/i18n-en-US.js | 27 +- src/lang/i18n-zh-CN.js | 22 + src/main.js | 6 +- src/router/index.js | 2 +- src/views/dashboard.vue | 316 ++++++++++++++ src/views/index.vue | 521 +++++++++++++----------- src/views/produce/info.vue | 20 +- src/views/product/needle/add_edit.vue | 14 +- src/views/product/needle/index.vue | 19 +- src/views/product/product/add_edit.vue | 2 +- src/views/product/product/index.vue | 52 +-- src/views/product/product/info.vue | 4 +- src/views/product/working/add_edit.vue | 8 +- src/views/product/working/index.vue | 8 +- src/views/quality/index.vue | 22 +- 24 files changed, 805 insertions(+), 317 deletions(-) create mode 100644 src/assets/icons/svg/renyuanxinxi.svg create mode 100644 src/assets/icons/svg/shengchanxinxi.svg create mode 100644 src/views/dashboard.vue diff --git a/package.json b/package.json index 846ef63..e0562d3 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.6.1", "axios": "0.27.2", - "echarts": "5.4.3", + "echarts": "^5.5.0", "element-plus": "2.4.3", "file-saver": "2.0.5", "fuse.js": "6.6.2", diff --git a/src/api/casm/quality.js b/src/api/casm/quality.js index b295447..80da85b 100644 --- a/src/api/casm/quality.js +++ b/src/api/casm/quality.js @@ -45,7 +45,7 @@ export function delQuality(id) { // 获取合格率 export function qualitystandardRate() { return request({ - url: '/casm/qualitystandardRate', + url: '/casm/quality/standardRate', method: 'get' }) } diff --git a/src/api/home.js b/src/api/home.js index 5767dad..2a974e7 100644 --- a/src/api/home.js +++ b/src/api/home.js @@ -6,4 +6,35 @@ export function getHomeDeviceInfoVO() { url: '/casm/device/getHomeDeviceInfo', method: 'get' }) +} +// 首页设备利用率 +//参数同首页其他接口 +export function homeDeviceRate() { + return request({ + url: '/casm/device/homeDeviceRate', + method: 'get' + }) +} +//实时生产监控 半小时产量 +export function halfHourOutputTotal() { + return request({ + url: '/casm/quality/halfHourOutputTotal', + method: 'get' + }) +} + + +//首页 设备 产品 人员信息 +export function getBaseInfoNew() { + return request({ + url: '/casm/quality/getBaseInfoNew', + method: 'get' + }) +} +//首页 产量堆叠图 +export function qualitynewDeviceOutputQuality() { + return request({ + url: '/casm/quality/newDeviceOutputQuality', + method: 'get' + }) } \ No newline at end of file diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 4126905..655f1b5 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 4503445 */ - src: url('iconfont.woff2?t=1712819070350') format('woff2'), - url('iconfont.woff?t=1712819070350') format('woff'), - url('iconfont.ttf?t=1712819070350') format('truetype'); + src: url('iconfont.woff2?t=1712901332022') format('woff2'), + url('iconfont.woff?t=1712901332022') format('woff'), + url('iconfont.ttf?t=1712901332022') format('truetype'); } .iconfont { @@ -13,6 +13,42 @@ -moz-osx-font-smoothing: grayscale; } +.icon-renyuanxinxi-copy:before { + content: "\e601"; +} + +.icon-baojing:before { + content: "\e64b"; +} + +.icon-zidongtaiyajiao:before { + content: "\e61f"; +} + +.icon-taiyajiaogaodu:before { + content: "\e623"; +} + +.icon-jizhenzhenshu:before { + content: "\e61a"; +} + +.icon-caijian:before { + content: "\e66e"; +} + +.icon-shebeixinxi:before { + content: "\ea02"; +} + +.icon-tonganrenyuanxinxi:before { + content: "\e61e"; +} + +.icon-a-zu496:before { + content: "\e600"; +} + .icon-shengchanxiaoshuai:before { content: "\e612"; } diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index 77182c75cdd34ac1181cc743de39003bb8d5095b..0cb444d48684e4f49bdadc131b4d4d7ae2fd18bd 100644 GIT binary patch delta 3514 zcmbVOdu$v>8J}-vcV^%B+S|Q5-)nE}+a$K{?0Y&SwrNAsMrrftgGNxGS0`~CHMY|x zB?*NyR78b>RLKZIsZ@yyC@pG>${z?J6e{?mA|M16f1pYf1gEMhr2_R2)a1;!cWz2s zRXld*oBd{X=KE%TGxPiA@sS_aAM(1+4Lw5OON5X+7EX3nbK71&L|DI-+_5MA ze)s)^NT&&jE60y^j%>Mo?lElp5=!ehRw$23H=zDwl+oiSPoJH79W?^4Vm5Wx%0kC^ zB4J_w!&uIo?3`VNDy`xF6qbw2os&nq(Z_Z^Lx^)9I$T^`x##rDS4tNMN&Oic{FVSA zY;9wW+%8=tWMcz!ta-;{3~I1;^73bMpNQ;ygXq$r!JpfuKyamf{x?GfA5it!@BiXp>XK&&4GNAuz@y#UkzGyR(j%L-`L}D=zYmFVz<$o=n?V83jbuL|V_vD;j5S(yujV9UHus@qft`oi95gE6C(1#&3W5vnmx6K- zDuZ|0>teASjCsj-yiNA(<%f%tlSOtc%&)9vt0N=TnQAs$&3;GE#8b8zHR7t7vkW_x zNE=auGkBQELbc#x{}MF*U2dE#!llqmzfqi|BwKBVb};L|q^MmkOOco!$ypIe=Bi@M zWHTcLr>On4QO5_faMFm;#?$Oq>=sfWyKug@kPblr#|D$GKv01a7Zx4Nyu@v%?%}-4 z0zqlC+O-xUGY31M*=W_A9Mo%hz?M!u4>s@02*@mWNn7v$@oKdZ{0Ouv)NkiOZ0e%j za#%xX^Q(Kb@y58eXLVjv{94VYPx@0+GgsDxstT_ zwxCn34H<&uc9ZGm5^0D@m{4)>PQh=NjkBKR5wwI*eUweeLrKPmtTZOvs<@j;hI9LfGIbf z%}(cXgH&u5F(r8gx$$Og#8 z>-3jo2bm{(hM0H%1L*%1=Km*V|I7TH_LJdW80gLDFOl4of!|xS7CV5=3xYAX)Cym{n(2baFCk)J=;mWr!JP5B}=_`Dn z!e_ZcX+Qel1-O{W1Y5G%ZHQuQ0A-I}N8-dIO|l)?@CMw^caUS`1Tw?j7(vdH&ydfB zTRY(g6*k9QQMSNw>%Lc;hq1Qogbe6+<#w41pF0IS^%dHhhdFR%7s)bcyFsnh2&Qqv zPjlOyc3h5p(w;^Vu>(8?$TPLpmbNnQ zHq6nqW5!HOR6x0Z-L}^rx$>8_8c7hBj37}H@bJ(h)8+xg(i|WQS3ve+9w1$Wuk^_`f77)~iA2ekDueH3 z0i*pF*&~;a427-brm~k`2+#9WmQ}J-xv%#x^^YwcTO?tuM27?&;w6M+NHBRS;OFnj~qAbk{gQjY@i!i*k^=`)*p6rVq4d|j2PRMS;}KOn;Cv;>l>`~APbbNxAZ z&h{O^lv)NPSyq-6?Mzg|DasWBS5D}AV!od1+ zzXvzXps}YylW>#kg;$eJWDK%GK1F^(UO-g5w?Xj$iQDHD+`8StRD-hM5g6PFLQ+S1 z$K)a?4r)Fg5RQc%&~osDc)3p78NyV<8j42(F&jjKGHNac+&OGEB>phS$^)ZZR4{;4 z&`r{!;jIH5@viH*18;f!H#Cnv+BJ+c<@OxKr3t;wK^2FLTv%(>ofZ;Hqm`#Tyf?lD z9h{-M8n=szt}&2=V<|$CnI!A6#hDsU^vV917*k(S=I6Lu>GKz3U+ z&IL6h0J5aYim)URvy-w(8OTXRib@eL%@E0C5}RpSWNXYx>Jl)HLohANG~!g|vSO*6 z87y6q8Pg0NKMc;;L^%l`tzKKXMpJ}LInY8PYTy-)X%XzenM7H9#Ij8^V2t2InW{LE z2oo~nl7fSY$dX_(){C^s6gwGVjEeomN)ZZ`5}wLuA7F2&T>~iKk|1In1Sp__209pE zlGxoxm(QK)ET3J%G`X;{dQRNgSvj$^ycjvZbYx|D@pNbDT<646XT`dzEp}FpoH0)< zoj-nbIh1>jpAie4C2X{;-*f!voky1j*5aqJduJIP#IAY}oyqfO8rxgzpEvz~0l0uM AlK=n! delta 421 zcmdmCyh3_{V!ejP4+aLt9tH-6gyh`Bf|R=#J^}e4v9|P_%CtAXmfJBfFn2I8u;*l? zCZ?$G+x-)$_5l!^WdH>@SeTas*?WLkB_p?_f=3m|Vqkm&BzSW2lM|V_n70A-Hvst@ zxrr48jA~3qKzRuuUm-6sH?>}1vCRes2Cgp*3{2?-`Nbu_MMB~k7^HQ5uj*hZ_V6zew(ih+$>-Pk8G{~ffx|_e?5yTb0d(;!N3HT z2D$-AGc!$=XDndknLL5fmRabT%;XD3@i*fK#gob znvsF&8Bovv{|pQ;8YsgElw$+aOq=&H@iJ;_068E4wD*}11cMBJCIi7R_kaRwvjG2B SP7Y>9CPrpP7KX`FC6xhwCR4`% diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 0ed21eb010f241d34164778ffd7d2a599cdb5212..9f9856ba1788064d9921c2492eabce112909309f 100644 GIT binary patch delta 3977 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 delta 1951 zcmV;Q2VnTPBHR)bcTYw}00961000SG01E&B000fBkrX|DC`kBYZDDW#00D>q00341 z00D+%-O%!9Y(_yZ)0Hq00+1L000O8000OB z3In!nVR&#j000NT0000V0000W0VV=6ZeeX@000Nz0003%0007K5TiV>aBp*T000Rf z0000v0000>`xI1PlL!Gp0pXKM0VRJ4J(FQ>_}{?5zC1G~4O~e*p4U4gLTCc$|$@ONbmr81BEGU0r|uoax8R zWM^jQ)xDc+W_6y1kd2sVB%6RyNJ2Ibi0CdZ-jpb0^8gXaA&7(oAq4d%;z=(GKEh%! zIT^%Dgd99X@L~>LB-x2ov(ca@r>468|F8e~RrTLS(J&sICM|r%*kbH84jLzobH;nd z`^IO+H*g3R;a#`}H{d4x1h;?SHv9^A;SacnFtSj~Fd&_UHVg-9blZ@nSsOM%opHup z;N3V;gL$AiO(uh_&`GrNAZ_U-RgZ2bPAb6lHrMt_oYeU+%^G!{jXe+gX{O?&S$FJ9 z4ehLoG?_Mr<0zbV`YL?XZS)yW;%?GN>wG->Jrz}Z8D|hjxC+Ch-$;LW#uKV7qgW@~ z2*Qd=lJQzS>-T1%r%kqjHtv*RFzjrFz6)6ts``{T?Q4aOR@x3)rwS?~RmV8LGK9K# zwJ2@nE^VZ|&emC#rY>oqDq2_Vjx+4Ue^X=6(Cs8q$TmS#>({cHMl4G?X(?lm z?T;yy)cOgifURyvfi-{ZWj&>wayAQ%x(cnzi$V{gN0H(&9Q~f=qL$jA8r7(a`;ADS z#ZW8597^jh#QD^P3d}(Y$#52!ipCS@Y=i#;cNvIVD*FjWfizJaY=ProCV*fj7h&N* z156npT=2>zTOwSEgW0y2Z3l4`Bl*ApL^znDS#}$~Fo6>UU;BSf#4AGjlw1nSPEztL zn+gmFyA~nn98hez7y%GLZSfq5T#ph@S~j!L+6Nf?u-3|X7~$nS@yU?-L@G1l29^l@ zz#*?MH1D*}wy&PP)x?KF3d#|Sof0wuA^U#cQ3BH`AX7Mgp(K-BaaeRi4~L}&!J+-s zj#xU=QglqRoKSxP$n;AX7hU0d9&q6}lm)hrppe6W>EcOB`Lo=*Wbu8b{RYDR=!yF- znAV?gZ$zI)XNtawOg9?c9sS;Zykq8b&BTMRsswW@zd6cBK&PY4`50TKAfOy_r%)tB zhE8!d;kHV(#)Y&@+jgC5;CYt0w)7EPlL3M1^^2qL50roW1$a~-e2pS!OCPWwn4u&rRo0&|wVHnAfO$2T}?*
%LAAMs_2L0KY&8W`a=8ZI8L0 z=Q7XcoDzS*Fd+j^a0I)Fa%`E42qbtuSOoc8{Ty{oEOh~>#1awsWv+N-^5EoK2QC)B za}p^(R(HXH(S6m!sFeeG!zsCeKM^9lMWxvk__72!VLLl$!YWaTA>SJGL&2vQ*&kq= zTFj0Si3tfUcfxTBf&*f7gX0u)8wg<2Bl}(=n2LWJFPn_<#TNyqz8Be}leRS3t5;h% zZxw~F&PJJ8m0WUr6|1;N@OsqnP3HL1*bFz$w=5xn5Uq#7GV|2-jvVHUnTM2w$Z8y91sMAW zFk*jW3ln4*V*E`2eAd7QH>BYid1J=dV=Ni3sh;1B8bdX?>P(4RGc}>En+yvR-9tOW zIn@Drnf@TqIT-hM)ywLtXX*xD*FEbYKcMUDx|ltb4#!4uz82J!itbl6Xtr7x()12G zzINryQ>QMhtbn<6?C|+)YAQQ__}CAR$kBgqjU&eoH?wIc=hSQEz5Di5YIQ|V!#nz! zo9#RnY_#+Cps;<%_QLSfwOz1FZNM`Sv|6p_ucs?3E9l$*dR-?!R9Q6B_Nfx$*oqUm3Vr7(n2Wt@S?y{lA_?mAMhfRC2 zWB>ssAm#!>28RD&J_7&_!~t6Xc$~9h4?qDrV_;%{04@gXfSHkrk(rT&L8v$*H7`9m lBQdWcGcmt7qcky-rz#^e4=9+GnV40|zyJX1$_%;y001Y7Qnmm9 diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index 9e309deefdf65ab3f77fa4dc1780ea1f2a3d6b0d..a587ac21a0b0fa6d64af9c6d7b73312eaf7c4ea9 100644 GIT binary patch literal 3640 zcmV-84#)9#Pew8T0RR9101h|+3jhEB02#Od01fE?0RR9100000000000000000000 z0000SR0d!GgggqQ2%BL6HUcCAFbf(01Rw>3X9s~(8?+RoqK1-I6l8yqzzJN1?TWB8 z8e&~(8z0@p@ehu&plLqhi-bj(@)#yLH`+rfd3f6I+qpCIJbFl~i%OG5gUk>bmCyq1 z*Z$pffVLMU5I&E!mBU^ISQterX8hc{2z2eVpm5*D-XW>I4c?GW#qhu&t{k_O08;)Q zsR%4XE7Yp{mbo#gB0W!^ctO8D#_bM}q{{HQPTg7$Nj_vO<$?be`KLj1&0zh63K?5F z79H=!3Gd_(Z>4OPRkL`Cn5+K%{ADPHW;4cON+5{2@c(~?{P^Ouj*G%vtwgtdb)qA5 zReDv*|F2^kg&;qvtKn89NfCAi6 z013Fe;7ZL{QrC2;=0e0xq}~8gKVXx65?b|AT4%Eq*Q_j3F-ufq%OY@JxIBkPCFzOC zSRxUN4L=?klceaPIEh5!cw#hSk;$t^U^FJJj3lIO(YGfaB{&xwAIn7RQu)EiSY#wJ zF_DDvv8>{Yq?a#_ew3i|aM)hJNj3+PHH(hYn^V@gTWscneSR9PaSB19Kx)KCwBjf^ ze?1evyq1De##>O?76lS;(%?tbF;uJ%EZ?zb8Y*%Fq z3Ofx3L=0`02>`QRPw9$tSO|-6rjO1;C;{v7n}%qyj=FEIxBU5&{rV~4RX_BiTc=a^ z*H4_E&Mgan*#(NO3*2{9WikvGsxGu0N}8qSO@#buB{-jf2gwxoI*V_=17%X^u60NWrq7=^d12;8K6U-~u10~8#H!}j z>=yC*?Bh4lW;6J?gqppwOh_Q5B&&7?4{XsNG&Cct8?0k1unP(xw`3?D;IwV4&}A*F z(y<-6C763?%jTy{V?RJJ=>!D9N4E`K3To@pExc%40FJ#&-A0*&lZV8iPQv9o- z$mh}6m%}4p>|jEct)_x#V0W;dGVqZSuZ~SN2L@_{3;7ixWMDCu)vmtlbSr|PiMR!$0Ml8k86ozO@bUwYH1-b zb{n!do~ljeg(_T?K*)0GlR||laFhy9>Rl*?GIOC@*Zk@8_JtXIZO)qA!X{0x7__sl z6L11J_iLmIYBtLv&6|YtDyWB&Ny25(P?_pNM|It>Asjo0idPAy5u!J9%@nT@Jeh81KF<-qG?2aWjr)m3#$%%Fg1&QSY^VJER-b9jWP&XHslS?4)U9ApYmk^Kzr zRR9=4pU491$f3lc)}s`wZqbz+k7EgNMSsM61foYYLwn?dMp_VH8TSbqvPOHw8c9$E z+8M=G>sz1J+>`-fkzow|?+bHH&haYM&O=NM)qzl9t+I*Or5CIYwtL4+7K3+ndjlmd$*1SA+W;$hbH6esupR{H((lT!0) zsg?p5B3hSn|7syPpFR0dcrD-f2s0OY%j~7L;*eD&Qxrte_0=>UScEh}&S#w5D3ea% zyM;S%spYr~@LGt#POXtPcjSMsqhaS{n>LTN);NBx)d=hDUAk(#$^%a&PwZe2j(~jOi2`kh_m+-L6%Z-s`EDIT(O#T)@lpH!loW?}@n{z{b>pcK^|KpLR<( zyXmOG779hHJ2Vn}N zdAl!L=Hsg~u~oixBE%!^b9mFhDNsQ3qY1Wf=Y7AT;f;h&q%)oOnFmPi!{TgEF84ir zl2B4K)#4(?^%|oFq`E>7y@qqSIf&&PDW|sTM0=ocGHL8-+!}|SV3Fe0W_h|VBoj~Q8WM^-J=^E5;PqUZ6$6$5`5S1W$21qIE)w!4V@0#Qt|S1 z@5C_@)u7~K zu--!BJplibMq4J!j%Cf}vX~*Z{ax8(a7ri_I%%e7^Ja6M{y-yu_ukw^{82eX0(LqQ zDFy%$Elj=+h2%*6_Ko_q&{)JFZtL|ml9;UTA+Rx+Cm0MH>{;L6D}fw(wh=iZW22Li zCpD-6U=WG;Q?wQHAE@-O!Inn4{kN(eLn2+tqSR}J*)o+7_1lK?D{NUSccn#ATjhC- z0mjn8$pudOevw?RH%_2vrn(+G?mQD+AX8?ZQFL0>&T-~yU9Rui3%rWnzy@QmJ@m=C zQS3tXB*|BDDK0!F+S>n?`oLqa-=md~zwTboeQMs)NROoT2Sad1j}`I?-%P3qTO zI2KKFE2(?m&9UOj4WiJcnYqknP=o{VGV{lBK{-F0Q8xUy>L|Y=%IEQFOeS99*BPS! zYv6xA#ijwuXNLwa{go#&MAnor`S6}Lt8ipD4MW?_R$8^4f(7`JHHe|8;?9vtPQ_r5?zr2m$bXG$#&n{OW+Iz9eeD-{8`na8*OVS0XmX#yhM!{ z43i^A_IS0K<8<`J50@+4INjtB(ej64eLT*w&1+9fn8ICk=a~{u4p=jGAZE%SEf!f>EEpnmlS5D|h5kCoiV3^vOD$Nnn8mp)5$b9^=TB);j1x}`q$ z{+Od;4hj;&sseRMi@p6yCSvq7GyM>Op+h96@RA8R5D_i|6L;>scIG|QPNGm! zPc(t#ug*VnZ6z$l-84O)nm?Y8R>lTS|C1Q_bN&?j)Xf;>UEE!3-S7>?Xr~P-8FDw1 zP)?=<|4a#tzTK)exxXqf2#dumhNf6UX7w9|?x*dm?Y(?sql}2Xz{g_&0aY}|7!is^ z;#U!w7cvit>g(!9YU{8K;Y5C_S(3P~Pn=|ydd)${NItk^EqN=wxnTxIbb7GVPZn4i5}vi#O4rt73=rRE&7fDR(xe8?WcXD6%whRwMHR()(m) zaFDZh7+^Lgs~iNp=QKnGE_^DCW$@m8`upueLM8&7qUN#aqz?)$of7@#r)jb678n96IGLH}hoHa*cOlWqi)MF6&}6jb%4ROW{? KkghXA0001*kKtR0DHUcCA z3=0SV1Rw>3X9r6gS_`A1oRYQ4{-VHca}W*}+HF@skw|pP-%aS{g2ada-|aUO!EntR z9EYX(RO8`m4Sj!i@4~1MEx3%20+dnVIv@$;Y?ZG9*46iaYwh11;vLe2v=&iMn%Dlw zj=tHyCz+NgjYf!nG%6**ylbyX%Sp?*O9}pG-4QEN2mf`7P|X3I&21d`u<=1z4FJ?< zy9qP50e05VZmX4#>_F-PAQut<|Ns4FMLV?5=@-fLBKk13#32%zSx7{Z=tLy-ot3^& z*3&{^i+KenbTD3ejX=8%$Hsftk1w!uRgr@|OGIMsA`C88!|ok(7gril_L8ezyMk;ih=FEe$KDUcv2u;L$* z$z=z%j^IdtS6k~)N1-#hs;RZ9xv9Nf_qMeTH;GRjoEYgiw-D0++Z#$c!YQf&m}Yw^`p-*c4xwPNLAie>U=5-^fh*$Y9dDjTu(El9^})C zT8w0Z7-A8dDv1K6&XuE>6T(rdWvtdL9^piyjO&Jff}C=pE@J?K9?=B0kYq$z1RaGj zRdJ>Hd?^7=thJf75Un+BbL|;_P!J$za*v>f%c6>tvZROU&>7MlT1YFH^9UCR<1WU~ z`w|29jvFS)%S+OWt6dt>dM2G*rR@=#l@y|D83_(t#?{I|T5eT&5=p|idm$XkFUA#A zQn$^2ly(3&pcEE@&1&eO@~#Tz2!T%6VRwhaDzD4Pp9Ad6j!CI}lE@AK5V5*`u=gYu ztPI~@9X^fv=di0_e%u*zbV-5;*LB3uvk2z|Oh_XdL8n5JM84mNzV~&vy76rl%$bBvZQVkRRT3{MUVVK(7j9a3#a<-d zL@Y8Ef4e`E#o4aL&W3qIJFJ~s{=U5N`@e|7DT>VJ3(7;A8`XV~O$3wJBxR%CcoV?EOXwXd5;OuJ<;ya=G@< z20&fs2e$`~ibN-|S&UyBn4A)hzf>T9*l8GLgc}(%jRm?C;5~o*xMz5r(BYFiO?{V z$W8W*2aDhm4lb?u`*{5y6!Uq7&`ja)Ih=@Iii`mJgID9lxE`pl~ z@}WXr*oF-kj=ln$U<~to(lC-TmvZ#N45Y`tEOR0%WhlkCB*<;-dzjn5kB6lWUkQ5R&6&apY} z_EE|gA|5F;qY$AO7p|zEsFG#_o*~bG#&TiU84qb+cj-GA$&5cS8Ev z9~o*7+(YdFgZ+zM*uN-$ieK|>r`!QIv)Gen*H8j9FUoAbY&asn+T_s1+`YY&~Dk)*&PN16H(eQ=N%w_^!k9L+h@pnec=oF z8!E$oq1NjU+8spKV<}%goNM&zIC=gjVrl3g3T8ith1sN&kF(G \ No newline at end of file diff --git a/src/assets/icons/svg/shengchanxinxi.svg b/src/assets/icons/svg/shengchanxinxi.svg new file mode 100644 index 0000000..88379a3 --- /dev/null +++ b/src/assets/icons/svg/shengchanxinxi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lang/i18n-en-US.js b/src/lang/i18n-en-US.js index 926b637..cb241a0 100644 --- a/src/lang/i18n-en-US.js +++ b/src/lang/i18n-en-US.js @@ -61,6 +61,9 @@ export default { "添加成功": "Add Success", "修改成功": "Edit Success", "删除成功": "Delete Success", + "合格": "Pass", + "不合格": "Fail", + "未完成": "Unfinished", }, "validate": { "不能为空": "Can not be empty ", @@ -103,6 +106,24 @@ export default { "fixedHeader": "Fixed Header", "sidebarLogo": "Sidebar Logo" }, + "home":{ + "员工总数": "Staff Total", + "设备总数": "Device Total", + "产出进度": "Output Progress", + "设备": "Device", + "使用中": "In Use", + "停机": "Down", + "总数": "Total", + "工作人员": "Staff", + "加工信息": "Process Info", + "产量": "Output", + "稼动率": "Utilization", + "设备利用率": "Device Utilization", + "设备状态": "Device Status", + "台": "Units", + "人": "Pepole", + + }, "device": { "设备信息": "Device Info", "设备名称": "Device Name", @@ -129,7 +150,9 @@ export default { "图片": "Image", "底线编码": "BottomCode", "面线编码": "UpperCode", - "表面张力": "Tension", + "表面张力": "Tension", + "最小张力": "Min Tension", + "最大张力": "Max Tension", "最小值": "Min", "最大值": "Max", "最小针数": "MinNeedle", @@ -141,7 +164,7 @@ export default { "梭芯信息": "Bobbin", "排序": "Sort", "类型": "Type", - "第几针": "Needle No.", + "第几次": "Needle No.", "步骤": "Step", }, "produce": { diff --git a/src/lang/i18n-zh-CN.js b/src/lang/i18n-zh-CN.js index a0fb2ab..b365bfc 100644 --- a/src/lang/i18n-zh-CN.js +++ b/src/lang/i18n-zh-CN.js @@ -62,6 +62,9 @@ export default { "添加成功": "添加成功", "修改成功": "修改成功", "删除成功": "删除成功", + '合格': '合格', + '不合格': '不合格', + "未完成": "未完成", }, "validate": { "不能为空": "不能为空", @@ -104,6 +107,23 @@ export default { "fixedHeader": "固定 Header", "sidebarLogo": "侧边栏 Logo" }, + "home":{ + "员工总数": "员工总数", + "设备总数": "设备总数", + "产出进度": "产出进度", + "设备": "设备", + "使用中": "使用中", + "停机": "停机", + "总数": "总数", + "工作人员": "工作人员", + "加工信息": "加工信息", + "产量": "产量", + "稼动率": "稼动率", + "设备利用率": "设备利用率", + "设备状态": "设备状态", + "台": "台", + "人": "人", + }, "device": { "设备信息": "设备信息", "设备名称": "设备名称", @@ -131,6 +151,8 @@ export default { "底线编码": "底线编码", "面线编码": "面线编码", "表面张力": "表面张力", + "最小张力": "最小张力", + "最大张力": "最大张力", "最小值": "最小值", "最大值": "最大值", "最小针数": "最小针数", diff --git a/src/main.js b/src/main.js index 29d7d99..8dd9f1a 100644 --- a/src/main.js +++ b/src/main.js @@ -51,12 +51,13 @@ import { getStoredLanguage, saveStoredLanguage } from "@/utils/languageStorage"; import VECharts from 'vue-echarts' import { use } from 'echarts/core' // 手动引入 ECharts 各模块来减小打包体积 - +//引入iconfont +import './assets/iconfont/iconfont.css' import { CanvasRenderer } from 'echarts/renderers' import { - PieChart,LineChart + PieChart,LineChart,BarChart } from 'echarts/charts' import { TitleComponent, @@ -72,6 +73,7 @@ use([ GridComponent, PieChart, LineChart, + BarChart ]); diff --git a/src/router/index.js b/src/router/index.js index 15425c6..c4a9d64 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -66,7 +66,7 @@ export const constantRoutes = [ path: '/index', component: () => import('@/views/index'), name: 'Index', - meta: { title: '实时生产监控', icon: 'dashboard', affix: true } + meta: { title: '首页', icon: 'dashboard', affix: true } } ] }, diff --git a/src/views/dashboard.vue b/src/views/dashboard.vue new file mode 100644 index 0000000..a642989 --- /dev/null +++ b/src/views/dashboard.vue @@ -0,0 +1,316 @@ + + + + + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index 85f9bdd..5d2b40b 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,95 +1,187 @@ - \ No newline at end of file + diff --git a/src/views/produce/info.vue b/src/views/produce/info.vue index b3621a9..59d6920 100644 --- a/src/views/produce/info.vue +++ b/src/views/produce/info.vue @@ -1,20 +1,20 @@