Commit Graph

8181 Commits

Author SHA1 Message Date
fan
7e0c3696ab 地图发布管理导入数据后重置table数据 2020-11-25 11:20:55 +08:00
fan
9ef4299527 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-25 10:29:14 +08:00
fan
dad52de123 发布地图管理编辑信息添加数据版本 2020-11-25 10:28:47 +08:00
joylink_cuiweidong
e355191291 教学系统 实训代码调整 2020-11-25 09:45:59 +08:00
joylink_cuiweidong
b99f0d7551 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 19:17:27 +08:00
joylink_cuiweidong
c7a98096a2 教学系统 代码调整 2020-11-24 19:17:10 +08:00
fan
31c0a1f466 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:28:31 +08:00
fan
db9bcd0cc1 进入iscs路径添加lineCode 2020-11-24 18:28:15 +08:00
joylink_cuiweidong
8388bf42b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:07:45 +08:00
joylink_cuiweidong
275b44e056 北交大 客流仿真 提示添加 2020-11-24 18:07:09 +08:00
fan
a69d3b45a5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 18:01:07 +08:00
fan
345b676cbc 调整登录错误码 2020-11-24 17:48:36 +08:00
zyy
e249c344eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:35:27 +08:00
zyy
9ba73cbb77 调整哈尔滨综合监控数据 2020-11-24 17:35:14 +08:00
sunzhenyu
6ce808b8f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:32:43 +08:00
sunzhenyu
7ef4994a09 修改三维客流视窗跳转方式 2020-11-24 17:32:37 +08:00
joylink_cuiweidong
465e0e5860 北交大系统 仿真页面代码调整
教学 实训列表文字调整
2020-11-24 17:11:00 +08:00
joylink_cuiweidong
872824dff1 绘图代码调整 2020-11-24 16:53:13 +08:00
sunzhenyu
69e97c635f 修复三维cctv自适应dom界面 2020-11-24 15:17:27 +08:00
sunzhenyu
7463dce8f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 11:31:39 +08:00
sunzhenyu
86462394a8 修改三维资源路径 2020-11-24 11:31:29 +08:00
fan
8988e979e1 Merge remote-tracking branch 'origin/test' 2020-11-24 09:16:51 +08:00
fan
dd17d48fa7 通用排班计划生成接口调整 2020-11-23 18:06:03 +08:00
fan
906208b236 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:04:02 +08:00
fan
84ccf357f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:03:41 +08:00
fan
6cba317525 哈尔滨打包调整 2020-11-23 18:03:23 +08:00
joylink_cuiweidong
d746206be0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:01:05 +08:00
joylink_cuiweidong
96a57af6fc 代码调整 2020-11-23 18:00:45 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
sunzhenyu
a12b80599c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 17:57:09 +08:00
sunzhenyu
9aa16839d0 修改三维驾驶列车坐标修正值 2020-11-23 17:57:01 +08:00
joylink_cuiweidong
c8256de5c7 屏蔽暂时无用代码 2020-11-23 17:32:17 +08:00
joylink_cuiweidong
ce5287964b 删除无效代码 2020-11-23 17:09:27 +08:00
joylink_cuiweidong
0599da13aa 综合演练暂时无用代码删除 2020-11-23 17:05:16 +08:00
sunzhenyu
28d0891365 merge 2020-11-23 14:27:22 +08:00
sunzhenyu
23411b5ddc 剔除项目三维本地模型 2020-11-23 14:26:33 +08:00
zyy
af2cac53ad 删除多余指令 2020-11-23 13:45:13 +08:00
joylink_cuiweidong
dc1ccfe699 地图绘制代码调整 2020-11-23 13:41:19 +08:00
joylink_cuiweidong
acd3e5c6ff 删除无效的文件 2020-11-23 10:47:33 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
joylink_cuiweidong
5056e18e0a 删除暂时无用的枚举 2020-11-23 10:14:42 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
e98baa752d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 15:38:10 +08:00
joylink_cuiweidong
504f23e84f 代码调整 2020-11-20 15:36:28 +08:00
fan
fb565f1f43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 15:27:39 +08:00
fan
b4e9942566 删除三维文件 2020-11-20 15:27:11 +08:00
joylink_cuiweidong
a131fd12d7 代码调整 2020-11-20 14:59:24 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
756aca9281 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 14:22:15 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00