From d5f9fc472bfca4ce18db0ce51abb30197cd73fde Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Thu, 14 Dec 2023 14:23:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?rev:=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=A2=9E=E7=82=B9=E4=BD=8D=E8=A7=92=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AcsPointAngleController.java | 77 ++++++ .../nl/acs/angle/domain/AcsPointAngle.java | 69 ++++++ .../acs/angle/mapper/AcsPointAngleMapper.java | 16 ++ .../angle/service/IAcsPointAngleService.java | 32 +++ .../impl/AcsPointAngleServiceImpl.java | 119 +++++++++ .../resources/mapper/AcsPointAngleMapper.xml | 10 + .../src/api/acs/angle/acsPointAngle.js | 35 +++ acs/nladmin-ui/src/i18n/langs/chinese.js | 8 +- .../src/i18n/langs/department/en.js | 25 ++ .../src/i18n/langs/department/in.js | 25 ++ .../src/i18n/langs/department/zh.js | 25 ++ acs/nladmin-ui/src/i18n/langs/dict/en.js | 28 +++ acs/nladmin-ui/src/i18n/langs/dict/in.js | 28 +++ acs/nladmin-ui/src/i18n/langs/dict/zh.js | 28 +++ acs/nladmin-ui/src/i18n/langs/english.js | 8 +- acs/nladmin-ui/src/i18n/langs/indonesian.js | 8 +- acs/nladmin-ui/src/i18n/langs/role/en.js | 23 ++ acs/nladmin-ui/src/i18n/langs/role/in.js | 23 ++ acs/nladmin-ui/src/i18n/langs/role/zh.js | 23 ++ acs/nladmin-ui/src/i18n/langs/user/en.js | 13 +- acs/nladmin-ui/src/i18n/langs/user/in.js | 37 +-- acs/nladmin-ui/src/i18n/langs/user/zh.js | 15 +- acs/nladmin-ui/src/views/acs/angle/index.vue | 231 ++++++++++++++++++ acs/nladmin-ui/src/views/screen/bigScreen.vue | 4 +- .../src/views/system/dept/index.vue | 92 ++++--- .../src/views/system/dict/dictDetail.vue | 41 ++-- .../src/views/system/dict/index.vue | 54 ++-- .../src/views/system/menu/index.vue | 63 ++--- .../src/views/system/role/index.vue | 31 +-- .../src/views/system/timing/index.vue | 7 +- .../src/views/system/user/index.vue | 77 +++--- 31 files changed, 1088 insertions(+), 187 deletions(-) create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/controller/AcsPointAngleController.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/domain/AcsPointAngle.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/mapper/AcsPointAngleMapper.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/IAcsPointAngleService.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java create mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/mapper/AcsPointAngleMapper.xml create mode 100644 acs/nladmin-ui/src/api/acs/angle/acsPointAngle.js create mode 100644 acs/nladmin-ui/src/i18n/langs/department/en.js create mode 100644 acs/nladmin-ui/src/i18n/langs/department/in.js create mode 100644 acs/nladmin-ui/src/i18n/langs/department/zh.js create mode 100644 acs/nladmin-ui/src/i18n/langs/dict/en.js create mode 100644 acs/nladmin-ui/src/i18n/langs/dict/in.js create mode 100644 acs/nladmin-ui/src/i18n/langs/dict/zh.js create mode 100644 acs/nladmin-ui/src/views/acs/angle/index.vue 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; + +/** + *

+ * 前端控制器 + *

+ * + * @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 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 create(@Validated @RequestBody AcsPointAngle dto) { + acsPointAngleService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改点位角度") + @ApiOperation("修改点位角度") + //@PreAuthorize("@el.check('acsPointAngle:edit')") + public ResponseEntity update(@Validated @RequestBody AcsPointAngle dto) { + acsPointAngleService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除点位角度") + @ApiOperation("删除点位角度") + //@PreAuthorize("@el.check('acsPointAngle:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + acsPointAngleService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + + @GetMapping("/updateActive") + @Log("是否启用") + @ApiOperation("是否启用") + public ResponseEntity 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; + +/** + *

+ * + *

+ * + * @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; + +/** + *

+ * Mapper 接口 + *

+ * + * @author tq + * @since 2023-12-13 + */ +public interface AcsPointAngleMapper extends BaseMapper { + +} 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; + +/** + *

+ * 服务类 + *

+ * + * @author tq + * @since 2023-12-13 + */ +public interface IAcsPointAngleService extends IService { + + void create(AcsPointAngle dto); + /** + * 编辑 + * + * @param dto / + */ + void update(AcsPointAngle dto); + + void deleteAll(String[] ids); + + Map 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; + +/** + *

+ * 服务实现类 + *

+ * + * @author tq + * @since 2023-12-13 + */ +@Service +public class AcsPointAngleServiceImpl extends ServiceImpl 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 map = new HashMap<>(); + map.put("id", id); + acsPointAngleMapper.deleteByMap(map); + } + } + + @Override + public Map queryAll(Map whereJson, Pageable page) { + IPage queryPage = PageUtil.toMybatisPage(page); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.orderByDesc(AcsPointAngle::getUpdate_time); + IPage 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/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 @@ + + + + + + + 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 + + + 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/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/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/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/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 @@ + + + + + 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 @@ 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" > - - + + - + - + - +
- +
- + - - - 男 - 女 + + + {{ $t('user.table_value.boy') }} + {{ $t('user.table_value.girl') }} - +
- + @@ -150,8 +150,8 @@
- 取消 - 确认 + {{ $t('common.Cancel') }} + {{ $t('common.Confirm') }}
@@ -171,42 +171,42 @@ /> - - + + - + - +