From 8966921312d40568ada299ee9130dcf710f6d7f8 Mon Sep 17 00:00:00 2001
From: yanps <yps00312>
Date: Fri, 26 Jan 2024 17:49:35 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E8=BE=93=E9=80=81=E7=BA=BF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=92=8C=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OvenGantryManipulatorDeviceDriver.java    |   4 +-
 .../SiemensConveyorDeviceDriver.java          |  26 ++--
 acs/nladmin-ui/src/assets/images/logo.png     | Bin 8852 -> 5102 bytes
 acs/nladmin-ui/src/assets/images/logo1.png    | Bin 0 -> 8852 bytes
 .../src/layout/components/Sidebar/Logo.vue    |   4 +-
 .../src/views/acs/device/opc/index.vue        |   8 +-
 .../acs/history/deviceErrorInfo/index.vue     |  10 +-
 .../views/acs/history/instRecord/index.vue    |  50 +++---
 .../views/acs/history/taskRecord/index.vue    |  52 +++----
 .../acs/history/taskTreeRecord/index.vue      |  48 +++---
 .../src/views/acs/history/udwData/index.vue   |   2 +-
 .../src/views/acs/instruction/index.vue       | 147 ++++++++++++++----
 acs/nladmin-ui/src/views/acs/task/index.vue   |  95 +++++++----
 acs/nladmin-ui/src/views/login.vue            |   4 +-
 14 files changed, 297 insertions(+), 153 deletions(-)
 create mode 100644 acs/nladmin-ui/src/assets/images/logo1.png

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
index 6fbc82193..f6c3817c7 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java
@@ -39,6 +39,7 @@ import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.service.ParamService;
 import org.nl.modules.system.service.impl.ParamServiceImpl;
+import org.nl.modules.system.util.CodeUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -579,6 +580,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 instdto.setPriority(priority);
                 instdto.setInstruction_status("0");
                 instdto.setExecute_device_code(start_point_code);
+                instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO"));
 
                 //判断关联的同一列烘箱设备是否都关门 都关门返回false，有一个不关门就返回true
                 boolean isCloseDoor = this.judgeCloseDoor(instdto.getStart_device_code(), instdto.getNext_device_code());
@@ -614,7 +616,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 String start_addr = startDevice.getExtraValue().get("address").toString();
                 String next_addr = nextDevice.getExtraValue().get("address").toString();
                 logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
