zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
joylink_cuiweidong
|
40fe41a8ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:36:35 +08:00 |
|
joylink_cuiweidong
|
e13fcb02e5
|
故障设置代码调整
|
2020-07-10 10:36:10 +08:00 |
|
sunzhenyu
|
3a25657440
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:28:01 +08:00 |
|
sunzhenyu
|
3e84301b42
|
修改综合演练切换带三维界面的处理
|
2020-07-10 10:27:49 +08:00 |
|
fan
|
0d5be61a17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:00:51 +08:00 |
|
fan
|
ac3da3ef00
|
成员管理总数在线人数调整
|
2020-07-10 10:00:20 +08:00 |
|
sunleking
|
07d9f8603d
|
修改hideibp隐藏三维界面
|
2020-07-09 21:44:11 +08:00 |
|
joylink_cuiweidong
|
0c9cd52c9a
|
剧本编制代码调整
|
2020-07-09 17:39:43 +08:00 |
|
joylink_cuiweidong
|
3aa0d55ea3
|
剧本编制代码调整
|
2020-07-09 16:54:31 +08:00 |
|
joylink_cuiweidong
|
ffab9631ce
|
代码调整
|
2020-07-09 15:45:32 +08:00 |
|
joylink_cuiweidong
|
84485c6f1d
|
剧本编制代码调整
|
2020-07-09 15:44:12 +08:00 |
|
fan
|
8af4eb6187
|
设备登录调整
|
2020-07-09 15:06:15 +08:00 |
|
fan
|
404c56e874
|
过滤司机角色调整
|
2020-07-09 13:05:50 +08:00 |
|
joylink_cuiweidong
|
c315f9121a
|
剧本编制代码调整
|
2020-07-09 10:50:56 +08:00 |
|
joylink_cuiweidong
|
96ff4c49f6
|
剧本编制代码调整
|
2020-07-09 10:17:55 +08:00 |
|
joylink_cuiweidong
|
3cd9d9416b
|
剧本代码调整
|
2020-07-08 18:56:32 +08:00 |
|
joylink_cuiweidong
|
dac800a86f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:36:07 +08:00 |
|
joylink_cuiweidong
|
b1005fd2ac
|
剧本编制代码调整
|
2020-07-08 18:35:46 +08:00 |
|
zyy
|
3693994526
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 18:35:25 +08:00 |
|
zyy
|
c4ffc859ce
|
调整大屏配置逻辑，登陆权限流程
|
2020-07-08 18:35:12 +08:00 |
|
fan
|
37d88998ab
|
清除会话@成员
|
2020-07-08 18:22:14 +08:00 |
|
fan
|
050fc8141c
|
设备登录调整
|
2020-07-08 17:36:32 +08:00 |
|
zyy
|
6ff8019898
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 15:49:41 +08:00 |
|
zyy
|
fd89fe974e
|
调整列车驾驶设备
|
2020-07-08 15:49:16 +08:00 |
|
fan
|
e8d54bc1d0
|
合并代码
|
2020-07-08 15:42:23 +08:00 |
|
fan
|
714113c819
|
设备登录调整
|
2020-07-08 15:40:55 +08:00 |
|
zyy
|
7c8d1319f3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 14:40:18 +08:00 |
|
zyy
|
753172433c
|
调整实训流程
|
2020-07-08 14:40:04 +08:00 |
|
fan
|
db5c516813
|
成员参数调整
|
2020-07-08 13:49:14 +08:00 |
|
fan
|
4a5923f263
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:11:36 +08:00 |
|
fan
|
1076eb2215
|
设备登录调整
|
2020-07-08 13:11:22 +08:00 |
|
joylink_cuiweidong
|
fe3ee372e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-08 13:05:53 +08:00 |
|
joylink_cuiweidong
|
fc97643116
|
剧本编制代码调整
|
2020-07-08 13:05:09 +08:00 |
|
zyy
|
b58a4afdda
|
调整列车过滤
|
2020-07-08 10:56:14 +08:00 |
|
joylink_cuiweidong
|
eb6aca6114
|
剧本录制接口调整
|
2020-07-08 09:39:25 +08:00 |
|
joylink_cuiweidong
|
30b1163017
|
故障代码调整
设备代码调整
|
2020-07-08 09:21:54 +08:00 |
|
zyy
|
e710e5eb34
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-07 17:37:59 +08:00 |
|
zyy
|
6b0d31dbbc
|
调整配置项
|
2020-07-07 17:37:45 +08:00 |
|
joylink_cuiweidong
|
00a4a8c184
|
自动设置故障（zc故障）代码调整
|
2020-07-07 17:08:01 +08:00 |
|
fan
|
f83a60bd88
|
聊天室调整
|
2020-07-07 14:58:10 +08:00 |
|
fan
|
aced111815
|
聊天室调整
|
2020-07-07 14:11:04 +08:00 |
|
joylink_fanyuhong
|
24daf6aea1
|
聊天室调整
|
2020-07-07 13:15:20 +08:00 |
|
fan
|
0fd852cc5a
|
聊天室调整
|
2020-07-07 10:54:57 +08:00 |
|
fan
|
421e591f52
|
Merge remote-tracking branch 'origin/test_device_login' into test
# Conflicts:
# src/layout/components/Title.vue
# src/views/demonstration/detail/index.vue
|
2020-07-07 09:47:21 +08:00 |
|
fan
|
a9b3f614c8
|
聊天室调整
|
2020-07-07 09:39:27 +08:00 |
|
zyy
|
67edc61d0e
|
调整大屏分屏预览页面
|
2020-07-06 18:16:49 +08:00 |
|
fan
|
87d8dd9ea7
|
聊天室调整
|
2020-07-06 18:14:03 +08:00 |
|
fan
|
9883d0ed3c
|
聊天室调整
|
2020-07-06 18:00:44 +08:00 |
|
zyy
|
6be93b39ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-06 17:02:31 +08:00 |
|
zyy
|
2c5c30216f
|
调整大屏预览流程，增加大屏分屏配置
|
2020-07-06 17:02:13 +08:00 |
|
fan
|
75e838b96f
|
聊天室调整
|
2020-07-03 18:42:29 +08:00 |
|
joylink_cuiweidong
|
ebf86de377
|
故障操作代码调整
|
2020-07-03 18:39:24 +08:00 |
|
joylink_cuiweidong
|
654b79fc27
|
故障操作代码调整
|
2020-07-03 17:13:24 +08:00 |
|
joylink_cuiweidong
|
3ae8582f05
|
剧本接口调整（预览与 删除剧本开始执行接口）
|
2020-07-03 16:29:40 +08:00 |
|
zyy
|
8a5845749e
|
调整绘图流程逻辑 删除多余配置
|
2020-07-03 15:18:58 +08:00 |
|
zyy
|
f91fc75528
|
调整西安线路进路状态
|
2020-07-03 11:11:57 +08:00 |
|
zyy
|
fa5097cd8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-02 18:47:57 +08:00 |
|
zyy
|
3b39a9a04b
|
调整区段字段，控制权操作
|
2020-07-02 18:47:39 +08:00 |
|
fan
|
872122e92b
|
综合演练仿真调整
|
2020-07-02 17:57:48 +08:00 |
|
joylink_cuiweidong
|
ac4c0baecf
|
西安三号线 仿真右侧列车列表代码调整
修改故障枚举
修改退出聊天会话接口
|
2020-07-02 17:44:20 +08:00 |
|
joylink_cuiweidong
|
146d6c2d0b
|
成都三号线站台操作代码调整
|
2020-07-02 13:28:36 +08:00 |
|
joylink_cuiweidong
|
50c7363791
|
故障操作代码调整
|
2020-07-02 10:10:16 +08:00 |
|
fan
|
13a4ee614c
|
综合演练仿真调整
|
2020-07-01 18:52:29 +08:00 |
|
zyy
|
64d415dbb3
|
调整地图绘图数据模型
|
2020-07-01 18:08:42 +08:00 |
|
zyy
|
3c6d5b903d
|
调整联锁配置，调整数据模型
|
2020-07-01 14:52:27 +08:00 |
|
joylink_cuiweidong
|
e5fff7388b
|
地图绘制 显示条件（showCondition）调整
|
2020-07-01 13:18:43 +08:00 |
|
sunzhenyu
|
9d855f5910
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-01 12:11:30 +08:00 |
|
joylink_cuiweidong
|
4f866bf257
|
故障操作代码调整
|
2020-07-01 11:27:09 +08:00 |
|
joylink_cuiweidong
|
ff1e707112
|
故障代码调整
|
2020-07-01 09:32:36 +08:00 |
|
joylink_cuiweidong
|
c0e3c99dc8
|
故障代码调整
|
2020-07-01 09:32:01 +08:00 |
|
joylink_cuiweidong
|
1c6eb510c9
|
故障代码调整
|
2020-06-30 19:17:29 +08:00 |
|
fan
|
ce180b1448
|
综合演练仿真调整
|
2020-06-30 18:35:57 +08:00 |
|
joylink_cuiweidong
|
619adde869
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 14:41:40 +08:00 |
|
joylink_cuiweidong
|
bb6c5319c7
|
故障管理页面代码调整
|
2020-06-30 14:41:22 +08:00 |
|
fan
|
8f4cecec0c
|
综合演练调整
|
2020-06-30 14:27:32 +08:00 |
|
zyy
|
9748ca2f63
|
调整成都三号线操作定义，位置提示
|
2020-06-30 13:32:50 +08:00 |
|
zyy
|
82415903f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-30 11:19:58 +08:00 |
|
zyy
|
7df86adff1
|
调整表单赋值拷贝
|
2020-06-30 11:19:33 +08:00 |
|
joylink_cuiweidong
|
f6982eb966
|
解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
|
2020-06-29 17:33:19 +08:00 |
|
joylink_cuiweidong
|
ccb976f078
|
仿真代码调整
|
2020-06-29 15:55:31 +08:00 |
|
fan
|
a689103abe
|
综合演练调整
|
2020-06-29 13:11:27 +08:00 |
|
fan
|
103ae24b64
|
仿真成员管理
|
2020-06-29 09:12:30 +08:00 |
|
joylink_cuiweidong
|
237aece890
|
代码调整
|
2020-06-28 18:34:32 +08:00 |
|
zyy
|
7873917d43
|
调整数据模型过滤空置，调整成都3号线实操
|
2020-06-28 16:03:59 +08:00 |
|
fan
|
4f248c3b19
|
综合演练界面调整&项目配置整理
|
2020-06-28 14:27:28 +08:00 |
|
zyy
|
e3ee44aae7
|
调整道岔失表状态，成都3号线实操定义
|
2020-06-28 13:27:10 +08:00 |
|
fan
|
d7a5b555a2
|
设备登录调整
|
2020-06-24 18:40:48 +08:00 |
|
zyy
|
c570e418e1
|
调整佛山操作定义，调整个人信息
|
2020-06-24 17:37:09 +08:00 |
|
zyy
|
45cac99681
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-24 14:06:45 +08:00 |
|
zyy
|
3b330a0932
|
调整佛山线路实训定义，删除区段定义
|
2020-06-24 14:06:17 +08:00 |
|
joylink_cuiweidong
|
0f7cdb2b8e
|
剧本编制代码调整
|
2020-06-24 09:24:08 +08:00 |
|
joylink_cuiweidong
|
b85362460e
|
剧本代码调整
|
2020-06-23 18:59:20 +08:00 |
|
fan
|
e67f98e9a0
|
合并代码
|
2020-06-23 15:26:26 +08:00 |
|
fan
|
a2664eb5dc
|
登录调整&综合演练调整&菜单调整
|
2020-06-23 15:18:44 +08:00 |
|
joylink_cuiweidong
|
677ebcaa7f
|
剧本编制修改会话代码调整
|
2020-06-23 10:57:35 +08:00 |
|
sunzhenyu
|
869ddc78b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 10:08:01 +08:00 |
|
sunzhenyu
|
01351fb34a
|
test
|
2020-06-23 10:07:52 +08:00 |
|
zyy
|
88211cee8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-23 09:27:10 +08:00 |
|
zyy
|
4e36c7b456
|
调整默认配置
|
2020-06-23 09:26:58 +08:00 |
|
joylink_cuiweidong
|
d789a30333
|
剧本编制代码调整
|
2020-06-22 18:37:09 +08:00 |
|
joylink_cuiweidong
|
d3d17f7bf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 14:30:14 +08:00 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
32f4ead036
|
剧本代码调整
|
2020-06-19 18:58:55 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
426aed9ef1
|
剧本代码调整
|
2020-06-18 09:20:42 +08:00 |
|
joylink_cuiweidong
|
eefbf70002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:36:45 +08:00 |
|
joylink_cuiweidong
|
0983307bc7
|
剧本代码调整
|
2020-06-17 18:36:22 +08:00 |
|
sunzhenyu
|
47d77d6925
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:17:00 +08:00 |
|
sunzhenyu
|
b70feae183
|
增加三维驾驶超速报警和牵引状态mmi显示，增加剧本设计中三维驾驶
|
2020-06-17 18:16:49 +08:00 |
|
joylink_cuiweidong
|
068fc65f3d
|
剧本代码调整
|
2020-06-17 15:33:04 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +08:00 |
|
joylink_cuiweidong
|
584654daec
|
剧本代码调整
|
2020-06-17 09:56:51 +08:00 |
|
fan
|
35b6d9093a
|
地图绘制信号机添加属性noOverlap是否无延续保护
|
2020-06-16 09:50:39 +08:00 |
|
zyy
|
28cc15fd10
|
调整综合监控数据，调整系统右键菜单样式
|
2020-06-15 17:16:26 +08:00 |
|
zyy
|
0f33f9d876
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 16:13:51 +08:00 |
|
zyy
|
428967e843
|
调整地图绘制右键菜单样式，调整道岔触发居中，绘制综合监控数据
|
2020-06-15 16:13:28 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
joylink_cuiweidong
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +08:00 |
|
joylink_cuiweidong
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
joylink_cuiweidong
|
6d5ba33e1f
|
剧本代码调整
|
2020-06-12 16:12:33 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
joylink_cuiweidong
|
9126397070
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:33:49 +08:00 |
|
joylink_cuiweidong
|
b341735a8c
|
剧本代码调整
|
2020-06-11 18:32:26 +08:00 |
|
zyy
|
6402e6312b
|
调整逻辑区段 名称偏移量
|
2020-06-11 17:53:35 +08:00 |
|
zyy
|
547c7efe5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:39:46 +08:00 |
|
zyy
|
9c0d69e81e
|
删除逻辑对应车次窗
|
2020-06-11 17:39:33 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
7a7b442a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:03:10 +08:00 |
|
joylink_cuiweidong
|
95715a9f12
|
代码调整
|
2020-06-10 18:02:46 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
fan
|
9b489d088b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:57:04 +08:00 |
|
fan
|
139066d66f
|
综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理
|
2020-06-10 16:56:52 +08:00 |
|
joylink_cuiweidong
|
b169bb1e20
|
佛山有轨电车指令代码调整
|
2020-06-10 13:24:12 +08:00 |
|
sunzhenyu
|
a18a7bccc6
|
merge jointtrainningnew/index.vue
|
2020-06-08 18:26:30 +08:00 |
|
sunzhenyu
|
b33f4c17b2
|
merge pull
|
2020-06-08 18:24:09 +08:00 |
|
sunzhenyu
|
6cae01f373
|
增加三维驾驶换端操作，修改三维cctv中前往站台找不到路径点bug，增加综合演练车站cctv
|
2020-06-08 18:22:12 +08:00 |
|
joylink_cuiweidong
|
404a23e35e
|
iscs 小系统代码调整
|
2020-06-08 17:59:28 +08:00 |
|
joylink_cuiweidong
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
6f59f03acd
|
裁判系统 获取参赛者的历史对话
|
2020-06-08 11:28:40 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
zyy
|
3b137ffae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:14:23 +08:00 |
|
zyy
|
30d76e763e
|
调整折返按钮 状态返回处理
|
2020-06-05 10:14:12 +08:00 |
|
fan
|
c7d07ebd9d
|
合并代码
|
2020-06-05 09:39:48 +08:00 |
|
fan
|
6dfbe18485
|
实操竞赛比赛计时&题目展示&结果展示
|
2020-06-05 09:38:14 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +08:00 |
|
zyy
|
a4df31fcc3
|
调整字段显示
|
2020-06-04 18:24:39 +08:00 |
|
zyy
|
24f089be32
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:59:08 +08:00 |
|
zyy
|
4a03d8613b
|
调整车站折返策略
|
2020-06-04 17:58:42 +08:00 |
|
joylink_cuiweidong
|
78d8da26b0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 17:52:12 +08:00 |
|
joylink_cuiweidong
|
d560d11ef5
|
裁判系统 回放页面调整
|
2020-06-04 17:51:30 +08:00 |
|
zyy
|
5a9a837e02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
# src/utils/baseUrl.js
# src/views/iscs/iscsDraw/iscsBasOperate/index.vue
|
2020-06-04 17:32:45 +08:00 |
|
zyy
|
9be9c9a313
|
增加西安 三号线设置折返策略元素
|
2020-06-04 17:29:18 +08:00 |
|
joylink_cuiweidong
|
8ea4e49e0a
|
代码调整
|
2020-06-04 16:38:28 +08:00 |
|
fan
|
7f08ae9e71
|
调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关
|
2020-06-04 14:21:19 +08:00 |
|
joylink_cuiweidong
|
0cf0caef1d
|
裁判系统代码调整
佛山左下角信息窗口调整
|
2020-06-04 11:12:55 +08:00 |
|
joylink_cuiweidong
|
aa5a00b401
|
竞赛裁判平台代码调整
|
2020-06-04 10:22:02 +08:00 |
|
joylink_cuiweidong
|
efc8d80899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 18:24:14 +08:00 |
|
joylink_cuiweidong
|
7946d9f6e7
|
仿真聊天代码调整
|
2020-06-03 18:23:48 +08:00 |
|
fan
|
44bb0f0f29
|
实操竞赛调整
|
2020-06-03 18:17:52 +08:00 |
|
joylink_cuiweidong
|
156a746a07
|
综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整
|
2020-06-03 16:44:38 +08:00 |
|
joylink_cuiweidong
|
49c61f8c8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:20:13 +08:00 |
|
joylink_cuiweidong
|
d8d896fc5f
|
综合演练结束仿真，其他成员不退出仿真 调整
|
2020-06-03 16:19:49 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
zyy
|
31fab488c0
|
调整区段保存流程
|
2020-06-03 14:47:26 +08:00 |
|
zyy
|
a98495f43f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 13:19:11 +08:00 |
|
zyy
|
a57ae39ebf
|
调整区段修改逻辑
|
2020-06-03 13:18:52 +08:00 |
|
joylink_cuiweidong
|
00705cd006
|
综合演练仿真聊天 退出群聊代码调整
|
2020-06-03 11:20:46 +08:00 |
|
joylink_cuiweidong
|
c3736a02c8
|
北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理
|
2020-06-03 10:43:41 +08:00 |
|
joylink_cuiweidong
|
7549203f97
|
综合演练仿真会话代码调整
|
2020-06-02 19:26:36 +08:00 |
|
joylink_cuiweidong
|
34016219dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 18:30:38 +08:00 |
|
joylink_cuiweidong
|
4c38334d2c
|
西安三号线 按计划行车/添加列车 列车列表代码调整
|
2020-06-02 18:30:12 +08:00 |
|
sunzhenyu
|
620839876d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:26 +08:00 |
|
sunzhenyu
|
f4d41eb0de
|
修改通号模型信息显示功能
|
2020-06-02 16:57:38 +08:00 |
|
joylink_cuiweidong
|
979a9e78b2
|
仿真聊天代码调整
竞赛 实操代码调整
|
2020-06-02 15:00:48 +08:00 |
|
zyy
|
3e62782fc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 13:36:41 +08:00 |
|
zyy
|
16392a3b1f
|
调整仿真运行图加载高亮显示
|
2020-06-01 13:36:26 +08:00 |
|
joylink_cuiweidong
|
ee9714a705
|
综合演练仿真聊天代码调整
|
2020-06-01 11:33:22 +08:00 |
|
joylink_cuiweidong
|
3012601bf6
|
综合演练仿真 聊天代码调整
|
2020-06-01 11:28:04 +08:00 |
|
joylink_cuiweidong
|
46d5e09f7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-01 11:22:08 +08:00 |
|
joylink_cuiweidong
|
799227f8c4
|
仿真页面刷新 时间代码调整
|
2020-06-01 11:21:10 +08:00 |
|
fan
|
119af19522
|
调整二次按计划行车报错
|
2020-06-01 10:57:19 +08:00 |
|
joylink_cuiweidong
|
8b23874ea5
|
综合演练仿真聊天代码调整
|
2020-05-29 18:15:51 +08:00 |
|
joylink_cuiweidong
|
9477a7ddc2
|
综合演练仿真聊天代码调整
|
2020-05-29 17:28:40 +08:00 |
|
joylink_cuiweidong
|
933db5fb50
|
综合演练 仿真聊天 代码调整
|
2020-05-29 16:56:02 +08:00 |
|
joylink_cuiweidong
|
6fe1a0c22b
|
新版地图绘图 高级数据交路代码调整
|
2020-05-29 16:23:38 +08:00 |
|
joylink_cuiweidong
|
7449b6b2a3
|
综合演练 仿真聊天代码调整
|
2020-05-29 14:03:43 +08:00 |
|
joylink_cuiweidong
|
8c99f4a3ce
|
西安一/三号线的侧边栏 代码调整
|
2020-05-29 09:16:35 +08:00 |
|
joylink_cuiweidong
|
cf6dadf46b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:39:11 +08:00 |
|
joylink_cuiweidong
|
65569da4cd
|
西安一/三号线的侧边栏 代码调整
|
2020-05-28 18:38:49 +08:00 |
|
fan
|
2a1ce3543f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 18:29:03 +08:00 |
|
zyy
|
474dcc2d74
|
新增车站字段
|
2020-05-28 18:17:15 +08:00 |
|
zyy
|
f1a66f8f73
|
调整站台轨关联站台也会修改
|
2020-05-28 18:08:20 +08:00 |
|
fan
|
5e97623b06
|
逻辑区段始终点偏移量设置调整
|
2020-05-28 17:47:52 +08:00 |
|
fan
|
601aed6f5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 16:41:04 +08:00 |
|
fan
|
80d016a2b5
|
公共菜单调整
|
2020-05-28 16:40:52 +08:00 |
|
joylink_cuiweidong
|
8822e8b3c7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/theory/quiz/index.vue
|
2020-05-28 15:31:11 +08:00 |
|
joylink_cuiweidong
|
c502d755f9
|
竞赛平台代码调整
|
2020-05-28 15:28:18 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
zyy
|
6eefedb434
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:39:21 +08:00 |
|
zyy
|
df4dc3eea9
|
调整供电线路保存，福州皮肤配置文件调整
|
2020-05-28 14:39:06 +08:00 |
|
joylink_cuiweidong
|
0939eecf59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 13:22:20 +08:00 |
|
joylink_cuiweidong
|
27981666b1
|
仿真聊天代码调整
|
2020-05-28 13:21:51 +08:00 |
|
fan
|
e5d4a31dce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 11:28:06 +08:00 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
joylink_cuiweidong
|
062cdc69dd
|
综合演练聊天代码调整
|
2020-05-28 10:35:16 +08:00 |
|
joylink_cuiweidong
|
a302ab24c1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 10:16:33 +08:00 |
|
joylink_cuiweidong
|
a471120ea0
|
综合演练 聊天代码调整
|
2020-05-28 10:16:13 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
joylink_cuiweidong
|
9fb51bd047
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:03:54 +08:00 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
fan
|
6a1215621d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 14:57:34 +08:00 |
|
fan
|
bb009011c3
|
修改列车识别号调整
|
2020-05-27 14:57:25 +08:00 |
|
joylink_cuiweidong
|
53c8c13405
|
竞赛系统 实操题目录制代码调整
|
2020-05-27 14:45:32 +08:00 |
|
zyy
|
d161492fed
|
添加题库管理流程
|
2020-05-26 15:59:11 +08:00 |
|
joylink_cuiweidong
|
681e67468f
|
竞赛代码调整
|
2020-05-26 10:18:54 +08:00 |
|
zyy
|
dc33306c96
|
调整参赛人员路由判断
|
2020-05-25 18:26:05 +08:00 |
|
zyy
|
f329e30049
|
调整西安一三 号线路 右键操作
|
2020-05-25 17:57:24 +08:00 |
|
zyy
|
f06419e963
|
调整裁判平台进入仿真操作
|
2020-05-25 16:38:03 +08:00 |
|
joylink_cuiweidong
|
40d7d960cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:43:58 +08:00 |
|
joylink_cuiweidong
|
3d10668abf
|
竞赛系统代码调整
|
2020-05-25 15:43:36 +08:00 |
|
zyy
|
fb6ba36680
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 15:06:47 +08:00 |
|
zyy
|
1ae2793221
|
调整绘图界面字体皮肤配置
|
2020-05-25 15:06:34 +08:00 |
|
joylink_cuiweidong
|
992892ee6b
|
竞赛代码调整
|
2020-05-25 14:55:42 +08:00 |
|
joylink_cuiweidong
|
af46cd3ff9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:49:14 +08:00 |
|
zyy
|
9d7e4f928f
|
调整竞赛系统进入仿真界面流程
|
2020-05-25 13:48:43 +08:00 |
|
joylink_cuiweidong
|
3b0d842b97
|
竞赛代码调整
|
2020-05-25 13:40:25 +08:00 |
|
zyy
|
a2e0522a30
|
调整判断状态
|
2020-05-25 10:53:01 +08:00 |
|
zyy
|
04f41456d9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/jsxt/competition/examDetail.vue
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:47:20 +08:00 |
|
zyy
|
cf8e39f765
|
调整流程
|
2020-05-25 10:45:56 +08:00 |
|
joylink_cuiweidong
|
d41f874bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/api/competition.js
# src/views/jsxt/refereeList/index.vue
|
2020-05-25 10:36:21 +08:00 |
|
fan
|
58118ba06a
|
西安一三日期显示调整
|
2020-05-25 10:32:14 +08:00 |
|
fan
|
d54db9bfe2
|
西安三号线调整
|
2020-05-22 20:32:19 +08:00 |
|
fan
|
4d29da9228
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:42:55 +08:00 |
|
fan
|
bb37c6ebbb
|
西安三号线调整
|
2020-05-22 18:41:23 +08:00 |
|
zyy
|
39d055ec09
|
调整车站连锁关系 右键空白处显示连锁关系
|
2020-05-22 18:28:03 +08:00 |
|
zyy
|
e221ca9b22
|
调整报名流程字段，调整西安线路非连锁站邮件操作
|
2020-05-22 17:10:07 +08:00 |
|
fan
|
23167aa4a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 16:34:19 +08:00 |
|
fan
|
86edffb984
|
竞赛考试结果调整
|
2020-05-22 16:34:05 +08:00 |
|
joylink_cuiweidong
|
ba42e40200
|
竞赛系统代码调整
|
2020-05-22 16:30:18 +08:00 |
|
joylink_cuiweidong
|
4210599f6b
|
竞赛裁判系统代码调整
|
2020-05-22 11:07:10 +08:00 |
|
joylink_cuiweidong
|
3b81436fbb
|
竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
|
2020-05-22 10:43:23 +08:00 |
|
joylink_cuiweidong
|
480df83efa
|
竞赛裁判系统代码调整
|
2020-05-22 09:32:48 +08:00 |
|
joylink_cuiweidong
|
16513c64d5
|
剧本编制代码调整
|
2020-05-22 09:07:39 +08:00 |
|
joylink_cuiweidong
|
9dc0995e59
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/menuDemon.vue
|
2020-05-21 17:01:36 +08:00 |
|
joylink_cuiweidong
|
3a48755817
|
竞赛裁判系统代码调整
|
2020-05-21 16:59:36 +08:00 |
|
zyy
|
81973b6967
|
添加实操考试 结束生成分值流程
|
2020-05-21 15:18:00 +08:00 |
|
zyy
|
9918678b27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 14:59:29 +08:00 |
|
zyy
|
568ac44bf9
|
调整打包模式， 报名系统逻辑
|
2020-05-21 14:59:18 +08:00 |
|
joylink_cuiweidong
|
cf021736b2
|
竞赛裁判系统代码调整
|
2020-05-21 10:43:32 +08:00 |
|
joylink_cuiweidong
|
1cc644d893
|
剧本编制代码调整
|
2020-05-20 15:29:41 +08:00 |
|
joylink_cuiweidong
|
df718218e3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:51:35 +08:00 |
|
joylink_cuiweidong
|
0b37830a8d
|
剧本录制代码调整
|
2020-05-20 14:50:34 +08:00 |
|
fan
|
e3034f630e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:46:39 +08:00 |
|
fan
|
b137adbd69
|
哈尔滨地图问题调整&竞赛管理
|
2020-05-20 14:46:26 +08:00 |
|
sunzhenyu
|
a58f175afc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:50:18 +08:00 |
|
sunzhenyu
|
01f90f6a2d
|
隐藏三维站台
|
2020-05-20 10:50:13 +08:00 |
|
joylink_cuiweidong
|
582543dd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:56:49 +08:00 |
|
joylink_cuiweidong
|
a51ae0aa30
|
西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整
|
2020-05-19 18:54:51 +08:00 |
|
fan
|
46a28d3cd5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:39:31 +08:00 |
|
sunzhenyu
|
4819efc14e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:00:47 +08:00 |
|
fan
|
bfb3c9357c
|
竞赛系统调整
|
2020-05-19 17:06:34 +08:00 |
|
joylink_cuiweidong
|
e69840c87f
|
综合演练代码调整
|
2020-05-19 17:05:23 +08:00 |
|
sunzhenyu
|
5046a886fd
|
merge
|
2020-05-19 16:50:34 +08:00 |
|
sunzhenyu
|
6a25030a53
|
修改三维数据
|
2020-05-19 16:49:56 +08:00 |
|
joylink_cuiweidong
|
3b2d431400
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:45:17 +08:00 |
|
joylink_cuiweidong
|
c1ce6f46ae
|
综合演练代码调整
|
2020-05-19 15:44:57 +08:00 |
|
fan
|
247bc7ef30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:44:13 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44:01 +08:00 |
|
joylink_cuiweidong
|
e3b7d513ba
|
综合演练行调添加 列车选择
|
2020-05-19 14:47:47 +08:00 |
|
joylink_cuiweidong
|
eed312e72f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-05-19 14:03:44 +08:00 |
|
joylink_cuiweidong
|
736c81a61d
|
综合演练 剧本代码调整
|
2020-05-19 14:01:23 +08:00 |
|
fan
|
cc3f117a8f
|
宁波一综合演练现地设置显示站
|
2020-05-19 13:41:48 +08:00 |
|
fan
|
6afafc9371
|
调整绘图批量设置信号机类型&竞赛考试详情
|
2020-05-19 11:20:09 +08:00 |
|
joylink_cuiweidong
|
a1097088ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:45:31 +08:00 |
|
joylink_cuiweidong
|
08991c8694
|
剧本代码调整
|
2020-05-19 09:45:15 +08:00 |
|
fan
|
9580d4b966
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:59:52 +08:00 |
|
fan
|
86d59db177
|
调整路由处理
|
2020-05-18 17:59:38 +08:00 |
|
zyy
|
3069cf2112
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 17:08:32 +08:00 |
|
zyy
|
b8bf51fc82
|
优化地图绘制
|
2020-05-18 17:08:21 +08:00 |
|
fan
|
9e03602403
|
草稿地图右键点击改变tree选中状态
|
2020-05-18 16:08:49 +08:00 |
|
fan
|
79f9f72c07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:48:06 +08:00 |
|
fan
|
c8d7347e61
|
课程问题调整
|
2020-05-18 15:47:55 +08:00 |
|
joylink_cuiweidong
|
559c33bb2a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 15:19:43 +08:00 |
|
joylink_cuiweidong
|
cc8b700328
|
剧本录制代码调整
退出剧本代码调整
|
2020-05-18 15:18:57 +08:00 |
|
fan
|
5f9806cdb8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:49:29 +08:00 |
|
fan
|
135b328dd1
|
故障操作调整
|
2020-05-18 14:49:16 +08:00 |
|
joylink_cuiweidong
|
f0d51a2771
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 14:00:40 +08:00 |
|
joylink_cuiweidong
|
bdf627e812
|
剧本调整
|
2020-05-18 14:00:16 +08:00 |
|
zyy
|
8e57bbe91e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:35:21 +08:00 |
|
zyy
|
6fdf3b74aa
|
调整车次窗撤销操作问题
|
2020-05-18 13:34:46 +08:00 |
|
joylink_cuiweidong
|
71eca2ad9d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:33:20 +08:00 |
|
joylink_cuiweidong
|
25b1c09141
|
剧本代码调整
|
2020-05-18 13:32:25 +08:00 |
|
zyy
|
bbc79b1b17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-18 13:08:56 +08:00 |
|
zyy
|
9591cbd268
|
调整竞赛系统登陆权限
|
2020-05-18 13:08:45 +08:00 |
|
joylink_cuiweidong
|
f092b27282
|
剧本代码调整
|
2020-05-18 11:04:39 +08:00 |
|
joylink_cuiweidong
|
be4da83dcd
|
剧本代码调整
|
2020-05-18 10:31:55 +08:00 |
|
joylink_cuiweidong
|
8059353f06
|
剧本代码调整
|
2020-05-15 20:45:59 +08:00 |
|
joylink_cuiweidong
|
b1ca16b62f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 17:11:59 +08:00 |
|
joylink_cuiweidong
|
bda901f4c9
|
剧本代码调整
|
2020-05-15 17:11:15 +08:00 |
|
zyy
|
7945dedade
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:35 +08:00 |
|
zyy
|
7992a2e11e
|
调整格式
|
2020-05-15 16:55:00 +08:00 |
|
joylink_cuiweidong
|
f775f76aa8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:54:59 +08:00 |
|
joylink_cuiweidong
|
901ab1a8bd
|
剧本添加提示
|
2020-05-15 16:54:31 +08:00 |
|
fan
|
e4b14d96e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 15:58:19 +08:00 |
|
fan
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
zyy
|
322ca86dec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 14:50:19 +08:00 |
|
zyy
|
ae5916b90a
|
调整竞赛系统路由配置
|
2020-05-15 14:50:05 +08:00 |
|
joylink_cuiweidong
|
d3df0afc94
|
剧本代码调整
|
2020-05-15 13:16:55 +08:00 |
|
joylink_cuiweidong
|
ddbf334419
|
剧本代码调整
|
2020-05-14 19:13:44 +08:00 |
|
fan
|
396dd0d899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:55:12 +08:00 |
|
fan
|
71682d00a5
|
区段计轴调整
|
2020-05-14 18:54:53 +08:00 |
|
zyy
|
43e6b4bca1
|
保存道岔状态
|
2020-05-14 18:49:47 +08:00 |
|
joylink_cuiweidong
|
3968331bbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:25:25 +08:00 |
|
joylink_cuiweidong
|
c226d75d6b
|
剧本代码调整
|
2020-05-14 17:24:47 +08:00 |
|
fan
|
5ef9b0aaaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:03:45 +08:00 |
|
fan
|
4f8de9cc6a
|
信号机批量操作调整
|
2020-05-14 17:03:30 +08:00 |
|
zyy
|
81c8ad5210
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:59 +08:00 |
|
zyy
|
ccf186e98e
|
调整区段停车点偏移量
|
2020-05-14 16:54:31 +08:00 |
|
fan
|
996b71da05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:09 +08:00 |
|
fan
|
126278ee01
|
状态表示道岔故障调整
|
2020-05-14 16:53:58 +08:00 |
|
fan
|
abec4b2b4c
|
西安二号线添加是否灭灯显示(CTC级)
|
2020-05-14 16:45:48 +08:00 |
|
zyy
|
0533ddfcfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:39 +08:00 |
|
zyy
|
42402f6223
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:11 +08:00 |
|
zyy
|
b735cd5b06
|
调整区段回车问题
|
2020-05-14 16:43:55 +08:00 |
|
joylink_cuiweidong
|
4fec468885
|
剧本预览代码调整
|
2020-05-14 15:48:25 +08:00 |
|
joylink_cuiweidong
|
812a7534b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:19:59 +08:00 |
|
joylink_cuiweidong
|
bbeb6d44aa
|
剧本预览代码调整
|
2020-05-14 15:19:07 +08:00 |
|
zyy
|
7833afa1fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:05:32 +08:00 |
|
zyy
|
04aacc3818
|
调整物理区段创建逻辑区段逻辑
|
2020-05-14 15:05:19 +08:00 |
|
joylink_cuiweidong
|
0684d2a93c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 14:37:17 +08:00 |
|
joylink_cuiweidong
|
70f06409df
|
综合演练 语音聊天接口调整
剧本预览 代码调整
|
2020-05-14 14:36:15 +08:00 |
|
zyy
|
ba1365b951
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:00:27 +08:00 |
|
zyy
|
2de0a0fc5b
|
调整区段鼠标移入元素绘制
|
2020-05-14 11:00:09 +08:00 |
|
joylink_cuiweidong
|
36ca6dc3d1
|
综合演练 聊天代码调整
|
2020-05-13 19:31:14 +08:00 |
|
joylink_cuiweidong
|
4631590df0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:06:15 +08:00 |
|
joylink_cuiweidong
|
2b8757a074
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 18:05:48 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
0f34b4293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 15:31:27 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
joylink_cuiweidong
|
1cae47b8d7
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 13:14:58 +08:00 |
|
joylink_cuiweidong
|
3e2a6b511b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:22:44 +08:00 |
|
joylink_cuiweidong
|
6866b58b19
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 10:21:53 +08:00 |
|
zyy
|
0a09f6a79b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:07:34 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
fan
|
4d18c4ac2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:08:11 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
joylink_cuiweidong
|
6fe3fe6ecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:03:19 +08:00 |
|
joylink_cuiweidong
|
13a3ccf066
|
代码调整
|
2020-05-12 19:02:53 +08:00 |
|
sunzhenyu
|
364c0afcef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:34:18 +08:00 |
|
zyy
|
86ecb843eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:24:09 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
joylink_cuiweidong
|
376662d96e
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 17:49:00 +08:00 |
|
joylink_cuiweidong
|
808236a6fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:47:08 +08:00 |
|
joylink_cuiweidong
|
6fe5363706
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 16:46:41 +08:00 |
|
zyy
|
dd6030d346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:45:59 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
fan
|
d11f64b7bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 13:57:48 +08:00 |
|
fan
|
a707d142be
|
逻辑区段生成调整
|
2020-05-12 13:57:33 +08:00 |
|
joylink_cuiweidong
|
c997e5d244
|
代码调整
|
2020-05-12 13:39:52 +08:00 |
|
joylink_cuiweidong
|
27a54d5842
|
代码调整
|
2020-05-12 10:51:17 +08:00 |
|
joylink_cuiweidong
|
fb17b72e5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 10:14:20 +08:00 |
|
fan
|
795503d227
|
大屏调整
|
2020-05-11 18:15:49 +08:00 |
|
fan
|
9a0465879c
|
合并代码
|
2020-05-11 17:43:33 +08:00 |
|
fan
|
68fdc7f2ec
|
问题调整
|
2020-05-11 17:40:52 +08:00 |
|
zyy
|
18fbae9114
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 17:36:39 +08:00 |
|
zyy
|
68e63ee5ef
|
调整地图绘制报错
|
2020-05-11 17:36:21 +08:00 |
|
fan
|
a04f353473
|
大屏缩放按钮影藏
|
2020-05-11 17:01:56 +08:00 |
|
fan
|
e8e63f2976
|
逻辑区段始终点偏移
|
2020-05-11 16:54:53 +08:00 |
|
joylink_cuiweidong
|
841afe35a1
|
剧本代码调整
|
2020-05-11 16:27:58 +08:00 |
|
fan
|
9991c50bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 15:51:49 +08:00 |
|
fan
|
a90adb9575
|
联锁关系生成过渡和结果展示调整
|
2020-05-11 15:51:33 +08:00 |
|
fan
|
6d38dd5ba3
|
增加联锁关系生成过渡和结果展示
|
2020-05-11 15:47:56 +08:00 |
|
joylink_cuiweidong
|
e83551b18d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 15:44:25 +08:00 |
|
joylink_cuiweidong
|
078252b6ac
|
剧本代码调整
|
2020-05-11 15:43:36 +08:00 |
|
fan
|
ac1d5bfdff
|
配置turefalse改为中文
|
2020-05-11 14:52:54 +08:00 |
|
fan
|
b56cbb47d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 14:45:37 +08:00 |
|
fan
|
56ed2a4f8c
|
调整更新坐标&联锁配置项
|
2020-05-11 14:45:07 +08:00 |
|
joylink_cuiweidong
|
46f40bd381
|
剧本代码调整
|
2020-05-11 14:32:40 +08:00 |
|
fan
|
115f1da928
|
批量生成区段逻辑始终端偏移量
|
2020-05-11 13:25:09 +08:00 |
|
sunzhenyu
|
c8544909f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 10:14:04 +08:00 |
|
sunzhenyu
|
275e4bab27
|
修改三维设备页面道岔转辙机
|
2020-05-11 10:13:54 +08:00 |
|
joylink_zyy
|
c65edfc06d
|
调整区段绘图逻辑
|
2020-05-10 20:43:37 +08:00 |
|
fan
|
ecf816d32a
|
地图数据维护中提示调整
|
2020-05-09 20:27:41 +08:00 |
|
fan
|
f57bf47c7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:25:18 +08:00 |
|
fan
|
1601b655d1
|
地图数据维护中提示调整
|
2020-05-09 20:24:59 +08:00 |
|
joylink_cuiweidong
|
5b0d16c920
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:21:43 +08:00 |
|
joylink_cuiweidong
|
b5a3a195f7
|
代码调整
|
2020-05-09 20:21:20 +08:00 |
|
fan
|
c5f63c9e52
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:35:56 +08:00 |
|
fan
|
29881aab0b
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:24:12 +08:00 |
|
joylink_cuiweidong
|
81450fbc9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 18:24:37 +08:00 |
|
fan
|
f16936d9c3
|
信号机接近区段
|
2020-05-09 18:24:35 +08:00 |
|
joylink_cuiweidong
|
13ae9eba9c
|
代码调整
|
2020-05-09 18:24:21 +08:00 |
|