Browse Source

fix: 斗山国际化开发

master
lishuai 7 months ago
parent
commit
f729b25c98
  1. 60
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
  2. 5
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java
  3. 4
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java
  4. 2
      acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
  5. 2
      acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml
  6. 2
      acs2/nladmin-ui/src/i18n/langs/Korean.js
  7. 38
      acs2/nladmin-ui/src/i18n/langs/instruction/ko.js
  8. 6
      acs2/nladmin-ui/src/i18n/langs/ko.js
  9. 1
      acs2/nladmin-ui/src/i18n/langs/menu/en.js
  10. 50
      acs2/nladmin-ui/src/i18n/langs/menu/ko.js
  11. 1
      acs2/nladmin-ui/src/i18n/langs/menu/zh.js
  12. 23
      acs2/nladmin-ui/src/i18n/langs/role/ko.js
  13. 67
      acs2/nladmin-ui/src/views/acs/instruction/index.vue
  14. 9
      acs2/nladmin-ui/src/views/system/menu/index.vue

60
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@ -419,8 +419,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
@Override @Override
public Map<String, Object> updateTask(String whereJson) { public Map<String, Object> updateTask(String whereJson) {
JSONArray datas = JSONArray.parseArray(whereJson); JSONObject jsonObject = JSON.parseObject(whereJson);
log.info("WMS更新任务点位状态--------------:输入参数" + datas.toString()); log.info("WMS更新任务点位状态--------------:输入参数" + jsonObject.toString());
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code("WMS更新任务点位状态") .device_code("WMS更新任务点位状态")
.content("WMS更新任务点位状态-----输入参数:" + whereJson) .content("WMS更新任务点位状态-----输入参数:" + whereJson)
@ -428,24 +428,14 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);
JSONArray errArr = new JSONArray(); JSONArray errArr = new JSONArray();
if (datas.size() > 0) { String device_code = jsonObject.getString("device_code");
for (int i = 0; i < datas.size(); i++) { //1-允许取放;
JSONObject jsonObject = datas.getJSONObject(i); String option = jsonObject.getString("option");
String device_code = jsonObject.getString("device_code"); StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
//1-允许取放; Device device_k = deviceAppService.findDeviceByCode(device_code);
String option = jsonObject.getString("option"); if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver();
Device device_k = deviceAppService.findDeviceByCode(device_code); standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
Device device_m = deviceAppService.findDeviceByCode(device_code);
if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
}
if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver();
standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
}
}
} }
JSONObject resultJson = new JSONObject(); JSONObject resultJson = new JSONObject();
if (ObjectUtil.isEmpty(errArr)) { if (ObjectUtil.isEmpty(errArr)) {
@ -458,6 +448,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
resultJson.put("errArr", errArr); resultJson.put("errArr", errArr);
} }
} }
LuceneLogDto logDto1 = LuceneLogDto.builder() LuceneLogDto logDto1 = LuceneLogDto.builder()
.device_code("WMS更新任务点位状态") .device_code("WMS更新任务点位状态")
.content("WMS更新任务点位状态-----返回参数:" + resultJson) .content("WMS更新任务点位状态-----返回参数:" + resultJson)
@ -508,7 +499,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver; InflatableShaftLibraryDeviceDriver inflatableShaftLibraryDeviceDriver;
HongXiangStationDeviceDriver hongXiangStationDeviceDriver; HongXiangStationDeviceDriver hongXiangStationDeviceDriver;
LampThreecolorDeviceDriver lampThreecolorDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
BeltConveyorDeviceDriver beltConveyorDeviceDriver ; BeltConveyorDeviceDriver beltConveyorDeviceDriver;
WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver; WasteFoilWeighingStationDriver wasteFoilWeighingStationDriver;
FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver; FoldDiscSiteDeviceDriver foldDiscSiteDeviceDriver;
if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) { if (device.getDeviceDriver() instanceof HongXiangStationDeviceDriver) {
@ -520,7 +511,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
lampThreecolorDeviceDriver.writing(code, value); lampThreecolorDeviceDriver.writing(code, value);
} }
if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver=(BeltConveyorDeviceDriver) device.getDeviceDriver(); beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver();
beltConveyorDeviceDriver.writing(code, value); beltConveyorDeviceDriver.writing(code, value);
} }
if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) { if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
@ -587,11 +578,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
wasteFoilWeighingStationDriver.writing("to_command", "6"); wasteFoilWeighingStationDriver.writing("to_command", "6");
Thread.sleep(1000); //休眠1秒 Thread.sleep(1000); //休眠1秒
while (wasteFoilWeighingStationDriver.getMode() == 6) { while (wasteFoilWeighingStationDriver.getMode() == 6) {
jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量
jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量
jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差
break; break;
} }
wasteFoilWeighingStationDriver.writing("to_command", "0"); wasteFoilWeighingStationDriver.writing("to_command", "0");
} }
//称重确认信号 //称重确认信号
@ -599,10 +590,10 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
wasteFoilWeighingStationDriver.writing("to_command", "7"); wasteFoilWeighingStationDriver.writing("to_command", "7");
Thread.sleep(1000); //休眠1秒 Thread.sleep(1000); //休眠1秒
while (wasteFoilWeighingStationDriver.getMode() == 7) { while (wasteFoilWeighingStationDriver.getMode() == 7) {
jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量 jo.put("currentWeight", wasteFoilWeighingStationDriver.getWeight());//当前重量
jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量 jo.put("lastWeight", wasteFoilWeighingStationDriver.getOld_weight());//上一次重量
jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差 jo.put("weightGap", wasteFoilWeighingStationDriver.getGap_weight());//重量差
break; break;
} }
wasteFoilWeighingStationDriver.writing("to_command", "0"); wasteFoilWeighingStationDriver.writing("to_command", "0");
} }
@ -649,11 +640,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver; PaperTubePickSiteDeviceDriver paperTubePickSiteDeviceDriver;
if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) { if (device.getDeviceDriver() instanceof PaperTubePickSiteDeviceDriver) {
paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver(); paperTubePickSiteDeviceDriver = (PaperTubePickSiteDeviceDriver) device.getDeviceDriver();
if (ObjectUtil.isEmpty(to_material)){ if (ObjectUtil.isEmpty(to_material)) {
map.put("to_material", "0"); map.put("to_material", "0");
map.put("to_spec", "0"); map.put("to_spec", "0");
map.put("to_qty", "0"); map.put("to_qty", "0");
}else { } else {
map.put("to_material", to_material); map.put("to_material", to_material);
map.put("to_spec", to_spec); map.put("to_spec", to_spec);
map.put("to_qty", to_qty); map.put("to_qty", to_qty);
@ -857,8 +848,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("qty", foldDiscSiteDeviceDriver.getQty()); jo.put("qty", foldDiscSiteDeviceDriver.getQty());
jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type()); jo.put("container_type", foldDiscSiteDeviceDriver.getContainer_type());
jo.put("error", foldDiscSiteDeviceDriver.getError()); jo.put("error", foldDiscSiteDeviceDriver.getError());
} } else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
else if (device.getDeviceDriver() instanceof InflatableShaftLibraryDeviceDriver) {
inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver(); inflatableShaftLibraryDeviceDriver = (InflatableShaftLibraryDeviceDriver) device.getDeviceDriver();
jo.put("device_code", parent_device_code); jo.put("device_code", parent_device_code);
jo.put("move", inflatableShaftLibraryDeviceDriver.getMove()); jo.put("move", inflatableShaftLibraryDeviceDriver.getMove());

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java

@ -73,6 +73,11 @@ public class SysMenu implements Serializable {
*/ */
private String in_title; private String in_title;
/**
* 菜单标题
*/
private String ko_title;
/** /**
* 组件名称 * 组件名称
*/ */

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuDto.java

@ -37,6 +37,7 @@ public class MenuDto extends BaseDTO implements Serializable {
private String zh_title; private String zh_title;
private String en_title; private String en_title;
private String in_title; private String in_title;
private String ko_title;
private Integer menu_sort; private Integer menu_sort;
@ -104,6 +105,9 @@ public class MenuDto extends BaseDTO implements Serializable {
if ("zh".equals(local)){ if ("zh".equals(local)){
return zh_title; return zh_title;
} }
if ("ko".equals(local)){
return ko_title;
}
return title; return title;
} }
} }

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java

@ -219,6 +219,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
sysDictMapper.delete(new QueryWrapper<Dict>().eq("para1",menu.getMenu_id())); sysDictMapper.delete(new QueryWrapper<Dict>().eq("para1",menu.getMenu_id()));
} }
menu.setTitle(resources.getTitle()); menu.setTitle(resources.getTitle());
menu.setKo_title(resources.getKo_title());
menu.setComponent(resources.getComponent()); menu.setComponent(resources.getComponent());
menu.setPath(resources.getPath()); menu.setPath(resources.getPath());
menu.setIcon(resources.getIcon()); menu.setIcon(resources.getIcon());
@ -366,6 +367,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
menuDto.setIn_title(entity.getIn_title()); menuDto.setIn_title(entity.getIn_title());
menuDto.setEn_title(entity.getEn_title()); menuDto.setEn_title(entity.getEn_title());
menuDto.setZh_title(entity.getZh_title()); menuDto.setZh_title(entity.getZh_title());
menuDto.setKo_title(entity.getKo_title());
menuDto.setMenu_sort(entity.getMenu_sort()); menuDto.setMenu_sort(entity.getMenu_sort());
menuDto.setPath(entity.getPath()); menuDto.setPath(entity.getPath());
menuDto.setComponent(entity.getComponent()); menuDto.setComponent(entity.getComponent());