-                        + instdto.getInstruction_code() + ",指令起点:" + instdto.getStart_device_code()
+                        + instdto.getInstruction_code() +";指令号: "+ CodeUtil.getNewCode("INSTRUCT_NO")  + ",指令起点:" + instdto.getStart_device_code()
                         + ",指令终点:" + instdto.getNext_device_code());
                 this.writing("to_onset", start_addr);
                 this.writing("to_target", next_addr);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index 1d4486e82..9ac8f9e9c 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -469,16 +469,24 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
         applyManipulatorActionRequest.setTask_code1(inst.getTask_code());
         logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS,参数:" + applyManipulatorActionRequest);
         try {
-            for (int i = 0; i < 5; i++) {
-                ApplyManipulatorActionResponse response = acsToWmsService.actionFinishRequest(applyManipulatorActionRequest);
-                if (response == null || response.getstatus() == 200) {
-                    logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS,接口返回:" + response.getMessage());
-                    break;
-                } else {
-                    message = "task变化请求LMS失败: " + response.getMessage();
-                    Thread.sleep(15000);
+            final ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll();
+            EXECUTOR.submit(() -> {
+                for (int i = 0; i < 5; i++) {
+                    ApplyManipulatorActionResponse response = acsToWmsService.actionFinishRequest(applyManipulatorActionRequest);
+                    if (response == null || response.getstatus() == 200) {
+                        logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS,接口返回:" + response.getMessage());
+                        break;
+                    } else {
+                        logServer.deviceExecuteLog(this.device_code, "", "", "任务变化请求LMS失败:" + response.getMessage());
+                        message = "task变化请求LMS失败: " + response.getMessage();
+                        try {
+                            Thread.sleep(15000);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
                 }
-            }
+            });
         } catch (Exception e) {
             e.printStackTrace();
             logServer.deviceExecuteLog(this.device_code, "", "", "task变化请求LMS失败" + e.getMessage());
diff --git a/acs/nladmin-ui/src/assets/images/logo.png b/acs/nladmin-ui/src/assets/images/logo.png
index f7577109651b89def3d9359ab324b445c714fe77..9675cc8b9ad17478078605e6453409db8dde5d3c 100644
GIT binary patch
literal 5102
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
Qa{vGU07*qoM6N<$g0P0Iu>b%7

literal 8852
zcmbW7^;?ur)bMwSrMr6xr5gl9U|B#)Lb@9PrMq`QU_ojHq&uZUL}}?(StJFdySsVz
z`#gWa`~EQZTytG>X3orgpL3u2oQcuaR3^fw#|HoaM5-!^I_P@vzk&-wKdX&ua?usg
zOGg<BsQJmbjc#B$$ZN<00QHFkch=bGHlDkRu@?Y9-1A=n4!C``0|3~#RTbs+{4Mr#
z@cc~&d=A&sp4B={OpD(qO}WlLb9J89oaj|`o^GQ4Kp;c|xD5H%%LEos8LDjS|9hG=
zL#^sg!>#k@Wy~M7m_iOUN^XJg`S!Q!nNM9%l7cR$ciAl(tCuBZn~=0;O2iPIm2iUW
z$IE-U05Z6==%$~;#$txlt`Q$~Y@bd2|9e%X|FJ^pA+;h#S})P~bEZyYXn#33kw9$&
z%j1j6z`pgwD(=ITJh|Nae`c8?iZGhaBC^NF(+b0K-@wSp17TS62Gg$Fu3V1|c4zj)
za5ZhOv4BP!JS><H^EU5yUD5@xB!=Q@GxqGSuiF{T`G|G>l))d-C8os~A;uq8_nXaK
ztp+c(w@fZ{-4v!jTMEQ}ZKz;Yz0)Hib`t_D2-IE;G>6eu_3z%3S-9zrHIl2_|Bmgk
zG4E_5seU9%Q|?`^D<?n*%cWuGf8686OpP3Fy!S+Lp4&7Ssq5}%ZTuBNTJ*zj42|<6
z!$TB=`Pj#D&TPIIJ$!29+@{z`QR%I}4KRk7SL%;pT&R0!dkWy;YnI6Wtmhlt`xW_T
z5vnq0N~jv71}<pDFpsH${$=&}#*}nv0GSK(ylZ`e464GF%fcz?p}R7V={QWepAt8v
za4@%sjo*RP5>xMf2u`$-Da7EMhY1qpKA91=jw~!t9DJUc(3OWdb-@;0A*f)O&pWQ~
zh|@y9uUJWHZu!1O$xX>kK`tVc_8#}<^_lI~{ubwNt-`$U^r*5QO{c;UgV?jm!v+3a
zG!>i_#nX*qv7Nf@8zQ-tb-~H5Wrj27WwJ?D#xq!oUFC`@Qb=O8AOXc^l!dXsO~Dlf
zSU@f%K{@dFxmHo0JdEO=@h0Gm!0H{0J}Ae8i;=JYoqCGJsZE^EiNGY$d-A9`;$0XK
zg0kd{Se}}Zp!u$lNQ8tltXdRPeo&r*_IeBBYz~85_mS=9$=S%3A-HKZ3+Xe1M@1uA
zY;PO^i>^yK`px@l?TG93%$D0vyl`xDsW*|M?0ETmuOi2YuwGI>XJDF#_x|bp@bK(L
zysoJ|qV9YCTRwf0eu#m%aQtbmMxb~DRAa|<<Jam{i`LZDLscLp7j2`wnI9We-m17@
zf`~xn)&1_4#BU$u%sC$=QL4?--(veq2dt8BQw&~37S()3u~8s_+P<*(+phWk3x|OS
zY=m|_=|mD-h@&8RyZ}48yoPxJFtstwx~W2>CurRfj=Y=S)*t@n_U}RN?Cl%6*E{yR
z`!o4PUJNsN`>XiH%#HGTwlAO%ckN$fbMW+?`K_ly5@OJeu7MxIxop)8<>Kqmv6Syh
zwXUhwSi7#;?P_$y<qryTbzZNmikTX~w9g11B)zYIHWlw)egkuj;SR6P#6DHsRa+sc
zkSSED4KS$N?J7_I#pheI+$;5RgABW?&g!@6I3Ze7ss+%8R&38i*S-Lws>Xv2lgUv;
zQ#;cwPM~OA`0E|hDK|6YbWXS4S%DY)Kjxnb%}|M9iqMeiE@*n=7@5*rk7zeH5^v6x
zb3f*5#@6nPb>Tm4elbj){o+Aq%KeMEk18ZM5%2wc+#3irMz7v<%px|ojNtowot8#T
z2L?CoPWQKLmTuHjChtf%Lb}T{oDjK<U2mlQeqg=U7^htlb_CgRqj#hQ@?E;XDj&4#
zx$I+wJ6w6^=@I`GZIosDwfQ+gsF#`bAy9}JNf=q=8%PZmsjj(13r<q2rRn^HK;l-B
zk87Y;y@77Rw^iA)K&r$>>o?6;ad?HM&lD6DI6%)Z8yL}3T)<15Xi{?dlc%mHsaGqg
zFO>to)Eg+A88EgU9S$?BeK>wpcnPBnug7ERg7b-jOIzBvLXcipc<xRHP7I^8e^>T1
zRd-o-#|BJP$78wEO7GrRvA)?$rzCC7%AXm8R|%m-FeSraOxd~qPNt)@tk=v7GiPt?
zsw0Bk`P_9>*3;=m_ZdiWMKBxa;pw}9tOZ5bj1*y;Pb4`WfC>%J7Lh9aU~TBoHEpzO
zD8L#l3a-S9Zax6dn6wnU6;qyj#$p<rhcF%CtI%${#me@g%;{QkYa@~W&N2qC!Uk`&
zC|EhY0ND4Gpq^#cyFEz0d8k@!tJ)>YVUCtT7#fU=3efg0`91POf55B6(cMEy&qK6>
zO+GbE@+F?KFYQw9-|5N>d#J95uDyt0?+zis_yNZvKzHoH9kS+<vQ2B6jnhxuDx+x+
z^!k#@<C973m~1G}yyVT{?D;Rg>lYl00o|EBUyLyd^@R%6lqF1@(^)Mc@s8W`?S`6h
z<j?PpxIqd1ZbD#rLiD=0xDME3)02(x&)zujztq%dCgDBkX{M4|O<LxPcD#As-37;z
zMi00u=^;l*Mbo767v-RF{p)SwRm<XC734&w9+l!(LKRcP7#sGPI(+pVVYECzcsd8b
z3)K<N<aN;%X}V72DYKC+LIBmD&aK8#`REvg*$ouay^_XDXr(264`kZ`foojk^t5jN
zm2aIz%gzy1ATZz6)K&Tn@g&48!CfvFaC;5uNZ(_y?Px;PE;Si-uwST_n33R2IX4Sr
zbuv2k=$bs<<MtT-CXD_FB=dQXoVZMCjITAiLp--{Hzy&WF843InyyFuUZZ;X*Or|$
zqElWJTmXpvEKT&pAsf~7bT$5j&8;c(Nm;3LvOZ<=P7)sHIu;0%Tn#>xsR_58fAsi#
zmTpOscr^8is^w%gz;V%fzf|=)ZJbbr3$1^YyDTbZf6w8z=IKNATj;f}%&Tt0nH*vj
zUfi6JJ0RAQx+92#60Mm-zSWY4)8FJAi+W3v<Ri)_&L8y&GZy`vUD+gQk=mf%6<MMS
z^;r}xSh`&;f>~g>WcaZEPK(jxKBr1&uxSCSD+fJN3VNhXu#W`M*EJ7#XfpH4mNkWJ
z_rVtf9Xi>~yg7In3?~zahXYYu5OSuQ<B7-4EBnMBI1_=W**n%Q9um&c#V9nz!v}F>
z17cjHfE9Tm`xS-(5>+DR)`!Q)Dz?FG#9?3lBd-`Hxh6ci<rEpT22-~Uf3>}Ic7*4m
zZ<%lt!gqA*#S1qRXT~Jcz{0^KPk<ZEJ9G)N!X%*V3Hx#ep}HhRzxDGM*{{Lacl&7f
z0wR5PYoM}difw#ff|Sz+nEterpLGZ6C6tbOR{XNx{F3h|#B!pUvi#2viaJp4LaF_x
z#Uy?02NWUsUQ#dbtBJT8Q3&)@T2(b(<{c<xEj)fkcy$EoZJNN#2<g-Ie8yD4Ns|_6
z#i|>)mGmV58DbO}QR5aq)Q*WMEeU*mqy<Y1(XYJ%y7Wx-aGw=x@&+`7CsUAU|3Gkp
zn{s>yr7{UFj(;F(`O~;J2U10qkWDaYu6Qi<BLJIk9Av713AOvwFzA!FOg2=j;%TXU
zWYffa(Xj#H#SxIBr3*N8`=Ma3yHHfBI$D41L%TXz@j=L3nmG?Gp#D!DVh1mv0^4Np
zGeXyKNW6NUomWVzI`1MNn2hNLt|*}gHF1+AW?w1xsZT9c%ncYYBmMibeRvMY=4%!)
z-vdnT)iUiUM(A(hZZeNGbU!Z}C7pd`6(I{A3L+qlThB18YE=K30)cLRBZGeh_D+dK
zv`5}OEeuq2%!z35u{k}o>MC|h_tHYW{M@OC5CEq(*>K5xYf>nG=d;~xqq28H9bVT0
zk7g>;_TCZR7H@7_X-5Wnd=6AfXv@dvYQ+uzjm0r%j*)Sn;Xhz1$*x=1>inH{MSA=A
zXa|_oSZNr@FB_zo&1}(6LtL9Mh;J<0K!<rp?Y#wLo5L^gmbA9Wh<72NBzgX0N-g>7
z6OQ8EcdU#0;2|HRQX*O?^<l#-uwUPV#U%<~2C@?5nI9<Pu0zM3#Z0lu97G$D6`1@9
zo1^T}6!i`Q)Ap6xo(N2*GfX+w(~-=xox_d(jlt0_xbTfa$6!%g)V^I~@g9Ux=Lzrq
zN~{LU+B=KpkQt5RouhinYc_PPK|5~=L4d%o4}u4oRB{b}y1S3(Q&efl;C7#2qTjQ^
zdi33vjy^>-dJ0`bO<pp&G%A7WM2r_=fEdqB=<;@NfIT7SM40>bt%VY8Dho3EVY;L<
zrv4nZRVObqAIGUL>XJki=e(#YM9YHY@+0mhdz*ax&hI#%fG=Kb%|sSLKBuJyi!~E<
zYF8(bSj8Jy`89&CL_i_Y{K)7M453Z9Zn7MX=rwm40Y%RU0~7G%Zl}cUvzT4`lSg=?
z>?4O|Jp@5b$G{=EA@{4VZzAW}f5AV?HSxhIbIyWphOE&#Jo$(6)wqr<hLCn%)(Y3f
z6RB)i+jh`dx}*`MEn_{9f*#L-NgcHcH}|x*hYTX>pH4MS+Z!-G7MbATu3{wBak{tI
zUQGJNl_{WVG_jWEfHCi+c<)_3&$Cu)&+9}Jkb6AF);t4+Rz<hJgzDn)q8+s&cT`se
znT%a3P5A6CI-*F;7{E3I96uEr?t;I~`qNeD)f%@1O1K@#Dq!k}Q7SLow0YLkY<7nY
zK%68ah4`3|{ADaDp=G+Fou!Bzk2O^96Ju-CO((S;T(O0!&f5qanuv|MsX~T~;s<b6
zYx`$9pEldgfJ!!9kRIvz%_2C$;tt_oMKQ?(QLOt`JZrfsQ7d2YW)$dcrEX1H?t-~{
zpRt&WfSd2#R60rAj5g2eM5DIWi7dW*2eeji{uIaLD3!ur39@kycj^B@qb;>lIUg{+
z_3OIqvtRR#aIG`H!7E+X-ou}fRXudtFH$H`yA3sylN9BWg0t-$5S^gF;(sN9eL;a+
zbPB#&XJZZF$fCcl#^R7y)mdOC7{?lMFQo4?(&Cp+n-Rp0q0~k?mi3DqLsPZ}am@PR
zh_(I~`3u&}G(KYF_bD&bA*(cJirk+b!7Ke$VYd`&o8dV3`L;qh7ZZa!7bTuOduc!?
ztX<$aMQl$6C1X-axZ?=Gi$K0X67uFyHPNY20hMdRCHX0=oq%MhiEuLfYs}NbFd&(9
z>Cpz8B}zAF7GmsqU%gcQowk_`p8ogneU)ui!A?@ZqMJaUzHJI@0Yi$@8M#P9fETpF
z+9VAOQ&Hqx?feD1lvfbD{Z2G2*t_gN0p2v?;W+$-W$GXs4o9j0GD0d;z2D=<w2qLb
zzG@4@8eO14mD)WYG7lmR{{f#7q*9fueaog#(z%rOoIf{}s_<wOa|DFDuBtWv2++(g
z+Pwd1^D4~TQ?u(j8pETNUsBHaiaQn6(Rj&n#y~~0%6h0s&v7`0IS$RglB416Hzybh
z8unOBipe7yuujK5N$3E4sO9{KspDH?av~L&WS{?pQ=r!IBNf|iugo-&isGs{a;kGN
zjojpdAq*WXBK=TtGGTayS*Z`{5)Hyst^U`3f>Ts96yPs{G}f%zcX?G@ncw953&`(o
zm%l}HoY;_Y_%bG8=!hK^pNUqy2~|Qbg=SHTWElUW$J*{Rw#waNP=TkjlNSO0Rv{||
zl#J-(!7hxXVSP_zj4oKl2)}qw5ah)!zw+q3IFn$q7m4rQK_0A(U7aq@yT%ek%ts_P
ze?yCGD+=|a_1#&fx$8b&3Qz@tua^vK@Q|OUY9Y(oy={jCb^{Ucvj?td*HY!Sk;_7%
z62I$dD=8TRu3jk>s9y;sGNY%`mY#WlHGRTQwwCu*l+}fLbH_ldDBO<aE%HGot{EtE
z7jEfae>jLw_U%$#9mEm(Z-I6%mPJ!PAwxKt-CeR##0^!HH6fJ0-r3Grx~lAzKn?$z
z6J`FO<!5NZj2L~u|4dJi$ZE9RO#iO~8F%l3dQ2>$PGk=462w|VG(cy3A19LlL(eaM
zv>hHf><H@+yM~V)d@_FvJ(NGus{TpWV!x@&TK$a?VTJYK@eJqKoJ66k9Ev5;%R=|=
z8JC>plY1EM;NQS2?9QWb*z<1yyLXo>fEecviVweBGcN-&wpCwW9OFj6ElrEy?WB$c
z)O(kz)!LWroz1x8rV<>tI_9p($wfCGOQ}dNg`=$J%qT6iy0+H*{&(SBhhzMJS(MLh
zI9&1TJldQ-p33ri&8iTlOK)K>@9-OB2P9i~y1E=pt<&hR`gCI2%wxqoVm(it+6<P0
z@(2u*gb|BZTC8*apME8~b&3Ntm>A>>fjD|`FUM}@&2(!&dQiUaJiejfwcrJNEI6Uw
znet0NU17adq5G-ySs5?edU)yqqq`8=7aiQ}AAN;s(p679wUCdnKEiKph2@#T!zV7;
zY4a`#RP07vV#ABx&PT|M%Uorw8;=E5!+)Dp@o!E&)bo}Iq7VK*mT5FLXf(UtxP;K5
zf>@&X6_g~s35Evx|9J!`xl~JRyp&;luO*;yJ-ZiMLmPiLx$y==ff#KNGzE74%LCu-
z*~dv2URv?}^Ss;zMx?e*+!D@yt%>A)i4wjtxALXnAlT#*llY^cbNK}sR7^b_bsEC?
zbhu+W+Cco6*E#D;%AMD)bW_&(Z$e^gl9Sa$fj_*mjTiHCt>YodmXH&i>0i7{W;8@D
zQDYj7qjtxY0fzLXCSzGJk*l9Qo|=8~T|?w5TY(tXM#1D-ULm3!-W?bjI4tkOfjB??
zPU_Q)b2xo@UE+F1B*kF*lYGZD!lw@B+U5+_G?({@0;9H}o(er0B)6Cx&6hO+kr}&p
z^3NkZwnr8WF-djReYM@Xs#{Vpq?8#+TTidCfx_3SU2ongx%;*Qoo;g@_Z~P&b4~WD
zJ&QXXDA|P`w@#vE?@pDl%CLgyd2@>LEfShT`X`x>eacGb%Mj-$c(6aat+<I-KQBg9
z^UMxA$`wJ;&8xm`3fQ4|M&6+JtsckdnHfk;4srwCeOPWSDl7X@;7v#IUcU}_JGQ*%
zzUqsKi*~;Ic+yjxis?Hz^VA3@<1NuRiPa(N);|fcJJoJ82pjz)#wKN!J<a(?^`Exd
z660j@T|~J1INUOBRd}^tJj|RseaP`!+}^`rsxVd+YLKGSUc`J6$?cTdP=`ds9dL0;
z;tC_MInsQJ`AqfRa@wV;^Ej*-&cSk5u~#T7lG8yu`^ufqrRR?c(B|!s_*tlTX1-zE
z+RX;DF@iaAEqAl7EP#nmqZ&;A+}-sAw8m1aR0n;md%+025AIt6mrtym&)R-FC(3K}
zc?SN-ZwVMEe$;Q)OazR}3-P)3=m`O!()daYC7#6pG_+W)HLi`%Bi3DIybWLe<kl^I
zNR(Z;N5$vO&A3m%#sEn^d#=}g+nT$rG?;QnQRP-x5l!<Zz8hh-;UrE%h58zIv>^!Q
zrpn5AB8i6x!0i0prnbyF%*G;+mHhqUBU%6_;-dKPb1x6BZY1qcBSsD}!+4L+`PYKw
z(pW5&x0XxIh>}={&@-^Nqk^*`^CB)SIXmqpLr)5iHp%4I@u(<<zj&n21ND4At`&+h
z2rpr}HH+hey(?6mIrlN_RKjN~O1)9?yMgI7InVz5`)tzUnryKa$8U}W-2y-d9(sML
zML6UgO+JK&3OQ0sxV~-U7P*ah917URR>NcR*J>dH7TCh7q+{JzerkOS@2fDpliQQx
z3v>h_4r(7Ke(A^E{M-B(jMRZ5o`SsvQcJ3_5NX!lTTmqZ@^>@QC$8f?BK~%lGojP}
zh7F793Qch1eq%=vCx}X<Da=M5X<js^8nmmm{>Ootle(TvXQ`#^6%LhjD7QXniQ`d0
zw(R<7{hm;gcwpq}U*ODmt!)+1W_MdaGqn-fK6h@yzk4u|8Oc;$3D>G>Lly?Bioq|q
z5PDupBU*OYV9vdwd=f#(*4B7&dmqHXW@slOWZ{7np{M1FI7bI-R_-GuF&3(<!PGfe
z@>f8pa-xZ!0d$?qVZ>Z>!Z((__Jm62ERGdxEu~6mZSV~S`wL*fmw@f9@xlo@RExFX
zqGa|>iMnpn1T%-sUK~4&d)9Hirt|%3H}-%3G2P2Fs1I!!<hy_tuR{*SaCP8!IxVB<
z@qkF^M7I)XZFORSznUk7n86ldqisZS*it%{5hZ!RiPY1O;^(zG=fGrBhasn8+wmOo
z@Ezm0{l=uH{!J;2&Ugl_CwntW*dRs04QDth?8QeZ^(4wh!taJ*t_;+jWr(!nlEB_?
zCD=-Ct}RrUIl$vI7LI}}O{KN8*e}(AeX=r*Pz9AXT?6fgEifr9DGWYZET=Mi2)KP>
zQL*wxxp%vOioPO)`i+zPxJMB85gjrTP;iDLe834_)qXNFpm4ho<HbX^X%!l%fwm6q
zy=5a!{Y1rk+3Kz|D#?4HoUbErJ`gekEkdLvKNt4)^LJVkh1%hdHiLUE@R^MX+?W?x
z=)=~|c^y8#_3~n-snN-&oCv}}9Y9773rD#FgR@jJ!OO9@%D|O^tv^M`#&>d~#bH0U
zgEVgZLUIib#ua!PBUby}hVb{&g{<>M!PEGIuWm3)*69X!YQrn)mk#wm`*AVPgPej)
zf2=TLy!K<(*v?Z9cFJd3%|QJs&lD*|=x&w2F)<e86_c`-!<NDHl!1?G!q9G(Zcx^Y
zXq{#)tclw9l^tYxNSW2%PnzreJ#H`Enbg^lKHP54?PF-}UN*IApk!q31q8+E&V2H#
zA$&sh16e%bpeIm7`aTSGM_#-agoO_p4%s{%-hn-F?o1)-E6YK9KK$Nqt4HMr9GO2P
z<4Y}UWx;=fv~#^@FPG<6aa4nnWDC&8Y<ysViGjc83UJOBy_XVTuL+ju(rIx0uJPcD
zE7HaBk%BWbAjs=Ev1Mupaoh&Ug}Sk}Zw(eOn6!adhGb~LwN8u)%WL8Fna3F(;REoj
z8?80L?;!t3b2QhW%8`qR41u{W4;coMf$U0vcqtD*P-{^$7fi_C*Yq4dofzCfxs&&d
z#b<5NR_(xJrg+lnMUdL6>)j|2E1yOK!U(-AA}LDDPXk4lEHnO;xkG1K4kJe!k|HB0
zst49SK@bx2@$$dmRaD?u4VYEM-`GWjg)F4uw&O`Wp2!8W*48q`O`$XpdQ#i)!TnVx
zYsII0D@ZpU>AMNAp4QV}u{a|A!&=>?m+54SWXwtWAgRMYfrP>T5g%?we;s-P*>{C{
zBw0sfOr7Br7c8p0ST6f)q_jwP07rQx&R?^KBnsQLoRydr%juq{ZN-5~g=qY=&i-1`
zn)ClS6-o$8-!|YsPF42FNXD#N*B^1zYAAEMb&m_cBp-&aG2NCn?hi>`N|qs1uPQDy
zPF-e_gSl$Kz$sUZFd&{1gk1V!`40MUfW3SbS#X&ySXL*Jo2F0R?8ygW%fcf@Q!YUL
zGh%qi=%cIZWaXc&<*qr|#s>*A3s&=O^`9)olO6xDw}y4^>c;9J+yPpCbyUxLCC?7~
zdj^;Szo+M62recjIX>Ku>EsbgikR%wE35jpYu%Mu4LN*SGpfABFO6wqhgQSS*7QcM
zx^Me6^HfimxM8EtL<u*I9hGvERyw#eo?1)<{1S_!X`NKEf1<=iy}x;D2x(az)UG2w
zk~f}fYmA*V@>1wW7A`TUR|RfFp9op+!*I&Fsp6Ka%KmU2#|)~16q>O~zP^1#eNd#y
ziHV4QxuZ%;$_`-LNmSULRdX^;3OOYnyCG`7HjX7*d~Mb+obAyCUKg{2!~s;6%Mryc
zlD3oVJpb`olez;?Rog-HC#k<um}G=1NK74}qx8o8H*xHd#O-~?>QwxWy}5Q!gL=`Q
z&tC$Bz+Jd1T|bIY&$5L1Me&<Ys|`&5BknWUFlB=-(VsH)bU-UeI1VzD>jj;^(fY{;
z?ub>`_Sk3(b9wT{uU4^Rg#aZ>j|VWQGYe?^4x$*sLYXti<5EPoTDKGQzoFQMJwIYE
zx$*PskGatztA(QDq_b!SPX+!EB!`ClX-#8sIn2kp(^>Vf0tw!CQu_aakI6M0+0pNN
z;dnMC(`dR*7+qaLz@vPBxC^FWOz?QWPAr!BIh-sBE)x@C2KS)}>w;H-z<5mjOSG0p
zVgs<kYN9~V1_K?valK_P`X!!9X6z&qMG-JBp~_7dO?}O3vCC0?-=$Mz#A0yO<Zpw-
z{Wp869h`2+#2h~n^tZLeO@rBx4afD9pd@-;;v@Ta=B3-}@2kY~H@4NKpI1Cq4nB&H
zIvXa8BV(7WAgP$hs~p$Q^roX3oi-`V6T4%5CInPkT%FrzSfQ(${nB)H%);`;S-@rk
z$mqE_a-ow6ojqAAl<alcNP~B=8Tq~65q8tR=h({FKOx)EctyMRpPyEpIe)H~@J4;t
zJ3+2D>-DEakt!>lbIOtcibGZU{kOJmNq#zzSE85=q+m5$2Fh%A>vsO9Qi)eI=Nk3$
zZo~#cZ~u$B>kFdRiTuAZCF2*L@ks93KsGRJYTOW`?-SqKLUTbb9es5Rwynl)AOoRT
z-;!n8D>7%v&Y*dRR?k;q#rIfvm{54}eh_FcjXF&^;=&Wm__dAVH(aMIrFPl>s<k2N
zQ?rd;SZ_O)Dmv+fhN&sJ4h5dQmN#M72JPLZ`{E1bh7u#uEuNsdli+*`-HjHTKN#gW
zwyZ7OXF#%p=ZtDH82Yh$!h?-}zx4CwE`&;LCkKjui4*wu*H42kN&LH<beSV}2p^X;
zUea%j-l-e>HKxjbk$&}&gXv7k$es%6v$yt<DOL+anu&uynAbT`{Ul2$YlaJ+7}5zS
zl9qzB<eF+wvJuTB_;x(@_4}XS2BFi++u}p`_SfWBS5J>){W)F?&~nwSoADJhssMEf
z<jLpZMkbc<Mobdu&}?v<Z)M{vV08?vhj~^0`Mpl9tikuegZg`c3ob1yFqRpVWsr)-
zmUYvgoa4-HB|8#qYzi4Y*kmo=BpZ~rApTS|ojh*PhVY8#M29CVJCl9*hOcd2mp#qx
zj%gF)pSP)gOU=a+^ZqV*2<gj3vC?|l^+yF+MF`&LF9R3s$}>KjEjZF+)w6ij+GJsq
z>U0$&5kFU_9?)-M)Zt@pQ9_EKv@kw0t7KZOmpssd7fx^^gI-XG+<LMGSh8|lILk*5
zgF7lQoTZtz-ZoNHufQs!A`af}5$z${zLCr6M&<E`uT0G1TGLBDB`@yu*{61UUGZh-
zW3SfsWS7mg;aFn>b5Kf%dcX^3NN1u<RO{5cW>djuv0ufmH@Gtg2Q1dHWFFJ7G793>
zuc&Sa!}AmlqtDRU`DwxD(y39bxWgWVb+9ySD<S%zm`n4_2E%g`&#ODrsfy@DwrT%S
zhDoPmG0?K3(7AwNjnXUDUcu#T9yaGMy$#{YrkqKk%IBFZ?&y>hW4D+MGGR66mZkw<
zp}8y67TGx&Dbs79|HYZ7HT%rzzQL$!iK>LGvcvfrW1(-7oBlKwXZ&1pUMdb|(JOst
zFP1}ptxI?UYvwr;Uw=fwlmQ(<*w2LFu%^|2uvFrpnhffVOl}W?OXC0EixzyC?-p7f
ZLF@BRes2KN|GQZNP*u`YtbtmE{|_Y7!}b6G

diff --git a/acs/nladmin-ui/src/assets/images/logo1.png b/acs/nladmin-ui/src/assets/images/logo1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7577109651b89def3d9359ab324b445c714fe77
GIT binary patch
literal 8852
zcmbW7^;?ur)bMwSrMr6xr5gl9U|B#)Lb@9PrMq`QU_ojHq&uZUL}}?(StJFdySsVz
z`#gWa`~EQZTytG>X3orgpL3u2oQcuaR3^fw#|HoaM5-!^I_P@vzk&-wKdX&ua?usg
zOGg<BsQJmbjc#B$$ZN<00QHFkch=bGHlDkRu@?Y9-1A=n4!C``0|3~#RTbs+{4Mr#
z@cc~&d=A&sp4B={OpD(qO}WlLb9J89oaj|`o^GQ4Kp;c|xD5H%%LEos8LDjS|9hG=
zL#^sg!>#k@Wy~M7m_iOUN^XJg`S!Q!nNM9%l7cR$ciAl(tCuBZn~=0;O2iPIm2iUW
z$IE-U05Z6==%$~;#$txlt`Q$~Y@bd2|9e%X|FJ^pA+;h#S})P~bEZyYXn#33kw9$&
z%j1j6z`pgwD(=ITJh|Nae`c8?iZGhaBC^NF(+b0K-@wSp17TS62Gg$Fu3V1|c4zj)
za5ZhOv4BP!JS><H^EU5yUD5@xB!=Q@GxqGSuiF{T`G|G>l))d-C8os~A;uq8_nXaK
ztp+c(w@fZ{-4v!jTMEQ}ZKz;Yz0)Hib`t_D2-IE;G>6eu_3z%3S-9zrHIl2_|Bmgk
zG4E_5seU9%Q|?`^D<?n*%cWuGf8686OpP3Fy!S+Lp4&7Ssq5}%ZTuBNTJ*zj42|<6
z!$TB=`Pj#D&TPIIJ$!29+@{z`QR%I}4KRk7SL%;pT&R0!dkWy;YnI6Wtmhlt`xW_T
z5vnq0N~jv71}<pDFpsH${$=&}#*}nv0GSK(ylZ`e464GF%fcz?p}R7V={QWepAt8v
za4@%sjo*RP5>xMf2u`$-Da7EMhY1qpKA91=jw~!t9DJUc(3OWdb-@;0A*f)O&pWQ~
zh|@y9uUJWHZu!1O$xX>kK`tVc_8#}<^_lI~{ubwNt-`$U^r*5QO{c;UgV?jm!v+3a
zG!>i_#nX*qv7Nf@8zQ-tb-~H5Wrj27WwJ?D#xq!oUFC`@Qb=O8AOXc^l!dXsO~Dlf
zSU@f%K{@dFxmHo0JdEO=@h0Gm!0H{0J}Ae8i;=JYoqCGJsZE^EiNGY$d-A9`;$0XK
zg0kd{Se}}Zp!u$lNQ8tltXdRPeo&r*_IeBBYz~85_mS=9$=S%3A-HKZ3+Xe1M@1uA
zY;PO^i>^yK`px@l?TG93%$D0vyl`xDsW*|M?0ETmuOi2YuwGI>XJDF#_x|bp@bK(L
zysoJ|qV9YCTRwf0eu#m%aQtbmMxb~DRAa|<<Jam{i`LZDLscLp7j2`wnI9We-m17@
zf`~xn)&1_4#BU$u%sC$=QL4?--(veq2dt8BQw&~37S()3u~8s_+P<*(+phWk3x|OS
zY=m|_=|mD-h@&8RyZ}48yoPxJFtstwx~W2>CurRfj=Y=S)*t@n_U}RN?Cl%6*E{yR
z`!o4PUJNsN`>XiH%#HGTwlAO%ckN$fbMW+?`K_ly5@OJeu7MxIxop)8<>Kqmv6Syh
zwXUhwSi7#;?P_$y<qryTbzZNmikTX~w9g11B)zYIHWlw)egkuj;SR6P#6DHsRa+sc
zkSSED4KS$N?J7_I#pheI+$;5RgABW?&g!@6I3Ze7ss+%8R&38i*S-Lws>Xv2lgUv;
zQ#;cwPM~OA`0E|hDK|6YbWXS4S%DY)Kjxnb%}|M9iqMeiE@*n=7@5*rk7zeH5^v6x
zb3f*5#@6nPb>Tm4elbj){o+Aq%KeMEk18ZM5%2wc+#3irMz7v<%px|ojNtowot8#T
z2L?CoPWQKLmTuHjChtf%Lb}T{oDjK<U2mlQeqg=U7^htlb_CgRqj#hQ@?E;XDj&4#
zx$I+wJ6w6^=@I`GZIosDwfQ+gsF#`bAy9}JNf=q=8%PZmsjj(13r<q2rRn^HK;l-B
zk87Y;y@77Rw^iA)K&r$>>o?6;ad?HM&lD6DI6%)Z8yL}3T)<15Xi{?dlc%mHsaGqg
zFO>to)Eg+A88EgU9S$?BeK>wpcnPBnug7ERg7b-jOIzBvLXcipc<xRHP7I^8e^>T1
zRd-o-#|BJP$78wEO7GrRvA)?$rzCC7%AXm8R|%m-FeSraOxd~qPNt)@tk=v7GiPt?
zsw0Bk`P_9>*3;=m_ZdiWMKBxa;pw}9tOZ5bj1*y;Pb4`WfC>%J7Lh9aU~TBoHEpzO
zD8L#l3a-S9Zax6dn6wnU6;qyj#$p<rhcF%CtI%${#me@g%;{QkYa@~W&N2qC!Uk`&
zC|EhY0ND4Gpq^#cyFEz0d8k@!tJ)>YVUCtT7#fU=3efg0`91POf55B6(cMEy&qK6>
zO+GbE@+F?KFYQw9-|5N>d#J95uDyt0?+zis_yNZvKzHoH9kS+<vQ2B6jnhxuDx+x+
z^!k#@<C973m~1G}yyVT{?D;Rg>lYl00o|EBUyLyd^@R%6lqF1@(^)Mc@s8W`?S`6h
z<j?PpxIqd1ZbD#rLiD=0xDME3)02(x&)zujztq%dCgDBkX{M4|O<LxPcD#As-37;z
zMi00u=^;l*Mbo767v-RF{p)SwRm<XC734&w9+l!(LKRcP7#sGPI(+pVVYECzcsd8b
z3)K<N<aN;%X}V72DYKC+LIBmD&aK8#`REvg*$ouay^_XDXr(264`kZ`foojk^t5jN
zm2aIz%gzy1ATZz6)K&Tn@g&48!CfvFaC;5uNZ(_y?Px;PE;Si-uwST_n33R2IX4Sr
zbuv2k=$bs<<MtT-CXD_FB=dQXoVZMCjITAiLp--{Hzy&WF843InyyFuUZZ;X*Or|$
zqElWJTmXpvEKT&pAsf~7bT$5j&8;c(Nm;3LvOZ<=P7)sHIu;0%Tn#>xsR_58fAsi#
zmTpOscr^8is^w%gz;V%fzf|=)ZJbbr3$1^YyDTbZf6w8z=IKNATj;f}%&Tt0nH*vj
zUfi6JJ0RAQx+92#60Mm-zSWY4)8FJAi+W3v<Ri)_&L8y&GZy`vUD+gQk=mf%6<MMS
z^;r}xSh`&;f>~g>WcaZEPK(jxKBr1&uxSCSD+fJN3VNhXu#W`M*EJ7#XfpH4mNkWJ
z_rVtf9Xi>~yg7In3?~zahXYYu5OSuQ<B7-4EBnMBI1_=W**n%Q9um&c#V9nz!v}F>
z17cjHfE9Tm`xS-(5>+DR)`!Q)Dz?FG#9?3lBd-`Hxh6ci<rEpT22-~Uf3>}Ic7*4m
zZ<%lt!gqA*#S1qRXT~Jcz{0^KPk<ZEJ9G)N!X%*V3Hx#ep}HhRzxDGM*{{Lacl&7f
z0wR5PYoM}difw#ff|Sz+nEterpLGZ6C6tbOR{XNx{F3h|#B!pUvi#2viaJp4LaF_x
z#Uy?02NWUsUQ#dbtBJT8Q3&)@T2(b(<{c<xEj)fkcy$EoZJNN#2<g-Ie8yD4Ns|_6
z#i|>)mGmV58DbO}QR5aq)Q*WMEeU*mqy<Y1(XYJ%y7Wx-aGw=x@&+`7CsUAU|3Gkp
zn{s>yr7{UFj(;F(`O~;J2U10qkWDaYu6Qi<BLJIk9Av713AOvwFzA!FOg2=j;%TXU
zWYffa(Xj#H#SxIBr3*N8`=Ma3yHHfBI$D41L%TXz@j=L3nmG?Gp#D!DVh1mv0^4Np
zGeXyKNW6NUomWVzI`1MNn2hNLt|*}gHF1+AW?w1xsZT9c%ncYYBmMibeRvMY=4%!)
z-vdnT)iUiUM(A(hZZeNGbU!Z}C7pd`6(I{A3L+qlThB18YE=K30)cLRBZGeh_D+dK
zv`5}OEeuq2%!z35u{k}o>MC|h_tHYW{M@OC5CEq(*>K5xYf>nG=d;~xqq28H9bVT0
zk7g>;_TCZR7H@7_X-5Wnd=6AfXv@dvYQ+uzjm0r%j*)Sn;Xhz1$*x=1>inH{MSA=A
zXa|_oSZNr@FB_zo&1}(6LtL9Mh;J<0K!<rp?Y#wLo5L^gmbA9Wh<72NBzgX0N-g>7
z6OQ8EcdU#0;2|HRQX*O?^<l#-uwUPV#U%<~2C@?5nI9<Pu0zM3#Z0lu97G$D6`1@9
zo1^T}6!i`Q)Ap6xo(N2*GfX+w(~-=xox_d(jlt0_xbTfa$6!%g)V^I~@g9Ux=Lzrq
zN~{LU+B=KpkQt5RouhinYc_PPK|5~=L4d%o4}u4oRB{b}y1S3(Q&efl;C7#2qTjQ^
zdi33vjy^>-dJ0`bO<pp&G%A7WM2r_=fEdqB=<;@NfIT7SM40>bt%VY8Dho3EVY;L<
zrv4nZRVObqAIGUL>XJki=e(#YM9YHY@+0mhdz*ax&hI#%fG=Kb%|sSLKBuJyi!~E<
zYF8(bSj8Jy`89&CL_i_Y{K)7M453Z9Zn7MX=rwm40Y%RU0~7G%Zl}cUvzT4`lSg=?
z>?4O|Jp@5b$G{=EA@{4VZzAW}f5AV?HSxhIbIyWphOE&#Jo$(6)wqr<hLCn%)(Y3f
z6RB)i+jh`dx}*`MEn_{9f*#L-NgcHcH}|x*hYTX>pH4MS+Z!-G7MbATu3{wBak{tI
zUQGJNl_{WVG_jWEfHCi+c<)_3&$Cu)&+9}Jkb6AF);t4+Rz<hJgzDn)q8+s&cT`se
znT%a3P5A6CI-*F;7{E3I96uEr?t;I~`qNeD)f%@1O1K@#Dq!k}Q7SLow0YLkY<7nY
zK%68ah4`3|{ADaDp=G+Fou!Bzk2O^96Ju-CO((S;T(O0!&f5qanuv|MsX~T~;s<b6
zYx`$9pEldgfJ!!9kRIvz%_2C$;tt_oMKQ?(QLOt`JZrfsQ7d2YW)$dcrEX1H?t-~{
zpRt&WfSd2#R60rAj5g2eM5DIWi7dW*2eeji{uIaLD3!ur39@kycj^B@qb;>lIUg{+
z_3OIqvtRR#aIG`H!7E+X-ou}fRXudtFH$H`yA3sylN9BWg0t-$5S^gF;(sN9eL;a+
zbPB#&XJZZF$fCcl#^R7y)mdOC7{?lMFQo4?(&Cp+n-Rp0q0~k?mi3DqLsPZ}am@PR
zh_(I~`3u&}G(KYF_bD&bA*(cJirk+b!7Ke$VYd`&o8dV3`L;qh7ZZa!7bTuOduc!?
ztX<$aMQl$6C1X-axZ?=Gi$K0X67uFyHPNY20hMdRCHX0=oq%MhiEuLfYs}NbFd&(9
z>Cpz8B}zAF7GmsqU%gcQowk_`p8ogneU)ui!A?@ZqMJaUzHJI@0Yi$@8M#P9fETpF
z+9VAOQ&Hqx?feD1lvfbD{Z2G2*t_gN0p2v?;W+$-W$GXs4o9j0GD0d;z2D=<w2qLb
zzG@4@8eO14mD)WYG7lmR{{f#7q*9fueaog#(z%rOoIf{}s_<wOa|DFDuBtWv2++(g
z+Pwd1^D4~TQ?u(j8pETNUsBHaiaQn6(Rj&n#y~~0%6h0s&v7`0IS$RglB416Hzybh
z8unOBipe7yuujK5N$3E4sO9{KspDH?av~L&WS{?pQ=r!IBNf|iugo-&isGs{a;kGN
zjojpdAq*WXBK=TtGGTayS*Z`{5)Hyst^U`3f>Ts96yPs{G}f%zcX?G@ncw953&`(o
zm%l}HoY;_Y_%bG8=!hK^pNUqy2~|Qbg=SHTWElUW$J*{Rw#waNP=TkjlNSO0Rv{||
zl#J-(!7hxXVSP_zj4oKl2)}qw5ah)!zw+q3IFn$q7m4rQK_0A(U7aq@yT%ek%ts_P
ze?yCGD+=|a_1#&fx$8b&3Qz@tua^vK@Q|OUY9Y(oy={jCb^{Ucvj?td*HY!Sk;_7%
z62I$dD=8TRu3jk>s9y;sGNY%`mY#WlHGRTQwwCu*l+}fLbH_ldDBO<aE%HGot{EtE
z7jEfae>jLw_U%$#9mEm(Z-I6%mPJ!PAwxKt-CeR##0^!HH6fJ0-r3Grx~lAzKn?$z
z6J`FO<!5NZj2L~u|4dJi$ZE9RO#iO~8F%l3dQ2>$PGk=462w|VG(cy3A19LlL(eaM
zv>hHf><H@+yM~V)d@_FvJ(NGus{TpWV!x@&TK$a?VTJYK@eJqKoJ66k9Ev5;%R=|=
z8JC>plY1EM;NQS2?9QWb*z<1yyLXo>fEecviVweBGcN-&wpCwW9OFj6ElrEy?WB$c
z)O(kz)!LWroz1x8rV<>tI_9p($wfCGOQ}dNg`=$J%qT6iy0+H*{&(SBhhzMJS(MLh
zI9&1TJldQ-p33ri&8iTlOK)K>@9-OB2P9i~y1E=pt<&hR`gCI2%wxqoVm(it+6<P0
z@(2u*gb|BZTC8*apME8~b&3Ntm>A>>fjD|`FUM}@&2(!&dQiUaJiejfwcrJNEI6Uw
znet0NU17adq5G-ySs5?edU)yqqq`8=7aiQ}AAN;s(p679wUCdnKEiKph2@#T!zV7;
zY4a`#RP07vV#ABx&PT|M%Uorw8;=E5!+)Dp@o!E&)bo}Iq7VK*mT5FLXf(UtxP;K5
zf>@&X6_g~s35Evx|9J!`xl~JRyp&;luO*;yJ-ZiMLmPiLx$y==ff#KNGzE74%LCu-
z*~dv2URv?}^Ss;zMx?e*+!D@yt%>A)i4wjtxALXnAlT#*llY^cbNK}sR7^b_bsEC?
zbhu+W+Cco6*E#D;%AMD)bW_&(Z$e^gl9Sa$fj_*mjTiHCt>YodmXH&i>0i7{W;8@D
zQDYj7qjtxY0fzLXCSzGJk*l9Qo|=8~T|?w5TY(tXM#1D-ULm3!-W?bjI4tkOfjB??
zPU_Q)b2xo@UE+F1B*kF*lYGZD!lw@B+U5+_G?({@0;9H}o(er0B)6Cx&6hO+kr}&p
z^3NkZwnr8WF-djReYM@Xs#{Vpq?8#+TTidCfx_3SU2ongx%;*Qoo;g@_Z~P&b4~WD
zJ&QXXDA|P`w@#vE?@pDl%CLgyd2@>LEfShT`X`x>eacGb%Mj-$c(6aat+<I-KQBg9
z^UMxA$`wJ;&8xm`3fQ4|M&6+JtsckdnHfk;4srwCeOPWSDl7X@;7v#IUcU}_JGQ*%
zzUqsKi*~;Ic+yjxis?Hz^VA3@<1NuRiPa(N);|fcJJoJ82pjz)#wKN!J<a(?^`Exd
z660j@T|~J1INUOBRd}^tJj|RseaP`!+}^`rsxVd+YLKGSUc`J6$?cTdP=`ds9dL0;
z;tC_MInsQJ`AqfRa@wV;^Ej*-&cSk5u~#T7lG8yu`^ufqrRR?c(B|!s_*tlTX1-zE
z+RX;DF@iaAEqAl7EP#nmqZ&;A+}-sAw8m1aR0n;md%+025AIt6mrtym&)R-FC(3K}
zc?SN-ZwVMEe$;Q)OazR}3-P)3=m`O!()daYC7#6pG_+W)HLi`%Bi3DIybWLe<kl^I
zNR(Z;N5$vO&A3m%#sEn^d#=}g+nT$rG?;QnQRP-x5l!<Zz8hh-;UrE%h58zIv>^!Q
zrpn5AB8i6x!0i0prnbyF%*G;+mHhqUBU%6_;-dKPb1x6BZY1qcBSsD}!+4L+`PYKw
z(pW5&x0XxIh>}={&@-^Nqk^*`^CB)SIXmqpLr)5iHp%4I@u(<<zj&n21ND4At`&+h
z2rpr}HH+hey(?6mIrlN_RKjN~O1)9?yMgI7InVz5`)tzUnryKa$8U}W-2y-d9(sML
zML6UgO+JK&3OQ0sxV~-U7P*ah917URR>NcR*J>dH7TCh7q+{JzerkOS@2fDpliQQx
z3v>h_4r(7Ke(A^E{M-B(jMRZ5o`SsvQcJ3_5NX!lTTmqZ@^>@QC$8f?BK~%lGojP}
zh7F793Qch1eq%=vCx}X<Da=M5X<js^8nmmm{>Ootle(TvXQ`#^6%LhjD7QXniQ`d0
zw(R<7{hm;gcwpq}U*ODmt!)+1W_MdaGqn-fK6h@yzk4u|8Oc;$3D>G>Lly?Bioq|q
z5PDupBU*OYV9vdwd=f#(*4B7&dmqHXW@slOWZ{7np{M1FI7bI-R_-GuF&3(<!PGfe
z@>f8pa-xZ!0d$?qVZ>Z>!Z((__Jm62ERGdxEu~6mZSV~S`wL*fmw@f9@xlo@RExFX
zqGa|>iMnpn1T%-sUK~4&d)9Hirt|%3H}-%3G2P2Fs1I!!<hy_tuR{*SaCP8!IxVB<
z@qkF^M7I)XZFORSznUk7n86ldqisZS*it%{5hZ!RiPY1O;^(zG=fGrBhasn8+wmOo
z@Ezm0{l=uH{!J;2&Ugl_CwntW*dRs04QDth?8QeZ^(4wh!taJ*t_;+jWr(!nlEB_?
zCD=-Ct}RrUIl$vI7LI}}O{KN8*e}(AeX=r*Pz9AXT?6fgEifr9DGWYZET=Mi2)KP>
zQL*wxxp%vOioPO)`i+zPxJMB85gjrTP;iDLe834_)qXNFpm4ho<HbX^X%!l%fwm6q
zy=5a!{Y1rk+3Kz|D#?4HoUbErJ`gekEkdLvKNt4)^LJVkh1%hdHiLUE@R^MX+?W?x
z=)=~|c^y8#_3~n-snN-&oCv}}9Y9773rD#FgR@jJ!OO9@%D|O^tv^M`#&>d~#bH0U
zgEVgZLUIib#ua!PBUby}hVb{&g{<>M!PEGIuWm3)*69X!YQrn)mk#wm`*AVPgPej)
zf2=TLy!K<(*v?Z9cFJd3%|QJs&lD*|=x&w2F)<e86_c`-!<NDHl!1?G!q9G(Zcx^Y
zXq{#)tclw9l^tYxNSW2%PnzreJ#H`Enbg^lKHP54?PF-}UN*IApk!q31q8+E&V2H#
zA$&sh16e%bpeIm7`aTSGM_#-agoO_p4%s{%-hn-F?o1)-E6YK9KK$Nqt4HMr9GO2P
z<4Y}UWx;=fv~#^@FPG<6aa4nnWDC&8Y<ysViGjc83UJOBy_XVTuL+ju(rIx0uJPcD
zE7HaBk%BWbAjs=Ev1Mupaoh&Ug}Sk}Zw(eOn6!adhGb~LwN8u)%WL8Fna3F(;REoj
z8?80L?;!t3b2QhW%8`qR41u{W4;coMf$U0vcqtD*P-{^$7fi_C*Yq4dofzCfxs&&d
z#b<5NR_(xJrg+lnMUdL6>)j|2E1yOK!U(-AA}LDDPXk4lEHnO;xkG1K4kJe!k|HB0
zst49SK@bx2@$$dmRaD?u4VYEM-`GWjg)F4uw&O`Wp2!8W*48q`O`$XpdQ#i)!TnVx
zYsII0D@ZpU>AMNAp4QV}u{a|A!&=>?m+54SWXwtWAgRMYfrP>T5g%?we;s-P*>{C{
zBw0sfOr7Br7c8p0ST6f)q_jwP07rQx&R?^KBnsQLoRydr%juq{ZN-5~g=qY=&i-1`
zn)ClS6-o$8-!|YsPF42FNXD#N*B^1zYAAEMb&m_cBp-&aG2NCn?hi>`N|qs1uPQDy
zPF-e_gSl$Kz$sUZFd&{1gk1V!`40MUfW3SbS#X&ySXL*Jo2F0R?8ygW%fcf@Q!YUL
zGh%qi=%cIZWaXc&<*qr|#s>*A3s&=O^`9)olO6xDw}y4^>c;9J+yPpCbyUxLCC?7~
zdj^;Szo+M62recjIX>Ku>EsbgikR%wE35jpYu%Mu4LN*SGpfABFO6wqhgQSS*7QcM
zx^Me6^HfimxM8EtL<u*I9hGvERyw#eo?1)<{1S_!X`NKEf1<=iy}x;D2x(az)UG2w
zk~f}fYmA*V@>1wW7A`TUR|RfFp9op+!*I&Fsp6Ka%KmU2#|)~16q>O~zP^1#eNd#y
ziHV4QxuZ%;$_`-LNmSULRdX^;3OOYnyCG`7HjX7*d~Mb+obAyCUKg{2!~s;6%Mryc
zlD3oVJpb`olez;?Rog-HC#k<um}G=1NK74}qx8o8H*xHd#O-~?>QwxWy}5Q!gL=`Q
z&tC$Bz+Jd1T|bIY&$5L1Me&<Ys|`&5BknWUFlB=-(VsH)bU-UeI1VzD>jj;^(fY{;
z?ub>`_Sk3(b9wT{uU4^Rg#aZ>j|VWQGYe?^4x$*sLYXti<5EPoTDKGQzoFQMJwIYE
zx$*PskGatztA(QDq_b!SPX+!EB!`ClX-#8sIn2kp(^>Vf0tw!CQu_aakI6M0+0pNN
z;dnMC(`dR*7+qaLz@vPBxC^FWOz?QWPAr!BIh-sBE)x@C2KS)}>w;H-z<5mjOSG0p
zVgs<kYN9~V1_K?valK_P`X!!9X6z&qMG-JBp~_7dO?}O3vCC0?-=$Mz#A0yO<Zpw-
z{Wp869h`2+#2h~n^tZLeO@rBx4afD9pd@-;;v@Ta=B3-}@2kY~H@4NKpI1Cq4nB&H
zIvXa8BV(7WAgP$hs~p$Q^roX3oi-`V6T4%5CInPkT%FrzSfQ(${nB)H%);`;S-@rk
z$mqE_a-ow6ojqAAl<alcNP~B=8Tq~65q8tR=h({FKOx)EctyMRpPyEpIe)H~@J4;t
zJ3+2D>-DEakt!>lbIOtcibGZU{kOJmNq#zzSE85=q+m5$2Fh%A>vsO9Qi)eI=Nk3$
zZo~#cZ~u$B>kFdRiTuAZCF2*L@ks93KsGRJYTOW`?-SqKLUTbb9es5Rwynl)AOoRT
z-;!n8D>7%v&Y*dRR?k;q#rIfvm{54}eh_FcjXF&^;=&Wm__dAVH(aMIrFPl>s<k2N
zQ?rd;SZ_O)Dmv+fhN&sJ4h5dQmN#M72JPLZ`{E1bh7u#uEuNsdli+*`-HjHTKN#gW
zwyZ7OXF#%p=ZtDH82Yh$!h?-}zx4CwE`&;LCkKjui4*wu*H42kN&LH<beSV}2p^X;
zUea%j-l-e>HKxjbk$&}&gXv7k$es%6v$yt<DOL+anu&uynAbT`{Ul2$YlaJ+7}5zS
zl9qzB<eF+wvJuTB_;x(@_4}XS2BFi++u}p`_SfWBS5J>){W)F?&~nwSoADJhssMEf
z<jLpZMkbc<Mobdu&}?v<Z)M{vV08?vhj~^0`Mpl9tikuegZg`c3ob1yFqRpVWsr)-
zmUYvgoa4-HB|8#qYzi4Y*kmo=BpZ~rApTS|ojh*PhVY8#M29CVJCl9*hOcd2mp#qx
zj%gF)pSP)gOU=a+^ZqV*2<gj3vC?|l^+yF+MF`&LF9R3s$}>KjEjZF+)w6ij+GJsq
z>U0$&5kFU_9?)-M)Zt@pQ9_EKv@kw0t7KZOmpssd7fx^^gI-XG+<LMGSh8|lILk*5
zgF7lQoTZtz-ZoNHufQs!A`af}5$z${zLCr6M&<E`uT0G1TGLBDB`@yu*{61UUGZh-
zW3SfsWS7mg;aFn>b5Kf%dcX^3NN1u<RO{5cW>djuv0ufmH@Gtg2Q1dHWFFJ7G793>
zuc&Sa!}AmlqtDRU`DwxD(y39bxWgWVb+9ySD<S%zm`n4_2E%g`&#ODrsfy@DwrT%S
zhDoPmG0?K3(7AwNjnXUDUcu#T9yaGMy$#{YrkqKk%IBFZ?&y>hW4D+MGGR66mZkw<
zp}8y67TGx&Dbs79|HYZ7HT%rzzQL$!iK>LGvcvfrW1(-7oBlKwXZ&1pUMdb|(JOst
zFP1}ptxI?UYvwr;Uw=fwlmQ(<*w2LFu%^|2uvFrpnhffVOl}W?OXC0EixzyC?-p7f
ZLF@BRes2KN|GQZNP*u`YtbtmE{|_Y7!}b6G

literal 0
HcmV?d00001

diff --git a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue
index bc2a53d0b..f05e56633 100644
--- a/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue
+++ b/acs/nladmin-ui/src/layout/components/Sidebar/Logo.vue
@@ -70,8 +70,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
-      height: 32px;
+      width: 55px;
+      height: 15px;
       vertical-align: middle;
       margin-right: 6px;
     }
diff --git a/acs/nladmin-ui/src/views/acs/device/opc/index.vue b/acs/nladmin-ui/src/views/acs/device/opc/index.vue
index 1afca03d7..8fabb2326 100644
--- a/acs/nladmin-ui/src/views/acs/device/opc/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/opc/index.vue
@@ -109,11 +109,11 @@
         <el-table-column prop="domain" label="domain"/>
         <el-table-column prop="remark" label="备注" min-width="100"/>
         <el-table-column prop="createtime" label="创建时间"/>
-        <el-table-column label="操作" width="200px" align="center" fixed="right">
+        <el-table-column label="操作" width="180px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
-            <el-button type="text" size="small" @click="handleClick(scope.row,'2')">删除</el-button>
-            <el-button v-if="scope.row.opc_flag === '1'" type="text" size="small" @click="handleClick(scope.row,'0')">
+            <el-button type="text" icon="el-icon-edit" size="small" @click="handleClick(scope.row,'1')">修改</el-button>
+            <el-button type="text" icon="el-icon-delete" size="small" @click="handleClick(scope.row,'2')">删除</el-button>
+            <el-button v-if="scope.row.opc_flag === '1'" type="text" icon="el-icon-plus" size="small" @click="handleClick(scope.row,'0')">
               新增PLC
             </el-button>
           </template>
diff --git a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
index 7a3611a3d..4c34c0590 100644
--- a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
@@ -43,7 +43,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
@@ -63,10 +63,10 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="device_code" label="设备编码" />
-        <el-table-column prop="error_code" label="报警编码" />
-        <el-table-column prop="error_info" label="报警信息" />
-        <el-table-column prop="error_time" label="报警时间" />
+        <el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
+        <el-table-column prop="error_code" label="报警编码" :min-width="flexWidth('error_code',crud.data,'报警编码')" />
+        <el-table-column prop="error_info" label="报警信息" :min-width="flexWidth('error_info',crud.data,'报警信息')" />
+        <el-table-column prop="error_time" label="报警时间" :min-width="flexWidth('error_time',crud.data,'报警时间')" />
         <el-table-column
           v-permission="['admin','acsDeviceErrorLog:edit','acsDeviceErrorLog:del']"
           label="操作"
diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
index 89b62682d..e71d890bb 100644
--- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
@@ -63,7 +63,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
@@ -95,45 +95,45 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" label="指令编号" width="200" />
-        <el-table-column prop="task_code" label="任务号" />
-        <el-table-column prop="vehicle_code" label="载具号" />
-        <el-table-column prop="instruction_type" label="指令类型" width="120">
+        <el-table-column v-if="false" prop="instruction_id" label="指令标识" :min-width="flexWidth('instruction_id',crud.data,'指令标识')" />
+        <el-table-column prop="instruction_code" label="指令编号" :min-width="flexWidth('instruction_code',crud.data,'指令编号')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="instruction_type" label="指令类型" width="120" >
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.instruction_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="instruction_status" label="指令状态">
+        <el-table-column prop="instruction_status" label="指令状态" :min-width="flexWidth('instruction_status',crud.data,'指令状态')" >
           <template slot-scope="scope">
             {{ dict.label.task_status[scope.row.instruction_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" />
-        <el-table-column prop="next_point_code" label="终点" />
-        <el-table-column prop="start_point_code2" label="起点2" />
-        <el-table-column prop="next_point_code2" label="终点2" />
-        <el-table-column prop="put_point_code" label="中转点" />
-        <el-table-column prop="start_height" label="取货高度" />
-        <el-table-column prop="next_height" label="放货高度" />
-        <el-table-column prop="carno" label="车号" />
-        <el-table-column prop="agv_system_type" label="AGV系统类型">
+        <el-table-column prop="start_point_code" label="起点" :min-width="flexWidth('start_point_code',crud.data,'起点')" />
+        <el-table-column prop="next_point_code" label="终点" :min-width="flexWidth('next_point_code',crud.data,'终点')" />
+        <el-table-column prop="start_point_code2" label="起点2" :min-width="flexWidth('start_point_code2',crud.data,'起点2')" />
+        <el-table-column prop="next_point_code2" label="终点2" :min-width="flexWidth('next_point_code2',crud.data,'终点2')" />
+        <el-table-column prop="put_point_code" label="中转点" :min-width="flexWidth('put_point_code',crud.data,'中转点')" />
+        <el-table-column prop="start_height" label="取货高度" :min-width="flexWidth('start_height',crud.data,'取货高度')" />
+        <el-table-column prop="next_height" label="放货高度" :min-width="flexWidth('next_height',crud.data,'放货高度')" />
+        <el-table-column prop="carno" label="车号" :min-width="flexWidth('carno',crud.data,'车号')" />
+        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120" >
           <template slot-scope="scope">
             {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="agv_inst_type" label="AGV指令类型">
+        <el-table-column prop="agv_inst_type" label="AGV指令类型" :min-width="flexWidth('agv_inst_type',crud.data,'AGV指令类型')" >
           <!--          <template slot-scope="scope">-->
           <!--            {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
           <!--          </template>-->
         </el-table-column>
-        <el-table-column prop="weight" label="重量" />
-        <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="描述" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column prop="update_by" label="修改者" />
-        <el-table-column prop="update_time" label="修改时间" width="135" />
+        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <el-table-column prop="quantity" label="数量" :min-width="flexWidth('quantity',crud.data,'数量')" />
+        <el-table-column prop="remark" label="描述" :min-width="flexWidth('remark',crud.data,'描述')" />
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_by" label="修改者" :min-width="flexWidth('update_by',crud.data,'修改者')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -202,7 +202,7 @@ export default {
         edit: false,
         del: false,
         reset: false,
-        download: true
+        download: false
       }
     })
   },
diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
index 702d4d290..28bbe2b32 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -229,47 +229,47 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column v-if="false" prop="task_id" label="任务标识" />
-        <el-table-column prop="task_code" label="任务号" width="200" />
-        <el-table-column prop="vehicle_code" label="载具号" />
-        <el-table-column prop="task_type" label="任务类型" width="120">
+        <el-table-column v-if="false" prop="task_id" label="任务标识" :min-width="flexWidth('task_id',crud.data,'任务标识')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="task_type" label="任务类型" width="120" >
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="task_status" label="任务状态">
+        <el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')" >
           <template slot-scope="scope">
             {{ dict.label.task_status[scope.row.task_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="priority" label="任务优先级" />
-        <el-table-column prop="start_point_code" label="起点" />
-        <el-table-column prop="next_point_code" label="终点" />
-        <el-table-column prop="start_point_code2" label="起点2" />
-        <el-table-column prop="start_point_code2" label="终点2" />
-        <el-table-column prop="put_point_code" label="中转点" />
-        <el-table-column prop="start_height" label="取货高度" />
-        <el-table-column prop="next_height" label="放货高度" />
-        <el-table-column prop="car_no" label="车号" />
-        <el-table-column prop="agv_system_type" label="AGV系统类型">
+        <el-table-column prop="priority" label="任务优先级" :min-width="flexWidth('priority',crud.data,'任务优先级')" />
+        <el-table-column prop="start_point_code" label="起点" :min-width="flexWidth('start_point_code',crud.data,'起点')" />
+        <el-table-column prop="next_point_code" label="终点" :min-width="flexWidth('next_point_code',crud.data,'终点')" />
+        <el-table-column prop="start_point_code2" label="起点2" :min-width="flexWidth('start_point_code2',crud.data,'起点2')" />
+        <el-table-column prop="next_point_code2" label="终点2" :min-width="flexWidth('next_point_code2',crud.data,'终点2')" />
+        <el-table-column prop="put_point_code" label="中转点" :min-width="flexWidth('put_point_code',crud.data,'中转点')" />
+        <el-table-column prop="start_height" label="取货高度" :min-width="flexWidth('start_height',crud.data,'取货高度')" />
+        <el-table-column prop="next_height" label="放货高度" :min-width="flexWidth('next_height',crud.data,'放货高度')" />
+        <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
+        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120" >
           <template slot-scope="scope">
             {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="storage_task_type" label="立库任务类型">
+        <el-table-column prop="storage_task_type" label="立库任务类型" :min-width="flexWidth('storage_task_type',crud.data,'立库任务类型')" >
           <template slot-scope="scope">
             {{ dict.label.storage_task_type[scope.row.storage_task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="weight" label="重量" />
-        <el-table-column prop="temperature" label="温度" />
-        <el-table-column prop="oven_time" label="烘箱时间" />
-        <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column prop="update_by" label="修改者" />
-        <el-table-column prop="update_time" label="结束时间" width="135" />
+        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <el-table-column prop="temperature" label="温度" :min-width="flexWidth('temperature',crud.data,'温度')" />
+        <el-table-column prop="oven_time" label="烘箱时间" :min-width="flexWidth('oven_time',crud.data,'烘箱时间')" />
+        <el-table-column prop="quantity" label="数量" :min-width="flexWidth('quantity',crud.data,'数量')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_by" label="修改者" :min-width="flexWidth('update_by',crud.data,'修改者')" />
+        <el-table-column prop="update_time" label="结束时间" :min-width="flexWidth('update_time',crud.data,'结束时间')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -325,7 +325,7 @@ export default {
         edit: false,
         del: false,
         reset: false,
-        download: true
+        download: false
       }
     })
   },
diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index 5ca9ad20f..b714d425d 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -86,51 +86,51 @@
         @select-all="crud.selectAllChange"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column v-if="false" prop="task_id" label="任务标识" />
-        <el-table-column prop="task_code" label="任务号(指令编号)" width="200" />
-        <el-table-column prop="vehicle_code" label="载具号" />
+        <el-table-column v-if="false" prop="task_id" label="任务标识" :min-width="flexWidth('task_id',crud.data,'任务标识')" />
+        <el-table-column prop="task_code" label="任务号(指令编号)" :min-width="flexWidth('task_code',crud.data,'任务号(指令编号)')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
         <el-table-column prop="task_type" label="任务类型" width="120">
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="task_status" label="状态">
+        <el-table-column prop="task_status" label="状态" width="60">
           <template slot-scope="scope">
             {{ dict.label.task_status[scope.row.task_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="priority" label="任务优先级" />
-        <el-table-column prop="start_point_code" label="起点" />
-        <el-table-column prop="next_point_code" label="终点" />
-        <el-table-column prop="start_point_code2" label="起点2" />
-        <el-table-column prop="next_point_code2" label="终点2" />
-        <el-table-column prop="put_point_code" label="中转点" />
-        <el-table-column prop="start_height" label="取货高度" />
-        <el-table-column prop="next_height" label="放货高度" />
-        <el-table-column prop="car_no" label="车号" />
-        <el-table-column prop="agv_system_type" label="AGV系统类型">
+        <el-table-column prop="priority" label="任务优先级" :min-width="flexWidth('priority',crud.data,'任务优先级')" />
+        <el-table-column prop="start_point_code" label="起点" :min-width="flexWidth('start_point_code',crud.data,'起点')" />
+        <el-table-column prop="next_point_code" label="终点" :min-width="flexWidth('next_point_code',crud.data,'终点')" />
+        <el-table-column prop="start_point_code2" label="起点2" :min-width="flexWidth('start_point_code2',crud.data,'起点2')" />
+        <el-table-column prop="next_point_code2" label="终点2" :min-width="flexWidth('next_point_code2',crud.data,'终点2')" />
+        <el-table-column prop="put_point_code" label="中转点" :min-width="flexWidth('put_point_code',crud.data,'中转点')" />
+        <el-table-column prop="start_height" label="取货高度" :min-width="flexWidth('start_height',crud.data,'取货高度')" />
+        <el-table-column prop="next_height" label="放货高度" :min-width="flexWidth('next_height',crud.data,'放货高度')" />
+        <el-table-column prop="car_no" label="车号" :min-width="flexWidth('car_no',crud.data,'车号')" />
+        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120px">
           <template slot-scope="scope">
             {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="agv_inst_type" label="AGV指令类型">
+        <el-table-column prop="agv_inst_type" label="AGV指令类型" width="120px">
           <!--          <template slot-scope="scope">-->
           <!--            {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}-->
           <!--          </template>-->
         </el-table-column>
-        <el-table-column prop="storage_task_type" label="立库任务类型">
+        <el-table-column prop="storage_task_type" label="立库任务类型" width="120px">
           <template slot-scope="scope">
             {{ dict.label.storage_task_type[scope.row.storage_task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="weight" label="重量" />
-        <el-table-column prop="temperature" label="温度" />
-        <el-table-column prop="quantity" label="数量" />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column prop="update_by" label="修改者" />
-        <el-table-column prop="update_time" label="结束时间" width="135" />
+        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <el-table-column prop="temperature" label="温度" :min-width="flexWidth('temperature',crud.data,'温度')" />
+        <el-table-column prop="quantity" label="数量" :min-width="flexWidth('quantity',crud.data,'数量')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_by" label="修改者" :min-width="flexWidth('update_by',crud.data,'修改者')" />
+        <el-table-column prop="update_time" label="结束时间" :min-width="flexWidth('update_time',crud.data,'结束时间')" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
index 17f53a1fd..346fd74a3 100644
--- a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue
@@ -31,7 +31,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index 406e28684..bc5b7faa2 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -32,7 +32,7 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.materialList" :key="item.id" :label="item.label" :value="item.value" />
         </el-select>
         <el-select
           v-model="query.status"
@@ -86,7 +86,7 @@
       <el-dialog
         :close-on-click-modal="false"
         :before-close="crud.cancelCU"
-        :visible.sync="crud.status.cu > 0"
+        :visible.sync="crud.status.cu"
         :title="crud.status.title"
         width="500px"
       >
@@ -119,48 +119,52 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" label="指令编号" />
-        <el-table-column prop="instruction_type" label="指令类型">
+        <el-table-column v-if="false" prop="instruction_id" label="指令标识" :min-width="flexWidth('instruction_id',crud.data,'指令标识')" />
+        <el-table-column prop="instruction_code" label="指令编号" :min-width="flexWidth('instruction_code',crud.data,'指令编号')" />
+        <el-table-column prop="instruction_type" label="指令类型" width="120px" >
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.instruction_type] }}
           </template>
         </el-table-column>
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="task_code" label="任务号" />
-        <el-table-column prop="vehicle_code" label="载具号" />
-        <el-table-column prop="instruction_status" label="指令状态">
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="instruction_status" label="指令状态" :min-width="flexWidth('instruction_status',crud.data,'指令状态')">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
             <span v-if="scope.row.instruction_status=='1' ">执行中</span>
             <span v-if="scope.row.instruction_status=='2' ">完成</span>
           </template>
         </el-table-column>
-        <el-table-column prop="send_status" label="下发状态">
+        <el-table-column prop="send_status" label="下发状态" :min-width="flexWidth('send_status',crud.data,'下发状态')" >
           <template slot-scope="scope">
             <span v-if="scope.row.send_status=='0' ">未下发</span>
             <span v-if="scope.row.send_status=='1' ">成功</span>
             <span v-if="scope.row.send_status=='2' ">失败</span>
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="取货点1" />
-        <el-table-column prop="next_point_code" label="放货点1" />
-        <el-table-column prop="start_point_code2" label="取货点2" />
-        <el-table-column prop="next_point_code2" label="放货点2" />
-        <el-table-column prop="put_point_code" label="中转点" />
-        <el-table-column prop="execute_device_code" label="当前执行设备" />
-        <el-table-column prop="carno" label="车号" />
-        <el-table-column prop="weight" label="重量" />
-        <el-table-column prop="agv_jobno" label="AGV任务号" />
-        <el-table-column prop="agv_inst_type" label="AGV任务类型" />
-        <el-table-column prop="agv_system_type" label="AGV系统类型" />
-        <el-table-column prop="start_height" label="取货高度" />
-        <el-table-column prop="next_height" label="放货高度" />
-        <el-table-column prop="remark" label="描述" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
+        <el-table-column prop="start_point_code" label="取货点1" :min-width="flexWidth('start_point_code',crud.data,'取货点1')" />
+        <el-table-column prop="next_point_code" label="放货点1" :min-width="flexWidth('next_point_code',crud.data,'放货点1')" />
+        <el-table-column prop="start_point_code2" label="取货点2" :min-width="flexWidth('start_point_code2',crud.data,'取货点2')" />
+        <el-table-column prop="next_point_code2" label="放货点2" :min-width="flexWidth('next_point_code2',crud.data,'放货点2')" />
+        <el-table-column prop="put_point_code" label="中转点" :min-width="flexWidth('put_point_code',crud.data,'中转点')" />
+        <el-table-column prop="execute_device_code" label="当前执行设备" :min-width="flexWidth('execute_device_code',crud.data,'当前执行设备')" />
+        <el-table-column prop="carno" label="车号" :min-width="flexWidth('carno',crud.data,'车号')" />
+        <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <el-table-column prop="agv_jobno" label="AGV任务号" :min-width="flexWidth('agv_jobno',crud.data,'AGV任务号')" />
+        <el-table-column prop="agv_inst_type" label="AGV任务类型" :min-width="flexWidth('agv_inst_type',crud.data,'AGV任务类型')" />
+        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120px">
+          <template slot-scope="scope">
+            {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_height" label="取货高度" :min-width="flexWidth('start_height',crud.data,'取货高度')" />
+        <el-table-column prop="next_height" label="放货高度" :min-width="flexWidth('next_height',crud.data,'放货高度')" />
+        <el-table-column prop="remark" label="描述" :min-width="flexWidth('remark',crud.data,'描述')" />
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
 
-        <el-table-column
+        <!-- <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
@@ -180,6 +184,94 @@
               </el-dropdown-menu>
             </el-dropdown>
           </template>
+        </el-table-column> -->
+        <el-table-column
+          v-permission="['admin','instruction:edit','instruction:del']"
+          label="操作"
+          width="100"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <!-- <el-button-group>
+              <el-button
+                type="text"
+                icon="el-icon-finished"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'a' })"
+              >
+                完成
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-circle-close"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'b' })"
+              >
+                取消
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-folder-add"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'c' })"
+              >
+                强制取消
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-folder-add"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'd' })"
+              >
+                初始化
+              </el-button>
+            </el-button-group> -->
+            <el-dropdown>
+              <span class="el-dropdown-link">
+                <i class="el-icon-setting">More</i>
+                <!-- <el-icon class="el-icon--right">
+                  <arrow-down />
+                </el-icon> -->
+              </span>
+              <template #dropdown>
+                <el-dropdown-menu>
+                  <el-dropdown-item>
+                    <el-button
+                      type="text"
+                      icon="el-icon-finished"
+                      @click="handleCommand({ index: scope.$index, row: scope.row, command: 'a' })"
+                    >
+                      完成
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      type="text"
+                      icon="el-icon-circle-close"
+                      @click="handleCommand({ index: scope.$index, row: scope.row, command: 'b' })"
+                    >
+                      取消
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      type="text"
+                      icon="el-icon-folder-add"
+                      @click="handleCommand({ index: scope.$index, row: scope.row, command: 'c' })"
+                    >
+                      强制取消
+                    </el-button>
+                  </el-dropdown-item>
+                  <el-dropdown-item>
+                    <el-button
+                      type="text"
+                      icon="el-icon-check"
+                      @click="handleCommand({ index: scope.$index, row: scope.row, command: 'd' })"
+                    >
+                      初始化
+                    </el-button>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </template>
+            </el-dropdown>
+          </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
@@ -232,7 +324,7 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status', 'task_type'],
+  dicts: ['task_status', 'task_type', 'agv_system_type'],
   name: 'Instruction',
   components: { crudOperation, pagination },
   mixins: [presenter(), header(), form(defaultForm), crud()],
@@ -370,4 +462,5 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+
 </style>
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 619b3ce01..6805581b6 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -408,47 +408,46 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="25" />
-        <el-table-column v-if="false" prop="task_id" label="任务标识" />
-        <el-table-column prop="task_code" label="任务号" width="100" />
-        <el-table-column prop="task_type" label="任务类型" width="120">
+        <el-table-column type="selection" width="50" />
+        <el-table-column v-if="false" prop="task_id" label="任务标识" :min-width="flexWidth('task_id',crud.data,'任务标识')" />
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')" />
+        <el-table-column prop="task_type" label="任务类型" width="120px" >
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.task_type] }}
           </template>
         </el-table-column>
         <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="vehicle_code" label="载具号" width="100" />
-        <el-table-column prop="task_status" label="任务状态" width="60">
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')" />
+        <el-table-column prop="task_status" label="任务状态" :min-width="flexWidth('task_status',crud.data,'任务状态')" >
           <template slot-scope="scope">
             {{ dict.label.task_status[scope.row.task_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="priority" label="优先级" width="100" />
-        <el-table-column prop="start_point_code" label="取货点1" width="100px" />
-        <el-table-column prop="next_point_code" label="放货点1" width="120px" />
-        <el-table-column prop="start_point_code2" label="取货点2" width="120px" />
-        <el-table-column prop="next_point_code2" label="放货点2" width="120px" />
-        <el-table-column prop="put_point_code" label="中转点" width="100px" />
-        <!--        <el-table-column prop="agv_task_type" label="AGV任务类型" width="120px" />-->
-        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120px">
+        <el-table-column prop="priority" label="优先级" :min-width="flexWidth('priority',crud.data,'优先级')" />
+        <el-table-column prop="start_point_code" label="取货点1" :min-width="flexWidth('start_point_code',crud.data,'取货点1')" />
+        <el-table-column prop="next_point_code" label="放货点1" :min-width="flexWidth('next_point_code',crud.data,'放货点1')" />
+        <el-table-column prop="start_point_code2" label="取货点2" :min-width="flexWidth('start_point_code2',crud.data,'取货点2')" />
+        <el-table-column prop="next_point_code2" label="放货点2" :min-width="flexWidth('next_point_code2',crud.data,'放货点2')" />
+        <el-table-column prop="put_point_code" label="中转点" :min-width="flexWidth('put_point_code',crud.data,'中转点')" />
+        <el-table-column prop="agv_system_type" label="AGV系统类型" width="120px" >
           <template slot-scope="scope">
             {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="storage_task_type" label="立库任务类型" width="120px">
+        <el-table-column prop="storage_task_type" label="立库任务类型" :min-width="flexWidth('storage_task_type',crud.data,'立库任务类型')" >
           <template slot-scope="scope">
             {{ dict.label.storage_task_type[scope.row.storage_task_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="start_height" label="取货高度" />
-        <el-table-column prop="next_height" label="放货高度" />
-        <el-table-column prop="device_code" label="纸管库出库仓位" />
-        <el-table-column prop="qty" label="纸管库出库数量" />
-        <el-table-column prop="truss_type" label="内包间行架任务类型" />
-        <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column
+        <el-table-column prop="start_height" label="取货高度" :min-width="flexWidth('start_height',crud.data,'取货高度')" />
+        <el-table-column prop="next_height" label="放货高度" :min-width="flexWidth('next_height',crud.data,'放货高度')" />
+        <el-table-column prop="device_code" label="纸管库出库仓位" :min-width="flexWidth('device_code',crud.data,'纸管库出库仓位')" />
+        <el-table-column prop="qty" label="纸管库出库数量" :min-width="flexWidth('qty',crud.data,'纸管库出库数量')" />
+        <el-table-column prop="truss_type" label="内包间行架任务类型" :min-width="flexWidth('truss_type',crud.data,'内包间行架任务类型')" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <!-- <el-table-column
           v-permission="['admin','task:edit','task:del']"
           fixed="left"
           label="操作"
@@ -467,6 +466,39 @@
               </el-dropdown-menu>
             </el-dropdown>
           </template>
+        </el-table-column> -->
+        <el-table-column
+          v-permission="['admin','task:edit','task:del']"
+          label="操作"
+          width="200"
+          align="center"
+          fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button-group>
+              <el-button
+                type="text"
+                icon="el-icon-finished"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'a' })"
+              >
+                完成
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-circle-close"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'b' })"
+              >
+                取消
+              </el-button>
+              <el-button
+                type="text"
+                icon="el-icon-folder-add"
+                @click="handleCommand({ index: scope.$index, row: scope.row, command: 'c' })"
+              >
+                创建指令
+              </el-button>
+            </el-button-group>
+          </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
@@ -497,7 +529,7 @@ export default {
         edit: true,
         del: true,
         reset: false,
-        download: true
+        download: false
       },
       crudMethod: { ...crudTask }
     })
@@ -707,14 +739,16 @@ export default {
     //   })
     // },
 
-    beforeHandleCommand(index, row, command) {
+    /* beforeHandleCommand(index, row, command) {
+      console.log(command.command)
       return {
         'index': index,
         'row': row,
         'command': command
       }
-    },
+    }, */
     handleCommand(command) {
+      console.log(command.command)
       switch (command.command) {
         case 'a':// 完成
           this.finish(command.index, command.row)
@@ -836,4 +870,11 @@ export default {
 .el-icon-arrow-down {
   font-size: 12px;
 }
+
+.custom-cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 </style>
diff --git a/acs/nladmin-ui/src/views/login.vue b/acs/nladmin-ui/src/views/login.vue
index caa6d0699..b246c984e 100644
--- a/acs/nladmin-ui/src/views/login.vue
+++ b/acs/nladmin-ui/src/views/login.vue
@@ -56,8 +56,8 @@ export default {
       codeUrl: '',
       cookiePass: '',
       loginForm: {
-        username: 'admin',
-        password: '123456',
+        username: '',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''