root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 页面国际化,agv货位地址优化

Browse Source
This commit is contained in:
yanps
2024-07-08 16:58:39 +08:00
parent b64b216e23
commit 050daf64d6
11 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -893,6 +893,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
celldto.setCreate_time(now);
StorageCell entity = ConvertUtil.convert(celldto, StorageCell.class);
storageCellMapper.insert(entity);
storageCells.add(celldto);
}
}

19
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
View File

@@ -211,9 +211,9 @@ public class XgAgvCarDeviceDriver extends AbstractDeviceDriver implements Device
@Override
public JSONObject getDeviceStatusName() {
Map<String, Object> map = new LinkedHashMap<>();
try{
try {
getAgvStatus();
}catch (Exception e){
} catch (Exception e) {
message = "获取机器人状态报错";
}
String isError;
@@ -231,18 +231,19 @@ public class XgAgvCarDeviceDriver extends AbstractDeviceDriver implements Device
}
map.put("errors", isError);
map.put("upload_scene_status", upload_scene_status);
map.put("procBusiness", procBusiness ? "是": "否");
// map.put("current_order", current_order);
map.put("procBusiness", procBusiness ? "是" : "否");
map.put("current_order", current_order);
map.put("connection_status", "1".equals(connection_status) ? "连接上" : "断连");
map.put("dispatchable", dispatchable ? "可接单" : "不可接单");
map.put("dispatchable_status", dispatchable_status == 1?"设置可接单" : dispatchable_status == 2?"设置不可接单(小车占用资源)" : dispatchable_status == 3?"设置不可接单(小车不占用资源)" : "未知");
map.put("current_map_invalid", current_map_invalid ? "机器人不在地图场景中": "机器人在地图场景中");
map.put("dispatchable_status", dispatchable_status == 1 ? "设置可接单" : dispatchable_status == 2 ? "设置不可接单(小车占用资源)" : dispatchable_status == 3 ? "设置不可接单(小车不占用资源)" : "未知");
map.put("current_map_invalid", current_map_invalid ? "机器人不在地图场景中" : "机器人在地图场景中");
map.put("disconnect", disconnect ? "机器人断连" : "机器人连接上");
map.put("low_battery", low_battery ? "低电量": "正常");
map.put("suspended", suspended ? "订单被暂停,需要人工手动恢复": "正常");
map.put("low_battery", low_battery ? "低电量" : "正常");
map.put("suspended", suspended ? "订单被暂停,需要人工手动恢复" : "正常");
map.put("message", message);
map.put("unconfirmed_reloc", unconfirmed_reloc ? "未确认定位" : "正常");
map.put("unlock", unlock == 0 ? "控制权在core手上" : unlock == 1 ? "控制权被其他人抢走" : unlock == 2 ?"控制权没有被抢占" : "未知");
map.put("unlock", unlock == 0 ? "控制权在core手上" : unlock == 1 ? "控制权被其他人抢走" : unlock == 2 ? "控制权没有被抢占" : "未知");
map.put("move_2","有货");
JSONObject jo = new JSONObject(map);
return jo;
}

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java
View File

@@ -729,7 +729,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
map.put("feedMessage", feedMessage);
map.put("driver_type", "siemens_conveyor");
map.put("is_click", true);
map.put("message", message);
map.put("message", LangProcess.msg(message));
map.put("notCreateTaskMessage", LangProcess.msg(notCreateTaskMessage));
map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
map.put("error", ErrorUtil.getDictDetail("bqhj_error_type", String.valueOf(this.getError())));

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java
View File

@@ -190,16 +190,16 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
// } else
if (mode == 0) {
this.setIsonline(false);
message = "universal_off-line";
message = LangProcess.msg("universal_off-line");
//有报警
} else if (error != 0) {
this.setIserror(true);
message = "universal_message3";
message = LangProcess.msg("universal_message3");
//无报警
} else {
this.setIsonline(true);
this.setIserror(false);
message = "universal_operation";
message = LangProcess.msg("universal_operation");
switch (mode) {
case 1:
log.debug("设备运转模式:等待工作");

1
acs2/nladmin-ui/src/i18n/langs/task/en.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': 'Task',
'start_or_end': 'Origin Or Destination',
'time': 'Time',
'empty_shaft_position': 'Empty shaft position',
'extension_field': 'Extension Field'
},
'select': {

1
acs2/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': 'Tugas',
'start_or_end': 'Asal Atau Tujuan',
'time': 'Waktu',
'empty_shaft_position': 'Posisi poros kosong',
'extension_field': 'Bidang Perluasan'
},
'select': {

1
acs2/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': '任务',
'start_or_end': '起点或终点',
'time': '时间段',
'empty_shaft_position': '空轴位',
'extension_field': '扩展字段'
},
'select': {

4
acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
View File

@@ -73,7 +73,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="关联设备" prop="device_code" label-width="135px">
<el-select
v-model="form.link_device_code"
@@ -89,7 +89,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
</el-card>

20
acs2/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -429,8 +429,21 @@
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="空轴位">
<el-input v-model="form.empty_site" style="width: 370px;" @change="isDisabled=false" />
<el-form-item :label="$t('task.txt_box.empty_shaft_position')">
<el-select
v-model="form.empty_site"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.txt_box.empty_shaft_position')"
>
<el-option
v-for="item in dict.empty_shaft_position"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.extension_field')">
<div>
@@ -615,7 +628,7 @@ import i18n from '@/i18n'
export default {
name: 'Task',
components: { pagination, crudOperation, rrOperation },
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'],
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan', 'empty_shaft_position'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
@@ -677,6 +690,7 @@ export default {
formDia: false,
isDisabled: false,
deviceList: [],
empty_shaft_position: [],
materialList: [],
statusList: [],
routeList: [],

4
acs2/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -14,7 +14,7 @@
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="device_code" label="设备号" width="100px" />
<el-table-column prop="device_code" label="设备号" width="120px" />
<!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
<el-table-column prop="task_code" label="任务编号" width="100px" />
<el-table-column prop="instruct_code" label="指令编号" width="100px" />
@@ -53,7 +53,7 @@ export default {
page: 0
},
query: {
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))]
}
})
},

2
acs2/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -641,7 +641,7 @@ export default {
const obj = { name: i18n.t('monitor.click.AGV_power'), value: data[val] }
this.arr.push(obj)
} else if (val === 'move_2') {
const obj = { name: i18n.t('monitor.click.station_photoelectric_signal'), value: data[val] }
const obj = { name: i18n.t('monitor.click.post-station_photoelectric_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'action_1') {
const obj = { name: i18n.t('monitor.click.front_station_action_signal'), value: data[val] }