From 4981b8578a3c3566a546eaed719bae6cd5eb07c9 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 15 Aug 2023 18:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E5=B7=A5=E8=89=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/iconfont.styl           |   12 +-
 src/assets/css/iconfont/iconfont.json  |   37 -
 src/assets/css/iconfont/iconfont.ttf   |  Bin 2052 -> 2172 bytes
 src/assets/css/iconfont/iconfont.woff  |  Bin 1376 -> 1492 bytes
 src/assets/css/iconfont/iconfont.woff2 |  Bin 944 -> 1096 bytes
 src/assets/css/mixin.styl              |    8 +
 src/assets/js/getData2.js              |  101 +-
 src/pages/shunhe/LogisticsProcess.vue  | 1680 ++++++++++--------------
 8 files changed, 786 insertions(+), 1052 deletions(-)
 delete mode 100644 src/assets/css/iconfont/iconfont.json

diff --git a/src/assets/css/iconfont.styl b/src/assets/css/iconfont.styl
index f4c4bae..3b75b12 100644
--- a/src/assets/css/iconfont.styl
+++ b/src/assets/css/iconfont.styl
@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 1255596 */
-  src: url('iconfont/iconfont.woff2?t=1620977303191') format('woff2'),
-       url('iconfont/iconfont.woff?t=1620977303191') format('woff'),
-       url('iconfont/iconfont.ttf?t=1620977303191') format('truetype');
+  font-family: "iconfont";
+  src: url('iconfont/iconfont.woff2') format('woff2'),
+       url('iconfont/iconfont.woff') format('woff'),
+       url('iconfont/iconfont.ttf') format('truetype');
 }
 
 @font-face {
@@ -25,4 +25,8 @@
 
 .icon-guanbi:before {
   content: "\e60f";
+}
+
+.icon_arrow:before {
+  content: '\e601'
 }
\ No newline at end of file
diff --git a/src/assets/css/iconfont/iconfont.json b/src/assets/css/iconfont/iconfont.json
deleted file mode 100644
index 34ac18f..0000000
--- a/src/assets/css/iconfont/iconfont.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "id": "1255596",
-  "name": "nl-hht-hl",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "2229060",
-      "name": "无信号",
-      "font_class": "no-signal",
-      "unicode": "e76b",
-      "unicode_decimal": 59243
-    },
-    {
-      "icon_id": "400034",
-      "name": "下拉",
-      "font_class": "htmal5icon03",
-      "unicode": "e626",
-      "unicode_decimal": 58918
-    },
-    {
-      "icon_id": "731140",
-      "name": "选择",
-      "font_class": "guanbi1",
-      "unicode": "e608",
-      "unicode_decimal": 58888
-    },
-    {
-      "icon_id": "4736203",
-      "name": "关闭",
-      "font_class": "guanbi",
-      "unicode": "e60f",
-      "unicode_decimal": 58895
-    }
-  ]
-}
diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf
index d19ae0d69deb508c110d24f379a84e2089fd95d5..a0a439843bdf4c32c5972949d0bdc94431d3b5ec 100644
GIT binary patch
delta 1218
zcmY*XOKclu5T5z>y&HQsWOwtd<Jid>94DzA+X*;{prv57%7s>;qCB#3+$3sZr;tE$
zaw@{Dhrn_{;sEqQg(`920-}Wj66yh|TtGa;<A4bgC&a6$iJ7&xhyJVi|8M4-Z{~mO
zu5riM8>m^u9|7<(0L+)x-1RTcW(UZ>L-zX8>h}3>cK^Nsz`Y5;vdd+6aVYxB!<73I
zS$>%U(huA#gg+)5TwdGQG6<0NcbbgVYRSd3uuu9u^3^qWYaKgam-sI7qZN0pTr;jr
zy$>MVq6SOr)fYD2{q8UgAWu@lF+h^;G<M)=o?HN$DRR%?n-PkZU%c|cbNbX@ptW*;
zhFfp@nXR>Pn+HxNR|Xd7{Yn(v0>O*n1%anZd){kU=!d%AYzo}>utQ1rwq)Ku#!t-$
z(WiiGq7<zvrOs2yQPPOCBCtBv^+p4rPBs0tSxux(&}oV1NFjO`*?-;+Q)+EZKHHq>
z+`g)1{+8>s3*Y>1b-iVN4viVu$DS5LvYYHPZ~!{8`EkL{=d$_S3`VdY?al~_I*QIj
zBJ0G5Vxw#tow4Kyo=l8zn3#H^mYPcrM6huGpM#@_{k?~8gpPED5kDG^Fx30Z2hBk<
zb3Fc7tfxD5wExp1`cSne#00&!D@WZ0fW~d^ExKcb2u#8`cnM%A%{lRyXqlaMr)^52
z6h_Om$1@Z8iF`KUa9Jl2@DVg?qC}ZKo1Q_=A&)*^-EP_i+P+O^AaVw$F`pwTXIg2}
zC!Ar7Il1<1zJSfb6YZwOtz1$>P1lRbR4Q4N6kU_#GwJb6I$uaDf~L16M#d5$Llx!B
z^l$QgQuL8$yK7fTpk41e^S}ryZK5Qrh)S~Ce0;Fmcr~Pm>LsJcneB^QX5)gc8gjCD
z^4h6ll5dk$T}YpP^5)#>!#@g(eS)s(vNd~d)|LqIeP#TFXF~7M6SAQmE^4~+=s<!=
zj5m~Bo@d7t{op<JjAcC3ZidwmPH9TmnzZbLe~|OO;x}s@cVCt+R)!A${b?|epf|uA
z#bW{H2`2+AfCiZW`~Tc@fK?cV69Lw!;yV3D$SYLUftLe}V8B%$mxy2xh7SXRBjWP_
z^Mt<+umCpv8eoy)2LV=L4nqOfz`@e-=gaO!c`>@M9bG9^E9a|~4R1`m=)EI4-oK*Z
oeJg(HU6Z159vO1TqX6>Oid$LQu5R+H?t&{WZMv0(75@_c2P~GrC;$Ke

delta 1108
zcmY*XTWAwe5S`hZ-A%W}R?;TXTAFN|L~PoowkAH(SbP=z5R_U)6y3II8=FT>BewOC
z;G<uD6!Yzeia#P&^hZJPNkLG-9~Ds)krY7@#DYS*b?#;hdUxl}nVB<lA9Lp_&Q(mh
zv+uTl0Kf|X(A}HRhF?x!nk4%-$?bvoSpVA2vrhroU9!&&Mzy{b*M9CJ?kAGqAUWhS
zY=ZE8lKR0!X0(z3alg=18Bg_UFo$8vzd?3cLK_`MJM5silWbQ~OGLAgF8vgMNF*UK
zoEphIzpA_ika@x$KuXOm<Nz#W8Z&wR8zSd$QU2ikq4Mx7loq+~pS*E!=AyO$Yb4VO
z0{7D3c_Od~$axiqM6>|@%3s6{)z+CIW6=XF2RV~SikHoQ!@7fMBNZSH%s_t93e`&!
zrGrR{v4~Kx7Rn3WnW2RRfPXPD_(0+nKRP323cMCdc}<wh4-0a(%wTmGv$1%=%IlEL
zNS7CdZ>r!e3P0G)P*Kbs@;#2jBs>P0*J0Ci1u`swD)2xPtb=x1(I?4{P%y+*1Vgr>
zWmB`VBiOpyVW%(T^?6yPeRZ(St4cQV)FOA)*)W87dU^LI71wM_AL&w8?r(dzB~T|e
zgl!wvSNogBQ^7!!Pu)Lq{JKMR(BBzZw>5}rc;~KtSM=R}yopc!?oA#H*8B+U^7z{A
z`knIDdZ|Iek6EQjYPP#;y`H^+migpThr{i3;+W{H38E+LR`pup>#}+3FmEHUd%_8R
zeh<1)*SE9u1kRGX7<(w(qDDgrdgKyhhxHx$>kiBbAWZ4auUz_NA<Ih`&w_0eo<TLN
zpiZ9@d$U!GHK>x6Zq2AiOc`oS%*bDFVhdrviA5-dHWN$a-)Le58lcm}rC@_Je?yiM
zT4xoUH!(s5OmQ5gfI#hfU<MckUYOWI_=AZ>u)}u~OHhH##0qqy&BUeP#h9`=9n~_?
zK3C6}E7qGz_NS5=CI3h|ib}pk_R+jo{+th4)sTn+GPIzG5|kuUjU%yvq!uq5%p|n<
V8lD<xl?RS#$(~q?RMh+q;V-dFz&Zc`

diff --git a/src/assets/css/iconfont/iconfont.woff b/src/assets/css/iconfont/iconfont.woff
index 31debf3715bff451c87dc99e355127fa234274e7..efd303d61717dd51bf20433b2ad41bd6ca90d592 100644
GIT binary patch
delta 1367
zcmW+#2UL?+6n=lgY62w6JWfEUED50uffOPedMrew0*Yini6bN+NTT2$OA^3Z4q;Tq
zpsXrknF1mzU_gc_=wVc*%nBIXpa=!&AMZKed-s0t-ErQ%ZxS<r)lCZY@c|G(M0EgQ
zmAgi=Sl0>mLNqE#&u@akqHzF#(h)lX*>ihB?Tuqj@_t41c?53&K-muqJ~uO?X;A>6
zhmd;&1de7#FUd@V1VBXtv9}>GRUbzSnXCjZ!kHqrHUc~zSx&MU%6s;Rictazbp!J(
z8W%~dLPm(42#g>dAc&>0q7jaYBu02t48DXU<FHR9Ak`NF0Eh@Y%0|Bub2K2bDvd^!
z$aD5XCNPmS6BGMoLN1plr$K&pw#DXj6ksfAvbmBsSuI+8TTL{9CB=IvOwtYd-_uts
zDPtm{EFo?>AjL40Z>>#{@3>fWSlUCX?P=sFs^fRv<t=QNaJrW2ALlr(GxH+<lME)k
z>^)TYCkN~EY#j9wo79erMT+4{94Jj}xIYLFFQ0UW=bYcaZu3_Jx$@MUjveoe3+S(#
zuJG~>V}^(@H|%VQcE0o|S`@=O9R}aE$g|yrdd9}0jz;}6y9>@GJ-FYWVnp^RHT#;m
z*JE&zUdC-VC-|Jjlead80|9DkX73!uX{;@HGPM+!78m&&cRB8zX&8<gzX%_S(J6d!
zq^WjLp~ru=6;d0a-w8{LUM^0RO)b}tOgv{UM?dVqu%7#B33LUI-TTh^d-73rfBf8Q
zCAcSTE6Hl8oc)J%WAkm4&7x?y!O(!${g<S3V+9yey4>wvpfj+6^QvLd<6fHYGPG3g
zst23<6d$0+T0UkpL&iHp7GXN-Qc7pYYyd&ug=kS=)^yY^IPrM-NSsS|A3a-f!N01(
zJ)PBQ6z;fQ6cNlG<ITeOmDx+HAFABu^(hW$a$xdj*^DcjRbYs{*)mr(skOs$fKwNB
z`pc_cYw@0*!hkbNQM~xNRcGfD76YaEuI>eA%gONz&dGUy_l=z?gq=GS-KDGRpA0KP
zPcIGDTzsckTHAF_;o@3JACjF==p~JQdJ3nS9?c+Z@c5U?GQu^^@7;p4Xd{_cYFW~b
z*5e!qRv)3sg1&O!&*gO{6P7<c!QHa84sdO}kY_-ovD|9{de;fi*N7+Idd{FmQK?{h
zpr-xs^a`ul4(8O_^5vc)EOyh<#&v7W?rmfnb+nG3E^uhaTt<fEn}c#d@ef-8ikvNm
z^ke||Vo)sPj7FtW_q75b1DlZON<lscv_&~w-~6bwGAcD1K;Ik9qCC_@8&o$m(4B&m
zafRX^V_V61Sa`i9OC{Glpw#}@FBayTyVi33q(Ox@3)O39ed`Cq34R04`!ln2{?&NJ
zJaxg3H{^--ZX6kAk2hc0-UZ&u($YTOpR*Z$XjYqT)gUk7<gMn&0?+AJ7iC=I6s%To
z&;+hdYz?DB`x@L{DNLf_?tH;lPpVyS4N*k4x~&|B8${}B8iUdejFat$YT;ETZ%VF^
z_MdVXm4-0;9+kf3W`3gU1iq1ydL1LL9864oO4;)2;3(s2^8I;d1L>oDFD+ih%urc(
z{%!3DS%S^Nol)`pKIUdkY7tS$ka*HW+h;Jwng_hR6Jk~_zg2Zi4?DJz7&u@5NV+p#
zXoF%UJUz1OUSBKEWq;<L$OTGbf>rF3e1Uy#c#l85W*SEttC9)^(AK|~Yo^rQE!Kg9
zy0g}xp&a%h<rCBSz((ygUntHHUl9w%dFM+^ejpN>>>lKr?Iv1?_cYlP2^Kl$ArQTy
IehcZ&|A!Yw_5c6?

delta 1250
zcmcb@{eVlP+~3WOfsp|SSQ8kyK{N-;L=p3PXCN!g=9cH(<lMvp1_s6sAU_jGZ#s8u
z?u7K5$}}MR3lK*Gaf^j}^O20y#1sYw<^Z5NT_84-S^6m=11Ja-YXI_PfLMjSiMcH!
zx1<6nHV4S(17Z;oAd!=w3{tlS$m9XzKX!~Zxrr4(i<x%-1>}KPfl-XXD=#rO6)1KC
zXsIg$15>VD$iLcx{NfUz>lJ`%9Dq3V%wnz^lQ|e2SW^-c{v4X@%cxXeXmdU-@5lWE
z0*CJ$xWFKi#&VL8fp0FaF+;_iw-XQYHYo78#xwFNs^uL#sd&TPpN}^=W1)=9A%D4r
z_PPA>35<J+G#H<_z1VeS>ci?wADCTVyBv9#wWj*)+Zwqa`<A=>e)Hw6qk75oHGgg$
zi%k=)s&f0^x=Z@-`L;B7Yu+cU5%sC!+kq~tm}5F&zyBczk>mGwx0%gQGCV5R!BV|-
zEhmTQ240Sg4*NyToX1uq7L{FKVPCBFFXE4VNlAdPx;b0&qZf}}y?OHF#8vIK-KY1K
z-~YYu^luprg|;thXPcN78}NyVEa2j0C`oDkHBY`x?bogUp2=KaPpPizetEl3SM^K%
zr0|V1*Kn$KFHFgLp&aM)W{bqR^=16qZu%_06kT@KW8FI4E0=yAx;gQ=n9MaxyPeB>
zy0%_hv##RAtJ!b&TJM{BoW16(v@ZAFGyS)>&1pL~|MAmIOZCUsJskC3xn0{<c6aB$
zhZ0NOj5?Q3OgZMfI?rI9>iv~=qHp<k#GSAdVBqGhe^L|s>fQr=p7&KxIF%Rzw@lIS
z`d!mpulG=t@zaTJ`QSg(V%p4%KCGKm?s0gD##iTC7FJA_6J1@!{&agB_SaBa$(nVk
z=c9vZaF)OdO|vr}tvWU?6l<AvBUv+;_sHw|CGmmXz|c)jNJ&UwNLn|)r~dKJ+<is`
zn++Nc%sqVlX#K=YF}Ac=g`)=#usmX9kZtDV0!If}11Mb_IB<x8$zjq&M$rvS47TA+
zLO{b36A}^}4>K^bFo*&bgFp^L6~hFELr{wnQa2<gq%$z8DLi9xVr%=KV8_hB-@up%
zbVzEyuis$<f!6q6>`R1Jtw^YEf5Mu?sPR{DbzVeB*7w+w`^)@hYjr9gUwehQK(6lq
zrv=lU2I~(V>a)$J9lyV)GTEQu&I5M2zWci0C)&msSr_q&?+{-XTrZF}A--jH#^cZ(
zu77=R95-HeD7PfBvibUsq;D<diTtuP9M=na{U2I=)qlwLGkQm-^&hV77e2l^RB!hz
zE__F?yZ*Q1Vfu68Rz7t+y6~jZWXt_cGvnS*YF&Hj)tv0;BWl6T3*tS4=VnIV4SsXo
z`MHv4<m6SHtF1hHPOZK9>H@3u^G|{6#XIF%)SgBp|J!zqsjrZ=Rh6&D&`Bbt<J5~6
z)}d)%)^Bt^6jvQ)d-i!rw8)kJ#jT7?U(Ux=1n=5(snW{7(KcQ>sI){o@ASMWCKKb%
zdJ1iFio3Qg#OW2IS!#HnU{%b;PJ4}XkN*suQF$kTAr1=aqy`2(wl@t^Cw5MpIk9!(
y)QP=~#`^KwEsSmT4cpZhtC$-eH!-%fKYw6`?Oqc@ea*`gc%6(57#I{yc|8GvlLSrx

diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2
index f9b361d1d545ec87b1e7878f7d73ee25fdfc77f1..9bf17007480fdedbe504c72109c8d609db86aa89 100644
GIT binary patch
literal 1096
zcmV-O1h@NlPew8T0RR9100c+?3jhEB00?{l00aC00RR9100000000000000000000
z0000SR0d!GgA@vcG=p{lHUcCA5DN+b1Rw>3X9q$Xa0gLTPLgC_VN-^CkrZ1yIZ!-|
z#)RM@7mwt@&2k!rAVDBQ@Bzfb*Bbi%?%st_G1$0Fbhv=3D!LOHTh$6%BT2IBcqCnY
z^RE5&RU!E>lk_zqC);tHzTH0N6-vRoH=0&!R1cL#=on)@Xon@OF9pDrPHOu(|KyGR
zph}ysc6tA}S2b&iJ_`WMu{0O_VDSJ2Y>lP0daqtl@1VQEfxhw~0_`?*Gw%&g#(@8v
zp(@B=WtRq7Zk&q(1Dsr~bmWFsp&mN0h({{YgLJ^d=;z}f*a{?7W-oPcZ-@tXKmF{<
zmklPr2baqgz{Uv`GFA?zjl13E>nurlg++VQY*uT4S`pGu)6YQDusADHbKrk?tw=&9
zYIb%f*nyGEPad7b&k%_uJy7B-u|?VnGoIrwn>Oi-gi4xEjSncu$}$C$O%%Dj3dtbs
z-MoL^jc*%{cV8LA)>g#*$OsixF*4EtVMjKcZlNlgz!vXw{29lde44T$&8U+9HTg;s
zF9GDmsVlnvj9&~yEqM8Uy=91J%;!l42+cJqXxMk#lovW$TOoA6e;8>A!N8>4OZy2$
zRkT1_(uz=}{HFh;G93m+vXx9!@c8((RE%L>U!NvCUdiw8+gv$G`25svmAh3P;p~k_
zdTF{PdfwA&!PmB)`OPz%_iMNFvlYZ;{AFV3JKA_J(BuMobyZ+XtB3)8b#r`<D3*;V
zk4-B(g^aW_SII<u^)RM*Yt%-x66cz6cx_#uaXW|h=+RdX`)Z8JWU$&~><K&iPu0mF
z(}e%BV{r1nEo!E0O2^SRcUPZ}Z)bR0;}clI!VsC<%UncD2P|C&ias<`V9(snuwkF0
zp0%9S#1lYmb9DQ-=wCcDLt0>n|Noz#A^rUS-_BA{CbjiH7F|_PNz$7ZA#|vAertXK
zH0QpIZrwLOzW={*djGH)I{!ljeDUsa<Zdotc%)T=vER1j=0L<^cqpZb?{WX2$ORjB
zFjKpByx@H3_pyX@U~rJoTHr89T1-IJY6@NOOHk>s1+`YY&~Dk#@D2lX7E#(TXBR-|
zbq-0lCy@2JM;H7%REB**t=B)aI}6`r9p+*K1ThrxkX?o%r>WSL(Wuf05>hfl>H-Nw
z3=#TZU3G0aHiA?{=ICN92=$a=h>51aVY(cWWew^?n@1e2o}*N6uc^UJcd6zy1q>h%
z28Hk-)-p)M(Wr2MOpCuS0uiLh7-S$iVI&O9LX|^xs?`oakBHSlMGsQlus~3cqA+fT
z5gG+FY#0&Q32Pv|x!yd4Lsgrb5Y)A+K}dM0xO#i3a(T<3oxOXB6gf&%S}#OK6_&M>
ORc2VmE~FTh6#)R^o%N~!

literal 944
zcmV;h15f;SPew8T0RR9100Xc93jhEB00;yC00UwG0RR9100000000000000000000
z0000SR0dW6gE9((1cFfkHUcCA6blRh1Rw>3Z3k5w{07J#k|Y%Z2^3U;DsTr-ir{HK
z+PvNUe&Xq_sb<46i9}RM#H%D|RV+~w*(?5&f7V;bv&rtASM<lsM?8Pdu7v73QI#s9
zO;UyV|8qHQErI#%EXTDM*HJI9;(!7hYf_X2TtFwv4P!SEG{i>)db`TFUZ`v7fxvql
zGeazQpgBk?<DMdM;B6X}hRV<ib;ZIWenLfh=K2tL&VL_2WQ8|Lm4S(uZ`6u#^`rNv
zyKYOJXRcBlh^F&{Q6gh=JLY&&>Ac4+N^Ww~d)T=<0eY<@eQrOFe_Z}#a60j&2U7R&
z509)!f~bM=5pbfU3ZK0(LgsUjuu3&aMo4@yh@a)43iKFo4R`^t7G2W_A+=32(fO5J
z&xe%uvZplaMSma5x$>rY@MT5jO;_rN*VoKE<F}#rUg^2g^4EQ@N0#o}aA4W~^?QeJ
zHNNVMD1YAf+ILVbRs<5VK;#>+LF?aM*DbuKZ`=C4OCx%FwzT#~_4jTa@R^Z)i*D@h
zMU|D|P<t`n_ESmk?g*bfSdx3Cr8@AhzIOkq(09c<51mSzZ%*s|{SJo@_R;j&8T&Sd
z5FJUDbW+{imuqU`dm;RFE9yud*z@7g=d<Wiusi*q%1cL1J)Qd0xn#__7z)oEj*Ggv
z`UiFgD7&CvtGnnBiiZW<MVkJC3!YM*${+JgKz`}E0D$}<9R=h|uJ`^MHvV_9kB^u9
zYW)iMbmL7FHx|QFtwd+xUsCB<S9}RDRmH8vLbtSX#EW|s|B$MG<DK$u8tv?Tr$cKt
zfuylu&stw3;|qBcDuY9)wT_{;p?>*b8s#QRhjptY2osJ#GUh#G6CU9U`7KoD{D9g-
zxIynqgl#xj4#l^cVvb=E@$--(Sj+@jn6Iep!qO}wN7E9{?!#15A}BL0BcG|qW=yA;
zqRp1F7$b;KiwV_9$6=$<f~?e{Vu7W}j9H7)(@E8f(gceMe4R&O90n61ym=6Xz`~5s
z){JlA`&}@}EJhsKfa(eM!6=Q=Ig%+&MhASo(%cDkE6-?VlVo8S0wE|16QoY+hZz}J
zAlB-BDontnkq5-BiloCvq^mM*d9~>sw?PkFP(_LyC90@(4=gh^MKW_nf0>!6BKIK%
SWn_Cvvp6%aWO{M~0001s6S_M9

diff --git a/src/assets/css/mixin.styl b/src/assets/css/mixin.styl
index d940186..60b45f3 100644
--- a/src/assets/css/mixin.styl
+++ b/src/assets/css/mixin.styl
@@ -6,6 +6,14 @@ $blue = #6798ef
 $gray = #c9c9c9
 $fc1 = #323232
 
+.green
+  background-color #11ff0d
+.yellow
+  background-color #fdfd0f
+.gray
+  background-color #bfbfbf
+.red
+  background-color #ff1016
 
 //宽高
 _wh(w, h)
diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 39acfde..80289e0 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -4,25 +4,112 @@ import {post, post1} from '@js/http.js'
 export const queryDevice = (url) => post1(url + '/api/screen/pdm/queryDevice', {})
 
 /** 1.1大屏左一 */
-export const planReached = (id) => post('api/bigscreen/product/planReached', {})
+// export const planReached = (id) => post('api/bigscreen/product/planReached', {})
+export const planReached = (id) => {
+  let res = {
+    code: '1',
+    dayResult: {
+      jo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
+      jo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
+      jo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'}
+    },
+    monthResult: {
+      joo1: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
+      joo2: {plan_qty: '100', real_qty: '200', finish_rate: '200'},
+      joo3: {plan_qty: '100', real_qty: '200', finish_rate: '200'}
+    }
+  }
+  return res
+}
 
 /** 1.2大屏左二 */
-export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {})
+// export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {})
+export const worksectionHarvest = (id) => {
+  let res = {
+    code: '1',
+    result: [
+      {
+        'device_name': '运行',
+        'failure': 0,
+        'shutdown': 0,
+        'standby': 0,
+        'running': 5
+      },
+      {
+        'device_name': '暂停',
+        'failure': 0,
+        'shutdown': 0,
+        'standby': 1,
+        'running': 0
+      },
+      {
+        'device_name': '停机',
+        'failure': 0,
+        'shutdown': 2,
+        'standby': 0,
+        'running': 0
+      },
+      {
+        'device_name': '故障',
+        'failure': 1,
+        'shutdown': 0,
+        'standby': 0,
+        'running': 0
+      }
+    ]
+  }
+  return res
+}
 
 /** 1.3大屏左三 */
-export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {})
+// export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {})
+export const monthHarvest = (id) => {
+  let res = {
+    code: '1',
+    result: [{date: '混料', real_qty: '10', rate: '10'}, {date: '压制', real_qty: '8', rate: '15'}, {date: '干燥', real_qty: '3', rate: '2'}, {date: '分拣', real_qty: '7', rate: '5'}]
+  }
+  return res
+}
 
 /** 1.4大屏右一 */
-export const output = (id) => post('api/bigscreen/product/output', {})
+// export const output = (id) => post('api/bigscreen/product/output', {})
+export const output = (id) => {
+  let res = {
+    code: '1',
+    result: {finish_rate: '80', plan_qty: '10', real_qty: '20', sum_qty: '100', normal_qty: '20', delayed_qty: '10'}
+  }
+  return res
+}
 
 /** 1.5大屏右二 */
-export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {})
+// export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {})
+export const topHarvest = (id) => {
+  let res = {
+    code: '1',
+    result: [{sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}, {sort: '1', material_spec: 'aa', real_qty: '10'}]
+  }
+  return res
+}
 
 /** 1.6大屏右三 */
-export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {})
+// export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {})
+export const monthOrder = (id) => {
+  let res = {
+    code: '1',
+    result: [{material_spec: '1', real_qty: '10'}]
+  }
+  return res
+}
 
 /** 1.7大屏中一 */
-export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {})
+// export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {})
+export const productSchedule = (id) => {
+  let res = {
+    code: '1',
+    result: [{a1: 'hn01', a2: 'wl01', a3: '1号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号混料', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '1号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '2号砖', a4: '1.05吨'}, {a1: 'hn01', a2: 'wl01', a3: '3号砖', a4: '1.05吨'}]
+  }
+  return res
+}
 
 /** 1.8大屏中二 */
 export const unfinishOrder = (id) => post('api/bigscreen/product/unfinishOrder', {})
diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue
index cec78a4..8166a3f 100644
--- a/src/pages/shunhe/LogisticsProcess.vue
+++ b/src/pages/shunhe/LogisticsProcess.vue
@@ -1,121 +1,17 @@
 <template>
     <section class="bg">
-      <t-header title="顺和大屏监控">
-        <p class="p1" @click="toJump">海亮纯铜精密件智能车间设备监控中心</p>
+      <t-header title="顺和大屏监控——物流工艺">
+        <div class="pages">
+          <router-link to="/setup">生产统计</router-link>
+          <router-link to="/setup">仓储监控</router-link>
+          <router-link to="/setup">设备监控</router-link>
+        </div>
       </t-header>
       <div class="container">
         <div class="left_wrap">
           <div class="item_wrap">
             <div class="item_tip">
-              <div class="item_tip_left" style="width: 40%">计划达成</div>
-              <div class="item_tip_right" style="width: 60%">
-                <span :class="{'span1': swiper === true}">日计划达成</span><span :class="{'span1': swiper === false}">/月计划达成</span>
-              </div>
-            </div>
-            <div class="swiper_wrap">
-              <div class="swiper_wrap_con">
-                <div v-show="swiper === false" class="swiper_item">
-                <!-- <div v-if="swiper === false" class="swiper_item"> -->
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">弯头工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo1.plan_qty === '' ? 0 : jo1.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo1.real_qty === '' ? 0 : jo1.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{jo1.finish_rate === '' ? 0 : jo1.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成率</p>
-                    </div>
-                  </div>
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">综合工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo2.plan_qty === '' ? 0 : jo2.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo2.real_qty === '' ? 0 : jo2.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{jo2.finish_rate === '' ? 0 : jo2.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成率</p>
-                    </div>
-                  </div>
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">成品工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo3.plan_qty === '' ? 0 : jo3.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{jo3.real_qty === '' ? 0 : jo3.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{jo3.finish_rate === '' ? 0 : jo3.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">日完成率</p>
-                    </div>
-                  </div>
-                </div>
-                <div v-show="swiper === true" class="swiper_item">
-                <!-- <div v-else class="swiper_item"> -->
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">弯头工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo1.plan_qty === '' ? 0 : joo1.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo1.real_qty === '' ? 0 : joo1.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{joo1.finish_rate === '' ? 0 : joo1.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成率</p>
-                    </div>
-                  </div>
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">综合工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo2.plan_qty === '' ? 0 : joo2.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo2.real_qty === '' ? 0 : joo2.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{joo2.finish_rate === '' ? 0 : joo2.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成率</p>
-                    </div>
-                  </div>
-                  <div class="item_content_1_inner">
-                    <div class="item_content_1_inner_1">成品工段</div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo3.plan_qty === '' ? 0 : joo3.plan_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月计划量</p>
-                    </div>
-                    <div class="item_content_1_inner_2 item_content_1_inner_2_bg">
-                      <p class="item_content_1_inner_2_p1">{{joo3.real_qty === '' ? 0 : joo3.real_qty}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成量</p>
-                    </div>
-                    <div class="item_content_1_inner_2">
-                      <p class="item_content_1_inner_2_p1">{{joo3.finish_rate === '' ? 0 : joo3.finish_rate}}</p>
-                      <p class="item_content_1_inner_2_p2">月完成率</p>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_tip">
-              <div class="item_tip_left">近一周工段产量</div>
+              <div class="item_tip_left">当前设备情况</div>
             </div>
             <div class="item_content_1">
               <div id="echart_d1" style="width: 100%; height: 100%"></div>
@@ -123,48 +19,227 @@
           </div>
           <div class="item_wrap">
             <div class="item_tip">
-              <div class="item_tip_left">近30天产量走势</div>
+              <div class="item_tip_left">月故障统计</div>
             </div>
-            <div class="item_content_1">
+            <div class="item_content_1" style="padding-bottom: 0">
               <div id="echart_d2" style="width: 100%; height: 100%"></div>
             </div>
           </div>
         </div>
         <div class="center_wrap">
-          <div class="item_wrap_2">
-            <div class="item_tip item_tip_2">
-              <div class="item_tip_left">今日排产生产进度跟踪</div>
+          <div class="status_wrap">
+            <div class="status_item">
+                <div class="status_tip green"></div>
+                <div class="status_name">运行</div>
+            </div>
+            <div class="status_item">
+                <div class="status_tip yellow"></div>
+                <div class="status_name">暂停</div>
+            </div>
+            <div class="status_item">
+                <div class="status_tip gray"></div>
+                <div class="status_name">停机</div>
+            </div>
+            <div class="status_item">
+                <div class="status_tip red"></div>
+                <div class="status_name">故障</div>
+            </div>
+          </div>
+          <div class="machine_block machine_block_1"></div>
+          <div class="machine_block machine_block_2"></div>
+          <div class="machine_block machine_block_3"></div>
+          <div class="machine_block machine_block_4"></div>
+          <div class="machine_block machine_block_5"></div>
+          <div class="machine_block machine_block_6"></div>
+        </div>
+        <div class="right_wrap">
+          <div class="item_wrap">
+            <div class="item_tip">
+              <div class="item_tip_left">当日工序生产统计</div>
+            </div>
+            <div class="item_content_1">
+              <div class="item_inner_wrap">
+                <div class="item_inner_h1">
+                  <div class="item_inner_h1_l">混料</div>
+                  <div class="item_inner_h1_r">
+                    <div class="process_wrap">
+                      <div class="process_rate" :style="{'width': Number(objL1.delayed_qty) * 100 / Number(objL1.normal_qty) + '%' }"></div>
+                    </div>
+                  </div>
+                </div>
+                <div class="item_inner_h2">
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color2"></i></span>
+                      <span>计划量</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.normal_qty}}</span>
+                      <span>吨</span>
+                    </div>
+                  </div>
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color1"></i></span>
+                      <span>已生产</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.delayed_qty}}</span>
+                      <span>吨</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="item_inner_wrap">
+                <div class="item_inner_h1">
+                  <div class="item_inner_h1_l">困料</div>
+                  <div class="item_inner_h1_r">
+                    <div class="process_wrap">
+                      <div class="process_rate" :style="{'width': Number(objL1.delayed_qty) * 100 / Number(objL1.normal_qty) + '%' }"></div>
+                    </div>
+                  </div>
+                </div>
+                <div class="item_inner_h2">
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color2"></i></span>
+                      <span>静置中</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.normal_qty}}</span>
+                      <span>吨</span>
+                    </div>
+                  </div>
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color1"></i></span>
+                      <span>已完成</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.delayed_qty}}</span>
+                      <span>吨</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="item_inner_wrap">
+                <div class="item_inner_h1">
+                  <div class="item_inner_h1_l">压制</div>
+                  <div class="item_inner_h1_r">
+                    <div class="process_wrap">
+                      <div class="process_rate" :style="{'width': Number(objL1.delayed_qty) * 100 / Number(objL1.normal_qty) + '%' }"></div>
+                    </div>
+                  </div>
+                </div>
+                <div class="item_inner_h2">
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color2"></i></span>
+                      <span>计划量</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.normal_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color1"></i></span>
+                      <span>已生产</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.delayed_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="item_inner_wrap">
+                <div class="item_inner_h1">
+                  <div class="item_inner_h1_l">干燥</div>
+                  <div class="item_inner_h1_r">
+                    <div class="process_wrap">
+                      <div class="process_rate" :style="{'width': Number(objL1.delayed_qty) * 100 / Number(objL1.normal_qty) + '%' }"></div>
+                    </div>
+                  </div>
+                </div>
+                <div class="item_inner_h2">
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color2"></i></span>
+                      <span>计划量</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.normal_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color1"></i></span>
+                      <span>已生产</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.delayed_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="item_inner_wrap">
+                <div class="item_inner_h1">
+                  <div class="item_inner_h1_l">分拣</div>
+                  <div class="item_inner_h1_r">
+                    <div class="process_wrap">
+                      <div class="process_rate" :style="{'width': Number(objL1.delayed_qty) * 100 / Number(objL1.normal_qty) + '%' }"></div>
+                    </div>
+                  </div>
+                </div>
+                <div class="item_inner_h2">
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color2"></i></span>
+                      <span>计划量</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.normal_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                  <div class="item_inner_h2_inner">
+                    <div class="item_inner_h2_inner_l">
+                      <span><i class="color1"></i></span>
+                      <span>已生产</span>
+                    </div>
+                    <div class="item_inner_h2_inner_r">
+                      <span>{{objL1.delayed_qty}}</span>
+                      <span>万块</span>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_tip">
+              <div class="item_tip_left"></div>
             </div>
             <div class="item_content_2">
               <div class="scroll_wrap">
                 <ul class="scroll_tab_1">