2
acs2/nladmin-system/nlsso-server/src/main/resources/config/application.yml

@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: prod
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:

2
acs2/nladmin-ui/src/i18n/langs/Korean.js

@ -2,7 +2,7 @@ import koLocale from 'element-ui/lib/locale/lang/ko'
import ko from './ko' import ko from './ko'
import menu from './menu/zh' import menu from './menu/zh'
import param from './param/zh' import param from './param/zh'
import instruction from './instruction/zh' import instruction from './instruction/ko'
import task from './task/ko' import task from './task/ko'
import history from './history/zh' import history from './history/zh'
import device from './device/zh' import device from './device/zh'

38
acs2/nladmin-ui/src/i18n/langs/instruction/ko.js

@ -0,0 +1,38 @@
export default {
'Inst': {
'table': {
'instruction_code': '명령 번호',
'instruction_type': '명령 형식',
'task_code': 'Task Code',
'vehicle_code': 'Vehicle Code',
'instruction_status': '명령 상태',
'send_status': '발령 상태',
'start_point_code': 'Start Device Code',
'next_point_code': 'Next Device Code',
'start_point_code2': 'Start Device Code 2',
'next_point_code2': 'Next Device Code 2',
'put_point_code': 'Put Point Code',
'execute_device_code': '현재 실행 장치',
'carno': 'Carno',
'remark': 'Remark',
'create_by': 'Created By',
'create_time': 'Create Time',
'update_by': 'Update By',
'update_time': 'Update Time',
'input_taskCode_or_instCode': '작업 번호나 명령 번호를 입력하십시오',
'input_vehicleCode': 'Input VehicleCode',
'material': 'Material Type',
'task_status': '작업 상태',
'input_startCode_or_nextCode': '시작점 혹은 끝점을 입력하다',
'ready': 'Ready',
'Execution': 'Execution',
'Finish': '완료',
'undelivered': 'Undelivered',
'succeed': 'Succeed',
'fail': 'Fail'
},
'rules': {
'NotNull': 'Cannot Be Empty'
}
}
}

