diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
new file mode 100644
index 0000000..d168ed0
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java
@@ -0,0 +1,77 @@
+package org.nl.acs.angle.controller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.angle.domain.AcsPointAngle;
+import org.nl.acs.angle.service.IAcsPointAngleService;
+import org.nl.common.logging.annotation.Log;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author tq
+ * @since 2023-12-13
+ */
+@RestController
+@Api(tags = "点位角度管理")
+@RequestMapping("/api/acsPointAngle")
+@Slf4j
+public class AcsPointAngleController {
+    @Autowired
+    private IAcsPointAngleService acsPointAngleService;
+
+    @GetMapping
+    @Log("查询点位角度")
+    @ApiOperation("查询点位角度")
+    //@PreAuthorize("@el.check('acsPointAngle:list')")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(acsPointAngleService.queryAll(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增点位角度")
+    @ApiOperation("新增点位角度")
+    //@PreAuthorize("@el.check('acsPointAngle:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody AcsPointAngle dto) {
+        acsPointAngleService.create(dto);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改点位角度")
+    @ApiOperation("修改点位角度")
+    //@PreAuthorize("@el.check('acsPointAngle:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody AcsPointAngle dto) {
+        acsPointAngleService.update(dto);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除点位角度")
+    @ApiOperation("删除点位角度")
+    //@PreAuthorize("@el.check('acsPointAngle:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody String[] ids) {
+        acsPointAngleService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @GetMapping("/updateActive")
+    @Log("是否启用")
+    @ApiOperation("是否启用")
+    public ResponseEntity<Object> updateOn(@RequestParam Long id, @RequestParam String is_active) {
+        acsPointAngleService.updateOn(id, is_active);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
new file mode 100644
index 0000000..8ccc88e
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java
@@ -0,0 +1,69 @@
+package org.nl.acs.angle.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author tq
+ * @since 2023-12-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("acs_point_angle")
+@ApiModel(value="AcsPointAngle对象", description="")
+public class AcsPointAngle implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "id标识")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "起始点位编码")
+    private String start_point_code;
+
+    @ApiModelProperty(value = "起始设备编码")
+    private String start_device_code;
+
+    @ApiModelProperty(value = "目标点位编码")
+    private String next_point_code;
+
+    @ApiModelProperty(value = "目标设备编码")
+    private String next_device_code;
+
+    @ApiModelProperty(value = "起始点位角度")
+    private BigDecimal start_point_angle;
+
+    @ApiModelProperty(value = "目标点位角度")
+    private BigDecimal next_point_angle;
+
+    @ApiModelProperty(value = "是否启用")
+    private String is_active;
+
+    @ApiModelProperty(value = "创建者")
+    private String create_by;
+
+    @ApiModelProperty(value = "创建时间")
+    private String create_time;
+
+    @ApiModelProperty(value = "修改者")
+    private String update_by;
+
+    @ApiModelProperty(value = "修改时间")
+    private String update_time;
+
+
+}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/mapper/AcsPointAngleMapper.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/mapper/AcsPointAngleMapper.java
new file mode 100644
index 0000000..acc350d
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/mapper/AcsPointAngleMapper.java
@@ -0,0 +1,16 @@
+package org.nl.acs.angle.mapper;
+
+import org.nl.acs.angle.domain.AcsPointAngle;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author tq
+ * @since 2023-12-13
+ */
+public interface AcsPointAngleMapper extends BaseMapper<AcsPointAngle> {
+
+}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
new file mode 100644
index 0000000..2d2558d
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java
@@ -0,0 +1,32 @@
+package org.nl.acs.angle.service;
+
+import org.nl.acs.angle.domain.AcsPointAngle;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author tq
+ * @since 2023-12-13
+ */
+public interface IAcsPointAngleService extends IService<AcsPointAngle> {
+
+    void create(AcsPointAngle dto);
+    /**
+     * 编辑
+     *
+     * @param dto /
+     */
+    void update(AcsPointAngle dto);
+
+    void deleteAll(String[] ids);
+
+    Map<String, Object> queryAll(Map whereJson, Pageable page);
+
+    void updateOn(Long id, String is_active);
+}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
new file mode 100644
index 0000000..efcf804
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java
@@ -0,0 +1,119 @@
+package org.nl.acs.angle.service.impl;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import org.nl.acs.angle.domain.AcsPointAngle;
+import org.nl.acs.angle.mapper.AcsPointAngleMapper;
+import org.nl.acs.angle.service.IAcsPointAngleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.nl.acs.device.domain.Device;
+import org.nl.acs.utils.ConvertUtil;
+import org.nl.acs.utils.PageUtil;
+import org.nl.common.exception.BadRequestException;
+import org.nl.common.utils.SecurityUtils;
+import org.nl.config.language.LangProcess;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author tq
+ * @since 2023-12-13
+ */
+@Service
+public class AcsPointAngleServiceImpl extends ServiceImpl<AcsPointAngleMapper, AcsPointAngle> implements IAcsPointAngleService {
+
+    @Autowired
+    private AcsPointAngleMapper acsPointAngleMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(AcsPointAngle dto) {
+        AcsPointAngle acsPointAngle = new AcsPointAngle();
+        String currentUsername = SecurityUtils.getCurrentUsername();
+        String now = DateUtil.now();
+        acsPointAngle.setId(dto.getId());
+        acsPointAngle.setStart_point_code(dto.getStart_point_code());
+        acsPointAngle.setStart_device_code(dto.getStart_device_code());
+        acsPointAngle.setNext_point_code(dto.getNext_point_code());
+        acsPointAngle.setNext_device_code(dto.getNext_device_code());
+        acsPointAngle.setStart_point_angle(dto.getStart_point_angle());
+        acsPointAngle.setNext_point_angle(dto.getNext_point_angle());
+        acsPointAngle.setIs_active(dto.getIs_active());
+        acsPointAngle.setCreate_by("auto");
+        acsPointAngle.setCreate_time(now);
+        acsPointAngle.setUpdate_by(currentUsername);
+        acsPointAngle.setUpdate_time(now);
+        acsPointAngleMapper.insert(acsPointAngle);
+    }
+
+    @Override
+    public void update(AcsPointAngle dto) {
+        if (dto == null) {
+            throw new BadRequestException(LangProcess.msg("error_nullPoint"));
+        }
+        AcsPointAngle acsPointAngle = new AcsPointAngle();
+        acsPointAngle.setId(dto.getId());
+        //起点角度，终点角度变化
+        acsPointAngle.setStart_point_angle(dto.getStart_point_angle());
+        acsPointAngle.setNext_point_angle(dto.getNext_point_angle());
+        String currentUsername = SecurityUtils.getCurrentUsername();
+        String now = DateUtil.now();
+        acsPointAngle.setUpdate_by(currentUsername);
+        acsPointAngle.setUpdate_time(now);
+        acsPointAngleMapper.updateById(acsPointAngle);
+    }
+
+    @Override
+    public void deleteAll(String[] ids) {
+        for (String id : ids) {
+            AcsPointAngle pointAngle = new LambdaQueryChainWrapper<>(acsPointAngleMapper)
+                    .eq(AcsPointAngle::getId, id)
+                    .one();
+            if (pointAngle == null) {
+                continue;
+            }
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", id);
+            acsPointAngleMapper.deleteByMap(map);
+        }
+    }
+
+    @Override
+    public Map<String, Object> queryAll(Map whereJson, Pageable page) {
+        IPage<AcsPointAngle> queryPage = PageUtil.toMybatisPage(page);
+        LambdaQueryWrapper<AcsPointAngle> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByDesc(AcsPointAngle::getUpdate_time);
+        IPage<AcsPointAngle> pointAnglePage = acsPointAngleMapper.selectPage(queryPage, wrapper);
+        final JSONObject json = (JSONObject) JSON.toJSON(ConvertUtil.convertPage(pointAnglePage, AcsPointAngle.class));
+        return json;
+    }
+
+    @Override
+    public void updateOn(Long id, String is_active) {
+        AcsPointAngle acsPointAngle = new AcsPointAngle();
+        acsPointAngle.setId(id);
+        acsPointAngle.setIs_active(is_active);
+        String currentUsername = SecurityUtils.getCurrentUsername();
+        String now = DateUtil.now();
+        acsPointAngle.setUpdate_by(currentUsername);
+        acsPointAngle.setUpdate_time(now);
+        acsPointAngleMapper.updateById(acsPointAngle);
+    }
+
+}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java
index a1ce92a..1fbee0e 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java
@@ -11,7 +11,7 @@ import java.util.List;
 @Data
 public class ItemProtocol {
 
-   /**
+    /**
      * 心跳
      */
     public static String item_heartbeat = "heartbeat";
@@ -21,17 +21,17 @@ public class ItemProtocol {
      */
     public static String item_deviceCode = "deviceCode";
 
-     /**
+    /**
      * 工作模式
      */
     public static String item_mode = "mode";
 
     /**
-     *作业状态
+     * 作业状态
      */
     public static String item_command = "command";
 
-     /**
+    /**
      * 任务号
      */
     public static String item_task = "task";
@@ -56,7 +56,7 @@ public class ItemProtocol {
      */
     public static String item_y = "y";
 
-     /**
+    /**
      * 行走开关信号
      */
     public static String item_move = "move";
@@ -66,12 +66,12 @@ public class ItemProtocol {
      */
     public static String item_cargoMove = "cargoMove";
 
-     /**
+    /**
      * 行走动作信号
      */
     public static String item_action = "action";
 
-     /**
+    /**
      * 行走激光数值
      */
     public static String item_distancex = "distancex";
@@ -82,88 +82,88 @@ public class ItemProtocol {
     public static String item_distancey = "distancey";
 
     /**
-     *载货台超限信号
+     * 载货台超限信号
      */
     public static String item_cargoError = "cargoError";
 
     /**
-     *货叉探货信号
+     * 货叉探货信号
      */
     public static String item_forkCargo = "forkCargo";
 
     /**
-     *货叉位置信号
+     * 货叉位置信号
      */
     public static String item_forkLocation = "forkLocation";
 
     /**
-     *货叉动作信号
+     * 货叉动作信号
      */
     public static String item_forkAction = "forkAction";
-     /**
+    /**
      * 特殊开关量1
      */
     public static String item_special1 = "special1";
-     /**
+    /**
      * 特殊开关量2
      */
     public static String item_special2 = "special2";
     /**
-     *托盘条码
+     * 托盘条码
      */
     public static String item_trayCode = "trayCode";
-     /**
+    /**
      * 水箱和消防缓存位有无货
      */
     public static String item_storage_cache = "storage_cache";
-     /**
+    /**
      * 速度（转/分钟）
      */
     public static String item_stacker_rpm = "stacker_rpm";
-     /**
+    /**
      * 电流
      */
     public static String item_stacker_electricCurrent = "stacker_electric Current";
 
-     /**
+    /**
      * 轴运行次数
      */
     public static String item_stacker_runing_time = "stacker_runing time";
-     /**
+    /**
      * 轴工作时间（小时）
      */
     public static String item_stacker_workingHours = "stacker_workingHours";
     /**
-     *载货台速度（转/分钟）
+     * 载货台速度（转/分钟）
      */
     public static String item_cargo_rpm = "cargo_rpm";
     /**
-     *载货台电流
+     * 载货台电流
      */
     public static String item_cargo_electric_Current = "cargo_electric Current";
     /**
-     *载货台轴工作小时数
+     * 载货台轴工作小时数
      */
     public static String item_cargo_workingHours = "cargo_workingHours";
     /**
-     *载货台轴运行次数
+     * 载货台轴运行次数
      */
     public static String item_cargo_runingTimes = "cargo_runingTimes";
     /**
-     *货叉速度（转/分钟
+     * 货叉速度（转/分钟
      */
     public static String item_fork_rpm = "fork_rpm";
     /**
-     *货叉电流
+     * 货叉电流
      */
     public static String item_fork_electric_Current = "fork_electric Current";
 
     /**
-     *货叉轴工作时间（小时
+     * 货叉轴工作时间（小时
      */
     public static String item_fork_workingHours = "fork_workingHours";
     /**
-     *货叉轴运行次数
+     * 货叉轴运行次数
      */
     public static String item_fork_runingTimes = "fork_runingTimes";
 
@@ -176,7 +176,7 @@ public class ItemProtocol {
      * 堆垛机号
      */
     public static String item_to_device_code = "to_device_code";
-     /**
+    /**
      * 轴运行次数
      */
     public static String item_to_command = "to_command";
@@ -184,12 +184,12 @@ public class ItemProtocol {
      * 物料类型
      */
     public static String item_to_type = "to_type";
-     /**
+    /**
      * 任务号
      */
     public static String item_to_task = "to_task";
     /**
-     *作业排
+     * 作业排
      */
     public static String item_to_z = "to_z";
     /**
@@ -467,5 +467,4 @@ public class ItemProtocol {
     public String toString() {
         return "";
     }
-
 }
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java
index b721ec8..14a9b09 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java
@@ -20,6 +20,7 @@ import cn.hutool.core.date.DateUtil;
 import org.nl.common.utils.ElAdminConstant;
 import org.nl.common.utils.FileUtil;
 import org.nl.common.utils.StringUtils;
+import org.nl.config.language.LangProcess;
 import org.nl.system.service.monitor.MonitorService;
 import org.springframework.stereotype.Service;
 import oshi.SystemInfo;
@@ -145,10 +146,10 @@ public class MonitorServiceImpl implements MonitorService {
     private Map<String,Object> getCpuInfo(CentralProcessor processor) {
         Map<String,Object> cpuInfo = new LinkedHashMap<>();
         cpuInfo.put("name", processor.getProcessorIdentifier().getName());
-        cpuInfo.put("package", processor.getPhysicalPackageCount() + "个物理CPU");
-        cpuInfo.put("core", processor.getPhysicalProcessorCount() + "个物理核心");
+        cpuInfo.put("package", processor.getPhysicalPackageCount() +" " +LangProcess.msg("physical_cpu"));
+        cpuInfo.put("core", processor.getPhysicalProcessorCount() +" " +LangProcess.msg("physical_core"));
         cpuInfo.put("coreNumber", processor.getPhysicalProcessorCount());
-        cpuInfo.put("logic", processor.getLogicalProcessorCount() + "个逻辑CPU");
+        cpuInfo.put("logic", processor.getLogicalProcessorCount() +" " +LangProcess.msg("logical_cpu"));
         // CPU信息
         long[] prevTicks = processor.getSystemCpuLoadTicks();
         // 等待1秒...
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
index 1527671..b7aa0fd 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties
@@ -4,3 +4,6 @@ device_checkRoute=设备{0}路由已存在,无法操作
 device_checkStatus=该设备已有呼叫请求未响应，操作失败\!
 device_checkrelate=设备{0}关联信息{1}异常\:{2}
 route_isNull=路由不通
+physical_cpu=个物理CPU
+physical_core=个物理核心
+logical_cpu=个逻辑CPU
\ No newline at end of file
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
index 81847a9..7449017 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties
@@ -4,3 +4,6 @@ device_checkRoute=Device {0} route already exists and cannot be operated
 device_checkStatus=The device has an unresponsive call request and the operation has failed\!  
 device_checkrelate=Device {0} association information {1} exception\: {2}  
 route_isNull=Routing not working  
+physical_cpu=Physical CPU  
+physical_core=Physical core  
+logical_cpu=Logical CPU
\ No newline at end of file
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
index 81ad49d..a7ace04 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_in_ID.properties
@@ -4,3 +4,7 @@ device_checkRoute=Jalan perangkat {0} sudah ada dan tidak dapat beroperasi
 device_checkStatus=Perangkat memiliki permintaan panggilan yang tidak respon dan operasinya gagal\!  
 device_checkrelate=Informasi asosiasi perangkat {0} pengecualian {1}\: {2}  
 route_isNull=Jalan tidak bekerja  
+physical_cpu=CPU fisik  
+physical_core=CPU logis  
+logical_cpu=CPU logis  
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
index 1527671..05b5da2 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties
@@ -4,3 +4,6 @@ device_checkRoute=设备{0}路由已存在,无法操作
 device_checkStatus=该设备已有呼叫请求未响应，操作失败\!
 device_checkrelate=设备{0}关联信息{1}异常\:{2}
 route_isNull=路由不通
+physical_cpu=个物理CPU
+physical_core=个物理核心
+logical_cpu=个逻辑CPU
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/mapper/AcsPointAngleMapper.xml b/acs/nladmin-system/nlsso-server/src/main/resources/mapper/AcsPointAngleMapper.xml
new file mode 100644
index 0000000..4fc8c3c
--- /dev/null
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/mapper/AcsPointAngleMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.acs.angle.mapper.AcsPointAngleMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, start_point_code, start_device_code, next_point_code, next_device_code, start_point_angle, next_point_angle, is_active, create_by, create_time, update_by, update_time
+    </sql>
+
+</mapper>
diff --git a/acs/nladmin-ui/src/api/acs/angle/acsPointAngle.js b/acs/nladmin-ui/src/api/acs/angle/acsPointAngle.js
new file mode 100644
index 0000000..c09f5aa
--- /dev/null
+++ b/acs/nladmin-ui/src/api/acs/angle/acsPointAngle.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/acsPointAngle',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/acsPointAngle/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/acsPointAngle',
+    method: 'put',
+    data
+  })
+}
+
+export function updateOn(id, is_active) {
+  console.log(is_active)
+  return request({
+    url: '/api/acsPointAngle/updateActive?id=' + id + '&is_active=' + is_active,
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, updateOn }
diff --git a/acs/nladmin-ui/src/components/Breadcrumb/index.vue b/acs/nladmin-ui/src/components/Breadcrumb/index.vue
index a5d29ce..515a1ee 100644
--- a/acs/nladmin-ui/src/components/Breadcrumb/index.vue
+++ b/acs/nladmin-ui/src/components/Breadcrumb/index.vue
@@ -37,7 +37,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: this.$t('common.home') }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: this.$t('auto.common.home') }}].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
diff --git a/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue b/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue
index 0f029f5..17d5d92 100644
--- a/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue
+++ b/acs/nladmin-ui/src/components/Crud/CRUD.operation.vue
@@ -12,7 +12,7 @@
         icon="el-icon-plus"
         @click="crud.toAdd"
       >
-        {{ $t('common.Create') }}
+        {{ $t('auto.common.Create') }}
       </el-button>
       <el-button
         v-if="crud.optShow.edit"
@@ -24,7 +24,7 @@
         :disabled="crud.selections.length !== 1"
         @click="crud.toEdit(crud.selections[0])"
       >
-        {{ $t('common.Update') }}
+        {{ $t('auto.common.Update') }}
       </el-button>
       <el-button
         v-if="crud.optShow.del"
@@ -38,7 +38,7 @@
         :disabled="crud.selections.length === 0"
         @click="toDelete(crud.selections)"
       >
-        {{ $t('common.Delete') }}
+        {{ $t('auto.common.Delete') }}
       </el-button>
       <el-button
         v-if="crud.optShow.download"
@@ -49,7 +49,7 @@
         type="warning"
         icon="el-icon-download"
         @click="crud.doExport"
-      >{{ $t('common.Export') }}</el-button>
+      >{{ $t('auto.common.Export') }}</el-button>
       <!--右侧-->
       <slot name="right" />
     </span>
@@ -86,7 +86,7 @@
           :indeterminate="allColumnsSelectedIndeterminate"
           @change="handleCheckAllChange"
         >
-          {{ $t('common.SelectAll') }}
+          {{ $t('auto.common.SelectAll') }}
         </el-checkbox>
         <el-checkbox
           v-for="item in tableColumns"
@@ -190,9 +190,9 @@ export default {
       this.tableColumns = columns
     },
     toDelete(datas) {
-      this.$confirm(this.$t('common.Tip1') + ` ${datas.length} ` + this.$t('common.Tip2'), this.$t('common.Tips'), {
-        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.Cancel'),
+      this.$confirm(this.$t('auto.common.Tip1') + ` ${datas.length} ` + this.$t('auto.common.Tip2'), this.$t('auto.common.Tips'), {
+        confirmButtonText: this.$t('auto.common.Confirm'),
+        cancelButtonText: this.$t('auto.common.Cancel'),
         type: 'warning'
       }).then(() => {
         this.crud.delAllLoading = true
diff --git a/acs/nladmin-ui/src/components/Crud/RR.operation.vue b/acs/nladmin-ui/src/components/Crud/RR.operation.vue
index 6a94f65..4f0535c 100644
--- a/acs/nladmin-ui/src/components/Crud/RR.operation.vue
+++ b/acs/nladmin-ui/src/components/Crud/RR.operation.vue
@@ -5,9 +5,9 @@
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
     -->
     <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
-      <i class="el-icon-search el-icon--left" />{{ $t('common.Query') }}
+      <i class="el-icon-search el-icon--left" />{{ $t('auto.common.Query') }}
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">{{ $t('common.Reset') }}</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">{{ $t('auto.common.Reset') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
 
diff --git a/acs/nladmin-ui/src/components/Crud/UD.operation.vue b/acs/nladmin-ui/src/components/Crud/UD.operation.vue
index 7bd742e..66bf9b6 100644
--- a/acs/nladmin-ui/src/components/Crud/UD.operation.vue
+++ b/acs/nladmin-ui/src/components/Crud/UD.operation.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
-    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">{{ $t('common.Update') }}</el-button>
+    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">{{ $t('auto.common.Update') }}</el-button>
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
-        <el-button size="mini" type="text" @click="doCancel">{{ $t('common.Cancel') }}</el-button>
-        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">{{ $t('common.Confirm') }}</el-button>
+        <el-button size="mini" type="text" @click="doCancel">{{ $t('auto.common.Cancel') }}</el-button>
+        <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">{{ $t('auto.common.Confirm') }}</el-button>
       </div>
-      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">{{ $t('common.Delete') }}</el-button>
+      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">{{ $t('auto.common.Delete') }}</el-button>
     </el-popover>
 
   </div>
diff --git a/acs/nladmin-ui/src/components/Crud/crud.js b/acs/nladmin-ui/src/components/Crud/crud.js
index eb70ffc..5c36475 100644
--- a/acs/nladmin-ui/src/components/Crud/crud.js
+++ b/acs/nladmin-ui/src/components/Crud/crud.js
@@ -85,7 +85,7 @@ function CRUD(options) {
       },
       // 标题
       get title() {
-        return this.add > CRUD.STATUS.NORMAL ? i18n.t('common.Create') + ' ' + i18n.t(`${crud.title}`) : this.edit > CRUD.STATUS.NORMAL ? i18n.t('common.Editors') + ' ' + i18n.t(`${crud.title}`) : crud.title
+        return this.add > CRUD.STATUS.NORMAL ? i18n.t('auto.common.Create') + ' ' + i18n.t(`${crud.title}`) : this.edit > CRUD.STATUS.NORMAL ? i18n.t('auto.common.Editors') + ' ' + i18n.t(`${crud.title}`) : crud.title
       }
     },
     msg: {
@@ -168,7 +168,7 @@ function CRUD(options) {
       if (!row[column.property]) {
         return '否'
       }
-      return row[column.property] == '1' ? '是' : '否'
+      return row[column.property] === '1' ? '是' : '否'
     },
 
     /**
diff --git a/acs/nladmin-ui/src/components/IconSelect/index.vue b/acs/nladmin-ui/src/components/IconSelect/index.vue
index ec7e454..9594fec 100644
--- a/acs/nladmin-ui/src/components/IconSelect/index.vue
+++ b/acs/nladmin-ui/src/components/IconSelect/index.vue
@@ -1,7 +1,7 @@
 <!-- @author zhengjie -->
 <template>
   <div class="icon-body">
-    <el-input v-model="name" style="position: relative;" clearable :placeholder="$t('common.Tip15')" @clear="filterIcons" @input.native="filterIcons">
+    <el-input v-model="name" style="position: relative;" clearable :placeholder="$t('auto.common.Tip15')" @clear="filterIcons" @input.native="filterIcons">
       <i slot="suffix" class="el-icon-search el-input__icon" />
     </el-input>
     <div class="icon-list">
diff --git a/acs/nladmin-ui/src/components/TopNav/index.vue b/acs/nladmin-ui/src/components/TopNav/index.vue
index 575b102..6729498 100644
--- a/acs/nladmin-ui/src/components/TopNav/index.vue
+++ b/acs/nladmin-ui/src/components/TopNav/index.vue
@@ -17,7 +17,7 @@
 
     <!-- 顶部菜单超出数量折叠 -->
     <el-submenu v-if="topMenus.length > visibleNumber" :style="{'--theme': theme}" index="more">
-      <template slot="title">{{ $t('common.moreMenu') }}</template>
+      <template slot="title">{{ $t('auto.common.moreMenu') }}</template>
       <template v-for="(item, index) in topMenus">
         <el-menu-item
           v-if="index >= visibleNumber"
@@ -96,7 +96,7 @@ export default {
         activePath = '/' + tmpPath.substring(0, tmpPath.indexOf('/'))
       } else if (path === '/index' || path === '') {
         if (!this.isFrist) {
-          this.isFrist = true
+          this.$set(this, 'isFrist', true)
         } else {
           activePath = 'index'
         }
diff --git a/acs/nladmin-ui/src/components/UploadExcel/index.vue b/acs/nladmin-ui/src/components/UploadExcel/index.vue
index 2afdd63..3354641 100644
--- a/acs/nladmin-ui/src/components/UploadExcel/index.vue
+++ b/acs/nladmin-ui/src/components/UploadExcel/index.vue
@@ -2,9 +2,9 @@
   <div>
     <input ref="excel-upload-input" class="excel-upload-input" type="file" accept=".xlsx, .xls" @change="handleClick">
     <div class="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
-      {{ $t('common.Tip7') }}
+      {{ $t('auto.common.Tip7') }}
       <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">
-        {{ $t('common.browses') }}
+        {{ $t('auto.common.browses') }}
       </el-button>
     </div>
   </div>
diff --git a/acs/nladmin-ui/src/i18n/langs/chinese.js b/acs/nladmin-ui/src/i18n/langs/chinese.js
index 3262cc2..424e7ec 100644
--- a/acs/nladmin-ui/src/i18n/langs/chinese.js
+++ b/acs/nladmin-ui/src/i18n/langs/chinese.js
@@ -18,6 +18,9 @@ import timing from './timing/zh'
 import config from './config/zh'
 import user from './user/zh'
 import deviceErrorInfo from './deviceErrorInfo/zh'
+import role from './role/zh'
+import department from './department/zh'
+import dict from './dict/zh'
 
 export default {
   ...zhLocale,
@@ -39,6 +42,9 @@ export default {
   ...timing,
   ...config,
   ...deviceErrorInfo,
-  ...user
+  ...user,
+  ...role,
+  ...department,
+  ...dict
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/department/en.js b/acs/nladmin-ui/src/i18n/langs/department/en.js
new file mode 100644
index 0000000..5844100
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/department/en.js
@@ -0,0 +1,25 @@
+export default {
+  'department': {
+    'table_title': {
+      'Department_name': 'Department Name',
+      'enter_department_name': 'Enter Department Name',
+      'Department': 'Department'
+    },
+    'table_value': {
+      'Sort': 'Sort',
+      'Name': 'Name',
+      'State': 'State',
+      'CreateDate': 'CreateDate',
+      'Operate': 'Operate'
+    },
+    'other': {
+      'Department_code': 'Department Code',
+      'Department_sort': 'Department Sort',
+      'External_identification': 'External Identification',
+      'Top_departments': 'Top Departments'
+    },
+    'msg': {
+      'delete_msg': 'Confirm That One Of The Selected Data Items Is Deleted?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/department/in.js b/acs/nladmin-ui/src/i18n/langs/department/in.js
new file mode 100644
index 0000000..fe15021
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/department/in.js
@@ -0,0 +1,25 @@
+export default {
+  'department': {
+    'table_title': {
+      'Department_name': 'Nama Departemen',
+      'enter_department_name': 'Silakan Masukkan Nama Departemen',
+      'Department': 'Departemen'
+    },
+    'table_value': {
+      'Sort': 'Jenis',
+      'Name': 'Nama',
+      'State': 'Negara',
+      'CreateDate': 'Tanggal Pembuatan',
+      'Operate': 'Beroperasi'
+    },
+    'other': {
+      'Department_code': 'Kode Departemen',
+      'Department_sort': 'Urutkan Berdasarkan Departemen',
+      'External_identification': 'Identifikasi Eksternal',
+      'Top_departments': 'Departemen Teratas'
+    },
+    'msg': {
+      'delete_msg': 'Mengonfirmasi Bahwa Salah Satu Item Data Yang Dipilih Dihapus?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/department/zh.js b/acs/nladmin-ui/src/i18n/langs/department/zh.js
new file mode 100644
index 0000000..94cf987
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/department/zh.js
@@ -0,0 +1,25 @@
+export default {
+  'department': {
+    'table_title': {
+      'Department_name': '部门名称',
+      'enter_department_name': '请输入部门名称',
+      'Department': '部门'
+    },
+    'table_value': {
+      'Sort': '排序',
+      'Name': '名称',
+      'State': '状态',
+      'CreateDate': '创建日期',
+      'Operate': '操作'
+    },
+    'other': {
+      'Department_code': '部门编码',
+      'Department_sort': '部门排序',
+      'External_identification': '外部标识',
+      'Top_departments': '顶级部门'
+    },
+    'msg': {
+      'delete_msg': '确认删除选中的1条数据?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/dict/en.js b/acs/nladmin-ui/src/i18n/langs/dict/en.js
new file mode 100644
index 0000000..21b2137
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/dict/en.js
@@ -0,0 +1,28 @@
+export default {
+  'dict': {
+    'table_title': {
+      'code_Name': 'Code(Name)',
+      'enter_code_name': 'Enter Name(Code)'
+    },
+    'table_value': {
+      'Code': 'Code',
+      'Name': 'Name',
+      'Operate': 'Operate',
+      'Dict': 'Dict'
+    },
+    'other': {
+      'Dict_detail': 'Dict Detail',
+      'Department_label': 'Department Label',
+      'Dictionary_value': 'Dictionary Value',
+      'Sort': 'Sort',
+      'Parameter1': 'Parameter1',
+      'Parameter2': 'Parameter2',
+      'Parameter3': 'Parameter3',
+      'Which_dictionary': 'Which Dictionary',
+      'Click_dictionary_see_details': 'Click On The Dictionary To See Details'
+    },
+    'msg': {
+      'delete_msg': 'Confirm That One Of The Selected Data Items Is Deleted?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/dict/in.js b/acs/nladmin-ui/src/i18n/langs/dict/in.js
new file mode 100644
index 0000000..f63d7a5
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/dict/in.js
@@ -0,0 +1,28 @@
+export default {
+  'dict': {
+    'table_title': {
+      'code_Name': 'Nama (Kode)',
+      'enter_code_name': 'Masukkan Nama (Kode)'
+    },
+    'table_value': {
+      'Code': 'Pengkodean Kamus',
+      'Name': 'Nama',
+      'Operate': 'Beroperasi',
+      'Dict': 'Kamus'
+    },
+    'other': {
+      'Dict_detail': 'Detail Kamus',
+      'Department_label': 'Tag Kamus',
+      'Dictionary_value': 'Nilai Kamus',
+      'Sort': 'Jenis',
+      'Parameter1': 'Parameter 1',
+      'Parameter2': 'Parameter 2',
+      'Parameter3': 'Parameter 3',
+      'Which_dictionary': 'Kamus Yang Menjadi Miliknya',
+      'Click_dictionary_see_details': 'Klik Kamus Untuk Melihat Detailnya'
+    },
+    'msg': {
+      'delete_msg': 'Mengonfirmasi Bahwa Salah Satu Item Data Yang Dipilih Dihapus?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/dict/zh.js b/acs/nladmin-ui/src/i18n/langs/dict/zh.js
new file mode 100644
index 0000000..e8f48a7
--- /dev/null
+++ b/acs/nladmin-ui/src/i18n/langs/dict/zh.js
@@ -0,0 +1,28 @@
+export default {
+  'dict': {
+    'table_title': {
+      'code_Name': '名称(编码)',
+      'enter_code_name': '输入名称(编码)'
+    },
+    'table_value': {
+      'Code': '字典编码',
+      'Name': '名称',
+      'Operate': '操作',
+      'Dict': '字典'
+    },
+    'other': {
+      'Dict_detail': '字典详情',
+      'Department_label': '字典标签',
+      'Dictionary_value': '字典值',
+      'Sort': '排序',
+      'Parameter1': '参数1',
+      'Parameter2': '参数2',
+      'Parameter3': '参数3',
+      'Which_dictionary': '所属字典',
+      'Click_dictionary_see_details': '点击字典查看详情'
+    },
+    'msg': {
+      'delete_msg': '确认删除选中的1条数据?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/en.js b/acs/nladmin-ui/src/i18n/langs/en.js
index 906b145..3d7a57a 100644
--- a/acs/nladmin-ui/src/i18n/langs/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/en.js
@@ -1,118 +1,120 @@
 export default {
   'lang': 'English',
-  'common': {
-    'home': 'Dashboard',
-    'Layout_setting': 'Layout Setting',
-    'Personal_center': 'Personal Center',
-    'Log_out': 'Log Out',
-    'Personal_information': 'Personal Information',
-    'username': 'UserName',
-    'name': 'Name',
-    'phone': 'Phone Number',
-    'phone2': 'Phone',
-    'sex': 'Sex',
-    'sex_male': 'Male',
-    'sex_female': 'Female',
-    'email': 'E-mail',
-    'Security_settings': 'Security Settings',
-    'Save_settings': 'Save Settings',
-    'Reset_settings': 'Reset Settings',
-    'Change_password': 'Change Password',
-    'New_password': 'New Password',
-    'Old_password': 'Old Password',
-    'Verify_password': 'Verify Password',
-    'User_information': 'User Information',
-    'Operation_log': 'Operation Log',
-    'action': 'Action',
-    'IP_source': 'IP Source',
-    'Browser': 'Browser',
-    'Request_time': 'Request Time',
-    'Creation_date': 'Creation Date',
-    'account': 'Account',
-    'password': 'Password',
-    'verification_code': 'Code',
-    'login_rm': 'Remember Me',
-    'login': 'Login',
-    'login_ing': 'Logging In...',
-    'Create': 'Create',
-    'Update': 'Update',
-    'Delete': 'Delete',
-    'Export': 'Export',
-    'Editors': 'Editor',
-    'SelectAll': 'SelectAll',
-    'Query': 'Query',
-    'Reset': 'Reset',
-    'Confirm': 'Confirm',
-    'Cancel': 'Cancel',
-    'Forced_cancellation': 'Forced_cancellation',
-    'Initialize': 'Initialize',
-    'Operate': 'Operate',
-    'Refresh': 'Refresh',
-    'Closes': 'Close',
-    'Closes_l': 'Close Left',
-    'Closes_r': 'Close Right',
-    'Closes_o': 'Close Other',
-    'Closes_a': 'Close All',
-    'Theme_style_setting': 'Theme Style Setting',
-    'Theme_color': 'Theme Color',
-    'System_layout_configuration': 'System Layout Configuration',
-    'Open': 'Open',
-    'Fixation': 'Fixation',
-    'Display': 'Display',
-    'Dynamic_titles': 'Dynamic Titles',
-    'crudTip': 'Are you sure to delete this data?',
-    'startDate': 'StartDate',
-    'endDate': 'EndDate',
-    'moreMenu': 'MoreMenu',
-    'browses': 'Browse',
-    'fz': 'Full Screen Zoom',
-    'Tips': 'Tips',
-    'Tip1': 'Confirm deletion of selected',
-    'Tip2': 'Data?',
-    'Tip3': 'User name not used as login',
-    'Tip4': 'Mobile phone number cannot be duplicate',
-    'Tip5': 'Please enter a phone number',
-    'Tip6': 'Please enter the correct 11 digit phone number',
-    'Tip7': 'Drag and drop the excel file here or',
-    'Tip8': 'The two passwords are different',
-    'Tip9': 'Please enter your password again',
-    'Tip10': 'Please enter your old password',
-    'Tip11': 'Please enter your new password',
-    'Tip12': '6 to 20 characters in length',
-    'Tip13': 'Are you sure to log out and exit the system?',
-    'Tip14': 'WebSocket connection error',
-    'Tip15': 'Please enter an icon name',
-    'loading': 'Loading...',
-    'synchronous': 'Synchronous',
-    'determine': 'Determine',
-    'stop': 'Stop',
-    'firing': 'Firing',
-    'import': 'Import',
-    'driver_configuration': 'Driver Configuration',
-    'create_time': 'Create Time',
-    'update_time': 'Update Time',
-    'create_by': 'Create People',
-    'update_by': 'Update People',
-    'is_on': 'Enable Or Not',
-    'please': 'Please Select',
-    'true': 'True',
-    'false': 'False',
-    'Running': 'Running',
-    'Paused': 'Paused'
-  },
-  'monitor': {
-    'sys': 'System',
-    'day': 'Running Day',
-    'status': 'Status',
-    'core': 'Core',
-    'cpu': 'CPU Utilization',
-    'memory': 'Memory Utilization',
-    'tality': 'Tality',
-    'used': 'Used',
-    'leisure': 'Leisure',
-    'exchange': 'Exchange Utilization',
-    'disk': 'Disk Utilization',
-    'cpu_monitoring': 'Cpu Utilization Monitoring',
-    'memory_monitoring': 'Memory Utilization Monitoring'
+  'auto': {
+    'common': {
+      'home': 'Dashboard',
+      'Layout_setting': 'Layout Setting',
+      'Personal_center': 'Personal Center',
+      'Log_out': 'Log Out',
+      'Personal_information': 'Personal Information',
+      'username': 'UserName',
+      'name': 'Name',
+      'phone': 'Phone Number',
+      'phone2': 'Phone',
+      'sex': 'Sex',
+      'sex_male': 'Male',
+      'sex_female': 'Female',
+      'email': 'E-mail',
+      'Security_settings': 'Security Settings',
+      'Save_settings': 'Save Settings',
+      'Reset_settings': 'Reset Settings',
+      'Change_password': 'Change Password',
+      'New_password': 'New Password',
+      'Old_password': 'Old Password',
+      'Verify_password': 'Verify Password',
+      'User_information': 'User Information',
+      'Operation_log': 'Operation Log',
+      'action': 'Action',
+      'IP_source': 'IP Source',
+      'Browser': 'Browser',
+      'Request_time': 'Request Time',
+      'Creation_date': 'Creation Date',
+      'account': 'Account',
+      'password': 'Password',
+      'verification_code': 'Code',
+      'login_rm': 'Remember Me',
+      'login': 'Login',
+      'login_ing': 'Logging In...',
+      'Create': 'Create',
+      'Update': 'Update',
+      'Delete': 'Delete',
+      'Export': 'Export',
+      'Editors': 'Editor',
+      'SelectAll': 'SelectAll',
+      'Query': 'Query',
+      'Reset': 'Reset',
+      'Confirm': 'Confirm',
+      'Cancel': 'Cancel',
+      'Forced_cancellation': 'Forced_cancellation',
+      'Initialize': 'Initialize',
+      'Operate': 'Operate',
+      'Refresh': 'Refresh',
+      'Closes': 'Close',
+      'Closes_l': 'Close Left',
+      'Closes_r': 'Close Right',
+      'Closes_o': 'Close Other',
+      'Closes_a': 'Close All',
+      'Theme_style_setting': 'Theme Style Setting',
+      'Theme_color': 'Theme Color',
+      'System_layout_configuration': 'System Layout Configuration',
+      'Open': 'Open',
+      'Fixation': 'Fixation',
+      'Display': 'Display',
+      'Dynamic_titles': 'Dynamic Titles',
+      'crudTip': 'Are you sure to delete this data?',
+      'startDate': 'StartDate',
+      'endDate': 'EndDate',
+      'moreMenu': 'MoreMenu',
+      'browses': 'Browse',
+      'fz': 'Full Screen Zoom',
+      'Tips': 'Tips',
+      'Tip1': 'Confirm deletion of selected',
+      'Tip2': 'Data?',
+      'Tip3': 'User name not used as login',
+      'Tip4': 'Mobile phone number cannot be duplicate',
+      'Tip5': 'Please enter a phone number',
+      'Tip6': 'Please enter the correct 11 digit phone number',
+      'Tip7': 'Drag and drop the excel file here or',
+      'Tip8': 'The two passwords are different',
+      'Tip9': 'Please enter your password again',
+      'Tip10': 'Please enter your old password',
+      'Tip11': 'Please enter your new password',
+      'Tip12': '6 to 20 characters in length',
+      'Tip13': 'Are you sure to log out and exit the system?',
+      'Tip14': 'WebSocket connection error',
+      'Tip15': 'Please enter an icon name',
+      'loading': 'Loading...',
+      'synchronous': 'Synchronous',
+      'determine': 'Determine',
+      'stop': 'Stop',
+      'firing': 'Firing',
+      'import': 'Import',
+      'driver_configuration': 'Driver Configuration',
+      'create_time': 'Create Time',
+      'update_time': 'Update Time',
+      'create_by': 'Create People',
+      'update_by': 'Update People',
+      'is_on': 'Enable Or Not',
+      'please': 'Please Select',
+      'true': 'True',
+      'false': 'False',
+      'Running': 'Running',
+      'Paused': 'Paused'
+    },
+    'monitor': {
+      'sys': 'System',
+      'day': 'Running Day',
+      'status': 'Status',
+      'core': 'Core',
+      'cpu': 'CPU Utilization',
+      'memory': 'Memory Utilization',
+      'tality': 'Tality',
+      'used': 'Used',
+      'leisure': 'Leisure',
+      'exchange': 'Exchange Utilization',
+      'disk': 'Disk Utilization',
+      'cpu_monitoring': 'Cpu Utilization Monitoring',
+      'memory_monitoring': 'Memory Utilization Monitoring'
+    }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/english.js b/acs/nladmin-ui/src/i18n/langs/english.js
index 73d9664..73881ed 100644
--- a/acs/nladmin-ui/src/i18n/langs/english.js
+++ b/acs/nladmin-ui/src/i18n/langs/english.js
@@ -18,6 +18,9 @@ import config from './config/en'
 import customPolicy from './customPolicy/en'
 import deviceErrorInfo from './deviceErrorInfo/en'
 import user from './user/en'
+import role from './role/en'
+import department from './department/en'
+import dict from './dict/en'
 
 export default {
   ...enLocale,
@@ -39,6 +42,9 @@ export default {
   ...timing,
   ...config,
   ...deviceErrorInfo,
-  ...user
+  ...user,
+  ...role,
+  ...department,
+  ...dict
 }
 
diff --git a/acs/nladmin-ui/src/i18n/langs/in.js b/acs/nladmin-ui/src/i18n/langs/in.js
index 36ad2bc..462b10b 100644
--- a/acs/nladmin-ui/src/i18n/langs/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/in.js
@@ -1,118 +1,120 @@
 export default {
   'lang': 'In',
-  'common': {
-    'home': 'Rumah', // 首页
-    'Layout_setting': 'Pengaturan Bentangan',
-    'Personal_center': 'Pusat Pribadi',
-    'Log_out': 'Log Out',
-    'Personal_information': 'Informasi Pribadi',
-    'username': 'Nama Pengguna',
-    'name': 'Nama',
-    'phone': 'Nomor Ponsel',
-    'phone2': 'Ponsel',
-    'sex': 'Gender',
-    'sex_male': 'Laki-Laki',
-    'sex_female': 'Wanita',
-    'email': 'E-mail',
-    'Security_settings': 'Pengaturan Keamanan',
-    'Save_settings': 'Simpan Pengaturan',
-    'Reset_settings': 'Reset Pengaturan',
-    'Change_password': 'Ubah Kata Sandi',
-    'New_password': 'Kata Sandi Baru',
-    'Old_password': 'Kata Sandi Lama',
-    'Verify_password': 'Konfirmasi Sandi',
-    'User_information': 'Informasi Pengguna',
-    'Operation_log': 'Log Operasi',
-    'action': 'Perilaku',
-    'Browser': 'Pelayar',
-    'IP_source': 'IP Sumber',
-    'Request_time': 'Meminta Konsumsi Waktu',
-    'Creation_date': 'Dicipta Pada',
-    'account': 'Akaun',
-    'password': 'Sandi',
-    'verification_code': 'Kode',
-    'login_rm': 'Ingat Aku',
-    'login': 'Login',
-    'login_ing': 'Daftar Masuk',
-    'Create': 'Buat',
-    'Update': 'Kemaskini',
-    'Delete': 'Hapus',
-    'Export': 'Ekspor',
-    'Editors': 'Editor',
-    'SelectAll': 'Pilih Semua',
-    'Query': 'Pertanyaan',
-    'Reset': 'Reset',
-    'Confirm': 'Konfirmasi',
-    'Cancel': 'Batalkan',
-    'Forced_cancellation': 'Pembatalan Paksa',
-    'Initialize': 'Menginisialisasi',
-    'Operate': 'Operasi',
-    'Refresh': 'Segar',
-    'Closes': 'Tutup',
-    'Closes_l': 'Tutup Sisi Kiri',
-    'Closes_r': 'Tutup Sisi Kanan',
-    'Closes_o': 'Tutup Lain',
-    'Closes_a': 'Tutup Semua',
-    'Theme_style_setting': 'Pengaturan Gaya Tema',
-    'Theme_color': 'Warna Tema',
-    'System_layout_configuration': 'Konfigurasi Layout Sistem',
-    'Open': 'Buka',
-    'Fixation': 'Tetap',
-    'Display': 'Tampilan',
-    'Dynamic_titles': 'Tajuk Dinamik',
-    'crudTip': 'Apakah Anda yakin untuk menghapus data ini?',
-    'startDate': 'TarikhAwal',
-    'endDate': 'TarikhAkhir',
-    'moreMenu': 'LebihBanyakMenu',
-    'browses': 'Melayar',
-    'fz': 'Zum Layar Penuh',
-    'Tips': 'Prompt',
-    'Tip1': 'Konfirmasi Penghapusan Yang Dipilih',
-    'Tip2': 'Data?',
-    'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk',
-    'Tip4': 'Nomor telepon ponsel tidak dapat duplikasi',
-    'Tip5': 'Silakan masukkan nomor telepon',
-    'Tip6': 'Silakan masukkan nomor telepon 11 digit yang benar',
-    'Tip7': 'Seret dan jatuhkan berkas Excel di sini atau',
-    'Tip8': 'Kata sandi yang dimasukkan dua kali tidak cocok',
-    'Tip9': 'Silakan masukkan sandi lagi',
-    'Tip10': 'Silakan masukkan kata sandi lama Anda',
-    'Tip11': 'Silakan masukkan sandi baru',
-    'Tip12': 'Antara 6 dan 20 karakter dalam panjang',
-    'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?',
-    'Tip14': 'Koneksi WebSocket error',
-    'Tip15': 'Silakan masukkan nama ikon',
-    'loading': 'Memuatkan Data...',
-    'synchronous': 'Sinkron',
-    'determine': 'Konfirmasi',
-    'stop': 'Berhenti',
-    'firing': 'Start Up',
-    'import': 'Mengimpor',
-    'driver_configuration': 'Konfigurasi Driver',
-    'create_time': 'Buat Waktu',
-    'update_time': 'Untuk Memperbarui Waktu',
-    'create_by': 'Dibuat Oleh',
-    'update_by': 'Pengubah',
-    'is_on': 'Diaktifkan Atau Tidak',
-    'please': 'Silahkan Pilih',
-    'true': 'Ada',
-    'false': 'Tidak',
-    'Running': 'Menjalankan',
-    'Paused': 'Berhenti'
-  },
-  'monitor': {
-    'sys': 'Sistem',
-    'day': 'Proyek ini telah berjalan terus menerus',
-    'status': 'Keadaan',
-    'core': 'Inti',
-    'cpu': 'Kadar penggunaan CPU',
-    'memory': 'Kadar penggunaan ingatan',
-    'tality': 'Total',
-    'used': 'Digunakan',
-    'leisure': 'Bebas',
-    'exchange': 'Kadar penggunaan area pertukaran',
-    'disk': 'Kadar penggunaan disk',
-    'cpu_monitoring': 'Monitor penggunaan CPU',
-    'memory_monitoring': 'Monitor penggunaan memori'
+  'auto': {
+    'common': {
+      'home': 'Rumah', // 首页
+      'Layout_setting': 'Pengaturan Bentangan',
+      'Personal_center': 'Pusat Pribadi',
+      'Log_out': 'Log Out',
+      'Personal_information': 'Informasi Pribadi',
+      'username': 'Nama Pengguna',
+      'name': 'Nama',
+      'phone': 'Nomor Ponsel',
+      'phone2': 'Ponsel',
+      'sex': 'Gender',
+      'sex_male': 'Laki-Laki',
+      'sex_female': 'Wanita',
+      'email': 'E-mail',
+      'Security_settings': 'Pengaturan Keamanan',
+      'Save_settings': 'Simpan Pengaturan',
+      'Reset_settings': 'Reset Pengaturan',
+      'Change_password': 'Ubah Kata Sandi',
+      'New_password': 'Kata Sandi Baru',
+      'Old_password': 'Kata Sandi Lama',
+      'Verify_password': 'Konfirmasi Sandi',
+      'User_information': 'Informasi Pengguna',
+      'Operation_log': 'Log Operasi',
+      'action': 'Perilaku',
+      'Browser': 'Pelayar',
+      'IP_source': 'IP Sumber',
+      'Request_time': 'Meminta Konsumsi Waktu',
+      'Creation_date': 'Dicipta Pada',
+      'account': 'Akaun',
+      'password': 'Sandi',
+      'verification_code': 'Kode',
+      'login_rm': 'Ingat Aku',
+      'login': 'Login',
+      'login_ing': 'Daftar Masuk',
+      'Create': 'Buat',
+      'Update': 'Kemaskini',
+      'Delete': 'Hapus',
+      'Export': 'Ekspor',
+      'Editors': 'Editor',
+      'SelectAll': 'Pilih Semua',
+      'Query': 'Pertanyaan',
+      'Reset': 'Reset',
+      'Confirm': 'Konfirmasi',
+      'Cancel': 'Batalkan',
+      'Forced_cancellation': 'Pembatalan Paksa',
+      'Initialize': 'Menginisialisasi',
+      'Operate': 'Operasi',
+      'Refresh': 'Segar',
+      'Closes': 'Tutup',
+      'Closes_l': 'Tutup Sisi Kiri',
+      'Closes_r': 'Tutup Sisi Kanan',
+      'Closes_o': 'Tutup Lain',
+      'Closes_a': 'Tutup Semua',
+      'Theme_style_setting': 'Pengaturan Gaya Tema',
+      'Theme_color': 'Warna Tema',
+      'System_layout_configuration': 'Konfigurasi Layout Sistem',
+      'Open': 'Buka',
+      'Fixation': 'Tetap',
+      'Display': 'Tampilan',
+      'Dynamic_titles': 'Tajuk Dinamik',
+      'crudTip': 'Apakah Anda yakin untuk menghapus data ini?',
+      'startDate': 'TarikhAwal',
+      'endDate': 'TarikhAkhir',
+      'moreMenu': 'LebihBanyakMenu',
+      'browses': 'Melayar',
+      'fz': 'Zum Layar Penuh',
+      'Tips': 'Prompt',
+      'Tip1': 'Konfirmasi Penghapusan Yang Dipilih',
+      'Tip2': 'Data?',
+      'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk',
+      'Tip4': 'Nomor telepon ponsel tidak dapat duplikasi',
+      'Tip5': 'Silakan masukkan nomor telepon',
+      'Tip6': 'Silakan masukkan nomor telepon 11 digit yang benar',
+      'Tip7': 'Seret dan jatuhkan berkas Excel di sini atau',
+      'Tip8': 'Kata sandi yang dimasukkan dua kali tidak cocok',
+      'Tip9': 'Silakan masukkan sandi lagi',
+      'Tip10': 'Silakan masukkan kata sandi lama Anda',
+      'Tip11': 'Silakan masukkan sandi baru',
+      'Tip12': 'Antara 6 dan 20 karakter dalam panjang',
+      'Tip13': 'Apakah Anda yakin untuk log keluar dan keluar dari sistem?',
+      'Tip14': 'Koneksi WebSocket error',
+      'Tip15': 'Silakan masukkan nama ikon',
+      'loading': 'Memuatkan Data...',
+      'synchronous': 'Sinkron',
+      'determine': 'Konfirmasi',
+      'stop': 'Berhenti',
+      'firing': 'Start Up',
+      'import': 'Mengimpor',
+      'driver_configuration': 'Konfigurasi Driver',
+      'create_time': 'Buat Waktu',
+      'update_time': 'Untuk Memperbarui Waktu',
+      'create_by': 'Dibuat Oleh',
+      'update_by': 'Pengubah',
+      'is_on': 'Diaktifkan Atau Tidak',
+      'please': 'Silahkan Pilih',
+      'true': 'Ada',
+      'false': 'Tidak',
+      'Running': 'Menjalankan',
+      'Paused': 'Berhenti'
+    },
+    'monitor': {
+      'sys': 'Sistem',
+      'day': 'Proyek ini telah berjalan terus menerus',
+      'status': 'Keadaan',
+      'core': 'Inti',
+      'cpu': 'Kadar penggunaan CPU',
+      'memory': 'Kadar penggunaan ingatan',
+      'tality': 'Total',
+      'used': 'Digunakan',
+      'leisure': 'Bebas',
+      'exchange': 'Kadar penggunaan area pertukaran',
+      'disk': 'Kadar penggunaan disk',
+      'cpu_monitoring': 'Monitor penggunaan CPU',
+      'memory_monitoring': 'Monitor penggunaan memori'
+    }
   }
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/indonesian.js b/acs/nladmin-ui/src/i18n/langs/indonesian.js
index 08c39af..a8df53b 100644
--- a/acs/nladmin-ui/src/i18n/langs/indonesian.js
+++ b/acs/nladmin-ui/src/i18n/langs/indonesian.js
@@ -18,6 +18,9 @@ import config from './config/in'
 import customPolicy from './customPolicy/in'
 import deviceErrorInfo from './deviceErrorInfo/in'
 import user from './user/in'
+import role from './role/in'
+import department from './department/in'
+import dict from './dict/in'
 
 export default {
   ...idLocale,
@@ -40,5 +43,8 @@ export default {
   ...config,
   ...timing,
   ...deviceErrorInfo,
-  ...user
+  ...user,
+  ...role,
+  ...department,
+  ...dict
 }
diff --git a/acs/nladmin-ui/src/i18n/langs/role/en.js b/acs/nladmin-ui/src/i18n/langs/role/en.js
index e69de29..2469676 100644
--- a/acs/nladmin-ui/src/i18n/langs/role/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/role/en.js
@@ -0,0 +1,23 @@
+export default {
+  'role': {
+    'table_title': {
+      'taskCode_or_instCode': 'Task Number (Instruction Number)',
+      'input_taskCode_or_instCode': 'Input TaskCode Or InstCode'
+    },
+    'table_value': {
+      'roleList': 'List Of Roles',
+      'Name': 'Name',
+      'Description': 'Description',
+      'CreateDate': 'CreateDate',
+      'Operate': 'Operate',
+      'Role': 'Role'
+    },
+    'other': {
+      'Menu_assignments': 'Menu Assignments',
+      'Save': 'Save'
+    },
+    'msg': {
+      'delete_msg': 'Confirm That One Of The Selected Data Items Is Deleted?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/role/in.js b/acs/nladmin-ui/src/i18n/langs/role/in.js
index e69de29..7b182be 100644
--- a/acs/nladmin-ui/src/i18n/langs/role/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/role/in.js
@@ -0,0 +1,23 @@
+export default {
+  'role': {
+    'table_title': {
+      'taskCode_or_instCode': 'Nomor Tugas (Nomor Instruksi)',
+      'input_taskCode_or_instCode': 'Masukkan Nomor Tugas Atau Nomor Instruksi'
+    },
+    'table_value': {
+      'roleList': 'Daftar Peran',
+      'Name': 'Nama',
+      'Description': 'Deskripsi',
+      'CreateDate': 'Tanggal Pembuatan',
+      'Operate': 'Beroperasi',
+      'Role': 'Peranan'
+    },
+    'other': {
+      'Menu_assignments': 'Penetapan Menu',
+      'Save': 'Simpan'
+    },
+    'msg': {
+      'delete_msg': 'Mengonfirmasi Bahwa Salah Satu Item Data Yang Dipilih Dihapus?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/role/zh.js b/acs/nladmin-ui/src/i18n/langs/role/zh.js
index e69de29..d067f8d 100644
--- a/acs/nladmin-ui/src/i18n/langs/role/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/role/zh.js
@@ -0,0 +1,23 @@
+export default {
+  'role': {
+    'table_title': {
+      'taskCode_or_instCode': '任务号(指令号)',
+      'input_taskCode_or_instCode': '输入任务号或指令号'
+    },
+    'table_value': {
+      'roleList': '角色列表',
+      'Name': '角色名称',
+      'Description': '描述',
+      'CreateDate': '创建日期',
+      'Operate': '操作',
+      'Role': '角色'
+    },
+    'other': {
+      'Menu_assignments': '菜单分配',
+      'Save': '保存'
+    },
+    'msg': {
+      'delete_msg': '确认删除选中的1条数据?'
+    }
+  }
+}
diff --git a/acs/nladmin-ui/src/i18n/langs/user/en.js b/acs/nladmin-ui/src/i18n/langs/user/en.js
index 9cebe6b..c30f94c 100644
--- a/acs/nladmin-ui/src/i18n/langs/user/en.js
+++ b/acs/nladmin-ui/src/i18n/langs/user/en.js
@@ -5,7 +5,9 @@ export default {
       'enter_department_name': 'Enter Department Name',
       'Account_Number (Name)': 'Account_Number (Name)',
       'Enter_Account_Number (Name)': 'Enter_Account_Number (Name)',
-      'State': 'State'
+      'State': 'State',
+      'Search': 'Search',
+      'System': 'System'
     },
     'table_value': {
       'Username': 'Username',
@@ -16,7 +18,14 @@ export default {
       'Department': 'Department',
       'State': 'State',
       'create_Date': 'Create Date',
-      'Operate': 'Operate'
+      'Operate': 'Operate',
+      'Password': 'Password',
+      'boy': 'Boy',
+      'girl': 'Girl',
+      'Select_Sector_Categories': 'Select Sector Categories',
+      'User': 'User',
+      'activation': 'Activation',
+      'lock': 'Lock'
     },
     'other': {
       'Revise': 'Revise',
diff --git a/acs/nladmin-ui/src/i18n/langs/user/in.js b/acs/nladmin-ui/src/i18n/langs/user/in.js
index 053ab26..7e7aee2 100644
--- a/acs/nladmin-ui/src/i18n/langs/user/in.js
+++ b/acs/nladmin-ui/src/i18n/langs/user/in.js
@@ -1,22 +1,31 @@
 export default {
   'user': {
     'table_title': {
-      'Department_name': '部门名称',
-      'enter_department_name': '请输入部门名称',
-      'Account_Number (Name)': '账号（名称）',
-      'Enter_Account_Number (Name)': '请输入账号或者名称',
-      'State': '状态'
+      'Department_name': 'Nama Departemen',
+      'enter_department_name': 'Silakan Masukkan Nama Departemen',
+      'Account_Number (Name)': 'Nomor Rekening (Nama)',
+      'Enter_Account_Number (Name)': 'Silakan Masukkan Nomor Akun Atau Nama',
+      'State': 'Negara',
+      'Search': 'Mencari',
+      'System': 'Sistem'
     },
     'table_value': {
-      'Username': '用户名',
-      'Name': '姓名',
-      'Sex': '性别',
-      'Phone': '电话',
-      'Mailbox': '邮箱',
-      'Department': '部门',
-      'State': '状态',
-      'create_Date': '创建日期',
-      'Operate': '操作'
+      'Username': 'Nama Pengguna',
+      'Name': 'Nama',
+      'Sex': 'Jenis Kelamin',
+      'Phone': 'Ponsel',
+      'Mailbox': 'Kotak Surat',
+      'Department': 'Departemen',
+      'State': 'Negara',
+      'create_Date': 'Tanggal Pembuatan',
+      'Operate': 'Beroperasi',
+      'Password': 'Kata Sandi',
+      'boy': 'Laki',
+      'girl': 'Wanita',
+      'Select_Sector_Categories': 'Pilih Kategori Departemen',
+      'User': 'Pengguna',
+      'activation': 'Pengaktifan',
+      'lock': 'Kunci'
     },
     'other': {
       'Revise': 'Merevisi',
diff --git a/acs/nladmin-ui/src/i18n/langs/user/zh.js b/acs/nladmin-ui/src/i18n/langs/user/zh.js
index a1567d8..992f97d 100644
--- a/acs/nladmin-ui/src/i18n/langs/user/zh.js
+++ b/acs/nladmin-ui/src/i18n/langs/user/zh.js
@@ -5,7 +5,9 @@ export default {
       'enter_department_name': '请输入部门名称',
       'Account_Number (Name)': '账号（名称）',
       'Enter_Account_Number (Name)': '请输入账号或者名称',
-      'State': '状态'
+      'State': '状态',
+      'Search': '搜索',
+      'System': '所属系统'
     },
     'table_value': {
       'Username': '用户名',
@@ -16,7 +18,14 @@ export default {
       'Department': '部门',
       'State': '状态',
       'create_Date': '创建日期',
-      'Operate': '操作'
+      'Operate': '操作',
+      'Password': '密码',
+      'boy': '男',
+      'girl': '女',
+      'Select_Sector_Categories': '选择部门类目',
+      'User': '用户',
+      'activation': '激活',
+      'lock': '锁定'
     },
     'other': {
       'Revise': '修改',
@@ -25,7 +34,7 @@ export default {
       'Reset': '重置密码',
       'Department_permissions': '部门权限',
       'Data_Permissions': '数据权限',
-      'Lock_account': '锁定账号',
+      'Lock_account': '账号',
       'Assign_roles': '分配角色'
     },
     'msg': {
diff --git a/acs/nladmin-ui/src/i18n/langs/zh-CN.js b/acs/nladmin-ui/src/i18n/langs/zh-CN.js
index 81c1bba..9c43943 100644
--- a/acs/nladmin-ui/src/i18n/langs/zh-CN.js
+++ b/acs/nladmin-ui/src/i18n/langs/zh-CN.js
@@ -1,118 +1,120 @@
 export default {
   'lang': 'zh',
-  'common': {
-    'home': '首页',
-    'Layout_setting': '布局设置',
-    'Personal_center': '个人中心',
-    'Log_out': '退出登录',
-    'Personal_information': '个人信息',
-    'username': '用户姓名',
-    'name': '姓名',
-    'phone': '手机号码',
-    'phone2': '手机号',
-    'sex': '性别',
-    'sex_male': '男',
-    'sex_female': '女',
-    'email': '用户邮箱',
-    'Security_settings': '安全设置',
-    'Save_settings': '保存配置',
-    'Reset_settings': '重置配置',
-    'Change_password': '修改密码',
-    'New_password': '新密码',
-    'Old_password': '旧密码',
-    'Verify_password': '确认密码',
-    'User_information': '用户资料',
-    'Operation_log': '操作日志',
-    'action': '行为',
-    'IP_source': 'IP来源',
-    'Browser': '浏览器',
-    'Request_time': '请求耗时',
-    'Creation_date': '创建日期',
-    'account': '账号',
-    'password': '密码',
-    'verification_code': '验证码',
-    'login_rm': '记住我',
-    'login': '登 录',
-    'login_ing': '登 录 中...',
-    'Create': '新增',
-    'Update': '修改',
-    'Delete': '删除',
-    'Export': '导出',
-    'Editors': '编辑',
-    'SelectAll': '全选',
-    'Query': '查询',
-    'Reset': '重置',
-    'Confirm': '确认',
-    'Cancel': '取消',
-    'Forced_cancellation': '强制取消',
-    'Initialize': '初始化',
-    'Operate': '操作',
-    'Refresh': '刷新',
-    'Closes': '关闭',
-    'Closes_l': '关闭左侧',
-    'Closes_r': '关闭右侧',
-    'Closes_o': '关闭其他',
-    'Closes_a': '关闭全部',
-    'Theme_style_setting': '主题风格设置',
-    'Theme_color': '主题颜色',
-    'System_layout_configuration': '系统布局配置',
-    'Open': '开启',
-    'Fixation': '固定',
-    'Display': '显示',
-    'Dynamic_titles': '动态标题',
-    'crudTip': '确定删除本条数据吗？',
-    'startDate': '开始日期',
-    'endDate': '结束日期',
-    'moreMenu': '更多菜单',
-    'browses': '浏览',
-    'fz': '全屏缩放',
-    'Tips': '提示',
-    'Tip1': '确认删除选中的',
-    'Tip2': '条数据?',
-    'Tip3': '用户姓名不作为登录使用',
-    'Tip4': '手机号码不能重复',
-    'Tip5': '请输入电话号码',
-    'Tip6': '请输入正确的11位手机号码',
-    'Tip7': '拖拽excel文件到此处 或者',
-    'Tip8': '两次输入的密码不一致',
-    'Tip9': '请再次输入密码',
-    'Tip10': '请输入旧密码',
-    'Tip11': '请输入新密码',
-    'Tip12': '长度在 6 到 20 个字符',
-    'Tip13': '确定注销并退出系统吗？',
-    'Tip14': 'WebSocket连接发生错误',
-    'Tip15': '请输入图标名称',
-    'loading': '数据加载中...',
-    'synchronous': '同步',
-    'determine': '确定',
-    'stop': '停止',
-    'firing': '启动',
-    'import': '导入',
-    'driver_configuration': '驱动配置',
-    'create_time': '创建时间',
-    'update_time': '更新时间',
-    'create_by': '创建者',
-    'update_by': '修改者',
-    'is_on': '是否启用',
-    'please': '请选择',
-    'true': '是',
-    'false': '否',
-    'Running': '运行中',
-    'Paused': '已暂停'
-  },
-  'monitor': {
-    'sys': '系统',
-    'day': '项目已不间断运行',
-    'status': '状态',
-    'cpu': 'CPU使用率',
-    'core': '核心',
-    'memory': '内存使用率',
-    'tality': '总量',
-    'used': '已使用',
-    'leisure': '空闲',
-    'exchange': '交换区使用率',
-    'disk': '磁盘使用率',
-    'cpu_monitoring': 'CPU使用率监控',
-    'memory_monitoring': '内存使用率监控'
+  'auto': {
+    'common': {
+      'home': '首页',
+      'Layout_setting': '布局设置',
+      'Personal_center': '个人中心',
+      'Log_out': '退出登录',
+      'Personal_information': '个人信息',
+      'username': '用户姓名',
+      'name': '姓名',
+      'phone': '手机号码',
+      'phone2': '手机号',
+      'sex': '性别',
+      'sex_male': '男',
+      'sex_female': '女',
+      'email': '用户邮箱',
+      'Security_settings': '安全设置',
+      'Save_settings': '保存配置',
+      'Reset_settings': '重置配置',
+      'Change_password': '修改密码',
+      'New_password': '新密码',
+      'Old_password': '旧密码',
+      'Verify_password': '确认密码',
+      'User_information': '用户资料',
+      'Operation_log': '操作日志',
+      'action': '行为',
+      'IP_source': 'IP来源',
+      'Browser': '浏览器',
+      'Request_time': '请求耗时',
+      'Creation_date': '创建日期',
+      'account': '账号',
+      'password': '密码',
+      'verification_code': '验证码',
+      'login_rm': '记住我',
+      'login': '登 录',
+      'login_ing': '登 录 中...',
+      'Create': '新增',
+      'Update': '修改',
+      'Delete': '删除',
+      'Export': '导出',
+      'Editors': '编辑',
+      'SelectAll': '全选',
+      'Query': '查询',
+      'Reset': '重置',
+      'Confirm': '确认',
+      'Cancel': '取消',
+      'Forced_cancellation': '强制取消',
+      'Initialize': '初始化',
+      'Operate': '操作',
+      'Refresh': '刷新',
+      'Closes': '关闭',
+      'Closes_l': '关闭左侧',
+      'Closes_r': '关闭右侧',
+      'Closes_o': '关闭其他',
+      'Closes_a': '关闭全部',
+      'Theme_style_setting': '主题风格设置',
+      'Theme_color': '主题颜色',
+      'System_layout_configuration': '系统布局配置',
+      'Open': '开启',
+      'Fixation': '固定',
+      'Display': '显示',
+      'Dynamic_titles': '动态标题',
+      'crudTip': '确定删除本条数据吗？',
+      'startDate': '开始日期',
+      'endDate': '结束日期',
+      'moreMenu': '更多菜单',
+      'browses': '浏览',
+      'fz': '全屏缩放',
+      'Tips': '提示',
+      'Tip1': '确认删除选中的',
+      'Tip2': '条数据?',
+      'Tip3': '用户姓名不作为登录使用',
+      'Tip4': '手机号码不能重复',
+      'Tip5': '请输入电话号码',
+      'Tip6': '请输入正确的11位手机号码',
+      'Tip7': '拖拽excel文件到此处 或者',
+      'Tip8': '两次输入的密码不一致',
+      'Tip9': '请再次输入密码',
+      'Tip10': '请输入旧密码',
+      'Tip11': '请输入新密码',
+      'Tip12': '长度在 6 到 20 个字符',
+      'Tip13': '确定注销并退出系统吗？',
+      'Tip14': 'WebSocket连接发生错误',
+      'Tip15': '请输入图标名称',
+      'loading': '数据加载中...',
+      'synchronous': '同步',
+      'determine': '确定',
+      'stop': '停止',
+      'firing': '启动',
+      'import': '导入',
+      'driver_configuration': '驱动配置',
+      'create_time': '创建时间',
+      'update_time': '更新时间',
+      'create_by': '创建者',
+      'update_by': '修改者',
+      'is_on': '是否启用',
+      'please': '请选择',
+      'true': '是',
+      'false': '否',
+      'Running': '运行中',
+      'Paused': '已暂停'
+    },
+    'monitor': {
+      'sys': '系统',
+      'day': '项目已不间断运行',
+      'status': '状态',
+      'cpu': 'CPU使用率',
+      'core': '核心',
+      'memory': '内存使用率',
+      'tality': '总量',
+      'used': '已使用',
+      'leisure': '空闲',
+      'exchange': '交换区使用率',
+      'disk': '磁盘使用率',
+      'cpu_monitoring': 'CPU使用率监控',
+      'memory_monitoring': '内存使用率监控'
+    }
   }
 }
diff --git a/acs/nladmin-ui/src/layout/components/Navbar.vue b/acs/nladmin-ui/src/layout/components/Navbar.vue
index 5ec9de0..43d8e6e 100644
--- a/acs/nladmin-ui/src/layout/components/Navbar.vue
+++ b/acs/nladmin-ui/src/layout/components/Navbar.vue
@@ -12,7 +12,7 @@
           <Doc class="right-menu-item hover-effect" />
         </el-tooltip>-->
 
-        <el-tooltip :content="$t('common.fz')" effect="dark" placement="bottom">
+        <el-tooltip :content="$t('auto.common.fz')" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
         <notice-icon class="right-menu-item" />
@@ -31,17 +31,17 @@
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
             <el-dropdown-item>
-              {{ $t('common.Layout_setting') }}
+              {{ $t('auto.common.Layout_setting') }}
             </el-dropdown-item>
           </span>
           <router-link to="/user/center">
             <el-dropdown-item>
-              {{ $t('common.Personal_center') }}
+              {{ $t('auto.common.Personal_center') }}
             </el-dropdown-item>
           </router-link>
           <span style="display:block;" @click="open">
             <el-dropdown-item divided>
-              {{ $t('common.Log_out') }}
+              {{ $t('auto.common.Log_out') }}
             </el-dropdown-item>
           </span>
         </el-dropdown-menu>
@@ -66,9 +66,7 @@ import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import TopNav from '@/components/TopNav'
 
-import Doc from '@/components/Doc'
 import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import Avatar from '@/assets/images/avatar.png'
 import NoticeIcon from '@/views/system/notice/NoticeIcon.vue'
@@ -81,9 +79,7 @@ export default {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    SizeSelect,
     Search,
-    Doc,
     TopNav
   },
   data() {
@@ -93,10 +89,6 @@ export default {
       language: '简体中文'
     }
   },
-  created() {
-    this.setLang(localStorage.getItem('lang'))
-    this.initWebSocket()
-  },
   computed: {
     ...mapGetters([
       'sidebar',
@@ -121,6 +113,10 @@ export default {
       }
     }
   },
+  created() {
+    this.setLang(localStorage.getItem('lang'))
+    this.initWebSocket()
+  },
   methods: {
     // 中英文切换
     langChange(command) {
@@ -142,9 +138,9 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     open() {
-      this.$confirm(this.$t('common.Tip13'), this.$t('common.Tips'), {
-        confirmButtonText: this.$t('common.Confirm'),
-        cancelButtonText: this.$t('common.Cancel'),
+      this.$confirm(this.$t('auto.common.Tip13'), this.$t('auto.common.Tips'), {
+        confirmButtonText: this.$t('auto.common.Confirm'),
+        cancelButtonText: this.$t('auto.common.Cancel'),
         type: 'warning'
       }).then(() => {
         this.logout()
@@ -164,7 +160,7 @@ export default {
     },
     webSocketOnError(e) {
       this.$notify({
-        title: this.$t('common.Tip14'),
+        title: this.$t('auto.common.Tip14'),
         type: 'error',
         duration: 0
       })
diff --git a/acs/nladmin-ui/src/layout/components/Settings/index.vue b/acs/nladmin-ui/src/layout/components/Settings/index.vue
index 9adea38..40ca9e7 100644
--- a/acs/nladmin-ui/src/layout/components/Settings/index.vue
+++ b/acs/nladmin-ui/src/layout/components/Settings/index.vue
@@ -3,7 +3,7 @@
     <div>
       <div class="setting-drawer-content">
         <div class="setting-drawer-title">
-          <h3 class="drawer-title">{{ $t('common.Theme_style_setting') }}</h3>
+          <h3 class="drawer-title">{{ $t('auto.common.Theme_style_setting') }}</h3>
         </div>
         <div class="setting-drawer-block-checbox">
           <div class="setting-drawer-block-checbox-item" @click="handleTheme('theme-dark')">
@@ -51,44 +51,44 @@
         </div>
 
         <div class="drawer-item">
-          <span>{{ $t('common.Theme_color') }}</span>
+          <span>{{ $t('auto.common.Theme_color') }}</span>
           <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
         </div>
       </div>
 
       <el-divider />
 
-      <h3 class="drawer-title">{{ $t('common.System_layout_configuration') }}</h3>
+      <h3 class="drawer-title">{{ $t('auto.common.System_layout_configuration') }}</h3>
 
       <div class="drawer-item">
-        <span>{{ $t('common.Open') }} TopNav</span>
+        <span>{{ $t('auto.common.Open') }} TopNav</span>
         <el-switch v-model="topNav" class="drawer-switch" />
       </div>
 
       <div class="drawer-item">
-        <span>{{ $t('common.Open') }} Tags-Views</span>
+        <span>{{ $t('auto.common.Open') }} Tags-Views</span>
         <el-switch v-model="tagsView" class="drawer-switch" />
       </div>
 
       <div class="drawer-item">
-        <span>{{ $t('common.Fixation') }} Header</span>
+        <span>{{ $t('auto.common.Fixation') }} Header</span>
         <el-switch v-model="fixedHeader" class="drawer-switch" />
       </div>
 
       <div class="drawer-item">
-        <span>{{ $t('common.Display') }} Logo</span>
+        <span>{{ $t('auto.common.Display') }} Logo</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
       </div>
 
       <div class="drawer-item">
-        <span>{{ $t('common.Dynamic_titles') }}</span>
+        <span>{{ $t('auto.common.Dynamic_titles') }}</span>
         <el-switch v-model="dynamicTitle" class="drawer-switch" />
       </div>
 
       <el-divider />
 
-      <el-button size="mini" type="primary" plain icon="el-icon-document-add" @click="saveSetting">{{ $t('common.Save_settings') }}</el-button>
-      <el-button size="mini" plain icon="el-icon-refresh" @click="resetSetting">{{ $t('common.Reset_settings') }}</el-button>
+      <el-button size="mini" type="primary" plain icon="el-icon-document-add" @click="saveSetting">{{ $t('auto.common.Save_settings') }}</el-button>
+      <el-button size="mini" plain icon="el-icon-refresh" @click="resetSetting">{{ $t('auto.common.Reset_settings') }}</el-button>
     </div>
   </div>
 </template>
@@ -198,7 +198,9 @@ export default {
     resetSetting() {
       this.$modal.loading('正在清除设置缓存并刷新，请稍候...')
       this.$cache.local.remove('layout-setting')
-      setTimeout('window.location.reload()', 1000)
+      setTimeout(() => {
+        window.location.reload()
+      }, 1000)
     }
   }
 }
diff --git a/acs/nladmin-ui/src/layout/components/TagsView/index.vue b/acs/nladmin-ui/src/layout/components/TagsView/index.vue
index c2dd4ed..1c0f778 100644
--- a/acs/nladmin-ui/src/layout/components/TagsView/index.vue
+++ b/acs/nladmin-ui/src/layout/components/TagsView/index.vue
@@ -17,12 +17,12 @@
       </router-link>
     </scroll-pane>
     <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">{{ $t('common.Refresh') }}</li>
-      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">{{ $t('common.Closes') }}</li>
-      <li v-if="!isFirstView()" @click="closeLeftTags()">{{ $t('common.Closes_l') }}</li>
-      <li v-if="!isLastView()" @click="closeRightTags">{{ $t('common.Closes_r') }}</li>
-      <li @click="closeOthersTags">{{ $t('common.Closes_o') }}</li>
-      <li @click="closeAllTags(selectedTag)">{{ $t('common.Closes_a') }}</li>
+      <li @click="refreshSelectedTag(selectedTag)">{{ $t('auto.common.Refresh') }}</li>
+      <li v-if="!(selectedTag.meta&&selectedTag.meta.affix)" @click="closeSelectedTag(selectedTag)">{{ $t('auto.common.Closes') }}</li>
+      <li v-if="!isFirstView()" @click="closeLeftTags()">{{ $t('auto.common.Closes_l') }}</li>
+      <li v-if="!isLastView()" @click="closeRightTags">{{ $t('auto.common.Closes_r') }}</li>
+      <li @click="closeOthersTags">{{ $t('auto.common.Closes_o') }}</li>
+      <li @click="closeAllTags(selectedTag)">{{ $t('auto.common.Closes_a') }}</li>
     </ul>
   </div>
 </template>
diff --git a/acs/nladmin-ui/src/router/routers.js b/acs/nladmin-ui/src/router/routers.js
index 2f52d66..99a4018 100644
--- a/acs/nladmin-ui/src/router/routers.js
+++ b/acs/nladmin-ui/src/router/routers.js
@@ -47,7 +47,7 @@ export const constantRouterMap = [
         path: 'dashboard',
         component: (resolve) => require(['@/views/monitor/server/index'], resolve),
         name: 'Dashboard',
-        meta: { title: i18n.t('common.home'), icon: 'index', affix: true, noCache: true }
+        meta: { title: i18n.t('auto.common.home'), icon: 'index', affix: true, noCache: true }
       }
     ]
   },
@@ -66,8 +66,8 @@ export const constantRouterMap = [
       {
         path: 'center',
         component: (resolve) => require(['@/views/system/user/center'], resolve),
-        name: i18n.t('common.Personal_center'),
-        meta: { title: i18n.t('common.Personal_center') }
+        name: i18n.t('auto.common.Personal_center'),
+        meta: { title: i18n.t('auto.common.Personal_center') }
       }
     ]
   }
diff --git a/acs/nladmin-ui/src/views/acs/angle/index.vue b/acs/nladmin-ui/src/views/acs/angle/index.vue
new file mode 100644
index 0000000..792cccf
--- /dev/null
+++ b/acs/nladmin-ui/src/views/acs/angle/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form
+          ref="form"
+          :model="form"
+          :rules="rules"
+          size="small"
+          label-width="80px"
+        >
+          <el-form-item
+            v-if="false"
+            label="id标识"
+          >
+            <el-input v-model="form.id" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="起始点位编码"
+          >
+            <el-input v-model="form.start_point_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="起始设备编码"
+          >
+            <el-input v-model="form.start_device_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="目标点位编码"
+          >
+            <el-input v-model="form.next_point_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="目标设备编码"
+          >
+            <el-input v-model="form.next_device_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="起始点位角度"
+          >
+            <el-input v-model="form.start_point_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="目标点位角度"
+          >
+            <el-input v-model="form.next_point_angle" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item
+            label="是否启用"
+            prop="is_active"
+          >
+            <el-input v-model="form.is_active" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="small"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
+        <el-table-column
+          v-if="false"
+          prop="id"
+          label="id标识"
+        />
+        <el-table-column
+          prop="start_point_code"
+          label="起始点位编码"
+        />
+        <el-table-column
+          prop="start_device_code"
+          label="起始设备编码"
+        />
+        <el-table-column
+          prop="next_point_code"
+          label="目标点位编码"
+        />
+        <el-table-column
+          prop="next_device_code"
+          label="目标设备编码"
+        />
+        <el-table-column
+          prop="start_point_angle"
+          label="起始点位角度"
+        />
+        <el-table-column
+          prop="next_point_angle"
+          label="目标点位角度"
+        />
+        <el-table-column
+          prop="is_active"
+          label="是否启用"
+        >
+          <template slot-scope="scope">
+            <el-switch
+              v-model="scope.row.is_active"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              :active-value="1"
+              :inactive-value="0"
+              @change="updateIsOn(scope.row.id,scope.row.is_active)"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="create_by"
+          label="创建者"
+        />
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+        />
+        <el-table-column
+          prop="update_by"
+          label="修改者"
+        />
+        <el-table-column
+          prop="update_time"
+          label="修改时间"
+        />
+        <el-table-column
+          v-permission="['admin','acsPointAngle:edit','acsPointAngle:del']"
+          label="操作"
+          width="150px"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import crudAcsPointAngle from '@/api/acs/angle/acsPointAngle'
+
+
+const defaultForm = {
+  id: null,
+  start_point_code: null,
+  start_device_code: null,
+  next_point_code: null,
+  next_device_code: null,
+  start_point_angle: null,
+  next_point_angle: null,
+  is_active: null,
+  create_by: null,
+  create_time: null,
+  update_by: null,
+  update_time: null
+}
+export default {
+  name: 'AcsPointAngle',
+  components: { pagination, crudOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '点位角度',
+      url: 'api/acsPointAngle',
+      idField: 'id',
+      sort: 'id,desc',
+      crudMethod: { ...crudAcsPointAngle }
+    })
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'acsPointAngle:add'],
+        edit: ['admin', 'acsPointAngle:edit'],
+        del: ['admin', 'acsPointAngle:del']
+      },
+      rules: {
+        is_active: [
+          {
+            required: true,
+            message: '是否启用不能为空',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    updateIsOn(id, is_active) {
+      crudAcsPointAngle.updateOn(id, is_active).then(res => {
+        this.notify('保存成功', 'success')
+      }).catch(err => {
+        console.log(err.response.data.message)
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/acs/nladmin-ui/src/views/acs/device/address/index.vue b/acs/nladmin-ui/src/views/acs/device/address/index.vue
index c2a4c8c..7ed6ee3 100644
--- a/acs/nladmin-ui/src/views/acs/device/address/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/address/index.vue
@@ -11,7 +11,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('opc.placeholder.name_code')">
+          <el-form-item :label="$t('opc.placeholder.name_code')">
             <el-input
               v-model="query.blurry"
               size="small"
@@ -54,7 +54,7 @@
         <el-table-column prop="methods_name" :label="$t('address.methods_name')" />
         <el-table-column prop="methods_url" :label="$t('address.methods_url')" />
         <el-table-column prop="remark" :label="$t('address.remark')" />
-        <el-table-column v-permission="['admin','Address:edit','Address:del']" :label="$t('common.Cancel')" width="150px" align="center">
+        <el-table-column v-permission="['admin','Address:edit','Address:del']" :label="$t('auto.common.Cancel')" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue b/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
index 61fd0ba..67d2023 100644
--- a/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/customPolicy/index.vue
@@ -13,7 +13,7 @@
               style="width: 370px;"
               filterable
               clearable
-              :placeholder="$t('common.please')"
+              :placeholder="$t('auto.common.please')"
             >
               <el-option
                 v-for="item in deviceList"
@@ -28,20 +28,20 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm')}}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="key_code" :label="$t('device.device_table_title.device_name')" />
-        <el-table-column prop="create_user" :label="$t('common.create_by')" />
-        <el-table-column prop="update_user" :label="$t('common.update_by')" />
+        <el-table-column prop="create_user" :label="$t('auto.common.create_by')" />
+        <el-table-column prop="update_user" :label="$t('auto.common.update_by')" />
         <el-table-column prop="name" :label="$t('customPolicy.unit_name')" />
-        <el-table-column prop="create_time" :label="$t('common.create_time')" />
-        <el-table-column prop="update_time" :label="$t('common.update_time')" />
-        <el-table-column prop="is_on" :label="$t('common.is_on')">
+        <el-table-column prop="create_time" :label="$t('auto.common.create_time')" />
+        <el-table-column prop="update_time" :label="$t('auto.common.update_time')" />
+        <el-table-column prop="is_on" :label="$t('auto.common.is_on')">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.is_on"
@@ -53,7 +53,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column v-permission="['admin','customPolicy:del']" :label="$t('common.Operate')" width="150px" align="center">
+        <el-table-column v-permission="['admin','customPolicy:del']" :label="$t('auto.common.Operate')" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/acs/nladmin-ui/src/views/acs/device/index.vue b/acs/nladmin-ui/src/views/acs/device/index.vue
index b9cb920..992c7b5 100644
--- a/acs/nladmin-ui/src/views/acs/device/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/index.vue
@@ -11,7 +11,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('device.placeholder.name_code')">
+          <el-form-item :label="$t('device.placeholder.name_code')">
             <el-input
               v-model="query.blurry"
               size="small"
@@ -22,7 +22,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('device.placeholder.device_type')">
+          <el-form-item :label="$t('device.placeholder.device_type')">
             <el-select
               v-model="query.device_type"
               clearable
@@ -48,7 +48,7 @@
           size="mini"
           @click="uploadShow = true"
         >
-          {{ $t('common.import') }}
+          {{ $t('auto.common.import') }}
         </el-button>
         <el-button
           slot="right"
@@ -58,7 +58,7 @@
           icon="el-icon-refresh"
           @click="reload"
         >
-          {{ $t('common.synchronous') }}
+          {{ $t('auto.common.synchronous') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -72,7 +72,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
           <el-row>
             <el-col :span="12">
-              <div class="grid-content bg-purple"></div>
+              <div class="grid-content bg-purple" />
               <el-form-item v-if="false" :label="$t('device.table_title.device_identification')" prop="device_id">
                 <el-input v-model="form.device_id" style="width: 370px;" />
               </el-form-item>
@@ -93,7 +93,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="grid-content bg-purple-light"></div>
+              <div class="grid-content bg-purple-light" />
               <el-form-item :label="$t('device.device_table_title.device_type')" prop="device_type">
                 <el-select v-model="form.device_type" style="width: 370px" :placeholder="$t('device.placeholder.please_select')">
                   <el-option
@@ -124,14 +124,14 @@
               <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
               <!--          </el-form-item>-->
               <el-form-item :label="$t('device.device_table_title.descriptive_information')" prop="description">
-                <el-input v-model="form.remark" style="width: 370px;"  type="textarea" />
+                <el-input v-model="form.remark" style="width: 370px;" type="textarea" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -167,7 +167,7 @@
         <!--        <el-table-column prop="manufacturer" label="生产厂家" />-->
         <!--        <el-table-column prop="manufacturer_phone" label="厂家电话" />-->
         <el-table-column prop="remark" :label="$t('device.device_table_title.descriptive_information')" :min-width="flexWidth('remark',crud.data,$t('device.device_table_title.descriptive_information'))" />
-        <el-table-column v-permission="['admin','device:edit','device:del']" :label="$t('common.Operate')" width="200px" align="center">
+        <el-table-column v-permission="['admin','device:edit','device:del']" :label="$t('auto.common.Operate')" width="200px" align="center">
           <template slot-scope="scope">
             <udOperation
               style="display: inline"
@@ -176,7 +176,7 @@
             />
             <el-button slot="right" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" icon="el-icon-edit-outline">
               <router-link :to="'/devices/device/config/' + scope.row.device_code ">
-                {{ $t('common.driver_configuration') }}
+                {{ $t('auto.common.driver_configuration') }}
               </router-link>
             </el-button>
           </template>
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 7719468..c5d7477 100644
--- a/acs/nladmin-ui/src/views/acs/device/opc/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/opc/index.vue
@@ -11,7 +11,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('opc.placeholder.name_code_path')">
+          <el-form-item :label="$t('opc.placeholder.name_code_path')">
             <el-input
               v-model="query.blurry"
               clearable
@@ -37,7 +37,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="125px">
           <el-row>
             <el-col :span="12">
-              <div class="grid-content bg-purple"></div>
+              <div class="grid-content bg-purple" />
               <el-form-item :label="$t('opc.table_title.opc_code')" prop="opc_code">
                 <el-input v-model="form.opc_code" style="width: 370px;" />
               </el-form-item>
@@ -47,16 +47,16 @@
               <el-form-item :label="$t('opc.table_title.opc_address')">
                 <el-input v-model="form.opc_host" style="width: 370px;" />
               </el-form-item>
-              <el-form-item :label="$t('common.username')">
+              <el-form-item :label="$t('auto.common.username')">
                 <el-input v-model="form.user" style="width: 370px;" />
               </el-form-item>
-              <el-form-item :label="$t('common.password')" prop="password">
+              <el-form-item :label="$t('auto.common.password')" prop="password">
                 <el-input v-model="form.password" style="width: 370px;" type="password" />
                 <el-button :loading="crud.cu === 2" type="primary" @click="getDetail()">{{ $t('opc.dialog.detail') }}</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="grid-content bg-purple-light"></div>
+              <div class="grid-content bg-purple-light" />
               <el-form-item :label="$t('opc.table_title.program_id')">
                 <el-input v-model="form.prog_id" style="width: 370px;" />
               </el-form-item>
@@ -73,8 +73,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
 
@@ -119,17 +119,17 @@
         <el-table-column prop="opc_name" :label="$t('opc.table_title.opc_name')" :min-width="flexWidth('opc_name',crud.data,$t('opc.table_title.opc_name'))" />
         <el-table-column prop="opc_host" :label="$t('opc.table_title.opc_address')" :min-width="flexWidth('opc_host',crud.data,$t('opc.table_title.opc_address'))" />
         <el-table-column prop="type" :label="$t('opc.table_title.type')" :min-width="flexWidth('type',crud.data,$t('opc.table_title.type'))" />
-        <el-table-column prop="user" :label="$t('common.username')" :min-width="flexWidth('user',crud.data,$t('opc.table_title.username'))" />
-        <el-table-column prop="password" :label="$t('common.password')" :min-width="flexWidth('password',crud.data,$t('opc.table_title.password'))" />
+        <el-table-column prop="user" :label="$t('auto.common.username')" :min-width="flexWidth('user',crud.data,$t('opc.table_title.username'))" />
+        <el-table-column prop="password" :label="$t('auto.common.password')" :min-width="flexWidth('password',crud.data,$t('opc.table_title.password'))" />
         <el-table-column prop="prog_id" :label="$t('opc.table_title.program_id')" :min-width="flexWidth('prog_id',crud.data,$t('opc.table_title.program_id'))" />
         <el-table-column prop="cls_id" :label="$t('opc.table_title.registry_id')" :min-width="flexWidth('cls_id',crud.data,$t('opc.table_title.registry_id'))" />
         <el-table-column prop="domain" :label="$t('opc.table_title.domain')" :min-width="flexWidth('domain',crud.data,$t('opc.table_title.domain'))" />
         <el-table-column prop="remark" :label="$t('opc.table_title.remark')" :min-width="flexWidth('remark',crud.data,$t('opc.table_title.remark'))" />
-        <el-table-column prop="create_time" :label="$t('common.create_time')" :min-width="flexWidth('create_time',crud.data,$t('opc.table_title.create_time'))" />
-        <el-table-column :label="$t('common.Operate')" width="200px" align="center" fixed="right">
+        <el-table-column prop="create_time" :label="$t('auto.common.create_time')" :min-width="flexWidth('create_time',crud.data,$t('opc.table_title.create_time'))" />
+        <el-table-column :label="$t('auto.common.Operate')" width="200px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" icon="el-icon-edit" size="small" @click="handleClick(scope.row,'1')">{{ $t('common.Update') }}</el-button>
-            <el-button type="text" icon="el-icon-circle-close" size="small" @click="handleClick(scope.row,'2')">{{ $t('common.Delete') }}</el-button>
+            <el-button type="text" icon="el-icon-edit" size="small" @click="handleClick(scope.row,'1')">{{ $t('auto.common.Update') }}</el-button>
+            <el-button type="text" icon="el-icon-circle-close" size="small" @click="handleClick(scope.row,'2')">{{ $t('auto.common.Delete') }}</el-button>
             <el-button v-if="scope.row.opc_flag === '1'" type="text" icon="el-icon-folder-add" size="small" @click="handleClick(scope.row,'0')">
               {{ $t('opc.table_title.plc_add') }}
             </el-button>
diff --git a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
index f1d5294..2c22481 100644
--- a/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/protocol/index.vue
@@ -11,7 +11,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('opc.placeholder.name_code')">
+          <el-form-item :label="$t('opc.placeholder.name_code')">
             <el-input
               v-model="query.blurry"
               size="small"
@@ -22,7 +22,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('device.placeholder.device_type')">
+          <el-form-item :label="$t('device.placeholder.device_type')">
             <el-select
               v-model="query.device_types"
               clearable
@@ -36,7 +36,7 @@
               <el-option v-for="item in device_types" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  label="Server">
+          <el-form-item label="Server">
             <el-select
               v-model="query.opc_id"
               clearable
@@ -55,7 +55,7 @@
               />
             </el-select>
           </el-form-item>
-        <rrOperation />
+          <rrOperation />
         </el-form>
       </div>
 
@@ -69,7 +69,7 @@
           :loading="downLoadcsvLoading"
           @click="doExportCSV()"
         >
-          {{ $t('common.Export') }} CSV
+          {{ $t('auto.common.Export') }} CSV
         </el-button>
         <el-button
           slot="left"
@@ -80,7 +80,7 @@
           :loading="downLoadcsvLoadingSmart"
           @click="doExportSmartCSV()"
         >
-          {{ $t('common.Export') }} SMARTCSV
+          {{ $t('auto.common.Export') }} SMARTCSV
         </el-button>
         <el-button
           slot="left"
@@ -91,7 +91,7 @@
           :loading="downLoadcsvLoadingFX5U"
           @click="doExportFX5UCSV()"
         >
-          {{ $t('common.Export') }} FX5UCSV
+          {{ $t('auto.common.Export') }} FX5UCSV
         </el-button>
       </crudOperation>
       <!--表格渲染-->
diff --git a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
index 90bf984..7fbd809 100644
--- a/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
+++ b/acs/nladmin-ui/src/views/acs/device/storageCell/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('storageCell.table_title.storage_code')">
+          <el-form-item :label="$t('storageCell.table_title.storage_code')">
             <el-input
               v-model="query.storage_code"
               size="small"
@@ -20,7 +20,7 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item  :label="$t('storageCell.table_title.parent_storage_code')">
+          <el-form-item :label="$t('storageCell.table_title.parent_storage_code')">
             <el-input
               v-model="query.parent_storage_code"
               size="small"
@@ -30,7 +30,7 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item  :label="$t('storageCell.table_title.agv_site')">
+          <el-form-item :label="$t('storageCell.table_title.agv_site')">
             <el-input
               v-model="query.address"
               size="small"
@@ -74,8 +74,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -86,10 +86,10 @@
         <el-table-column prop="y" :label="$t('storageCell.table_title.y')" />
         <el-table-column prop="z" :label="$t('storageCell.table_title.z')" />
         <el-table-column prop="address" :label="$t('storageCell.table_title.address')" />
-        <el-table-column prop="create_by" :label="$t('common.create_by')" />
-        <el-table-column prop="create_time" :label="$t('common.create_time')" />
+        <el-table-column prop="create_by" :label="$t('auto.common.create_by')" />
+        <el-table-column prop="create_time" :label="$t('auto.common.create_time')" />
         <el-table-column prop="parent_storage_code" :label="$t('storageCell.table_title.parent_storage_code')" />
-        <el-table-column v-permission="['admin','storageCell:edit','storageCell:del']" :label="$t('common.Operate')" width="150px" align="center">
+        <el-table-column v-permission="['admin','storageCell:edit','storageCell:del']" :label="$t('auto.common.Operate')" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
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 070185f..316bcaf 100644
--- a/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue
@@ -51,7 +51,7 @@
           :loading="downLoadDeviceErrorLogging"
           @click="doExportDeviceErrorLogging()"
         >
-          {{ $t('common.Export') }}
+          {{ $t('auto.common.Export') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
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 9421c82..8164ad4 100644
--- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('task.txt_box.Task_code')">
+          <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.code"
               size="small"
@@ -21,7 +21,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+          <el-form-item :label="$t('task.txt_box.Vehicle_number')">
             <el-input
               v-model="query.vehicle_code"
               size="small"
@@ -32,7 +32,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Material_type')">
+          <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
               clearable
@@ -46,7 +46,7 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Task_status')">
+          <el-form-item :label="$t('task.txt_box.Task_status')">
             <el-select
               v-model="query.status"
               clearable
@@ -60,7 +60,7 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+          <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
               size="small"
@@ -71,7 +71,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.time')">
+          <el-form-item :label="$t('task.txt_box.time')">
             <Search />
           </el-form-item>
         </el-form>
@@ -87,7 +87,7 @@
           :loading="downLoadInstLogging"
           @click="doExportInstLogging()"
         >
-          {{ $t('common.Export') }}
+          {{ $t('auto.common.Export') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -127,9 +127,9 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" :min-width="flexWidth('instruction_code',crud.data,$t('TaskRecord.table.Instruction_code'))"/>
-        <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))"/>
-        <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))"/>
+        <el-table-column prop="instruction_code" :label="$t('TaskRecord.table.Instruction_code')" :min-width="flexWidth('instruction_code',crud.data,$t('TaskRecord.table.Instruction_code'))" />
+        <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
+        <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
@@ -137,14 +137,14 @@
             <span v-if="scope.row.instruction_status=='2' ">{{ $t('task.select.Completed') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))"/>
-        <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))"/>
-        <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))"/>
-        <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))"/>
-        <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))"/>
-        <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))"/>
+        <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />
+        <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
+        <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
+        <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
+        <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
+        <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
         <el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
-        <el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))"/>
+        <el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))" />
         <el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))" />
       </el-table>
       <!--分页组件-->
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 e6f500f..61ee27b 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('task.txt_box.Task_code')">
+          <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.task_code"
               size="small"
@@ -21,7 +21,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+          <el-form-item :label="$t('task.txt_box.Vehicle_number')">
             <el-input
               v-model="query.vehicle_code"
               size="small"
@@ -32,7 +32,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Material_type')">
+          <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
               clearable
@@ -46,7 +46,7 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Task_status')">
+          <el-form-item :label="$t('task.txt_box.Task_status')">
             <el-select
               v-model="query.status"
               clearable
@@ -60,7 +60,7 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+          <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
               size="small"
@@ -71,21 +71,21 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.time')">
+          <el-form-item :label="$t('task.txt_box.time')">
             <Search />
           </el-form-item>
         </el-form>
-<!--        <el-input-->
-<!--          v-if="false"-->
-<!--          v-model="query.is_over"-->
-<!--          value="1"-->
-<!--          size="small"-->
-<!--          clearable-->
-<!--          :placeholder="$t('TaskRecord.table.Task_code')"-->
-<!--          style="width: 200px;"-->
-<!--          class="filter-item"-->
-<!--          @keyup.enter.native="crud.toQuery"-->
-<!--        />-->
+        <!--        <el-input-->
+        <!--          v-if="false"-->
+        <!--          v-model="query.is_over"-->
+        <!--          value="1"-->
+        <!--          size="small"-->
+        <!--          clearable-->
+        <!--          :placeholder="$t('TaskRecord.table.Task_code')"-->
+        <!--          style="width: 200px;"-->
+        <!--          class="filter-item"-->
+        <!--          @keyup.enter.native="crud.toQuery"-->
+        <!--        />-->
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -98,7 +98,7 @@
           :loading="downLoadTaskLogging"
           @click="doExportTaskLogging()"
         >
-          {{ $t('common.Export') }}
+          {{ $t('auto.common.Export') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
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 ca44f31..97e1bb6 100644
--- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('task.txt_box.Task_code')">
+          <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.task_code"
               size="small"
@@ -21,7 +21,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Vehicle_number')">
+          <el-form-item :label="$t('task.txt_box.Vehicle_number')">
             <el-input
               v-model="query.vehicle_code"
               size="small"
@@ -32,7 +32,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Material_type')">
+          <el-form-item :label="$t('task.txt_box.Material_type')">
             <el-select
               v-model="query.material_type"
               clearable
@@ -46,7 +46,7 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Task_status')">
+          <el-form-item :label="$t('task.txt_box.Task_status')">
             <el-select
               v-model="query.status"
               clearable
@@ -60,7 +60,7 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.Origin_or_destination')">
+          <el-form-item :label="$t('task.txt_box.Origin_or_destination')">
             <el-input
               v-model="query.point_code"
               size="small"
@@ -71,7 +71,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.time')">
+          <el-form-item :label="$t('task.txt_box.time')">
             <Search />
           </el-form-item>
         </el-form>
@@ -87,7 +87,7 @@
           :loading="downLoadTaskTreeLogging"
           @click="doExportTaskTreeLogging()"
         >
-          {{ $t('common.Export') }}
+          {{ $t('auto.common.Export') }}
         </el-button>
       </crudOperation>
       <!--表格渲染-->
@@ -107,7 +107,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
-        <el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))"/>
+        <el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))" />
         <el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
         <el-table-column prop="task_status" :label="$t('TaskRecord.table.Status')" :min-width="flexWidth('task_status',crud.data,$t('TaskRecord.table.Status'))">
           <template slot-scope="scope">
@@ -116,16 +116,16 @@
             <span v-if="scope.row.task_status=='2' ">{{ $t('task.select.Completed') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))"/>
-        <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))"/>
-        <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))"/>
-        <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))"/>
-        <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))"/>
-        <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))"/>
-        <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))"/>
-        <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))"/>
-        <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))"/>
-        <el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))"/>
+        <el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))" />
+        <el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />
+        <el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
+        <el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
+        <el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
+        <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
+        <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
+        <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
+        <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
+        <el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index 663665e..9a0a10a 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('Inst.table.instruction_code')">
+          <el-form-item :label="$t('Inst.table.instruction_code')">
             <el-input
               v-model="query.code"
               size="small"
@@ -21,7 +21,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('Inst.table.vehicle_code')">
+          <el-form-item :label="$t('Inst.table.vehicle_code')">
             <el-input
               v-model="query.vehicle_code"
               size="small"
@@ -32,7 +32,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('Inst.table.material')">
+          <el-form-item :label="$t('Inst.table.material')">
             <el-select
               v-model="query.material_type"
               clearable
@@ -46,7 +46,7 @@
               <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('Inst.table.task_status')">
+          <el-form-item :label="$t('Inst.table.task_status')">
             <el-select
               v-model="query.status"
               clearable
@@ -60,7 +60,7 @@
               <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('task.txt_box.start_or_end')">
+          <el-form-item :label="$t('task.txt_box.start_or_end')">
             <el-input
               v-model="query.point_code"
               size="small"
@@ -71,7 +71,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('Inst.table.instruction_type')">
+          <el-form-item :label="$t('Inst.table.instruction_type')">
             <el-select
               v-model="query.instruction_type"
               clearable
@@ -98,7 +98,7 @@
           icon="el-icon-refresh"
           @click="reload"
         >
-          {{ $t('common.synchronous') }}
+          {{ $t('auto.common.synchronous') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -124,8 +124,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -155,7 +155,7 @@
         <el-table-column prop="update_time" :label="$t('Inst.table.update_time')" :min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
-          :label="$t('common.Operate')"
+          :label="$t('auto.common.Operate')"
           width="250px"
           align="center"
         >
@@ -166,9 +166,9 @@
             <!--              </span>-->
             <!--              <el-dropdown-menu slot="dropdown">-->
             <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('Inst.table.Finish') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('common.Cancel') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('common.Forced_cancellation') }}</el-dropdown-item>-->
-            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">{{ $t('common.Initialize') }}</el-dropdown-item>-->
+            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('auto.common.Cancel') }}</el-dropdown-item>-->
+            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">{{ $t('auto.common.Forced_cancellation') }}</el-dropdown-item>-->
+            <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">{{ $t('auto.common.Initialize') }}</el-dropdown-item>-->
             <!--              </el-dropdown-menu>-->
             <!--            </el-dropdown>-->
             <el-button
@@ -183,21 +183,21 @@
               icon="el-icon-circle-close"
               @click="handleCommand(scope.$index, scope.row,'b')"
             >
-              {{ $t('common.Cancel') }}
+              {{ $t('auto.common.Cancel') }}
             </el-button>
             <el-button
               type="text"
               icon="el-icon-error"
               @click="handleCommand(scope.$index, scope.row,'c')"
             >
-              {{ $t('common.Forced_cancellation') }}
+              {{ $t('auto.common.Forced_cancellation') }}
             </el-button>
             <el-button
               type="text"
               icon="el-icon-refresh"
               @click="handleCommand(scope.$index, scope.row,'d')"
             >
-              {{ $t('common.Initialize') }}
+              {{ $t('auto.common.Initialize') }}
             </el-button>
           </template>
         </el-table-column>
diff --git a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
index bd278db..fd3dff6 100644
--- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('route.table_title.type')">
+          <el-form-item :label="$t('route.table_title.type')">
             <el-select
               v-model="query.route_plan_id"
               :placeholder="$t('route.placeholder.please_type')"
@@ -24,7 +24,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item  :label="$t('route.table_title.device_code')">
+          <el-form-item :label="$t('route.table_title.device_code')">
             <el-input
               v-model="query.device_code"
               clearable
@@ -35,7 +35,7 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item  :label="$t('route.table_title.next_device_code')">
+          <el-form-item :label="$t('route.table_title.next_device_code')">
             <el-input
               v-model="query.next_device_code"
               clearable
@@ -59,7 +59,7 @@
           icon="el-icon-refresh"
           @click="reload"
         >
-          {{ $t('common.synchronous') }}
+          {{ $t('auto.common.synchronous') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -98,7 +98,7 @@
               clearable
               multiple
               reserve-keyword
-              :placeholder="$t('common.please')"
+              :placeholder="$t('auto.common.please')"
               style="width: 370px;"
             >
               <el-option
@@ -117,7 +117,7 @@
               clearable
               reserve-keyword
               multiple
-              :placeholder="$t('common.please')"
+              :placeholder="$t('auto.common.please')"
               style="width: 370px;"
             >
               <el-option
@@ -180,7 +180,7 @@
         <el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备类型" />
         <el-table-column prop="weights" :label="$t('route.table_title.weights')" />
 
-        <el-table-column :label="$t('common.is_on')" align="center" prop="is_active" :min-width="flexWidth('is_active',crud.data,$t('common.is_on'))">
+        <el-table-column :label="$t('auto.common.is_on')" align="center" prop="is_active" :min-width="flexWidth('is_active',crud.data,$t('auto.common.is_on'))">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.is_active"
@@ -193,11 +193,11 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="update_by" :label="$t('common.update_by')" />
-        <el-table-column prop="update_time" min-width="160" :label="$t('common.update_time')" />
+        <el-table-column prop="update_by" :label="$t('auto.common.update_by')" />
+        <el-table-column prop="update_time" min-width="160" :label="$t('auto.common.update_time')" />
         <el-table-column
           v-permission="['admin','routeLine:edit','routeLine:del']"
-          :label="$t('common.Operate')"
+          :label="$t('auto.common.Operate')"
           width="150px"
           align="center"
         >
diff --git a/acs/nladmin-ui/src/views/acs/route/routePlan/index.vue b/acs/nladmin-ui/src/views/acs/route/routePlan/index.vue
index 7450aaa..03ffa74 100644
--- a/acs/nladmin-ui/src/views/acs/route/routePlan/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routePlan/index.vue
@@ -27,8 +27,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -45,13 +45,13 @@
         <el-table-column prop="plan_code" :label="$t('route.table_title.code')" />
         <el-table-column prop="plan_name" :label="$t('route.table_title.name')" />
         <el-table-column prop="remark" :label="$t('route.table_title.remark')" />
-        <el-table-column prop="create_by" :label="$t('common.create_by')" />
-        <el-table-column prop="create_time" :label="$t('common.create_time')" />
-        <el-table-column prop="update_by" :label="$t('common.update_by')" />
-        <el-table-column prop="update_time" :label="$t('common.update_time')" />
+        <el-table-column prop="create_by" :label="$t('auto.common.create_by')" />
+        <el-table-column prop="create_time" :label="$t('auto.common.create_time')" />
+        <el-table-column prop="update_by" :label="$t('auto.common.update_by')" />
+        <el-table-column prop="update_time" :label="$t('auto.common.update_time')" />
         <el-table-column
           v-permission="['admin','routePlan:edit','routePlan:del']"
-          :label="$t('common.Update')"
+          :label="$t('auto.common.Update')"
           width="150px"
           align="center"
         >
@@ -72,7 +72,6 @@
 <script>
 import crudRoutePlan from '@/api/acs/route/routePlan'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
@@ -92,7 +91,7 @@ const defaultForm = {
 }
 export default {
   name: 'RoutePlan',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index 4dd0dd2..86ca829 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('task.txt_box.Task_code')">
+          <el-form-item :label="$t('task.txt_box.Task_code')">
             <el-input
               v-model="query.task_code"
               size="small"
@@ -97,7 +97,7 @@
           icon="el-icon-plus"
           @click="formDia=true"
         >
-          {{ $t('common.Create') }}
+          {{ $t('auto.common.Create') }}
         </el-button>
         <el-button
           slot="right"
@@ -107,7 +107,7 @@
           icon="el-icon-refresh"
           @click="reload"
         >
-          {{ $t('common.synchronous') }}
+          {{ $t('auto.common.synchronous') }}
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -115,7 +115,7 @@
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="135px">
           <el-row>
             <el-col :span="12">
-              <div class="grid-content bg-purple"></div>
+              <div class="grid-content bg-purple" />
               <el-form-item v-if="false" label="任务标识" prop="task_id">
                 <el-input v-model="form.task_id" style="width: 240px;" />
               </el-form-item>
@@ -219,7 +219,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <div class="grid-content bg-purple-light"></div>
+              <div class="grid-content bg-purple-light" />
               <el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y">
                 <el-select
                   v-model="form.from_y"
@@ -338,7 +338,7 @@
                 <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
               </el-form-item>
               <el-form-item :label="$t('task.select.Description')" prop="description">
-                <el-input v-model="form.remark" style="width: 370px;"  type="textarea" @change="isDisabled=false" />
+                <el-input v-model="form.remark" style="width: 370px;" type="textarea" @change="isDisabled=false" />
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/acs/nladmin-ui/src/views/login.vue b/acs/nladmin-ui/src/views/login.vue
index 7d3cbbc..18d1ed9 100644
--- a/acs/nladmin-ui/src/views/login.vue
+++ b/acs/nladmin-ui/src/views/login.vue
@@ -4,17 +4,17 @@
       <h3 class="title">
         {{ title }}</h3>
       <el-form-item prop="username">
-        <el-input v-model="loginForm.username" type="text" auto-complete="off" :placeholder="$t('common.account')">
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" :placeholder="$t('auto.common.account')">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="loginForm.password" type="password" auto-complete="off" :placeholder="$t('common.password')" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" :placeholder="$t('auto.common.password')" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="code">
-        <el-input v-model="loginForm.code" auto-complete="off" :placeholder="$t('common.verification_code')" style="width: 63%" @keyup.enter.native="handleLogin">
+        <el-input v-model="loginForm.code" auto-complete="off" :placeholder="$t('auto.common.verification_code')" style="width: 63%" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
@@ -24,14 +24,14 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">
-            {{ $t('common.login_rm') }}
+            {{ $t('auto.common.login_rm') }}
           </el-checkbox>
         </el-col>
         <el-col :span="12">
           <el-dropdown style="display: flex; justify-content: right; color: #409EFF;" trigger="click" @command="langChange">
-        <span class="el-dropdown-link">
-          {{ language }}
-        </span>
+            <span class="el-dropdown-link">
+              {{ language }}
+            </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
               <el-dropdown-item divided command="en">English</el-dropdown-item>
@@ -42,8 +42,8 @@
       </el-row>
       <el-form-item style="width:100%;">
         <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
-          <span v-if="!loading">{{ $t('common.login') }}</span>
-          <span v-else>{{ $t('common.login_ing') }}</span>
+          <span v-if="!loading">{{ $t('auto.common.login') }}</span>
+          <span v-else>{{ $t('auto.common.login_ing') }}</span>
         </el-button>
       </el-form-item>
     </el-form>
diff --git a/acs/nladmin-ui/src/views/monitor/server/index.vue b/acs/nladmin-ui/src/views/monitor/server/index.vue
index 13f1bd3..5ba81d4 100644
--- a/acs/nladmin-ui/src/views/monitor/server/index.vue
+++ b/acs/nladmin-ui/src/views/monitor/server/index.vue
@@ -1,28 +1,28 @@
 <template>
-  <div v-loading="!show" :element-loading-text="$t('common.loading')" :style="!show ? 'height: 500px' : 'height: 100%'" class="app-container">
+  <div v-loading="!show" :element-loading-text="$t('auto.common.loading')" :style="!show ? 'height: 500px' : 'height: 100%'" class="app-container">
     <div v-if="show">
       <el-card class="box-card">
         <div style="color: #666;font-size: 13px;">
           <svg-icon icon-class="system" style="margin-right: 5px" />
           <span>
-            {{ $t('monitor.sys') }}：{{ data.sys.os }}
+            {{ $t('auto.monitor.sys') }}：{{ data.sys.os }}
           </span>
           <span>
             IP：{{ data.sys.ip }}
           </span>
           <span>
-            {{ $t('monitor.day') }}：{{ data.sys.day }}
+            {{ $t('auto.monitor.day') }}：{{ data.sys.day }}
           </span>
           <i class="el-icon-refresh" style="margin-left: 40px" @click="init" />
         </div>
       </el-card>
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.status') }}</span>
+          <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('auto.monitor.status') }}</span>
         </div>
         <div>
           <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.cpu') }}</div>
+            <div class="title">{{ $t('auto.monitor.cpu') }}</div>
             <el-tooltip placement="top-end">
               <div slot="content" style="font-size: 12px;">
                 <div style="padding: 3px;">
@@ -42,20 +42,20 @@
                 <el-progress type="dashboard" :percentage="parseFloat(data.cpu.used)" />
               </div>
             </el-tooltip>
-            <div class="footer">{{ data.cpu.coreNumber }} {{ $t('monitor.core') }}</div>
+            <div class="footer">{{ data.cpu.coreNumber }} {{ $t('auto.monitor.core') }}</div>
           </el-col>
           <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.memory') }}</div>
+            <div class="title">{{ $t('auto.monitor.memory') }}</div>
             <el-tooltip placement="top-end">
               <div slot="content" style="font-size: 12px;">
                 <div style="padding: 3px;">
-                  {{ $t('monitor.tality') }}：{{ data.memory.total }}
+                  {{ $t('auto.monitor.tality') }}：{{ data.memory.total }}
                 </div>
                 <div style="padding: 3px">
-                  {{ $t('monitor.used') }}：{{ data.memory.used }}
+                  {{ $t('auto.monitor.used') }}：{{ data.memory.used }}
                 </div>
                 <div style="padding: 3px">
-                  {{ $t('monitor.leisure') }}：{{ data.memory.available }}
+                  {{ $t('auto.monitor.leisure') }}：{{ data.memory.available }}
                 </div>
               </div>
               <div class="content">
@@ -65,17 +65,17 @@
             <div class="footer">{{ data.memory.used }} / {{ data.memory.total }}</div>
           </el-col>
           <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.exchange') }}</div>
+            <div class="title">{{ $t('auto.monitor.exchange') }}</div>
             <el-tooltip placement="top-end">
               <div slot="content" style="font-size: 12px;">
                 <div style="padding: 3px;">
-                  {{ $t('monitor.tality') }}：{{ data.swap.total }}
+                  {{ $t('auto.monitor.tality') }}：{{ data.swap.total }}
                 </div>
                 <div style="padding: 3px">
-                  {{ $t('monitor.used') }}：{{ data.swap.used }}
+                  {{ $t('auto.monitor.used') }}：{{ data.swap.used }}
                 </div>
                 <div style="padding: 3px">
-                  {{ $t('monitor.leisure') }}：{{ data.swap.available }}
+                  {{ $t('auto.monitor.leisure') }}：{{ data.swap.available }}
                 </div>
               </div>
               <div class="content">
@@ -85,15 +85,15 @@
             <div class="footer">{{ data.swap.used }} / {{ data.swap.total }}</div>
           </el-col>
           <el-col :xs="24" :sm="24" :md="6" :lg="6" :xl="6" style="margin-bottom: 10px">
-            <div class="title">{{ $t('monitor.disk') }}</div>
+            <div class="title">{{ $t('auto.monitor.disk') }}</div>
             <div class="content">
               <el-tooltip placement="top-end">
                 <div slot="content" style="font-size: 12px;">
                   <div style="padding: 3px">
-                    {{ $t('monitor.tality') }}：{{ data.disk.total }}
+                    {{ $t('auto.monitor.tality') }}：{{ data.disk.total }}
                   </div>
                   <div style="padding: 3px">
-                    {{ $t('monitor.leisure') }}：{{ data.disk.available }}
+                    {{ $t('auto.monitor.leisure') }}：{{ data.disk.available }}
                   </div>
                 </div>
                 <div class="content">
@@ -111,7 +111,7 @@
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
-                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.cpu_monitoring') }}</span>
+                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('auto.monitor.cpu_monitoring') }}</span>
               </div>
               <div>
                 <v-chart :options="cpuInfo" />
@@ -121,7 +121,7 @@
           <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" style="margin-bottom: 10px">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
-                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('monitor.memory_monitoring') }}</span>
+                <span style="font-weight: bold;color: #666;font-size: 15px">{{ $t('auto.monitor.memory_monitoring') }}</span>
               </div>
               <div>
                 <v-chart :options="memoryInfo" />
diff --git a/acs/nladmin-ui/src/views/screen/bigScreen.vue b/acs/nladmin-ui/src/views/screen/bigScreen.vue
index 2b497bd..0dfc75d 100644
--- a/acs/nladmin-ui/src/views/screen/bigScreen.vue
+++ b/acs/nladmin-ui/src/views/screen/bigScreen.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="login" :style="'background-image:url('+ Background +');'">
-    <div style="font-size: 42px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 20px;">兰州海亮设备管理任务看板</div>
+    <div style="font-size: 42px; color: #f4f4f5; text-align: center; background-color: transparent;padding-top: 20px;">{{ $t('task.screen.title') }}</div>
     <el-row>
       <el-col :span="12">
-        <di><h2 style="font-size: 50px; color: #f4f4f5;margin-left: 30px;padding-top: 10px;">任务看板</h2></di>
+        <di><h2 style="font-size: 50px; color: #f4f4f5;margin-left: 30px;padding-top: 10px;">{{ $t('task.screen.task_screen') }}</h2></di>
         <el-form
           :inline="true"
           label-position="right"
diff --git a/acs/nladmin-ui/src/views/system/auto/index.vue b/acs/nladmin-ui/src/views/system/auto/index.vue
index ee8cceb..5d52e72 100644
--- a/acs/nladmin-ui/src/views/system/auto/index.vue
+++ b/acs/nladmin-ui/src/views/system/auto/index.vue
@@ -12,16 +12,16 @@
     <!--表格渲染-->
     <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="name" :label="$t('Auto.table.name')" :min-width="flexWidth('name',crud.data,$t('Auto.table.name'))"/>
+      <el-table-column show-overflow-tooltip prop="name" :label="$t('Auto.table.name')" :min-width="flexWidth('name',crud.data,$t('Auto.table.name'))" />
       <el-table-column :show-overflow-tooltip="false" prop="code" :label="$t('Auto.table.code')" :min-width="flexWidth('code',crud.data,$t('Auto.table.code'))" />
       <el-table-column show-overflow-tooltip prop="status" :label="$t('Auto.table.status')" :min-width="flexWidth('status',crud.data,$t('Auto.table.status'))" />
-      <el-table-column show-overflow-tooltip prop="thread_name" :label="$t('Auto.table.thread_name')" :min-width="flexWidth('thread_name',crud.data,$t('Auto.table.thread_name'))"/>
+      <el-table-column show-overflow-tooltip prop="thread_name" :label="$t('Auto.table.thread_name')" :min-width="flexWidth('thread_name',crud.data,$t('Auto.table.thread_name'))" />
       <el-table-column show-overflow-tooltip prop="thread_state" :label="$t('Auto.table.thread_state')" :min-width="flexWidth('thread_state',crud.data,$t('Auto.table.thread_state'))" />
       <el-table-column show-overflow-tooltip prop="usedStatus" :label="$t('Auto.table.usedStatus')" :min-width="flexWidth('usedStatus',crud.data,$t('Auto.table.usedStatus'))" />
-      <el-table-column show-overflow-tooltip prop="stopMessage"  :label="$t('Auto.table.stopMessage')" :min-width="flexWidth('stopMessage',crud.data,$t('Auto.table.stopMessage'))" />
-      <el-table-column v-permission="['admin','timing:edit','timing:del']" :label="$t('Auto.table.operate')"  width="170px" align="center" fixed="right">
+      <el-table-column show-overflow-tooltip prop="stopMessage" :label="$t('Auto.table.stopMessage')" :min-width="flexWidth('stopMessage',crud.data,$t('Auto.table.stopMessage'))" />
+      <el-table-column v-permission="['admin','timing:edit','timing:del']" :label="$t('Auto.table.operate')" width="170px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" icon="el-icon-video-pause" @click="start(scope.row.code)">{{ $t('common.firing') }}</el-button>
+          <el-button v-permission="['admin','timing:edit']" style="margin-left: -2px" type="text" size="mini" icon="el-icon-video-pause" @click="start(scope.row.code)">{{ $t('auto.common.firing') }}</el-button>
           <el-popover
             :ref="scope.row.code"
             placement="top"
@@ -29,10 +29,10 @@
           >
             {{ $t('Auto.msg.stop_msg') }}
             <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.code].doClose()">{{ $t('common.Cancel') }}</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini"  @click="stop(scope.row.code)">{{ $t('common.determine') }}</el-button>
+              <el-button size="mini" type="text" @click="$refs[scope.row.code].doClose()">{{ $t('auto.common.Cancel') }}</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="stop(scope.row.code)">{{ $t('auto.common.determine') }}</el-button>
             </div>
-            <el-button slot="reference" icon="el-icon-video-play" type="text" size="mini">{{ $t('common.stop') }}</el-button>
+            <el-button slot="reference" icon="el-icon-video-play" type="text" size="mini">{{ $t('auto.common.stop') }}</el-button>
           </el-popover>
 
         </template>
@@ -45,15 +45,13 @@
 
 <script>
 import crudAutoRun from '@/api/system/autorun'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, { presenter, header, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
-import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import crudJob from '@/views/system/timing/timing'
 
 export default {
   name: 'Autorun',
-  components: { pagination, crudOperation, rrOperation },
+  components: { pagination, rrOperation },
   cruds() {
     return CRUD({ title: '自动线程', url: 'api/autorun', crudMethod: { ...crudAutoRun }})
   },
diff --git a/acs/nladmin-ui/src/views/system/dept/index.vue b/acs/nladmin-ui/src/views/system/dept/index.vue
index b8c2525..a0806ba 100644
--- a/acs/nladmin-ui/src/views/system/dept/index.vue
+++ b/acs/nladmin-ui/src/views/system/dept/index.vue
@@ -4,27 +4,38 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.name"
-          clearable
-          size="mini"
-          placeholder="输入部门名称搜索"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.is_used"
-          clearable
-          size="mini"
-          placeholder="状态"
-          class="filter-item"
-          style="width: 90px"
-          @change="crud.toQuery"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
-        </el-select>
-        <rrOperation />
+          <el-form-item  :label="$t('department.table_title.Department_name')">
+            <el-input
+              v-model="query.name"
+              clearable
+              size="mini"
+              :placeholder="$t('department.table_title.enter_department_name')"
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item  :label="$t('department.table_value.State')">
+            <el-select
+              v-model="query.is_used"
+              clearable
+              size="mini"
+              :placeholder="$t('department.table_value.State')"
+              class="filter-item"
+              style="width: 200px"
+              @change="crud.toQuery"
+            >
+              <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission" />
     </div>
@@ -34,16 +45,16 @@
       :before-close="crud.cancelCU"
       :visible.sync="crud.status.cu > 0"
       :title="crud.status.title"
-      width="500px"
+      width="650px"
     >
-      <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="部门编码" prop="code">
+      <el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="160px">
+        <el-form-item :label="$t('department.other.Department_code')" prop="code" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-input v-model="form.code" :disabled="true" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="部门名称" prop="name">
+        <el-form-item :label="$t('department.table_title.Department_name')" prop="name" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="部门排序" prop="dept_sort">
+        <el-form-item :label="$t('department.other.Department_sort')" prop="dept_sort" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-input-number
             v-model.number="form.dept_sort"
             :min="0"
@@ -52,16 +63,18 @@
             style="width: 370px;"
           />
         </el-form-item>
-        <el-form-item label="外部标识" prop="ext_id">
+        <el-form-item :label="$t('department.other.External_identification')" prop="ext_id" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-input v-model="form.ext_id" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="顶级部门">
+        <el-form-item :label="$t('department.other.Top_departments')" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-radio-group v-model="form.isTop" style="width: 140px">
-            <el-radio label="1">是</el-radio>
-            <el-radio label="0">否</el-radio>
+            <el-row>
+            <el-radio label="1">{{ $t('common.true') }}</el-radio>
+            <el-radio label="0">{{ $t('common.false') }}</el-radio>
+            </el-row>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="状态" prop="is_used">
+        <el-form-item :label="$t('department.table_value.State')" prop="is_used" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <el-switch
             v-model="form.is_used"
             active-color="#409EFF"
@@ -70,7 +83,7 @@
             inactive-valu="false"
           />
         </el-form-item>
-        <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
+        <el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" :label="$t('department.other.Top_departments')" prop="pid" :min-width="flexWidth('code',crud.data,$t('department.other.Department_code'))">
           <treeselect
             v-model="form.pid"
             :load-options="loadDepts"
@@ -82,8 +95,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <!--表格渲染  :load="getDeptDatas" 点击事件 row-key需要指定唯一的数据id-->
@@ -101,9 +114,9 @@
     >
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
       <!--      <el-table-column label="编码" prop="code" />-->
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="排序" prop="dept_sort" />
-      <el-table-column label="状态" align="center" prop="is_used">
+      <el-table-column :label="$t('department.table_value.Name')" prop="name" :min-width="flexWidth('name',crud.data,$t('department.table_value.Name'))" />
+      <el-table-column :label="$t('department.table_value.Sort')" prop="dept_sort" :min-width="flexWidth('dept_sort',crud.data,$t('department.table_value.Sort'))" />
+      <el-table-column :label="$t('department.table_value.State')" align="center" prop="is_used" :min-width="flexWidth('is_used',crud.data,$t('department.table_value.State'))">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.is_used"
@@ -114,10 +127,10 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="create_time" label="创建日期" />
+      <el-table-column prop="create_time" :label="$t('department.table_value.CreateDate')" :min-width="flexWidth('create_time',crud.data,$t('department.table_value.CreateDate'))" />
       <el-table-column
         v-permission="['admin','dept:edit','dept:del']"
-        label="操作"
+        :label="$t('department.table_value.Operate')"
         width="130px"
         align="center"
         fixed="right"
@@ -143,6 +156,7 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
+import i18n from '@/i18n'
 
 const defaultForm = {
   code: null,
@@ -158,7 +172,7 @@ export default {
   name: 'Dept',
   components: { Treeselect, crudOperation, rrOperation, udOperation },
   cruds() {
-    return CRUD({ title: '部门', idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }})
+    return CRUD({ title: i18n.t('department.table_title.Department'), idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 设置数据字典
diff --git a/acs/nladmin-ui/src/views/system/dict/dictDetail.vue b/acs/nladmin-ui/src/views/system/dict/dictDetail.vue
index 77faea6..1c2ce04 100644
--- a/acs/nladmin-ui/src/views/system/dict/dictDetail.vue
+++ b/acs/nladmin-ui/src/views/system/dict/dictDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="query.code === ''">
-      <div class="my-code">点击字典查看详情</div>
+      <div class="my-code">{{ $t('dict.other.Click_dictionary_see_details') }}</div>
     </div>
     <div v-else>
       <!--工具栏-->
@@ -27,16 +27,16 @@
         :before-close="crud.cancelCU"
         :visible="crud.status.cu > 0"
         :title="crud.status.title"
-        width="500px"
+        width="600px"
       >
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="字典标签" prop="label">
+        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px">
+          <el-form-item :label="$t('dict.other.Dict_detail')" prop="label">
             <el-input v-model="form.label" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="字典值" prop="value">
+          <el-form-item :label="$t('dict.other.Dictionary_value')" prop="value">
             <el-input v-model="form.value" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="排序" prop="dict_sort">
+          <el-form-item :label="$t('dict.other.Sort')" prop="dict_sort">
             <el-input-number
               v-model.number="form.dict_sort"
               :min="0"
@@ -45,19 +45,19 @@
               style="width: 370px;"
             />
           </el-form-item>
-          <el-form-item label="参数1" prop="para1">
+          <el-form-item :label="$t('dict.other.Parameter1')" prop="para1">
             <el-input v-model="form.para1" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="参数2" prop="para2">
+          <el-form-item :label="$t('dict.other.Parameter2')" prop="para2">
             <el-input v-model="form.para2" style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="参数3" prop="para3">
+          <el-form-item :label="$t('dict.other.Parameter3')" prop="para3">
             <el-input v-model="form.para3" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
+          <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -69,18 +69,18 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column label="所属字典" min-width="150" show-overflow-tooltip>
+        <el-table-column prop="code" :label="$t('dict.other.Which_dictionary')" :min-width="flexWidth('code',crud.data,$t('dict.other.Which_dictionary'))" show-overflow-tooltip>
           {{ query.code }}
         </el-table-column>
-        <el-table-column prop="label" label="字典标签" align="center" width="120" show-overflow-tooltip />
-        <el-table-column prop="value" label="字典值" align="center" width="60" />
-        <el-table-column prop="dict_sort" label="排序" align="center" width="65" />
-        <el-table-column prop="para1" label="参数1" align="center" width="65" />
-        <el-table-column prop="para2" label="参数2" align="center" width="65" />
-        <el-table-column prop="para3" label="参数3" align="center" width="65" />
+        <el-table-column prop="label" :label="$t('dict.other.Department_label')" align="center" :min-width="flexWidth('label',crud.data,$t('dict.other.Department_label'))" show-overflow-tooltip />
+        <el-table-column prop="value" :label="$t('dict.other.Dictionary_value')" align="center" :min-width="flexWidth('value',crud.data,$t('dict.other.Dictionary_value'))" />
+        <el-table-column prop="dict_sort" :label="$t('dict.other.Sort')" align="center" min-width="120px" />
+        <el-table-column prop="para1" :label="$t('dict.other.Parameter1')" align="center" :min-width="flexWidth('para1',crud.data,$t('dict.other.Parameter1'))" />
+        <el-table-column prop="para2" :label="$t('dict.other.Parameter2')" align="center" :min-width="flexWidth('para2',crud.data,$t('dict.other.Parameter2'))" />
+        <el-table-column prop="para3" :label="$t('dict.other.Parameter3')" align="center" :min-width="flexWidth('para3',crud.data,$t('dict.other.Parameter3'))" />
         <el-table-column
           v-permission="['admin','dict:edit','dict:del']"
-          label="操作"
+          :label="$t('dict.table_value.Operate')"
           align="center"
           width="115px"
           fixed="right"
@@ -105,6 +105,7 @@ import CRUD, { form, header, presenter } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
+import i18n from '@/i18n'
 
 const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
 
@@ -113,7 +114,7 @@ export default {
   cruds() {
     return [
       CRUD({
-        title: '字典详情',
+        title: i18n.t('dict.other.Dict_detail'),
         url: 'api/dict/dictDetail',
         query: { code: '' },
         idField: 'dict_id',
diff --git a/acs/nladmin-ui/src/views/system/dict/index.vue b/acs/nladmin-ui/src/views/system/dict/index.vue
index 8bb0ac4..253d036 100644
--- a/acs/nladmin-ui/src/views/system/dict/index.vue
+++ b/acs/nladmin-ui/src/views/system/dict/index.vue
@@ -7,19 +7,19 @@
       :before-close="crud.cancelCU"
       :visible="crud.status.cu > 0"
       :title="crud.status.title"
-      width="500px"
+      width="650px"
     >
-      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="字典编码" prop="code">
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="170px">
+        <el-form-item :label="$t('dict.table_value.Code')" prop="code">
           <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="名称">
+        <el-form-item :label="$t('dict.table_value.Name')">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <!-- 字典列表 -->
@@ -30,16 +30,25 @@
           <div class="head-container">
             <div v-if="crud.props.searchToggle">
               <!-- 搜索 -->
-              <el-input
-                v-model="query.blurry"
-                clearable
-                size="mini"
-                placeholder="输入名称或者描述搜索"
-                style="width: 200px;"
-                class="filter-item"
-                @keyup.enter.native="crud.toQuery"
-              />
-              <rrOperation />
+              <el-form
+                :inline="true"
+                class="demo-form-inline"
+                label-position="right"
+                label-suffix=":"
+              >
+                <el-form-item  :label="$t('dict.table_title.code_Name')">
+                  <el-input
+                    v-model="query.blurry"
+                    clearable
+                    size="mini"
+                    :placeholder="$t('dict.table_title.enter_code_name')"
+                    style="width: 200px;"
+                    class="filter-item"
+                    @keyup.enter.native="crud.toQuery"
+                  />
+                </el-form-item>
+                <rrOperation />
+              </el-form>
             </div>
             <crudOperation :permission="permission" />
           </div>
@@ -54,11 +63,11 @@
             @current-change="handleCurrentChange"
           >
             <el-table-column type="selection" width="55" />
-            <el-table-column show-overflow-tooltip prop="code" label="编码" />
-            <el-table-column show-overflow-tooltip prop="name" label="名称" />
+            <el-table-column show-overflow-tooltip prop="code" :label="$t('dict.table_value.Code')"  />
+            <el-table-column show-overflow-tooltip prop="name" :label="$t('dict.table_value.Name')" />
             <el-table-column
               v-permission="['admin','dict:edit','dict:del']"
-              label="操作"
+              :label="$t('dict.table_value.Operate')"
               width="130px"
               align="center"
               fixed="right"
@@ -79,7 +88,7 @@
       <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span>字典详情</span>
+            <span>{{ $t('dict.other.Dict_detail') }}</span>
             <el-button
               v-if="checkPermission(['admin','dict:add']) && this.$refs.dictDetail && this.$refs.dictDetail.query.code"
               class="filter-item"
@@ -88,7 +97,7 @@
               type="primary"
               icon="el-icon-plus"
               @click="$refs.dictDetail && $refs.dictDetail.crud.toAdd()"
-            >新增
+            >{{ $t('common.Create') }}
             </el-button>
           </div>
           <dictDetail ref="dictDetail" :permission="permission" />
@@ -108,6 +117,7 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
+import i18n from '@/i18n'
 
 const defaultForm = {
   dict_id: null,
@@ -127,7 +137,7 @@ export default {
   components: { crudOperation, pagination, rrOperation, udOperation, dictDetail },
   cruds() {
     return [
-      CRUD({ title: '字典', url: 'api/dict', idField: 'dict_id', crudMethod: { ...crudDict }})
+      CRUD({ title: i18n.t('dict.table_value.Dict'), url: 'api/dict', idField: 'dict_id', crudMethod: { ...crudDict }})
     ]
   },
   mixins: [presenter(), header(), form(defaultForm)],
diff --git a/acs/nladmin-ui/src/views/system/menu/index.vue b/acs/nladmin-ui/src/views/system/menu/index.vue
index 0ec0ca2..34735ff 100644
--- a/acs/nladmin-ui/src/views/system/menu/index.vue
+++ b/acs/nladmin-ui/src/views/system/menu/index.vue
@@ -4,28 +4,35 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input
-          v-model="query.blurry"
-          clearable
-          size="mini"
-          :placeholder="$t('menu.placeholder.fuzzy_search')"
-          style="width: 200px;margin-bottom: 10px"
-          class="filter-item"
-          @keyup.enter.native="queryBlurry"
-        />
-        <el-select
-          v-model="query.system_type"
-          style="width: 100px; height: 35px;top: -5px;"
-          :placeholder="$t('menu.placeholder.owning_system')"
-          @change="changetype"
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-suffix=":"
         >
-          <el-option
-            v-for="item in dict.system_type"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <rrOperation />
+          <el-form-item :label="$t('menu.placeholder.fuzzy_search')">
+            <el-input
+              v-model="query.blurry"
+              clearable
+              size="mini"
+              :placeholder="$t('menu.placeholder.fuzzy_search')"
+              style="width: 200px;margin-bottom: 10px"
+              class="filter-item"
+              @keyup.enter.native="queryBlurry"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('menu.placeholder.owning_system')">
+            <el-select
+              v-model="query.system_type"
+              style="width: 200px; margin-bottom: 10px"
+              :placeholder="$t('menu.placeholder.owning_system')"
+              @change="changetype"
+            >
+              <el-option v-for="item in dict.system_type" :key="item.id" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <crudOperation :permission="permission" />
     </div>
@@ -34,11 +41,11 @@
       append-to-body
       :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="650px"
     >
-      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="150px">
         <el-form-item :label="$t('menu.dialog.menu_type')" prop="type">
           <el-radio-group v-model="form.type" size="mini">
             <el-radio-button label="1">{{ $t('menu.dialog.system') }}</el-radio-button>
@@ -69,20 +76,20 @@
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1'" :label="$t('menu.dialog.menu_chain')" prop="iframe">
           <el-radio-group v-model="form.iframe" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
+            <el-radio-button label="true">{{ $t('common.true') }}</el-radio-button>
+            <el-radio-button label="false">{{ $t('common.false') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-show="form.type.toString() === '2'" :label="$t('menu.dialog.menu_cache')" prop="cache">
           <el-radio-group v-model="form.cache" size="mini">
-            <el-radio-button label="true">是</el-radio-button>
-            <el-radio-button label="false">否</el-radio-button>
+            <el-radio-button label="true">{{ $t('common.true') }}</el-radio-button>
+            <el-radio-button label="false">{{ $t('common.false') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-show="form.type.toString() !== '2' && form.type.toString() !== '1' " :label="$t('menu.dialog.menu_visible')" prop="hidden">
           <el-radio-group v-model="form.hidden" size="mini">
-            <el-radio-button label="false">是</el-radio-button>
-            <el-radio-button label="true">否</el-radio-button>
+            <el-radio-button label="false">{{ $t('common.true') }}</el-radio-button>
+            <el-radio-button label="true">{{ $t('common.false') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="form.type.toString() !== '2'" :label="$t('menu.dialog.default_title')" prop="title">
@@ -150,8 +157,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
@@ -173,7 +180,7 @@
       <el-table-column :label="$t('menu.table_title.menu_title')" :prop="$langPre.computedProp('title')" :min-width="flexWidth($langPre.computedProp('title'),crud.data,$t('menu.table_title.menu_title'))" />
       <el-table-column :label="$t('menu.table_title.system')" prop="system_type" :min-width="flexWidth('system_type',crud.data,$t('menu.table_title.system'))">
         <template slot-scope="scope">
-          {{ dict.label.system_type[scope.row.system_type] }} : {{scope.row.system_type}}
+          {{ dict.label.system_type[scope.row.system_type] }} : {{ scope.row.system_type }}
         </template>
       </el-table-column>
       <el-table-column prop="icon" :label="$t('menu.table_title.icon')" align="center" :min-width="flexWidth('icon',crud.data, $t('menu.table_title.system'))">
@@ -209,7 +216,7 @@
       <el-table-column prop="create_time" :label="$t('menu.table_title.create_time')" :min-width="flexWidth('create_time',crud.data,$t('menu.table_title.create_time'))" />
       <el-table-column
         v-permission="['admin','menu:edit','menu:del']"
-        :label="$t('common.Operate')"
+        :label="$t('auto.common.Operate')"
         width="130px"
         align="center"
         fixed="right"
@@ -236,7 +243,6 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
-import DateRangePicker from '@/components/DateRangePicker'
 import Dict from '../../../components/Dict/Dict'
 import i18n from '@/i18n'
 
@@ -264,7 +270,7 @@ const defaultForm = {
 }
 export default {
   name: 'Menu',
-  components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation, DateRangePicker },
+  components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation },
   cruds() {
     return CRUD({ title: i18n.t('menu.title'), idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
   },
diff --git a/acs/nladmin-ui/src/views/system/param/index.vue b/acs/nladmin-ui/src/views/system/param/index.vue
index 5dbf1dc..fc67a8e 100644
--- a/acs/nladmin-ui/src/views/system/param/index.vue
+++ b/acs/nladmin-ui/src/views/system/param/index.vue
@@ -27,8 +27,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
         </div>
       </el-dialog>
       <!--表格渲染-->
@@ -46,7 +46,7 @@
         <el-table-column :prop="$langPre.computedProp('name')" :label="$t('SysParam.table.name')" min-width="120" show-overflow-tooltip />
         <el-table-column prop="value" :label="$t('SysParam.table.values')" min-width="270" show-overflow-tooltip />
         <el-table-column prop="remark" :label="$t('SysParam.table.description')" />
-        <el-table-column v-permission="['admin','param:edit','param:del']" :label="$t('common.Operate')" width="150px" align="center">
+        <el-table-column v-permission="['admin','param:edit','param:del']" :label="$t('auto.common.Operate')" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -64,7 +64,6 @@
 <script>
 import crudParam from '@/views/system/param/param'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
@@ -79,7 +78,7 @@ const defaultForm = {
 }
 export default {
   name: 'Param',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: 'menu.SystemParam', url: 'api/param', idField: 'id', sort: 'id,desc', crudMethod: { ...crudParam },
diff --git a/acs/nladmin-ui/src/views/system/role/index.vue b/acs/nladmin-ui/src/views/system/role/index.vue
index a1ef7cf..8ddd411 100644
--- a/acs/nladmin-ui/src/views/system/role/index.vue
+++ b/acs/nladmin-ui/src/views/system/role/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('task.txt_box.Task_code')">
+          <el-form-item  :label="$t('role.table_title.taskCode_or_instCode')">
             <el-input
               v-model="query.blurry"
               size="mini"
@@ -36,16 +36,16 @@
       width="520px"
     >
       <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="80px">
-        <el-form-item label="角色名称" prop="name">
+        <el-form-item :label="$t('role.table_value.Name')" prop="name">
           <el-input v-model="form.name" style="width: 380px;" />
         </el-form-item>
-        <el-form-item label="备注" prop="description">
+        <el-form-item :label="$t('role.table_value.Name')" prop="description">
           <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">取消</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('task.select.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('task.select.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <el-row :gutter="15">
@@ -53,7 +53,7 @@
       <el-col :span="12" style="margin-bottom: 10px">
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
-            <span class="role-span">角色列表</span>
+            <span class="role-span">{{ $t('role.table_value.roleList') }}</span>
           </div>
           <el-table
             ref="table"
@@ -65,16 +65,16 @@
             @current-change="handleCurrentChange"
           >
             <el-table-column type="selection" width="55" />
-            <el-table-column prop="name" label="名称" min-width="100" show-overflow-tooltip />
-            <el-table-column show-overflow-tooltip prop="remark" label="描述" />
-            <el-table-column show-overflow-tooltip width="135px" prop="create_time" label="创建日期">
+            <el-table-column prop="name" :label="$t('role.table_value.Name')" :min-width="flexWidth('name',crud.data,$t('role.table_value.Name'))" show-overflow-tooltip />
+            <el-table-column show-overflow-tooltip prop="remark" :label="$t('role.table_value.Description')" :min-width="flexWidth('remark',crud.data,$t('role.table_value.Description'))" />
+            <el-table-column show-overflow-tooltip :min-width="flexWidth('create_time',crud.data,$t('role.table_value.CreateDate'))" prop="create_time" :label="$t('role.table_value.CreateDate')">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.create_time) }}</span>
               </template>
             </el-table-column>
             <el-table-column
               v-permission="['admin','roles:edit','roles:del']"
-              label="操作"
+              :label="$t('role.table_value.Operate')"
               width="130px"
               align="center"
               fixed="right"
@@ -96,7 +96,7 @@
         <el-card class="box-card" shadow="never">
           <div slot="header" class="clearfix">
             <el-tooltip class="item" effect="dark" content="选择指定角色分配菜单" placement="top">
-              <span class="role-span">菜单分配</span>
+              <span class="role-span">{{ $t('role.other.Menu_assignments') }}</span>
             </el-tooltip>
             <el-button
               v-permission="['admin','roles:edit']"
@@ -107,7 +107,7 @@
               style="float: right; padding: 6px 10px"
               type="primary"
               @click="saveMenu"
-            >保存
+            >{{ $t('role.other.Save') }}
             </el-button>
           </div>
 
@@ -139,18 +139,19 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import i18n from '@/i18n'
 
 const defaultForm = { role_id: null, name: null, remark: null }
 export default {
   name: 'Role',
   components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
   cruds() {
-    return CRUD({ idField: 'role_id', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles }})
+    return CRUD({ idField: 'role_id', title: i18n.t('role.table_value.Role'), url: 'api/sysRole', crudMethod: { ...crudRoles }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
-      defaultProps: { children: 'children', label: 'title', isLeaf: 'leaf' },
+      defaultProps: { children: 'children', label: this.$langPre.computedProp('title'), isLeaf: 'leaf' },
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], // 多选时使用
       permission: {
@@ -221,6 +222,8 @@ export default {
         this.showButton = true
       }
     },
+
+
     menuChange(menu) {
       // 获取该节点的所有子节点，id 包含自身
       getChild(menu.menu_id).then(childIds => {
diff --git a/acs/nladmin-ui/src/views/system/timing/index.vue b/acs/nladmin-ui/src/views/system/timing/index.vue
index b07dd68..6f5521a 100644
--- a/acs/nladmin-ui/src/views/system/timing/index.vue
+++ b/acs/nladmin-ui/src/views/system/timing/index.vue
@@ -10,7 +10,7 @@
           label-position="right"
           label-suffix=":"
         >
-          <el-form-item  :label="$t('Timing.DB.job_name')">
+          <el-form-item :label="$t('Timing.DB.job_name')">
             <el-input
               v-model="query.job_name"
               clearable
@@ -82,14 +82,14 @@
         </el-form-item>
         <el-form-item :label="$t('Timing.DB.Whether_pause')">
           <el-radio-group v-model="form.pause_after_failure" style="width: 220px">
-            <el-radio :label="true">{{ $t('common.true') }}</el-radio>
-            <el-radio :label="false">{{ $t('common.false') }}</el-radio>
+            <el-radio :label="true">{{ $t('auto.common.true') }}</el-radio>
+            <el-radio :label="false">{{ $t('auto.common.false') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('Timing.DB.thread_state')">
           <el-radio-group v-model="form.is_pause" style="width: 220px">
-            <el-radio :label="false">{{ $t('common.firing') }}</el-radio>
-            <el-radio :label="true">{{ $t('common.stop') }}</el-radio>
+            <el-radio :label="false">{{ $t('auto.common.firing') }}</el-radio>
+            <el-radio :label="true">{{ $t('auto.common.stop') }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item :label="$t('Timing.DB.Parameter_content')">
@@ -97,8 +97,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
-        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
+        <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+        <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
       </div>
     </el-dialog>
     <!--表格渲染-->
@@ -110,11 +110,11 @@
       @selection-change="crud.selectionChangeHandler"
     >
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column show-overflow-tooltip prop="job_id" :label="$t('Timing.DB.job_id')" :min-width="flexWidth('job_id',crud.data,$t('Timing.DB.job_id'))"/>
-      <el-table-column show-overflow-tooltip prop="job_name" :label="$t('Timing.DB.job_name')" :min-width="flexWidth('job_name',crud.data,$t('Timing.DB.job_name'))"/>
-      <el-table-column show-overflow-tooltip prop="bean_name" :label="$t('Timing.DB.bean_name')" :min-width="flexWidth('bean_name',crud.data,$t('Timing.DB.bean_name'))"/>
-      <el-table-column show-overflow-tooltip prop="method_name" :label="$t('Timing.DB.method_name')" :min-width="flexWidth('method_name',crud.data,$t('Timing.DB.method_name'))"/>
-      <el-table-column show-overflow-tooltip prop="params" :label="$t('Timing.DB.params')" :min-width="flexWidth('params',crud.data,$t('Timing.DB.params'))"/>
+      <el-table-column show-overflow-tooltip prop="job_id" :label="$t('Timing.DB.job_id')" :min-width="flexWidth('job_id',crud.data,$t('Timing.DB.job_id'))" />
+      <el-table-column show-overflow-tooltip prop="job_name" :label="$t('Timing.DB.job_name')" :min-width="flexWidth('job_name',crud.data,$t('Timing.DB.job_name'))" />
+      <el-table-column show-overflow-tooltip prop="bean_name" :label="$t('Timing.DB.bean_name')" :min-width="flexWidth('bean_name',crud.data,$t('Timing.DB.bean_name'))" />
+      <el-table-column show-overflow-tooltip prop="method_name" :label="$t('Timing.DB.method_name')" :min-width="flexWidth('method_name',crud.data,$t('Timing.DB.method_name'))" />
+      <el-table-column show-overflow-tooltip prop="params" :label="$t('Timing.DB.params')" :min-width="flexWidth('params',crud.data,$t('Timing.DB.params'))" />
       <el-table-column
         show-overflow-tooltip
         prop="cron_expression"
@@ -125,7 +125,7 @@
       <el-table-column show-overflow-tooltip prop="is_pause" width="120px" :label="$t('Timing.DB.is_pause')" align="center">
         <template slot-scope="scope">
           <el-tag :type="scope.row.is_pause ? 'warning' : 'success'">{{
-            scope.row.is_pause ? $t('common.Paused') : $t('common.Running')
+            scope.row.is_pause ? $t('auto.common.Paused') : $t('auto.common.Running')
           }}
           </el-tag>
         </template>
@@ -138,7 +138,7 @@
       </el-table-column>
       <el-table-column
         v-permission="['admin','timing:edit','timing:del']"
-        :label="$t('common.Operate')"
+        :label="$t('auto.common.Operate')"
         width="170px"
         align="center"
         fixed="right"
@@ -148,6 +148,7 @@
             v-permission="['admin','timing:edit']"
             size="mini"
             style="margin-right: 3px;"
+            icon="el-icon-edit"
             type="text"
             @click="crud.toEdit(scope.row)"
           >{{ $t('Timing.DB.edit') }}
@@ -156,6 +157,7 @@
             v-permission="['admin','timing:edit']"
             style="margin-left: -2px"
             type="text"
+            icon="el-icon-video-pause"
             size="mini"
             @click="execute(scope.row.job_id)"
           >{{ $t('Timing.DB.execute') }}
@@ -164,6 +166,7 @@
             v-permission="['admin','timing:edit']"
             style="margin-left: 3px"
             type="text"
+            icon="el-icon-video-play"
             size="mini"
             @click="updateStatus(scope.row.job_id,scope.row.is_pause ? $t('Timing.DB.restore') : $t('Timing.DB.suspend'))"
           >
@@ -177,11 +180,11 @@
           >
             {{ $t('Timing.msg.delete_msg') }}
             <div style="text-align: right; margin: 0">
-              <el-button size="mini" type="text" @click="$refs[scope.row.job_id].doClose()">{{ $t('common.Cancel') }}</el-button>
-              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.job_id)">{{ $t('common.determine') }}
+              <el-button size="mini" type="text" @click="$refs[scope.row.job_id].doClose()">{{ $t('auto.common.Cancel') }}</el-button>
+              <el-button :loading="delLoading" type="primary" size="mini" @click="delMethod(scope.row.job_id)">{{ $t('auto.common.determine') }}
               </el-button>
             </div>
-            <el-button slot="reference" type="text" size="mini">{{ $t('common.Cancel') }}</el-button>
+            <el-button slot="reference" icon="el-icon-circle-close" type="text" size="mini">{{ $t('auto.common.Cancel') }}</el-button>
           </el-popover>
         </template>
       </el-table-column>
diff --git a/acs/nladmin-ui/src/views/system/user/center.vue b/acs/nladmin-ui/src/views/system/user/center.vue
index f3538c2..8875aba 100644
--- a/acs/nladmin-ui/src/views/system/user/center.vue
+++ b/acs/nladmin-ui/src/views/system/user/center.vue
@@ -4,7 +4,7 @@
       <el-col :xs="24" :sm="24" :md="8" :lg="6" :xl="5" style="margin-bottom: 10px">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span>{{ $t('common.Personal_information') }}</span>
+            <span>{{ $t('auto.common.Personal_information') }}</span>
           </div>
           <div>
             <div style="text-align: center">
@@ -19,15 +19,15 @@
               </div>
             </div>
             <ul class="user-info">
-              <li><div style="height: 100%"><svg-icon icon-class="login" /> {{ $t('common.account') }}<div class="user-right">{{ user.username }}</div></div></li>
-              <li><svg-icon icon-class="user1" /> {{ $t('common.username') }} <div class="user-right">{{ user.person_name }}</div></li>
+              <li><div style="height: 100%"><svg-icon icon-class="login" /> {{ $t('auto.common.account') }}<div class="user-right">{{ user.username }}</div></div></li>
+              <li><svg-icon icon-class="user1" /> {{ $t('auto.common.username') }} <div class="user-right">{{ user.person_name }}</div></li>
               <!--              <li><svg-icon icon-class="dept" /> 所属部门 <div class="user-right"> {{ user.dept.name }}</div></li>-->
-              <li><svg-icon icon-class="phone" /> {{ $t('common.phone') }} <div class="user-right">{{ user.phone }}</div></li>
-              <li><svg-icon icon-class="email" /> {{ $t('common.email') }} <div class="user-right">{{ user.email }}</div></li>
+              <li><svg-icon icon-class="phone" /> {{ $t('auto.common.phone') }} <div class="user-right">{{ user.phone }}</div></li>
+              <li><svg-icon icon-class="email" /> {{ $t('auto.common.email') }} <div class="user-right">{{ user.email }}</div></li>
               <li>
-                <svg-icon icon-class="anq" /> {{ $t('common.Security_settings') }}
+                <svg-icon icon-class="anq" /> {{ $t('auto.common.Security_settings') }}
                 <div class="user-right">
-                  <a @click="$refs.pass.dialog = true">{{ $t('common.Change_password') }}</a>
+                  <a @click="$refs.pass.dialog = true">{{ $t('auto.common.Change_password') }}</a>
                   <!--                  <a @click="$refs.email.dialog = true">修改邮箱</a>-->
                 </div>
               </li>
@@ -39,35 +39,35 @@
         <!--    用户资料    -->
         <el-card class="box-card">
           <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane :label="$t('common.User_information')" name="first">
+            <el-tab-pane :label="$t('auto.common.User_information')" name="first">
               <el-form ref="form" :model="form" :rules="rules" style="margin-top: 10px;" size="mini" label-width="65px">
-                <el-form-item :label="$t('common.name')" prop="person_name">
+                <el-form-item :label="$t('auto.common.name')" prop="person_name">
                   <el-input v-model="form.person_name" style="width: 35%" />
-                  <span style="color: #C0C0C0;margin-left: 10px;">{{ $t('common.Tip3') }}</span>
+                  <span style="color: #C0C0C0;margin-left: 10px;">{{ $t('auto.common.Tip3') }}</span>
                 </el-form-item>
-                <el-form-item :label="$t('common.phone2')" prop="phone">
+                <el-form-item :label="$t('auto.common.phone2')" prop="phone">
                   <el-input v-model="form.phone" style="width: 35%;" />
-                  <span style="color: #C0C0C0;margin-left: 10px;">{{ $t('common.Tip4') }}</span>
+                  <span style="color: #C0C0C0;margin-left: 10px;">{{ $t('auto.common.Tip4') }}</span>
                 </el-form-item>
-                <el-form-item :label="$t('common.sex')">
+                <el-form-item :label="$t('auto.common.sex')">
                   <el-radio-group v-model="form.gender" style="width: 178px">
-                    <el-radio :label="$t('common.sex_male')">{{ $t('common.sex_male') }}</el-radio>
-                    <el-radio :label="$t('common.sex_female')">{{ $t('common.sex_female') }}</el-radio>
+                    <el-radio :label="$t('auto.common.sex_male')">{{ $t('auto.common.sex_male') }}</el-radio>
+                    <el-radio :label="$t('auto.common.sex_female')">{{ $t('auto.common.sex_female') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item label="">
-                  <el-button :loading="saveLoading" size="mini" type="primary" @click="doSubmit">{{ $t('common.Save_settings') }}</el-button>
+                  <el-button :loading="saveLoading" size="mini" type="primary" @click="doSubmit">{{ $t('auto.common.Save_settings') }}</el-button>
                 </el-form-item>
               </el-form>
             </el-tab-pane>
             <!--    操作日志    -->
-            <el-tab-pane :label="$t('common.Operation_log')" name="second">
+            <el-tab-pane :label="$t('auto.common.Operation_log')" name="second">
               <el-table v-loading="loading" :data="data" style="width: 100%;">
-                <el-table-column prop="description" :label="$t('common.action')" min-width="130" show-overflow-tooltip />
+                <el-table-column prop="description" :label="$t('auto.common.action')" min-width="130" show-overflow-tooltip />
                 <el-table-column prop="request_ip" label="IP" />
-                <el-table-column show-overflow-tooltip prop="address" :label="$t('common.IP_source')" />
-                <el-table-column prop="browser" :label="$t('common.Browser')" min-width="120" show-overflow-tooltip />
-                <el-table-column prop="time" :label="$t('common.Request_time')" align="center">
+                <el-table-column show-overflow-tooltip prop="address" :label="$t('auto.common.IP_source')" />
+                <el-table-column prop="browser" :label="$t('auto.common.Browser')" min-width="120" show-overflow-tooltip />
+                <el-table-column prop="time" :label="$t('auto.common.Request_time')" align="center">
                   <template slot-scope="scope">
                     <el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
                     <el-tag v-else-if="scope.row.time <= 1000" type="warning">{{ scope.row.time }}ms</el-tag>
@@ -81,7 +81,7 @@
                 >
                   <template slot="header">
                     <div style="display:inline-block;float: right;cursor: pointer" @click="init">
-                      {{ $t('common.Creation_date') }} <i class="el-icon-refresh" style="margin-left: 40px" /></div>
+                      {{ $t('auto.common.Creation_date') }} <i class="el-icon-refresh" style="margin-left: 40px" /></div>
                   </template>
                   <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.create_time) }}</span>
@@ -127,9 +127,9 @@ export default {
     // 自定义验证
     const validPhone = (rule, value, callback) => {
       if (!value) {
-        callback(new Error(this.$t('common.Tip5')))
+        callback(new Error(this.$t('auto.common.Tip5')))
       } else if (!isvalidPhone(value)) {
-        callback(new Error(this.$t('common.Tip6')))
+        callback(new Error(this.$t('auto.common.Tip6')))
       } else {
         callback()
       }
diff --git a/acs/nladmin-ui/src/views/system/user/center/updatePass.vue b/acs/nladmin-ui/src/views/system/user/center/updatePass.vue
index 2c8779c..c0c026b 100644
--- a/acs/nladmin-ui/src/views/system/user/center/updatePass.vue
+++ b/acs/nladmin-ui/src/views/system/user/center/updatePass.vue
@@ -2,19 +2,19 @@
   <div style="display: inline-block">
     <el-dialog :visible.sync="dialog" :close-on-click-modal="false" :before-close="cancel" :title="title" append-to-body width="500px" @close="cancel">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="30%">
-        <el-form-item :label="$t('common.Old_password')" prop="oldPass">
+        <el-form-item :label="$t('auto.common.Old_password')" prop="oldPass">
           <el-input v-model="form.oldPass" type="password" auto-complete="on" style="width: 70%;" />
         </el-form-item>
-        <el-form-item :label="$t('common.New_password')" prop="newPass">
+        <el-form-item :label="$t('auto.common.New_password')" prop="newPass">
           <el-input v-model="form.newPass" type="password" auto-complete="on" style="width: 70%;" />
         </el-form-item>
-        <el-form-item :label="$t('common.Verify_password')" prop="confirmPass">
+        <el-form-item :label="$t('auto.common.Verify_password')" prop="confirmPass">
           <el-input v-model="form.confirmPass" type="password" auto-complete="on" style="width: 70%;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="cancel">{{ $t('common.Cancel') }}</el-button>
-        <el-button :loading="loading" type="primary" @click="doSubmit">{{ $t('common.Confirm') }}</el-button>
+        <el-button type="text" @click="cancel">{{ $t('auto.common.Cancel') }}</el-button>
+        <el-button :loading="loading" type="primary" @click="doSubmit">{{ $t('auto.common.Confirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -29,23 +29,23 @@ export default {
     const confirmPass = (rule, value, callback) => {
       if (value) {
         if (this.form.newPass !== value) {
-          callback(new Error(this.$t('common.Tip8')))
+          callback(new Error(this.$t('auto.common.Tip8')))
         } else {
           callback()
         }
       } else {
-        callback(new Error(i18n.t('common.Tip9')))
+        callback(new Error(i18n.t('auto.common.Tip9')))
       }
     }
     return {
-      loading: false, dialog: false, title: i18n.t('common.Change_password'), form: { oldPass: '', newPass: '', confirmPass: '' },
+      loading: false, dialog: false, title: i18n.t('auto.common.Change_password'), form: { oldPass: '', newPass: '', confirmPass: '' },
       rules: {
         oldPass: [
-          { required: true, message: i18n.t('common.Tip10'), trigger: 'blur' }
+          { required: true, message: i18n.t('auto.common.Tip10'), trigger: 'blur' }
         ],
         newPass: [
-          { required: true, message: i18n.t('common.Tip11'), trigger: 'blur' },
-          { min: 6, max: 20, message: i18n.t('common.Tip12'), trigger: 'blur' }
+          { required: true, message: i18n.t('auto.common.Tip11'), trigger: 'blur' },
+          { min: 6, max: 20, message: i18n.t('auto.common.Tip12'), trigger: 'blur' }
         ],
         confirmPass: [
           { required: true, validator: confirmPass, trigger: 'blur' }
diff --git a/acs/nladmin-ui/src/views/system/user/index.vue b/acs/nladmin-ui/src/views/system/user/index.vue
index 05121d4..a5d3396 100644
--- a/acs/nladmin-ui/src/views/system/user/index.vue
+++ b/acs/nladmin-ui/src/views/system/user/index.vue
@@ -59,7 +59,7 @@
                   size="mini"
                   :placeholder="$t('user.table_title.State')"
                   class="filter-item"
-                  style="width: 90px"
+                  style="width: 200px"
                   @change="crud.toQuery"
                 >
                   <el-option
@@ -82,45 +82,45 @@
           :before-close="crud.cancelCU"
           :visible.sync="crud.status.cu > 0"
           :title="crud.status.title"
-          width="700px"
+          width="800px"
         >
-          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
-            <el-form-item label="用户名" prop="username">
+          <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="150px">
+            <el-form-item :label="$t('user.table_value.Username')" prop="username">
               <el-input v-model="form.username" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="电话" prop="phone">
+            <el-form-item :label="$t('user.table_value.Phone')" prop="phone">
               <el-input v-model.number="form.phone" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="姓名" prop="preson_name">
+            <el-form-item :label="$t('user.table_value.Name')" prop="preson_name">
               <el-input v-model="form.person_name" style="width: 200px;" />
             </el-form-item>
-            <el-form-item label="邮箱" prop="email">
+            <el-form-item :label="$t('user.table_value.Mailbox')" prop="email">
               <el-input v-model="form.email" style="width: 200px;" />
             </el-form-item>
             <br v-if="!crud.status.edit">
-            <el-form-item v-if="crud.status.add" label="部门" prop="depts" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
+            <el-form-item v-if="crud.status.add" :label="$t('user.table_value.Department')" prop="depts" :rules="[{ required: true, message: '请选择部门', trigger: 'change' }]">
               <treeselect
                 v-model="form.depts"
                 :load-options="loadDepts"
                 :options="deptDatas"
-                style="width: 370px;"
+                style="width: 200px;"
                 :multiple="true"
                 :flat="true"
                 :normalizer="normalizer"
-                placeholder="选择部门类目"
+                :placeholder="$t('user.table_value.Select_Sector_Categories')"
               />
             </el-form-item>
             <br v-if="!crud.status.add">
-            <el-form-item v-if="crud.status.add" label="密码" prop="password">
+            <el-form-item v-if="crud.status.add" :label="$t('user.table_value.Password')" prop="password">
               <el-input v-model="form.password" style="width: 200px;" show-password auto-complete="new-password" />
             </el-form-item>
-            <el-form-item label="性别">
-              <el-radio-group v-model="form.gender" style="width: 178px">
-                <el-radio label="男">男</el-radio>
-                <el-radio label="女">女</el-radio>
+            <el-form-item :label="$t('user.table_value.Sex')">
+              <el-radio-group v-model="form.gender" style="width: 200px">
+                <el-radio :label="$t('user.table_value.boy')">{{ $t('user.table_value.boy') }}</el-radio>
+                <el-radio :label="$t('user.table_value.girl')">{{ $t('user.table_value.girl') }}</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="状态" prop="is_uesd">
+            <el-form-item :label="$t('user.table_value.State')" prop="is_uesd">
               <el-switch
                 v-model="form.is_used"
                 active-color="#409EFF"
@@ -128,14 +128,14 @@
               />
             </el-form-item>
             <br v-if="!crud.status.edit">
-            <el-form-item v-if="crud.status.add" style="margin-bottom: 0;" label="角色" prop="roles">
+            <el-form-item v-if="crud.status.add" style="margin-bottom: 0;" :label="$t('role.table_value.Role')" prop="roles">
               <el-select
                 v-model="roleDatas"
-                style="width: 512px"
+                style="width: 200px"
                 multiple
                 active-value="1"
                 inactive-value="0"
-                placeholder="请选择"
+                :placeholder="$t('common.please')"
                 @remove-tag="deleteTag"
                 @change="changeRole"
               >
@@ -150,8 +150,8 @@
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
-            <el-button type="text" @click="crud.cancelCU">取消</el-button>
-            <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+            <el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
+            <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
           </div>
         </el-dialog>
         <!--表格渲染-->
@@ -171,42 +171,42 @@
           />
           <el-table-column prop="gender" :label="$t('user.table_value.Sex')" :min-width="flexWidth('gender',crud.data,$t('user.table_value.Sex'))" />
           <el-table-column prop="phone" :label="$t('user.table_value.Phone')" :min-width="flexWidth('phone',crud.data,$t('user.table_value.Phone'))" />
-          <el-table-column prop="email" label="邮箱" :min-width="flexWidth('email',crud.data,'邮箱')" />
-          <el-table-column show-overflow-tooltip prop="depts" label="部门" :min-width="flexWidth('depts',crud.data,'邮箱')">
+          <el-table-column prop="email" :label="$t('user.table_value.Mailbox')" :min-width="flexWidth('email',crud.data,$t('user.table_value.Mailbox'))" />
+          <el-table-column show-overflow-tooltip prop="depts" :label="$t('user.table_value.Department')" :min-width="flexWidth('depts',crud.data,$t('user.table_value.Department'))">
             <template slot-scope="scope">
               <span v-for="(item, index) in scope.row.depts" :key="index">
                 {{ item.name }}<span v-if="index !== scope.row.depts.length - 1">、</span>
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="状态" align="center" prop="enabled">
+          <el-table-column :label="$t('user.table_value.State')" align="center" prop="enabled" :min-width="flexWidth('enabled',crud.data,$t('user.table_value.State'))">
             <template slot-scope="scope">
               <span :style="{'color': caseStatusColorFilter(scope.row.is_used)}">{{ enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="create_time" label="创建日期" :min-width="flexWidth('create_time',crud.data,'创建日期')" />
+          <el-table-column prop="create_time" :label="$t('user.table_value.create_Date')" :min-width="flexWidth('create_time',crud.data,$t('user.table_value.create_Date'))" />
           <el-table-column
-            label="操作"
+            :label="$t('user.table_value.Operate')"
             fixed="right"
             align="center"
             width="200"
           >
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="crud.toEdit(scope.row)">{{ $t('user.other.Revise') }}</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handdeleted(scope.row)">{{ $t('user.other.Delete') }}</el-button>
               <el-dropdown v-hasPermi="['system:user:resetPwd', 'system:user:edit']" size="mini">
-                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('user.other.More') }}</el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item icon="el-icon-refresh-right"><span @click="resetPassword(scope.row)">重置密码</span></el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-refresh-right"><span @click="resetPassword(scope.row)">{{ $t('user.other.Reset') }}</span></el-dropdown-item>
                   <el-dropdown-item icon="el-icon-key">
-                    <span @click="openDeptDrawer(scope.row)">部门权限</span>
+                    <span @click="openDeptDrawer(scope.row)">{{ $t('user.other.Department_permissions') }}</span>
                   </el-dropdown-item>
                   <el-dropdown-item icon="el-icon-key">
-                    <span @click="openDataDialog(scope.row)">数据权限</span>
+                    <span @click="openDataDialog(scope.row)">{{ $t('user.other.Data_Permissions') }}</span>
                   </el-dropdown-item>
-                  <el-dropdown-item icon="el-icon-lock"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号</span></el-dropdown-item>
+                  <el-dropdown-item icon="el-icon-lock"><span @click="changeEnabled(scope.row)">{{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}{{ $t('user.other.Lock_account') }}</span></el-dropdown-item>
                   <el-dropdown-item icon="el-icon-circle-check">
-                    <span @click="openRoleDrawer(scope.row)">分配角色</span>
+                    <span @click="openRoleDrawer(scope.row)">{{ $t('user.other.Assign_roles') }}</span>
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -356,6 +356,7 @@ import { mapGetters } from 'vuex'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import RelevanceUserDialog from '@/views/system/user/dialog/relevanceUserDialog'
 import RelevanceDeptDialog from '@/views/system/user/dialog/relevanceDeptDialog'
+import i18n from '@/i18n'
 
 let userRoles = []
 const defaultForm = {
@@ -374,7 +375,7 @@ export default {
   name: 'User',
   components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
-    return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
+    return CRUD({ title: i18n.t('user.table_value.User'), idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
   },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   // 数据字典
@@ -384,7 +385,7 @@ export default {
       height: document.documentElement.clientHeight - 180 + 'px;',
       deptName: '', depts: [], deptDatas: [], level: 3, roles: [],
       roleDatas: [], // 多选时使用
-      defaultProps: { children: 'children', label: 'name' },
+      defaultProps: { children: 'children', label: this.$langPre.computedProp('name') },
       deptProps: { children: 'children', label: 'name' },
       permission: {
         add: ['admin', 'user:add'],
@@ -392,8 +393,8 @@ export default {
         del: ['admin', 'user:del']
       },
       enabledTypeOptions: [
-        { key: true, display_name: '激活' },
-        { key: false, display_name: '锁定' }
+        { key: true, display_name: i18n.t('user.table_value.activation') },
+        { key: false, display_name: i18n.t('user.table_value.lock') }
       ],
       rules: {
         username: [