-                  <li>工单号</li>
-                  <li>物料编码</li>
-                  <li>物料规格</li>
-                  <li>计划完成</li>
-                  <li>实际完成</li>
-                  <li>差距</li>
-                  <li>完成率</li>
-                  <li>进度</li>
+                  <li>生产设备</li>
+                  <li>物料号</li>
+                  <li>物料名称</li>
+                  <li>完成重量</li>
                 </ul>
                 <div class="scroll_container_1">
                   <vue-seamless-scroll :data="array1" :class-option="defaultOption1">
                     <ul class="scroll-ul_1">
                       <li v-for="(e, i) in array1" :key="i">
-                        <div class="scroll-ul_1_div">{{e.produceorder_code}}</div>
-                        <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                        <div class="scroll-ul_1_div">{{e.material_spec}}</div>
-                        <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                        <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                        <div class="scroll-ul_1_div">{{e.gap_qty}}</div>
-                        <div class="scroll-ul_1_div">{{e.finish_rate | numFixed(1)}}%</div>
-                        <div class="scroll-ul_1_div">
-                          <div class="progress_line_wrap">
-                            <div class="progress_dot_wrap">
-                              <div class="progress_dot" :style="{'left': Number(e.finish_rate) + '%'}"></div>
-                            </div>
-                          </div>
-                        </div>
+                        <div class="scroll-ul_1_div">{{e.a1}}</div>
+                        <div class="scroll-ul_1_div">{{e.a2}}</div>
+                        <div class="scroll-ul_1_div">{{e.a3}}</div>
+                        <div class="scroll-ul_1_div">{{e.a4}}</div>
                       </li>
                     </ul>
                 </vue-seamless-scroll>