6
acs2/nladmin-ui/src/i18n/langs/ko.js

@ -45,9 +45,9 @@ export default {
'Reset': 'Reset', 'Reset': 'Reset',
'Confirm': 'Confirm', 'Confirm': 'Confirm',
'Cancel': 'Cancel', 'Cancel': 'Cancel',
'Forced_cancellation': 'Forced_cancellation', 'Forced_cancellation': '강제 취소',
'Initialize': 'Initialize', 'Initialize': '초기화',
'Operate': 'Operate', 'Operate': '조작',
'Refresh': 'Refresh', 'Refresh': 'Refresh',
'Closes': 'Close', 'Closes': 'Close',
'Closes_l': 'Close Left', 'Closes_l': 'Close Left',

1
acs2/nladmin-ui/src/i18n/langs/menu/en.js

@ -36,6 +36,7 @@ export default {
'zh_title': 'ZH-Title', 'zh_title': 'ZH-Title',
'en_title': 'EN-Title', 'en_title': 'EN-Title',
'id_title': 'ID-Title', 'id_title': 'ID-Title',
'ko_title': 'KO-Title',
'router_path': 'Router Path', 'router_path': 'Router Path',
'menu_sort': 'Menu Sort', 'menu_sort': 'Menu Sort',
'component_name': 'Component Name', 'component_name': 'Component Name',

50
acs2/nladmin-ui/src/i18n/langs/menu/ko.js

@ -0,0 +1,50 @@
export default {
'menu': {
'title': 'Menu',
'placeholder': {
'fuzzy_search': 'Fuzzy Search',
'owning_system': 'System',
'choose_icon': 'Choose Icon',
'component_tip': 'Match The Name Field Within The Component',
'choose_superior_category': 'Choose Superior Category'
},
'table_title': {
'menu_title': 'Title',
'system': 'System',
'icon': 'Icon',
'sort': 'Sort',
'permission_ident': 'Permission Mark',
'path': 'Path',
'outside_chain': 'Out Chain',
'cache': 'Cache',
'visible': 'Visible',
'create_time': 'Create Time',
'SystemParam': 'System Parameters'
},
'dialog': {
'menu_type': 'Menu Type',
'system': 'System',
'catalogue': 'Catalogue',
'menu': 'Menu',
'button': 'Button',
'button_name': 'Button Name',
'menu_icon': 'Menu Icon',
'menu_chain': 'Menu Chain',
'menu_cache': 'Menu Cache',
'menu_visible': 'Menu Visible',
'default_title': 'Default Title',
'zh_title': 'ZH-Title',
'en_title': 'EN-Title',
'id_title': 'ID-Title',
'ko_title': '한국 제목',
'router_path': 'Router Path',
'menu_sort': 'Menu Sort',
'component_name': 'Component Name',
'component_path': 'Component Path',
'superior_class': 'Superior Class'
},
'msg': {
'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, They Will Be Deleted Together. This Operation Cannot Be Undone!'
}
}
}

1
acs2/nladmin-ui/src/i18n/langs/menu/zh.js

@ -36,6 +36,7 @@ export default {
'zh_title': '中文标题', 'zh_title': '中文标题',
'en_title': '英文标题', 'en_title': '英文标题',
'id_title': '印尼标题', 'id_title': '印尼标题',
'ko_title': '韩国标题',
'router_path': '路由地址', 'router_path': '路由地址',
'menu_sort': '菜单排序', 'menu_sort': '菜单排序',
'component_name': '组件名称', 'component_name': '组件名称',

23
acs2/nladmin-ui/src/i18n/langs/role/ko.js

@ -0,0 +1,23 @@
export default {
'role': {
'table_title': {
'taskCode_or_instCode': 'Task Number (Instruction Number)',
'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?'
}
}
}

67
acs2/nladmin-ui/src/views/acs/instruction/index.vue

@ -21,31 +21,6 @@
@keyup.enter.native="crud.toQuery" @keyup.enter.native="crud.toQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item :label="$t('Inst.table.vehicle_code')">
<el-input
v-model="query.vehicle_code"
size="small"
clearable
:placeholder="$t('Inst.table.input_vehicleCode')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('Inst.table.material')">
<el-select
v-model="query.material_type"
clearable
filterable
size="small"
:placeholder="$t('Inst.table.material')"
class="filter-item"
style="width: 200px"
@change="crud.toQuery"
>
<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 <el-select
v-model="query.status" v-model="query.status"
@ -111,18 +86,12 @@
width="500px" width="500px"
> >
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item :label="$t('Inst.table.start_point_code')"> <el-form-item :label="$t('task.select.Start_point')">
<el-input v-model="form.start_point_code" style="width: 370px;" /> <el-input v-model="form.start_point_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('Inst.table.next_point_code')"> <el-form-item :label="$t('task.select.Destination')">
<el-input v-model="form.next_point_code" style="width: 370px;" /> <el-input v-model="form.next_point_code" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('Inst.table.vehicle_code')">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('Inst.table.remark')" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button> <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
@ -146,19 +115,9 @@
{{ dict.label.task_type[scope.row.instruction_type] }} {{ dict.label.task_type[scope.row.instruction_type] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))">
<template slot-scope="scope">
<span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
<span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
</template>
</el-table-column>
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" /> <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<!-- <el-table-column prop="link_num" label="关联编号" />--> <!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" /> <el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />
<el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
<el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))"> <el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span> <span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@ -173,18 +132,14 @@
<span v-if="scope.row.send_status=='2' ">{{ $t('Inst.table.fail') }}</span> <span v-if="scope.row.send_status=='2' ">{{ $t('Inst.table.fail') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" :min-width="flexWidth('start_point_code',crud.data,$t('Inst.table.start_point_code'))" /> <el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
<el-table-column prop="next_point_code" :label="$t('Inst.table.next_point_code')" :min-width="flexWidth('next_point_code',crud.data,$t('Inst.table.next_point_code'))" /> <el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
<el-table-column prop="start_point_code2" :label="$t('Inst.table.start_point_code2')" :min-width="flexWidth('start_point_code2',crud.data,$t('Inst.table.start_point_code2'))" />
<el-table-column prop="next_point_code2" :label="$t('Inst.table.next_point_code2')" :min-width="flexWidth('next_point_code2',crud.data,$t('Inst.table.next_point_code2'))" />
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" /> <el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" /> <el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" />
<el-table-column prop="remark" :label="$t('Inst.table.remark')" :min-width="flexWidth('remark',crud.data,$t('Inst.table.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_by" :label="$t('Inst.table.create_by')" :min-width="flexWidth('create_by',crud.data,$t('Inst.table.create_by'))" /> <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="create_time" :label="$t('Inst.table.create_time')" :min-width="flexWidth('create_time',crud.data,$t('Inst.table.create_time'))" /> <el-table-column prop="update_by" :label="$t('task.select.update_by')" :min-width="flexWidth('update_by',crud.data,$t('task.select.update_by'))" />
<el-table-column prop="update_by" :label="$t('Inst.table.update_by')" :min-width="flexWidth('update_by',crud.data,$t('Inst.table.update_by'))" /> <el-table-column prop="update_time" :label="$t('task.select.update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.update_time'))" />
<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 <el-table-column
v-permission="['admin','instruction:edit','instruction:del']" v-permission="['admin','instruction:edit','instruction:del']"
:label="$t('auto.common.Operate')" :label="$t('auto.common.Operate')"
@ -201,10 +156,10 @@
{{ $t('Inst.table.Finish') }} {{ $t('Inst.table.Finish') }}
</el-button> </el-button>
<el-dropdown size="mini"> <el-dropdown size="mini">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('user.other.More') }}</el-button> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('task.select.More') }}</el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-circle-close"><span @click="handleCommand(scope.$index, scope.row,'b')"> <el-dropdown-item icon="el-icon-circle-close"><span @click="handleCommand(scope.$index, scope.row,'b')">
{{ $t('auto.common.Cancel') }}</span> {{ $t('task.select.Cancel') }}</span>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item icon="el-icon-error"><span @click="handleCommand(scope.$index, scope.row,'c')"> <el-dropdown-item icon="el-icon-error"><span @click="handleCommand(scope.$index, scope.row,'c')">
{{ $t('auto.common.Forced_cancellation') }}</span></el-dropdown-item> {{ $t('auto.common.Forced_cancellation') }}</span></el-dropdown-item>

