Commit Graph

1595 Commits

Author SHA1 Message Date
fan
d6b677201e Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 16:14:03 +08:00
fan
8710a6231a 综合演练房间调整 2019-10-23 16:13:36 +08:00
joylink_cuiweidong
1761fbdca8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-23 16:10:20 +08:00
joylink_cuiweidong
0b23a7f9a0 右上角用户昵称样式调整 2019-10-23 16:09:44 +08:00
fan
5abc54c522 合代码 2019-10-23 15:03:35 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
joylink_cuiweidong
b0c589cd2a 权限管理编辑权限样式调整
设计平台添加跳转实训平台的链接
2019-10-23 14:57:45 +08:00
zyy
15510a07cf desc: 修改区段点击bug 2019-10-23 14:43:25 +08:00
joylink_cuiweidong
2fa5966055 剧本审核通过bug调整
登录全屏调整
2019-10-23 14:33:45 +08:00
fan
7a073334d5 去除添加plc真实设备限制 2019-10-23 13:50:04 +08:00
fan
8839122191 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 13:41:48 +08:00
fan
abd4fbbf64 开放plc真实设备 2019-10-23 13:41:33 +08:00
joylink_cuiweidong
8320f57345 路由调整 2019-10-23 13:35:14 +08:00
fan
d55f740065 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 13:33:40 +08:00
fan
89d71ed661 发现问题调整 2019-10-23 13:33:09 +08:00
joylink_cuiweidong
1c38f16199 回车登录调整 2019-10-23 13:32:00 +08:00
joylink_cuiweidong
16d2b61d0f Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-23 11:03:20 +08:00
joylink_cuiweidong
f5dc8818fe 登录页面添加键盘回车登录 2019-10-23 11:02:44 +08:00
fan
f8b149fa5a 同一个标签切换平台404问题 2019-10-23 10:43:29 +08:00
fan
cf5f902a45 代码调整 2019-10-23 10:18:28 +08:00
fan
c843e25094 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-23 09:59:39 +08:00
fan
43d900747a 增加地图发布仅管理员可见 2019-10-23 09:59:28 +08:00
joylink_cuiweidong
aa6cb458de 登录修改 2019-10-23 09:58:05 +08:00
joylink_cuiweidong
7550d82f2b 登录修改 2019-10-22 20:09:29 +08:00
fan
332fa22b81 登录配置调整 2019-10-22 20:04:55 +08:00
fan
48fafacdc2 获取上次用户登录系统 2019-10-22 20:01:03 +08:00
fan
01cf337b63 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 19:49:59 +08:00
fan
21510d9464 创建章节修改 2019-10-22 19:49:37 +08:00
program-walker
6fa2b2e636 登陆逻辑修改 2019-10-22 19:47:36 +08:00
fan
5c5c2412fd 章节下添加创建章节 2019-10-22 19:23:01 +08:00
fan
ff37fe128e 问题调整 2019-10-22 18:49:46 +08:00
fan
4bd232bd67 地图系统结构调整 2019-10-22 18:34:05 +08:00
fan
4f14075072 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 18:20:10 +08:00
joylink_cuiweidong
2bd13ad075 实训tree 样式调整 2019-10-22 18:19:18 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
6760cdc7e3 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 17:24:51 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
zyy
d97c1096b0 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 16:29:19 +08:00
zyy
83c53b0640 desc: 修改代码 2019-10-22 16:29:11 +08:00
joylink_cuiweidong
2282f27239 设计系统运行图样式调整 2019-10-22 16:10:39 +08:00
fan
6f314ba150 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 16:06:20 +08:00
fan
0e23a62b39 调整代码 2019-10-22 16:05:58 +08:00
zyy
0eb05638a0 desc: 调整列车识别号初始化 2019-10-22 15:42:07 +08:00
zyy
8f01ed2e57 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 15:24:43 +08:00
zyy
3c67e18350 desc: 修改代码 2019-10-22 15:24:36 +08:00
joylink_cuiweidong
b26ab2fc15 删除地图系统接口调整以及西铁院系统tree接口调整 2019-10-22 15:13:58 +08:00
joylink_cuiweidong
df4113ff29 代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
2019-10-22 14:43:27 +08:00
fan
e89211a873 Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev 2019-10-22 14:28:41 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
2eb3dc9842 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-22 14:07:27 +08:00