@@ -172,149 +247,6 @@
               </div>
             </div>
           </div>
-          <div class="item_wrap_2 item_wrap_3">
-            <div class="item_tip item_tip_2">
-              <div class="item_tip_left">今日未完成的订单</div>
-            </div>
-            <div class="item_content_2">
-              <div class="scroll_wrap">
-                <ul class="scroll_tab_1 scroll_tab_2">
-                  <li>订单号</li>
-                  <li>产品编号</li>
-                  <li>产品规格</li>
-                  <li>订单数量</li>
-                  <li>实际完成</li>
-                  <li>计划完成日期</li>
-                </ul>
-                <div class="scroll_container_1">
-                  <vue-seamless-scroll :data="array2" :class-option="defaultOption1">
-                    <ul class="scroll-ul_1 scroll-ul_2">
-                      <li v-for="(e, i) in array2" :key="i">
-                        <div class="scroll-ul_1_div">{{e.produceorder_code}}</div>
-                        <div class="scroll-ul_1_div">{{e.material_code}}</div>
-                        <div class="scroll-ul_1_div">{{e.material_spec}}</div>
-                        <div class="scroll-ul_1_div">{{e.plan_qty}}</div>
-                        <div class="scroll-ul_1_div">{{e.real_qty}}</div>
-                        <div class="scroll-ul_1_div">{{e.date}}</div>
-                      </li>
-                    </ul>
-                </vue-seamless-scroll>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="right_wrap">
-          <div class="item_wrap">
-            <div class="item_tip">
-              <div class="item_tip_left">今日产量</div>
-            </div>
-            <div class="item_content_3">
-              <div class="right_1_up">
-                <div class="right_1_up_left">
-                  <div class="echart_d3_wrap">
-                    <div id="echart_d3" style="width: 100%; height: 100%"></div>
-                  </div>
-                </div>
-                <div class="right_1_up_right">
-                  <div class="right_1_up_right_item">
-                    <p class="right_1_up_p1">计划产量</p>
-                    <p class="right_1_up_p2">{{objL1.plan_qty}}<span>PCS</span></p>
-                  </div>
-                  <div class="right_1_up_right_item">
-                    <p class="right_1_up_p1">实际产量</p>
-                    <p class="right_1_up_p2">{{objL1.real_qty}}<span>PCS</span></p>
-                  </div>
-                </div>
-              </div>
-              <div class="right_1_down">
-                <div class="right_1_down_inner_1">
-                  <div>工单总数：</div>
-                  <div>{{objL1.sum_qty}}个</div>
-                </div>
-                <div class="right_1_down_inner_2">
-                  <div :style="{'width': Number(objL1.normal_qty) * 100 / (Number(objL1.normal_qty) + Number(objL1.delayed_qty)) + '%' }"></div>
-                  <div :style="{'width': Number(objL1.delayed_qty) * 100 / (Number(objL1.normal_qty) + Number(objL1.delayed_qty)) + '%'}"></div>
-                </div>
-                <div class="right_1_down_inner_3">
-                  <div class="right_1_down_inner_3_i">
-                    <div class="right_1_down_inner_3_l">
-                      <span><i class="color1"></i></span>
-                      <span>正常工单</span>
-                    </div>
-                    <div class="right_1_down_inner_3_r">
-                      <span>{{objL1.normal_qty}}</span>
-                      <span>个</span>
-                    </div>
-                  </div>
-                  <div class="right_1_down_inner_3_i">
-                    <div class="right_1_down_inner_3_l">
-                      <span><i class="color2"></i></span>
-                      <span>延期工单</span>
-                    </div>
-                    <div class="right_1_down_inner_3_r">
-                      <span>{{objL1.delayed_qty}}</span>
-                      <span>个</span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_tip">
-              <div class="item_tip_left">今日TOP10产量</div>
-            </div>
-            <div class="item_content_4">
-              <vue-seamless-scroll :data="array3" :class-option="defaultOption3">
-                <ul class="scroll-ul_2">
-                  <li v-for="(e, i) in array3" :key="i">
-                    <div class="scroll-ul_2_div_1"><span>{{e.sort}}</span></div>
-                    <div class="scroll-ul_2_div_2">{{e.material_spec}}</div>
-                    <div class="scroll-ul_2_div_3">
-                      <span>{{e.real_qty}}</span><span>产量</span>
-                    </div>
-                  </li>
-                </ul>
-              </vue-seamless-scroll>
-            </div>
-          </div>
-          <div class="item_wrap">
-            <div class="item_tip">
-              <div class="item_tip_left">近30天生产订单分布</div>
-            </div>
-            <div class="item_content_5">
-              <div class="item_5_l">
-                <div class="item_5_l_1">
-                  <div id="echart_d4" style="width: 100%; height: 100%"></div>
-                </div>
-                <div class="item_5_l_2">
-                  <div class="right_1_down_inner_3_i" v-for="(e, i) in arrR1.slice(0,3)" :key="i">
-                    <div class="right_1_down_inner_3_l">
-                      <span><i :style="{'background-color': e.color}"></i></span>
-                      <span>{{e.material_spec}}</span>
-                    </div>
-                    <div class="right_1_down_inner_3_r">
-                      <span>{{e.real_qty}}</span>
-                      <span>个</span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div class="item_5_r">
-                <div class="right_1_down_inner_3_i"  v-for="(e, i) in arrR1.slice(3,10)" :key="i">
-                  <div class="right_1_down_inner_3_l">
-                    <span><i :style="{'background-color': e.color}"></i></span>
-                    <span>{{e.material_spec}}</span>
-                  </div>
-                  <div class="right_1_down_inner_3_r">
-                    <span>{{e.real_qty}}</span>
-                    <span>个</span>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
       <section class="bottom"></section>