9
acs2/nladmin-ui/src/views/system/menu/index.vue

@ -123,6 +123,14 @@
:placeholder="$t('menu.dialog.id_title')" :placeholder="$t('menu.dialog.id_title')"
/> />
</el-form-item> </el-form-item>
<el-form-item v-if="form.type.toString() !== '2'" :label="$t('menu.dialog.ko_title')" prop="ko_title">
<el-input
v-model="form.ko_title"
:style=" form.type.toString() === '0' ? 'width: 450px' : 'width: 190px'"
:placeholder="$t('menu.dialog.ko_title')"
/>
</el-form-item>
<el-form-item v-if="form.type.toString() === '2'" :label="$t('menu.dialog.button_name')" prop="title"> <el-form-item v-if="form.type.toString() === '2'" :label="$t('menu.dialog.button_name')" prop="title">
<el-input v-model="form.title" :placeholder="$t('menu.dialog.button_name')" style="width: 190px;" /> <el-input v-model="form.title" :placeholder="$t('menu.dialog.button_name')" style="width: 190px;" />
</el-form-item> </el-form-item>
@ -256,6 +264,7 @@ const defaultForm = {
en_title: null, en_title: null,
in_title: null, in_title: null,
zh_title: null, zh_title: null,
ko_title: null,
menu_sort: 999, menu_sort: 999,
path: null, path: null,
system_type: null, system_type: null,

Loading…
Cancel
Save