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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
This commit is contained in:
lishuai
2024-07-08 17:26:18 +08:00
parent 447c175049 050daf64d6
commit da4d4c0352
21 changed files with 259 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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] }