@@ -323,7 +255,7 @@
 
 <script>
 import THeader from '@components/header.vue'
-import {planReached, worksectionHarvest, monthHarvest, productSchedule, unfinishOrder, output, topHarvest, monthOrder} from '@js/getData2.js'
+import {worksectionHarvest, monthHarvest, productSchedule, output} from '@js/getData2.js'
 export default {
   name: 'LogisticsProcess',
   components: {
@@ -331,63 +263,24 @@ export default {
   },
   data () {
     return {
-      setTime: null,
       iTime: this.$store.getters.setTime1,
       interTime: this.$store.getters.setTime,
       timer1: null,
       timer2: null,
-      timer3: null,
       timeOut1: null,
-      swiper: false,
       myCharts1: '',
       myCharts2: '',
-      myCharts3: '',
-      myCharts4: '',
-      jo1: {},
-      jo2: {},
-      jo3: {},
-      joo1: {},
-      joo2: {},
-      joo3: {},
+      arrL1: [],
       arrL2: [],
-      arrL3: [],
       array1: [],
-      array2: [],
-      array3: [],
-      objL1: {},
-      arrR1: [],
-      docState: 'saved'
+      objL1: {}
     }
   },
   computed: {
     defaultOption1 () {
       return {
         step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 7, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    },
-    defaultOption2 () {
-      return {
-        step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 7, // 开始无缝滚动的数据量 this.dataList.length
-        hoverStop: true, // 是否开启鼠标悬停stop
-        direction: 1, // 0向下 1向上 2向左 3向右
-        openWatch: true, // 开启数据实时监控刷新dom
-        singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
-        singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
-        waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
-      }
-    },
-    defaultOption3 () {
-      return {
-        step: 0.4, // 数值越大速度滚动越快
-        limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
+        limitMoveNum: 18, // 开始无缝滚动的数据量 this.dataList.length
         hoverStop: true, // 是否开启鼠标悬停stop
         direction: 1, // 0向下 1向上 2向左 3向右
         openWatch: true, // 开启数据实时监控刷新dom
@@ -399,18 +292,13 @@ export default {
   },
   mounted () {
     this.refresh()
-    this.setTime = setTimeout(() => {
-      this.$router.push('/devicescreen')
-    }, this.iTime)
   },
   beforeDestroy () {
     this.$once('hook:beforeDestroy', () => {
       clearInterval(this.timer1)
       clearInterval(this.timer2)
-      clearInterval(this.timer3)
       clearInterval(this.interTime)
       clearInterval(this.timeOut1)
-      clearTimeout(this.setTime)
     })
   },
   methods: {
@@ -418,13 +306,9 @@ export default {
       this.$router.push('/devicescreen')
     },
     initData () {
-      this._planReached()
       this._worksectionHarvest()
       this._productSchedule()
       this._output()
-      this._unfinishOrder()
-      this._topHarvest()
-      this._monthOrder()
     },
     refresh () {
       this.initData()
@@ -437,16 +321,25 @@ export default {
       }, this.iTime)
     },
     setEchart1 () {
-      let date = []
-      let data1 = []
-      let data2 = []
-      let data3 = []
-      this.arrL2.map(e => {
-        date.push(e.date)
-        data1.push(e.elbow_qty)
-        data2.push(e.comprehensive_qty)
-        data3.push(e.comprehensive_qty)
+      let colors = ['#30EBC9', '#E2BB0E', '#516282', '#F96700']
+      let status = ['运行', '暂停', '停机', '故障']
+      let barName = []
+      let data = []
+      let running = []
+      let standby = []
+      let shutdown = []
+      let failure = []
+      this.arrL1.map(el => {
+        barName.push(el.device_name)
+        running.push(el.running)
+        standby.push(el.standby)
+        shutdown.push(el.shutdown)
+        failure.push(el.failure)
       })
+      data.push(running)
+      data.push(standby)
+      data.push(shutdown)
+      data.push(failure)
       let option = {
         grid: {
           top: 50,
@@ -456,7 +349,6 @@ export default {
           containLabel: true
         },
         legend: {
-          icon: 'rect',
           textStyle: {
             color: '#fff',
             fontSize: 14,
@@ -465,8 +357,9 @@ export default {
           itemGap: 30.86,
           itemWidth: 14.16,
           itemHeight: 7.38,
-          data: [{name: '弯头工段', itemStyle: {color: '#0E90FD'}}, {name: '综合工段', itemStyle: {color: '#33CCCC'}}, {name: '成品工段', itemStyle: {color: '#EAAD24'}}]
+          data: status
         },
+        color: colors,
         xAxis: {
           type: 'category',
           axisTick: {
@@ -484,17 +377,16 @@ export default {
             textStyle: {
               color: '#8FABBF',
               fontSize: 16
-            },
-            rotate: 50
+            }
           },
-          data: date
+          data: barName
         },
         yAxis: {
           type: 'value',
           axisLine: {
             show: false
           },
-          splitNumber: 2,
+          // splitNumber: 2,
           axisTick: {
             show: false
           },
@@ -513,9 +405,184 @@ export default {
             }
           }
         },
+        series: []
+      }
+      for (let j = 0; j < status.length; j++) {
+        option.series.push({
+          name: status[j],
+          type: 'bar',
+          stack: '总数',
+          barWidth: '20',
+          label: {
+            show: false,
+            position: 'insideRight'
+          },
+          data: data[j]
+        })
+      }
+      let echart = document.getElementById('echart_d1')
+      if (this.myCharts1 !== '') {
+        this.myCharts1.dispose()
+      }
+      if (echart !== null) {
+        this.myCharts1 = this.$echarts.init(echart)
+        this.myCharts1.setOption(option)
+        window.addEventListener('resize', () => {
+          this.myCharts1.resize()
+        })
+      }
+    },
+    setEchart2 () {
+      let date = []
+      let qty = []
+      let barData = []
+      const legendData = ['故障次数', '平均次数']
+      this.arrL2.map(el => {
+        date.push(el.date)
+        qty.push(el.real_qty)
+        barData.push(el.rate)
+      })
+      let option = {
+        grid: {
+          top: 50,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'none'
+          },
+          position: function (point, params, dom, rect, size) { // 提示框位置
+            let x = 0
+            let y = 0
+            // 提示框定位
+            if (point[0] + size.contentSize[0] < size.viewSize[0]) {
+              x = point[0]
+            } else if (point[0] > size.contentSize[0]) {
+              x = point[0] - size.contentSize[0]
+            } else {
+              x = '30%'
+            }
+            if (point[1] > size.contentSize[1]) {
+              y = point[1] - size.contentSize[1]
+            } else if (point[1] + size.contentSize[1] < size.viewSize[1]) {
+              y = point[1]
+            } else {
+              y = '30%'
+            }
+            return [x, y]
+          },
+          formatter: params => {
+            return `
+            <div style="font-size: 14px;font-family: Source Han Sans CN-Medium;font-weight: 500;color: #FFFFFF;margin-bottom:12px;">${params[0].name}</div>
+            <div style="font-size: 14px;font-family: Source Han Sans CN-Medium;font-weight: 500;color: #FFFFFF;margin-bottom:4px;">${legendData[0]}：${params[0].value}次</div>
+            <div style="font-size: 14px;font-family: Source Han Sans CN-Medium;font-weight: 500;color: #FFFFFF;margin-bottom:4px;">${legendData[1]}：${params[1].value}次</div>`
+          },
+          extraCssText: 'opacity: 0.8;background-color:#050F1B;padding:16px;box-shadow: 1px 6px 15px 1px rgba(0,0,0,0.13);border-radius: 4px;filter: blur(undefinedpx);border:none;'
+        },
+        legend: {
+          textStyle: {
+            color: '#fff',
+            fontSize: 14,
+            lineHeight: 14
+          },
+          itemGap: 30.86,
+          itemWidth: 14.16,
+          itemHeight: 7.38,
+          data: legendData
+        },
+        // dataZoom: [
+        //   {
+        //     show: false, // 为true滚动条出现
+        //     type: 'slider', // type:'inside'，滚动条在最下面，鼠标点击滚动
+        //     startValue: 0, // 从头开始。
+        //     endValue: 9 // end百分比显示范围，endValue具体显示几个数值
+        //   }
+        // ],
+        xAxis: {
+          type: 'category',
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              width: 2,
+              color: '#8FABBF'
+            }
+          },
+          axisLabel: {
+            interval: 0,
+            textStyle: {
+              color: '#8FABBF',
+              fontSize: 16
+            }
+            // rotate: 50
+          },
+          data: date
+        },
+        yAxis: [{
+          type: 'value',
+          name: '次数',
+          boundaryGap: ['0%', '20%'],
+          alignTicks: true,
+          nameTextStyle: {
+            color: '#82AFC6',
+            fontSize: 13,
+            fontFamily: 'Source Han Sans CN-Normal',
+            align: 'left',
+            verticalAlign: 'center'
+          },
+          axisLabel: {
+            color: '#8FABBF',
+            fontSize: 14
+          },
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              type: [8, 4],
+              dashOffset: 4,
+              color: '#8FABBF'
+            }
+          }
+        }, {
+          type: 'value',
+          name: '',
+          position: 'right',
+          boundaryGap: ['0%', '20%'],
+          alignTicks: true,
+          splitNumber: 5,
+          nameTextStyle: {
+            show: false
+          },
+          axisLabel: {
+            show: false
+          },
+          axisLine: {
+            show: false
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            lineStyle: {
+              color: 'rgba(49, 218, 255, 0.5)',
+              type: 'dashed'
+            }
+          }
+        }],
         series: [
           {
-            name: '弯头工段',
+            name: legendData[0],
             type: 'bar',
             barWidth: '8',
             itemStyle: {
@@ -534,35 +601,23 @@ export default {
                 ])
               }
             },
-            data: data1
+            data: barData
           },
           {
-            name: '综合工段',
-            type: 'bar',
-            barWidth: '8',
+            name: legendData[1],
+            type: 'line',
+            smooth: true,
+            symbolSize: 5,
+            showSymbol: false,
             itemStyle: {
               normal: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: '#33CCCC',
-                    opacity: 1
-                  },
-                  {
-                    offset: 1,
-                    color: 'rgba(31,89,89,0.25)',
-                    opacity: 0.25
-                  }
-                ])
+                lineStyle: {
+                  color: '#B68845',
+                  width: 2.4
+                }
               }
             },
-            data: data2
-          },
-          {
-            name: '成品工段',
-            type: 'bar',
-            barWidth: '8',
-            itemStyle: {
+            areaStyle: {
               normal: {
                 color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
                   {
@@ -575,126 +630,39 @@ export default {
                     color: 'rgba(134,98,45,0.25)',
                     opacity: 0.25
                   }
-                ])
-              }
-            },
-            data: data3
-          }
-        ]
-      }
-      let echart = document.getElementById('echart_d1')
-      if (this.myCharts1 !== '') {
-        this.myCharts1.dispose()
-      }
-      if (echart !== null) {
-        this.myCharts1 = this.$echarts.init(echart)
-        this.myCharts1.setOption(option)
-        window.addEventListener('resize', () => {
-          this.myCharts1.resize()
-        })
-      }
-    },
-    setEchart2 () {
-      let date = []
-      let qty = []
-      this.arrL3.map(el => {
-        date.push(el.date)
-        qty.push(el.real_qty)
-      })
-      let option = {
-        grid: {
-          top: 50,
-          left: 0,
-          right: 25,
-          bottom: 0,
-          containLabel: true
-        },
-        dataZoom: [
-          {
-            show: false, // 为true滚动条出现
-            type: 'slider', // type:'inside'，滚动条在最下面，鼠标点击滚动
-            startValue: 0, // 从头开始。
-            endValue: 9 // end百分比显示范围，endValue具体显示几个数值
-          }
-        ],
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 2,
-              color: '#8FABBF'
-            }
-          },
-          axisLabel: {
-            interval: 0,
-            textStyle: {
-              color: '#8FABBF',
-              fontSize: 16
-              // align: 'center'
-            },
-            rotate: 50
-          },
-          data: date
-        },
-        yAxis: {
-          type: 'value',
-          axisLine: {
-            show: false
-          },
-          splitNumber: 2,
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            textStyle: {
-              color: '#8FABBF',
-              fontSize: 14
-            }
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              type: [8, 4],
-              dashOffset: 4,
-              color: '#8FABBF'
-            }
-          }
-        },
-        series: [
-          {
-            name: '今日',
-            type: 'line',
-            smooth: true,
-            symbolSize: 5,
-            showSymbol: false,
-            itemStyle: {
-              normal: {
-                lineStyle: {
-                  color: '#33CCCC',
-                  width: 2.4
-                }
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {
-                    offset: 0,
-                    color: 'rgba(38,191,191,0.50)'
-                  },
-                  {
-                    offset: 1,
-                    color: 'rgba(31,89,89,0.00)'
-                  }
                 ], false)
               }
             },
             data: qty
