Commit Graph

1263 Commits

Author SHA1 Message Date
joylink_cuiweidong
fbe928749b 剧本预览代码调整 2020-07-22 13:55:12 +08:00
fan
7bd43dd7d4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-22 13:31:10 +08:00
fan
507fdd2593 综合仿真页面调整&删除连接真实设备 2020-07-22 13:30:56 +08:00
zyy
31b6241bf7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-22 13:16:21 +08:00
zyy
b9a412943e 调整哈尔滨聊天窗口位置 2020-07-22 13:16:04 +08:00
joylink_cuiweidong
191816db09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-22 09:46:00 +08:00
fan
c617cf27c6 heb项目取消综合仿真生成二维码按钮 2020-07-22 09:04:45 +08:00
joylink_cuiweidong
f3d2982bd2 剧本预览代码调整 2020-07-21 19:27:32 +08:00
fan
64466ff7d6 综合演练初始化清除activeTrainList 2020-07-21 15:54:35 +08:00
fan
d518ae9907 成员列表报错调整 2020-07-21 15:38:47 +08:00
joylink_cuiweidong
1038063860 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 15:23:23 +08:00
joylink_cuiweidong
54b838a46b 剧本预览代码调整
聊天会话代码优化
2020-07-21 15:15:28 +08:00
fan
dcc36af6cc 成员列表报错调整 2020-07-21 15:09:43 +08:00
fan
b51b8680c2 会话调整 2020-07-21 14:56:46 +08:00
fan
ebeda7eb0d 会话调整 2020-07-21 13:57:45 +08:00
fan
1ea1583874 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:51:29 +08:00
fan
9ffd832562 会话调整 2020-07-21 13:51:13 +08:00
zyy
7498e7c844 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:38:13 +08:00
zyy
4bb41700bc 列车提示信息调整,哈尔滨线路操作 2020-07-21 13:37:59 +08:00
fan
337a2c127d 会话调整 2020-07-21 13:36:03 +08:00
fan
39afe867a4 会话调整 2020-07-21 13:32:43 +08:00
fan
acd929239b 会话调整 2020-07-21 13:22:58 +08:00
joylink_cuiweidong
57ffa85451 剧本预览代码调整 2020-07-21 10:49:01 +08:00
joylink_cuiweidong
95a9d18ccd 地图绘图代码调整 2020-07-20 17:13:56 +08:00
joylink_cuiweidong
b1821d8274 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 16:46:55 +08:00
joylink_cuiweidong
f809d514a1 地图绘制代码调整 2020-07-20 16:46:38 +08:00
fan
025b1595c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:19:33 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
joylink_cuiweidong
e2e66074af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-20 15:11:17 +08:00
joylink_cuiweidong
2dc14c9374 地图绘制代码调整 2020-07-20 15:10:57 +08:00
fan
23885760f3 会话调整 2020-07-20 13:38:54 +08:00
fan
00a98a5b14 merger 2020-07-20 13:29:32 +08:00
fan
6f20f4db18 会话调整 2020-07-20 13:18:38 +08:00
fan
826b4da854 公共会话切换 2020-07-20 10:48:53 +08:00
joylink_cuiweidong
39eace3b40 剧本预览代码调整 2020-07-20 10:28:31 +08:00
zyy
3673eb1015 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-07-20 09:24:02 +08:00
zyy
02157c45a0 修改生成联锁数据提示信息 2020-07-20 09:23:08 +08:00
fan
ba90420115 merger 2020-07-17 19:08:42 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
zyy
e0f7175923 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 18:28:56 +08:00
zyy
04f1205e56 调整上行是否向右地图字段 2020-07-17 18:28:38 +08:00
joylink_cuiweidong
f0d0b6db79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 17:19:26 +08:00
joylink_cuiweidong
451b5343e0 剧本编制代码调整 2020-07-17 17:18:48 +08:00
fan
3e1e36c921 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-17 16:35:34 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
joylink_cuiweidong
a5ce9e4a88 地图绘制代码调整 2020-07-17 15:45:44 +08:00
joylink_cuiweidong
1e91cb616d 地图绘图代码调整 2020-07-17 14:08:14 +08:00
joylink_cuiweidong
56089e1a55 地图绘图代码优化 2020-07-17 11:14:50 +08:00
fan
fb4864496a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-16 19:11:35 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00