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 f75771096..9675cc8b9 100644
Binary files a/acs/nladmin-ui/src/assets/images/logo.png and b/acs/nladmin-ui/src/assets/images/logo.png differ
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 000000000..f75771096
Binary files /dev/null and b/acs/nladmin-ui/src/assets/images/logo1.png differ
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: ''