Commit Graph

74 Commits

Author SHA1 Message Date
fan
ee209d5dbf 综合演练二维码下添加房间号 2020-04-16 17:23:43 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
fan
a697ab21d5 调整实训 2020-03-27 13:52:14 +08:00
fan
71d328296f 综合演练调整 2020-03-17 18:44:49 +08:00
fan
b94c2b47de 综合演练调整 2020-03-17 14:54:03 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
joylink_cuiweidong
1cd35488e8 房间socket代码修改 2020-01-16 16:15:58 +08:00
joylink_cuiweidong
5357d5c23c 解决 页面刷新 用户进入房间的问题 2020-01-16 15:08:03 +08:00
joylink_cuiweidong
e0824e33a0 房间的订阅代码调整 2020-01-15 13:20:48 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
lVAL
eeb69eac26 修改,两个房主相互邀请时,跳转房间路径bug的问题 2019-12-09 10:52:08 +08:00
zyy
22825baf03 增加车站创建方式 2019-12-05 18:01:09 +08:00
lVAL
899f4a4216 修改跳转bug 2019-11-25 18:21:56 +08:00
joylink_cuiweidong
fde3e4dcd6 快速入口进入的,销毁房间问题修改 2019-11-19 14:02:52 +08:00
joylink_cuiweidong
133899b699 综合演练房间样式调整 2019-11-18 17:11:40 +08:00
ival
88007ba56b 修改代码 2019-11-15 19:07:46 +08:00
ival
8eb4ac80a6 修改刷新问题 2019-11-12 17:27:30 +08:00
ival
ff6c1c67c4 修改房间布局错误的bug 2019-11-12 14:56:53 +08:00
joylink_cuiweidong
5ce2e1a5b7 仿真skinCode调整 2019-11-12 13:39:52 +08:00
joylink_cuiweidong
e8c8e491f5 skinCode调整 2019-11-11 15:54:04 +08:00
fan
00458ff53f Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-11-08 20:25:26 +08:00
fan
46c6282a14 代码调整 2019-11-08 20:25:04 +08:00
ival
1e1400ac68 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
2019-11-08 19:33:05 +08:00
ival
b049ff3be2 修改代码 2019-11-08 19:32:21 +08:00
joylink_cuiweidong
d64e838bcb 代码调整 2019-11-08 19:29:39 +08:00
ival
46effe5ca8 提交代码 2019-11-08 18:17:34 +08:00
ival
0776d08053 修改仿真房间代码 2019-11-08 18:15:52 +08:00
ival
ddfa368268 修改代码 2019-11-08 09:13:38 +08:00
ival
b99f994541 修改代码 2019-11-08 09:02:18 +08:00
fan
d381ed6a88 西铁院title、logo修改,综合演练房间角色调整后,角色顺序不再变化 2019-11-04 11:29:35 +08:00
zyy
bc332c1a9d desc: 调整国际化,高度问题 2019-11-01 18:08:05 +08:00
fan
7455fb17ea 发布地图管理国际化调整,添加ibp角色多人时disable为true 调整 2019-10-31 16:52:49 +08:00
fan
00dcbdf7bd 任务管理调整 2019-10-30 19:36:26 +08:00
joylink_cuiweidong
ba7583cd1c 综合演练进入房间 没有输入发送文字禁用 2019-10-25 13:47:25 +08:00
fan
bfce5a2103 问题调整 2019-10-25 12:59:24 +08:00
fan
787580f964 路由调整调整 2019-10-23 17:41:50 +08:00
fan
c83e882f6a 国际化调整 2019-10-23 17:20:32 +08:00
fan
0a39680f6c 综合演练真实设备调整 2019-10-23 16:39:16 +08:00
fan
16b2dbda05 综合演练真实设备调整 2019-10-23 16:33:23 +08:00
fan
8710a6231a 综合演练房间调整 2019-10-23 16:13:36 +08:00
fan
7a073334d5 去除添加plc真实设备限制 2019-10-23 13:50:04 +08:00
fan
abd4fbbf64 开放plc真实设备 2019-10-23 13:41:33 +08:00
fan
36b0b048bd 仿真路由调整 2019-10-21 14:09:03 +08:00
fan
d5063802f4 接口调整 2019-10-18 17:15:04 +08:00
fan
5ba5ca7ea7 Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
#	src/components/QueryListPage/QueryForm.vue
#	src/i18n/langs/en/rules.js
#	src/i18n/langs/en/scriptRecord.js
#	src/i18n/langs/zh/lesson.js
#	src/i18n/langs/zh/rules.js
#	src/i18n/langs/zh/scriptRecord.js
#	src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
#	src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
#	src/permission.js
#	src/router/index.js
#	src/utils/baseUrl.js
#	src/views/demonstration/detail/index.vue
#	src/views/display/tipExamList.vue
#	src/views/lesson/lessoncategory/edit/lesson/publish.vue
#	src/views/lesson/taskmanage/createTask.vue
#	src/views/lesson/trainingRule/list.vue
#	src/views/login/index.vue
#	src/views/planMonitor/editTool/statusBar.vue
#	src/views/scriptManage/home.vue
#	src/views/teach/category/tree.vue
#	src/views/trainRoom/index.vue
2019-10-17 09:16:40 +08:00
fan
355e06ae2e 注释plc相关接口 2019-10-16 17:03:21 +08:00
fan
f0bf595b60 国际化添加左、右 2019-10-16 14:16:48 +08:00
fan
1caad290e5 ibp盘添加扣车关联 2019-10-16 14:00:30 +08:00