Commit Graph

6 Commits

Author SHA1 Message Date
ival
d87a4fff22 国际化处理 2019-08-19 14:02:20 +08:00
ival
836c6d383a 修改格式,以及修改综合演练设置车站的stationCode为deviceCode 2019-08-16 15:41:20 +08:00
ival
fd2b66e984 Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/rules.js
#	src/views/trainRoom/index.vue
2019-08-14 16:50:50 +08:00
zyy
ed8b14dac2 desc: 修改综合演练,socket创建 2019-08-14 16:15:44 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00