lishuai 42e572a003 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_in_ID.properties
#	acs2/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties

2024-02-26 16:33:08 +08:00

..

api

更新

2023-03-27 10:57:27 +08:00

assets

opt: 输送线优化和界面优化

2024-01-26 17:49:35 +08:00

components

crud.js修改

2022-10-31 10:35:42 +08:00

layout

opt: 输送线优化和界面优化

2024-01-26 17:49:35 +08:00

mixins

init

2022-10-27 18:58:02 +08:00

router

init

2022-10-27 18:58:02 +08:00

store

rev 监控图片地址修改

2023-08-21 14:58:34 +08:00

utils

代码更新

2022-10-28 15:12:52 +08:00

views

Merge remote-tracking branch 'origin/master'

2024-02-26 16:33:08 +08:00

App.vue

更新

2023-01-08 21:38:25 +08:00

main.js

opt: 三色灯回退,OPC连接优化

2024-02-23 15:38:33 +08:00

settings.js

代码更新

2022-11-08 14:42:32 +08:00