fan
|
22f70897c4
|
北信坤成页面调整
|
2020-07-14 16:04:55 +08:00 |
|
zyy
|
c2d158da5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:35:19 +08:00 |
|
zyy
|
952de95f4c
|
调整列车列表样式
|
2020-07-14 15:35:03 +08:00 |
|
fan
|
135fe2d917
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:32:29 +08:00 |
|
fan
|
0db415d5ca
|
北信坤成页面调整&&综合演练会话调整
|
2020-07-14 15:32:18 +08:00 |
|
sunzhenyu
|
9352cac2b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 15:03:38 +08:00 |
|
sunzhenyu
|
54a773aa84
|
修改录制三维驾驶托管模块
|
2020-07-14 15:03:31 +08:00 |
|
joylink_cuiweidong
|
66070d2157
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:48:41 +08:00 |
|
joylink_cuiweidong
|
a96ace44d1
|
剧本预览代码调整
|
2020-07-14 14:48:26 +08:00 |
|
zyy
|
b231f2b96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:30:52 +08:00 |
|
zyy
|
dfc478b8d4
|
调整哈尔滨综合演练按钮位置，调整角色设置样式
|
2020-07-14 14:30:37 +08:00 |
|
joylink_cuiweidong
|
a752c1e636
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:28:14 +08:00 |
|
joylink_cuiweidong
|
99b622ef24
|
地图绘图代码调整
|
2020-07-14 14:27:35 +08:00 |
|
fan
|
23d3663e0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 13:41:28 +08:00 |
|
fan
|
d3626758ee
|
哈尔滨操作调整
|
2020-07-14 13:41:17 +08:00 |
|
zyy
|
cb4e2bec19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 13:28:08 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
fan
|
d18b440c24
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 11:21:31 +08:00 |
|
fan
|
7bbeb6bbd6
|
哈尔滨指令样式调整
|
2020-07-14 11:21:24 +08:00 |
|
joylink_cuiweidong
|
7f67225828
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 11:01:40 +08:00 |
|
joylink_cuiweidong
|
a462e540fb
|
socket 退出登陆 断开连接
绘图代码调整
|
2020-07-14 11:01:22 +08:00 |
|
sunzhenyu
|
30b1bf3646
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 10:50:16 +08:00 |
|
fan
|
1c051d0561
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 10:15:37 +08:00 |
|
fan
|
84e4668e40
|
哈尔滨指令调整
|
2020-07-14 10:14:59 +08:00 |
|
sunzhenyu
|
006fd8f0a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 09:25:11 +08:00 |
|
sunzhenyu
|
f1cab6fba3
|
test
|
2020-07-14 09:24:58 +08:00 |
|
joylink_cuiweidong
|
d2f653bc54
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
# src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
# src/jmapNew/theme/xian_01/menus/menuTrain.vue
# src/jmapNew/theme/xian_02/menus/menuTrain.vue
|
2020-07-13 18:59:56 +08:00 |
|
joylink_cuiweidong
|
fe5787b3ce
|
新增 确认列车行驶之前方站台 进路闭塞法行车 指令
|
2020-07-13 18:54:42 +08:00 |
|
fan
|
440eeed75f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 18:40:53 +08:00 |
|
fan
|
7cdc3c5878
|
贵州导入班级报错提示&哈尔滨指令调整
|
2020-07-13 18:40:41 +08:00 |
|
zyy
|
1b61866b37
|
删除样式
|
2020-07-13 17:28:32 +08:00 |
|
zyy
|
06fecf9aad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:27:49 +08:00 |
|
zyy
|
1c15fdbdd9
|
增加所有线路列车故障模式
|
2020-07-13 17:27:33 +08:00 |
|
joylink_cuiweidong
|
3898f66e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:02:11 +08:00 |
|
joylink_cuiweidong
|
d9ed44b218
|
剧本预览代码调整
新版地图绘制代码优化
|
2020-07-13 17:01:34 +08:00 |
|
fan
|
7ac85def7c
|
合并代码
|
2020-07-13 16:49:26 +08:00 |
|
fan
|
40402a9a8e
|
试卷规则bug修复&哈尔滨操作调整
|
2020-07-13 16:48:23 +08:00 |
|
zyy
|
4704f9e413
|
增加配置
|
2020-07-13 15:47:27 +08:00 |
|
zyy
|
321c59b155
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:37:43 +08:00 |
|
zyy
|
9d74e75624
|
列车故障配置
|
2020-07-13 14:37:18 +08:00 |
|
fan
|
1b3a491d52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:35:07 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
zyy
|
ee9cf9f54d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:30:16 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
938e789173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 13:01:44 +08:00 |
|
fan
|
a5649cc6e8
|
哈尔滨操作调整
|
2020-07-13 13:01:28 +08:00 |
|
joylink_cuiweidong
|
1add21a740
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 10:16:07 +08:00 |
|
joylink_cuiweidong
|
57125367fc
|
剧本编制与剧本预览代码调整
|
2020-07-13 10:15:44 +08:00 |
|
zyy
|
fccbc9ecd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:42:05 +08:00 |
|
zyy
|
f205ddf0fc
|
删除多余配置
|
2020-07-10 18:41:29 +08:00 |
|