+          },
+          { // 滚动点
+            type: 'lines',
+            zIndex: 999,
+            z: 999,
+            yAxisIndex: 1,
+            coordinateSystem: 'cartesian2d',
+            polyline: true,
+            smooth: true,
+            effect: {
+              show: true,
+              trailLength: 0,
+              period: 10, // 光点滑动速度
+              delay: 2000,
+              symbol: 'circle',
+              color: '#9eefce',
+              symbolSize: 8,
+              shadowBlur: 10,
+              shadowColor: '#9eefce'
+            },
+            lineStyle: {
+              show: false,
+              opacity: 0
+            },
+            data: [{
+              coords: date.map((item, index) => {
+                return ['' + date[index], '' + barData[index]]
+              })
+            }]
           }
         ]
       }
@@ -705,7 +673,31 @@ export default {
       if (echart !== null) {
         this.myCharts2 = this.$echarts.init(echart)
         this.myCharts2.setOption(option)
-        this.autoMove(option)
+
+        var count = 0
+        var timer = null
+
+        var dataLength = option.series[1].data.length
+        timer && clearInterval(timer)
+        timer = setInterval(() => {
+          this.myCharts2.dispatchAction({
+            type: 'downplay',
+            seriesIndex: 1
+          })
+          this.myCharts2.dispatchAction({
+            type: 'highlight',
+            seriesIndex: 1,
+            dataIndex: count % dataLength
+          })
+          this.myCharts2.dispatchAction({
+            type: 'showTip',
+            seriesIndex: 1,
+            dataIndex: count % dataLength
+          })
+          count++
+        }, 2000)
+
+        // this.autoMove(option)
         window.addEventListener('resize', () => {
           this.myCharts2.resize()
         })
@@ -723,177 +715,30 @@ export default {
         this.myCharts2.setOption(option)
       }, 2000)
     },
-    setEchart3 () {
-      let value = Number(this.objL1.finish_rate)
-      let title = '%'
-      let text = '完成率'
-      let option = {
-        title: [
-          {
-            text: '{a|' + value + '}{b|' + title + '}\n{c|' + text + '}',
-            x: 'center',
-            y: 'center',
-            textStyle: {
-              rich: {
-                a: {
-                  fontSize: 26,
-                  color: '#00D9FF',
-                  fontFamily: 'SourceHanSansCN',
-                  foontWeight: '700'
-                },
-                b: {
-                  fontSize: 16,
-                  color: '#ffffff',
-                  fontFamily: 'SourceHanSansCN',
-                  foontWeight: '700',
-                  padding: [10, 0, 0, 3]
-                },
-                c: {
-                  color: '#FFFFFF',
-                  fontSize: 13,
-                  fontWeight: '700',
-                  fontFamily: 'SourceHanSansCN',
-                  padding: [10, 0, 0, 0]
-                }
-              }
-            }
-          }
-        ],
-        polar: {
-          radius: ['75%', '83%'],
-          center: ['50%', '50%']
-        },
-        angleAxis: {
-          max: 100,
-          show: false
-        },
-        radiusAxis: {
-          type: 'category',
-          show: true,
-          axisLabel: {
-            show: false
-          },
-          axisLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          }
-        },
-        series: [
-          {name: '',
-            type: 'bar',
-            roundCap: true,
-            showBackground: true,
-            backgroundStyle: {
-              color: '#0a2543'
-            },
-            data: [value],
-            coordinateSystem: 'polar',
-            itemStyle: {
-              normal: {
-                color: '#00dfff'
-              }
-            }
-          }
-        ]
-      }
-      let echart = document.getElementById('echart_d3')
-      if (this.myCharts3 !== '') {
-        this.myCharts3.dispose()
-      }
-      if (echart !== null) {
-        this.myCharts3 = this.$echarts.init(echart)
-        this.myCharts3.setOption(option)
-        window.addEventListener('resize', () => {
-          this.myCharts3.resize()
-        })
-      }
-    },
-    setEchart4 () {
-      let arr = []
-      this.arrR1.map(el => {
-        arr.push({name: el.material_spec, value: parseFloat(el.real_qty), itemStyle: {color: el.color}})
-      })
-      var option = {
-        tooltip: {
-          trigger: 'item'
-        },
-        series: [
-          {
-            name: '区域',
-            type: 'pie',
-            radius: ['70%', '95%'],
-            center: ['50%', '50%'],
-            roseType: 'radius',
-            label: {
-              show: false
-            },
-            labelLine: {
-              show: false
-            },
-            data: arr
-          }
-        ]
-      }
-      let echart = document.getElementById('echart_d4')
-      if (this.myCharts4 !== '') {
-        this.myCharts4.dispose()
-      }
-      if (echart !== null) {
-        this.myCharts4 = this.$echarts.init(echart)
-        this.myCharts4.setOption(option)
-        window.addEventListener('resize', () => {
-          this.myCharts4.resize()
-        })
-      }
-    },
     /** 左一 */
-    async _planReached () {
-      let res = await planReached()
-      if (res.code === '1') {
-        this.jo1 = res.dayResult.jo1
-        this.jo2 = res.dayResult.jo2
-        this.jo3 = res.dayResult.jo3
-        this.joo1 = res.monthResult.joo1
-        this.joo2 = res.monthResult.joo2
-        this.joo3 = res.monthResult.joo3
-        clearInterval(this.timer3)
-        this.toSwiper()
-      } else {
-        this.Dialog(res.desc)
-      }
-    },
-    /** 轮播 */
-    toSwiper () {
-      this.timer3 = setInterval(() => {
-        this.swiper = !this.swiper
-      }, 5000)
-    },
-    /** 左二 */
     async _worksectionHarvest () {
       let res = await worksectionHarvest()
       if (res.code === '1') {
-        this.arrL2 = [...res.result]
-        if (this.arrL2.length > 0) {
+        this.arrL1 = [...res.result]
+        if (this.arrL1.length > 0) {
           this.setEchart1()
         }
       } else {
         this.Dialog(res.desc)
       }
     },
-    /** 左三 */
+    /** 左二 */
     async _monthHarvest () {
       let res = await monthHarvest()
       if (res.code === '1') {
-        this.arrL3 = [...res.result]
+        this.arrL2 = [...res.result]
         clearInterval(this.timeOut1)
         this.setEchart2()
       } else {
         this.Dialog(res.desc)
       }
     },
-    /** 中一 */
+    /** 右二 */
     async _productSchedule () {
       let res = await productSchedule()
       if (res.code === '1') {
@@ -902,50 +747,11 @@ export default {
         this.Dialog(res.desc)
       }
     },
-    /** 中二 */
-    async _unfinishOrder () {
-      let res = await unfinishOrder()
-      if (res.code === '1') {
-        this.array2 = [...res.result]
-      } else {
-        this.Dialog(res.desc)
-      }
-    },
     /** 右一 */
     async _output () {
       let res = await output()
       if (res.code === '1') {
         this.objL1 = res.result
-        this.setEchart3()
-      } else {
-        this.Dialog(res.desc)
-      }
-    },
-    /** 右二 */
-    async _topHarvest () {
-      let res = await topHarvest()
-      if (res.code === '1') {
-        res.result.map((e, i) => {
-          let index = parseInt(i) + 1
-          if (index >= 4) {
-            this.$set(e, 'sort', `NO.${index}`)
-          }
-        })
-        this.array3 = [...res.result]
-      } else {
-        this.Dialog(res.desc)
-      }
-    },
-    /** 右三 */
-    async _monthOrder () {
-      let res = await monthOrder()
-      if (res.code === '1') {
-        let colors = ['#E0CA07', '#007744', '#C0C0C0', '#B68845', '#07E083', '#2D7CEB', '#00D5FF ', '#C44545', '#8B31A1', '#E1BF94']
-        res.result.map((e, i) => {
-          this.$set(e, 'color', colors[i])
-        })
-        this.arrR1 = [...res.result]
-        this.setEchart4()
       } else {
         this.Dialog(res.desc)
       }
@@ -954,246 +760,139 @@ export default {
 }
 </script>
 
-    <style lang="stylus" scoped>
-    @import '~@css/mixin'
-    .bg
-      _wh(100%, 100%)
-      overflow hidden
-    .container
-      _wh(100%, calc(100% - 1.38rem))
-      padding .3rem .2509rem 0
-      overflow hidden
-      clear both
-    .bottom
-      _wh(100%, .38rem)
-      background center bottom / 19.06rem 100% url(../../assets/images/screen1/bottom.png) no-repeat
-    .left_wrap
+<style lang="stylus" scoped>
+@import '~@css/mixin'
+.bg
+  _wh(100%, 100%)
+  overflow hidden
+.container
+  _wh(100%, calc(100% - 1.38rem))
+  padding .3rem .2509rem 0
+  overflow hidden
+  clear both
+.bottom
+  _wh(100%, .38rem)
+  background center bottom / 19.06rem 100% url(../../assets/images/screen1/bottom.png) no-repeat
+.left_wrap
+  float left
+  _wh(4.0756rem, 100%)
+.center_wrap
+  float left
+  position relative
+  _wh(9.96rem, 100%)
+  margin-left .2936rem
+  padding .4rem .16rem
+  background center bottom / 100% 100% url(../../assets/images/screen1/item_2.png) no-repeat
+.right_wrap
+  float right
+  _wh(4.0273rem, 100%)
+.item_wrap
+  _wh(100%, calc(100% / 2))
+.item_tip
+  clear both
+  _wh(100%, .32rem)
+  line-height .32rem
+  background center center / 100% 100% url(../../assets/images/screen1/title_bg_1.png) no-repeat
+.item_tip_left
+  float left
+  _wh(60%, 100%)
+  font-family "SourceHanSansCN"
+  _font(.18rem, inherit, #fff, 700,)
+  letter-spacing .02rem
+  text-shadow 0 0 .09rem #159AFF
+  padding-left .38rem
+.item_content_1
+  _wh(100%, calc(100% - .32rem))
+  padding .12rem 0 .15rem
+.item_content_2
+    _wh(100%, calc(100% - .38rem))
+    margin-top .06rem
+    border .01rem solid rgba(8,205,248,0.3)
+.scroll_wrap
+    _wh(100%, 100%)
+.scroll_tab_1
+    _wh(100%, .4rem)
+    border-bottom .01rem solid rgba(8,205,248,0.3)
+    li
       float left
-      _wh(4.0756rem, 100%)
-    .center_wrap
-      float left
-      _wh(9.96rem, 100%)
-      margin-left .2936rem
-      padding .4rem .16rem
-      background center bottom / 100% 100% url(../../assets/images/screen1/item_2.png) no-repeat
-    .right_wrap
-      float right
-      _wh(4.0273rem, 100%)
-    .item_wrap
-      _wh(100%, calc(100% / 3))
-    .item_tip
-      clear both
-      _wh(100%, .32rem)
-      line-height .32rem
-      background center center / 100% 100% url(../../assets/images/screen1/title_bg_1.png) no-repeat
-    .item_tip_2
-      background center center / 100% 100% url(../../assets/images/screen1/title_bg_2.png) no-repeat
-    .item_tip_left
-      float left
-      _wh(60%, 100%)
-      font-family "SourceHanSansCN"
-      _font(.18rem, inherit, #fff, 700,)
-      letter-spacing .02rem
-      text-shadow 0 0 .09rem #159AFF
-      padding-left .38rem
-    .item_tip_right
-      float right
-      _wh(39%, 100%)
-      line-height inherit
-      text-align right
-      padding-right .09rem
-      span
-        _font(.14rem, inherit, #FFCB00, lighter,)
-      .span1
-        font-size .12rem
-        color #84B0DA
-    .item_content_1
-      _wh(100%, calc(100% - .32rem))
-      _fj(space-around)
-      padding .17rem 0 .24rem
-    .item_content_1_inner
-      _wh(1.2rem, 100%)
-      background-color #011834
-    .item_content_1_inner_1
-      _wh(100%, .37rem)
-      font-family "SourceHanSansCN"
-      _font(.14rem, .37rem, #78B1DE, 700, center)
-      letter-spacing .02rem
-      background center center / 100% 100% url(../../assets/images/screen1/item_1.png) no-repeat
-    .item_content_1_inner_2
-      _wh(100%, calc((100% - .37rem) / 3))
+      width 25%
+      _font(.14rem,.4rem,#78B1DE,,center)
+      word-wrap break-word
+      word-break break-all
+      white-space nowrap
+      padding 0 .02rem
       overflow hidden
-      _fj(space-evenly)
-      flex-direction column
-      padding-top .06rem
-    .item_content_1_inner_2_bg
-      background center bottom / 1.02rem .03rem url(../../assets/images/screen1/line_1.png) no-repeat
-    .item_content_1_inner_2_p1
-      font-family "SourceHanSansCN"
-      _font(.18rem, .18rem, #fff, 700, center)
-      letter-spacing .0188rem
-    .item_content_1_inner_2_p2
-      font-family "SourceHanSansCN"
-      _font(.14rem, .14rem, #84B0DA, 700, center)
-      letter-spacing .02rem
-    .item_wrap_2
-      _wh(100%, calc((100% - .4rem) / 2))
-    .item_wrap_3
-      margin-top .4rem
-    .item_content_2
-      _wh(100%, calc(100% - .32rem))
-      margin-top .06rem
-      border .01rem solid rgba(8,205,248,0.3)
-    .scroll_wrap
-      _wh(100%, 100%)
-    .scroll_tab_1
-      _wh(100%, .4rem)
+      box-sizing border-box
+.scroll_container_1
+    width 100%
+    height calc(100% - .4rem)
+    overflow hidden
+.scroll-ul_1
+    li
+      _wh(100%, .44rem)
       border-bottom .01rem solid rgba(8,205,248,0.3)
-      li
+      &:nth-child(even)
+          background rgba(1,24,52,0.60)
+          box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
+    .scroll-ul_1_div
         float left
-        width 12%
-        _font(.14rem,.4rem,#78B1DE,,center)
+        _wh(25%, .44rem)
+        _fj(center)
+        _font(.14rem, .44rem, #fff,,center)
         word-wrap break-word
         word-break break-all
         white-space nowrap
         padding 0 .02rem
         overflow hidden
-        box-sizing border-box
-        &:nth-child(8)
-          width 16%
-    .scroll_tab_2 li
-      width 17%
-      &:first-child
-        width 15%
-    .scroll_container_1
-      width 100%
-      height calc(100% - .4rem)
-      overflow hidden
-    .scroll-ul_1
-      li
-        _wh(100%, .44rem)
-        border-bottom .01rem solid rgba(8,205,248,0.3)
-        &:nth-child(even)
-          background rgba(1,24,52,0.60)
-          box-shadow inset 0px 1px 0px 0px rgba(13,89,115,0.3)
-        .scroll-ul_1_div
-          float left
-          _wh(12%, .44rem)
-          _fj(center)
-          _font(.14rem, .44rem, #fff,,center)
-          word-wrap break-word
-          word-break break-all
-          white-space nowrap
-          padding 0 .02rem
-          overflow hidden
-          &:nth-child(8)
-            width 16%
-    .scroll-ul_2 li .scroll-ul_1_div
-      width 17%
-      &:first-child
-        width 15%
-    .progress_line_wrap
-      position relative
-      _wh(1.35rem, .03rem)
-      background-image linear-gradient(270deg, #00EFFF 2%, #00527D 100%)
-    .progress_dot_wrap
-      position absolute
-      _wh(100%, .15rem)
-      top -.06rem
-      left -.05rem
-    .progress_dot
-      position absolute
-      top 0
-      left 0
-      _wh(.15rem, .15rem)
-      background center center / 100% 100% url(../../assets/images/screen1/dot_1.png) no-repeat
-    .item_content_3
-      _wh(100%, calc(100% - .32rem))
-      padding-top .1rem
-      _fj(flex-start)
-      flex-direction column
-    .right_1_up
-      clear both
-      _wh(100%, 1.6rem)
-      padding 0 .3rem .2rem
-      background center bottom / 100% .03rem url(../../assets/images/screen1/line_2.png) no-repeat
-    .right_1_up_left
-      float left
-      _wh(1.4rem, 1.4rem)
-      background center bottom / 100% 100% url(../../assets/images/screen1/item_3.png) no-repeat
-      _fj(center)
-    .echart_d3_wrap
-      _wh(80%, 80%)
-    .right_1_up_right
-      float right
-      _wh(1.71rem, 100%)
-    .right_1_up_right_item
-      _wh(100%, .6rem)
-      background center bottom / 100% 100% url(../../assets/images/screen1/item_4.png) no-repeat
-      _fj(space-evenly)
-      flex-direction column
-      &:nth-child(2)
-        margin-top .2rem
-    .right_1_up_p1
-      font-family "SourceHanSansCN"
-      _font(.14rem, .14rem, #78B1DE, 700, center)
-    .right_1_up_p2
-      font-family "SourceHanSansCN"
-      _font(.18rem, .18rem, #fff, 700, center)
-      span
-        _font(.12rem, .18rem, #fff, 700, center)
-        padding-left .1rem
-    .right_1_down
-      _wh(100%, calc(100% - 1.6rem))
-      padding .05rem .3rem 0
-    .right_1_down_inner_1
-      _wh(100%, .28rem)
-      overflow hidden
-      _fj()
-      div
-        &:nth-child(1)
-          font-family "SourceHanSansCN"
-          _font(.12rem, .28rem, #84B0DA, 700,)
-          letter-spacing .0171rem
-        &:nth-child(2)
-          font-family "SourceHanSansCN"
-          _font(.16rem, .28rem, #fff, 700, right)
-          letter-spacing .02rem
-    .right_1_down_inner_2
-      _wh(100%, .1811rem)
-      background-color rgba(0,213,255,0.20)
-      _fj()
-      div
-        height .0805rem
-        &:nth-child(1)
-          background-color #07E083
-        &:nth-child(2)
-          background-color #B68845
-    .right_1_down_inner_3
-      _wh(100%, .3rem)
-      margin-top .1rem
-      _fj()
-    .right_1_down_inner_3_i
-      _wh(1.83rem, .3rem)
-      _fj()
-      background center bottom / 100% 100% url(../../assets/images/screen1/item_5.png) no-repeat
-    .right_1_down_inner_3_l
-      _wh(50%, 100%)
-      overflow hidden
-      clear both
-      span
-        display block
-        float left
-        &:nth-child(1)
-          _wh(.0725rem, .3rem)
+.item_inner_wrap
+    width 100%
+    padding-bottom .15rem
+    margin-bottom .1rem
+    background center bottom / 100% .03rem url(../../assets/images/screen1/line_2.png) no-repeat
+    &:last-child
+      background none
+      padding 0
+      margin 0
+.item_inner_h1
+    _wh(100%, .16rem)
+    overflow hidden
+    _fj()
+.item_inner_h1_l
+    _wh(0.6rem, 100%)
+    font-family "SourceHanSansCN"
+    _font(.14rem, .16rem, #84B0DA, 700,)
+    letter-spacing .02rem
+.item_inner_h1_r
+    _wh(calc(100% - 0.6rem), 100%)
+    _fj()
+.process_wrap
+  _wh(100%, .0805rem)
+  background-color #B68845
+  _fj()
+.process_rate
+    height 100%
+    background-color #07e083
+.item_inner_h2
+    _wh(100%, .3rem)
+    margin-top .1rem
+    _fj()
+.item_inner_h2_inner
+    _wh(48%, .3rem)
+    _fj()
+    background center bottom / 100% 100% url(../../assets/images/screen1/item_5.png) no-repeat
+.item_inner_h2_inner_l
+    _wh(50%, 100%)
+    _fj()
+    span
+      display block
+      &:nth-child(1)
+          _wh(.0725rem, .0725rem)
           margin-left .15rem
-          _fj()
-          overflow hidden
           i
             display block
             _wh(.0725rem, .0725rem)
             border-radius 100%
-        &:nth-child(2)
+      &:nth-child(2)
           _wh(calc(100% - 0.2825rem), .3rem)
           font-family "SourceHanSansCN"
           _font(.12rem, .3rem, #fff,400,)
@@ -1201,106 +900,79 @@ export default {
           overflow hidden
           text-overflow ellipsis
           white-space nowrap
-    .right_1_down_inner_3_r
-      _wh(50%, 100%)
-      line-height .3rem
-      overflow hidden
-      text-align right
-      span
-        font-family "SourceHanSansCN"
-        _font(.12rem, .3rem, #fff,700,)
-        &:nth-child(1)
+.item_inner_h2_inner_r
+    _wh(50%, 100%)
+    line-height .3rem
+    overflow hidden
+    text-align right
+    span
+      font-family "SourceHanSansCN"
+      _font(.12rem, .3rem, #fff,700,)
+      &:nth-child(1)
           font-family "SourceHanSansCN"
           _font(.18rem, .3rem, #00D5FF,700,)
           overflow hidden
           text-overflow ellipsis
           white-space nowrap
-    .item_content_4
-      _wh(100%, calc(100% - .32rem))
-      padding .1rem 0 .2rem
-      overflow hidden
-    .scroll-ul_2
-      li
-        _wh(100%, .4rem)
-        clear both
-        margin-bottom .1rem
-        &:nth-child(-n+3)
-          background center center / 100% 100% url(../../assets/images/screen1/item_6.png) no-repeat
-        &:nth-child(n+4)
-          background center center / 100% 100% url(../../assets/images/screen1/item_7.png) no-repeat
-        &:nth-child(1) .scroll-ul_2_div_1
-          background center center / .24rem .27rem url(../../assets/images/screen1/top_1.png) no-repeat
-        &:nth-child(2) .scroll-ul_2_div_1
-          background center center / .24rem .27rem url(../../assets/images/screen1/top_2.png) no-repeat
-        &:nth-child(3) .scroll-ul_2_div_1
-          background center center / .24rem .27rem url(../../assets/images/screen1/top_3.png) no-repeat
-    .scroll-ul_2_div_1
-      float left
-      _wh(.6rem, 100%)
-      _font(.16rem, .4rem, #fff, 700, center)
-    .scroll-ul_2_div_2
-      float left
-      _wh(calc(60% - .6rem), 100%)
-      font-family "SourceHanSansCN"
-      _font(.14rem, .4rem, #fff, 700,)
-      padding-left .1rem
-      letter-spacing .02rem
-    .scroll-ul_2_div_3
-      float right
-      _wh(30%, 100%)
-      font-family "SourceHanSansCN"
-      _font(.12rem, .4rem, #fff, 700, right)
-      padding-right .2rem
-      span
-       &:nth-child(1)
-        font-size .18rem
-        letter-spacing: .0125rem
-    .item_content_5
-      _wh(100%, calc(100% - .32rem))
-      padding-top .3rem
-      clear both
-    .item_5_l
-      float left
-      _wh(50%, 100%)
-    .item_5_r
-      float right
-      _wh(50%, 100%)
-      _fj()
-      flex-direction column
-    .item_5_l_1
-      _wh(100%, 60%)
-      background right center / .02rem 100% url(../../assets/images/screen1/line_3.png) no-repeat
-    .item_5_l_2
-      _wh(100%, 40%)
-      _fj()
-      flex-direction column
-      // .right_1_down_inner_3_i
-      //   &:nth-child(1), &:nth-child(2)
-      //     margin-bottom 5%
-    .color1
-      background-color #07E083
-    .color2
-      background-color #B68845
-    .swiper_wrap
-      clear both
-      _wh(100%, calc(100% - .32rem))
-      padding .17rem 0 .24rem
-      overflow hidden
-    .swiper_wrap_con
-      _wh(100%, 100%)
-    .swiper_item
-      position relative
-      left 0
-      float left
-      _wh(100%, 100%)
-      _fj(space-around)
-    .p1
-      position absolute
-      display block
-      cursor pointer
-      left .2509rem
-      top .22rem
-      font-family "SourceHanSansCN"
-      _font(.18rem, .30rem, #fff, 700,)
-      letter-spacing .01rem
-    </style>
+.color1
+    background-color #07E083
+.color2
+    background-color #B68845
+.pages
+  position absolute
+  left .2509rem
+  top 11%
+  _wh(20%, .4rem)
+  _fj()
+  a
+    cursor pointer
+    font-family "SourceHanSansCN"
+    _font(.18rem, .30rem, #fff, 700,)
+    letter-spacing .01rem
+    padding .05rem .2rem
+    border-radius .05rem
+    background: radial-gradient(circle at 7.2% 13.6%, rgb(37, 249, 245) 0%, #004c92 90%)
+.status_wrap
+    position absolute
+    top 3%
+    right 2%
+    z-index 1
+    _fj(row)
+.status_item
+    _fj(row)
+    margin-left 20px
+.status_tip
+    _wh(15px, 15px)
+    border-radius 50%
+    margin-right 10px
+    box-shadow 0px 0px 4px 0px rgba(33,121,195,0.88)
+.status_name
+    _font(16px, 1, #fff)
+.machine_block
+  position absolute
+  border 1px dashed #8FABBF
+.machine_block_1
+  _wh(50%, 43%)
+  left 2%
+  top 3%
+.machine_block_2
+  _wh(30%, 32%)
+  right 2%
+  top 9%
+.machine_block_3
+  _wh(50%, 30%)
+  left 2%
+  top 56%
+.machine_block_4
+  _wh(13%, 10%)
+  left 56%
+  top 75%
+.machine_block_5
+  _wh(22%, 30%)
+  right 2%
+  top 56%
+.machine_block_6
+  _wh(96%, 7%)
+  left 2%
+  bottom 3%
+</style>