zyy
|
be565e3711
|
调整道岔逻辑
|
2020-09-24 13:40:09 +08:00 |
|
fan
|
4eafbd72ea
|
iscs调整&宁波道岔取消故障失表取消动画
|
2020-09-18 18:30:14 +08:00 |
|
zyy
|
e66a5a5687
|
调整道岔绘制逻辑
|
2020-09-18 11:08:17 +08:00 |
|
zyy
|
c2e3df8dbc
|
调整ibp按钮点击
|
2020-09-17 17:45:04 +08:00 |
|
zyy
|
e98b53d8ad
|
调整ibp鼠标逻辑
|
2020-09-17 16:33:22 +08:00 |
|
zyy
|
6eafb7883c
|
调整道岔绘制流程，ibp鼠标事件
|
2020-09-17 13:31:13 +08:00 |
|
zyy
|
3ce1418f89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-16 10:10:27 +08:00 |
|
zyy
|
4264996520
|
调整ibp数据，调整道岔生成逻辑
|
2020-09-16 10:10:13 +08:00 |
|
joylink_cuiweidong
|
0f5099221f
|
站台绘图代码调整
|
2020-09-15 18:28:32 +08:00 |
|
joylink_cuiweidong
|
10cae34098
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:48:24 +08:00 |
|
joylink_cuiweidong
|
ca45d2ab98
|
代码调整
|
2020-09-15 17:48:08 +08:00 |
|
zyy
|
fdaf3eaa1e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:41:10 +08:00 |
|
zyy
|
4b2939ff0a
|
调整区段配置
|
2020-09-15 17:40:57 +08:00 |
|
joylink_cuiweidong
|
619474b651
|
屏蔽门 绘图状态代码调整
|
2020-09-15 17:13:36 +08:00 |
|
joylink_cuiweidong
|
0b4fa8f3e0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-15 17:09:07 +08:00 |
|
joylink_cuiweidong
|
ce2d07ea20
|
站台 屏蔽门 绘图代码调整
|
2020-09-15 17:08:28 +08:00 |
|
fan
|
b7a02f45c1
|
宁波三菜单
|
2020-09-14 18:34:56 +08:00 |
|
fan
|
40b12de294
|
会话调整
|
2020-09-11 17:57:48 +08:00 |
|
joylink_cuiweidong
|
feff7d50cc
|
屏蔽门 状态代码调整
|
2020-09-11 17:07:45 +08:00 |
|
fan
|
34fe136bcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 15:52:26 +08:00 |
|
fan
|
2875444ed7
|
会话调整
|
2020-09-11 15:52:15 +08:00 |
|
joylink_cuiweidong
|
b35bb2e6fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-11 14:14:08 +08:00 |
|
joylink_cuiweidong
|
2c74a91e2d
|
屏蔽门 绘图代码调整
|
2020-09-11 14:13:29 +08:00 |
|
zyy
|
50c9a4eabb
|
调整道岔生成 道岔区段问题
|
2020-09-11 10:18:07 +08:00 |
|
fan
|
03d4a28ab6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 17:42:10 +08:00 |
|
fan
|
281bbc32f8
|
宁波三菜单调整&表单记录页数
|
2020-09-09 17:41:51 +08:00 |
|
fan
|
06ecb8dd1a
|
宁波三菜单调整
|
2020-09-09 14:45:38 +08:00 |
|
zyy
|
273d3073de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 14:36:01 +08:00 |
|
zyy
|
d6fba202b4
|
字段调整
|
2020-09-09 14:35:48 +08:00 |
|
joylink_cuiweidong
|
5aa9d94071
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Switch/index.js
|
2020-09-09 14:02:15 +08:00 |
|
joylink_cuiweidong
|
ccf2228eeb
|
站台 绘图代码调整
|
2020-09-09 13:55:42 +08:00 |
|
zyy
|
d01f367e73
|
调整右键操作显示
|
2020-09-09 13:25:34 +08:00 |
|
zyy
|
83b1d16773
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-09 09:40:01 +08:00 |
|
zyy
|
fa70285ef9
|
调整西安二号线列车右键操作栏
|
2020-09-09 09:39:23 +08:00 |
|
fan
|
5ceaaed517
|
调整加载动画
|
2020-09-08 16:57:48 +08:00 |
|
fan
|
3a25327100
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 16:41:47 +08:00 |
|
fan
|
9d42aac8fa
|
调整宁波三菜单&调整加载动画
|
2020-09-08 16:41:38 +08:00 |
|
zyy
|
f9e8e10458
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 15:39:33 +08:00 |
|
zyy
|
7d826a4d59
|
调整鼠标事件
|
2020-09-08 15:39:23 +08:00 |
|
fan
|
c432c2f614
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 15:29:54 +08:00 |
|
fan
|
cbb00efdcb
|
一键生成课程、试卷响应调整
|
2020-09-08 15:29:45 +08:00 |
|
zyy
|
5ff71d3820
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 14:26:59 +08:00 |
|
zyy
|
f548a7495a
|
调整车站点击
|
2020-09-08 14:26:49 +08:00 |
|
fan
|
dfb3fcac38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 14:14:38 +08:00 |
|
fan
|
ebcc73cb2d
|
宁波三号线菜单调整&增加一键生成课程、试卷
|
2020-09-08 14:14:20 +08:00 |
|
zyy
|
2d461041ca
|
调整状态
|
2020-09-08 13:15:09 +08:00 |
|
zyy
|
49d791428d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 11:19:19 +08:00 |
|
zyy
|
b8cfb1900e
|
调整道岔绘图状态
|
2020-09-08 11:19:06 +08:00 |
|
fan
|
4bfe76c9cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-08 09:49:57 +08:00 |
|
fan
|
fadcb630ab
|
宁波三号线菜单调整&宁波分割符调整&教学系统班级显示调整
|
2020-09-08 09:49:49 +08:00 |
|
zyy
|
d19ac59839
|
调整哈尔滨道岔状态显示
|
2020-09-07 17:47:04 +08:00 |
|
zyy
|
c3c5850bbf
|
调整仿真时间同步
|
2020-09-07 17:07:09 +08:00 |
|
zyy
|
eafc37ce7c
|
调整流程
|
2020-09-07 16:40:50 +08:00 |
|
zyy
|
7f07fe898b
|
调整发送指令参数
|
2020-09-07 14:17:41 +08:00 |
|
zyy
|
7f434b2828
|
调整西安二号线列车右键显示
|
2020-09-07 14:04:44 +08:00 |
|
zyy
|
518bf2eeac
|
调整西安二号线右键操作
|
2020-09-07 13:17:11 +08:00 |
|
zyy
|
18c74bb3ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-07 11:28:25 +08:00 |
|
zyy
|
bb3b202eb1
|
调整西安二号线列车操作
|
2020-09-07 11:28:12 +08:00 |
|
fan
|
4f1a2f03cb
|
哈尔滨盈达科技项目页添加
|
2020-09-07 11:08:26 +08:00 |
|
joylink_cuiweidong
|
3b8c4852c3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 18:22:59 +08:00 |
|
joylink_cuiweidong
|
0d6ed19f4a
|
道岔绘图代码调整
|
2020-09-04 18:22:41 +08:00 |
|
fan
|
5af9956f5b
|
佛山修改列车识别好调整
|
2020-09-04 17:57:37 +08:00 |
|
fan
|
dc085df977
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 17:21:46 +08:00 |
|
fan
|
f33fb7ee91
|
绘图数据处理调整&佛山修改列车识别好调整
|
2020-09-04 17:21:34 +08:00 |
|
zyy
|
7db89b8351
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-04 10:44:28 +08:00 |
|
zyy
|
2b548186c3
|
调整道岔绘制流程
|
2020-09-04 10:44:17 +08:00 |
|
joylink_cuiweidong
|
d328a11569
|
西安三号线 福州一号线新版 地图配置文件调整
|
2020-09-04 10:38:36 +08:00 |
|
joylink_cuiweidong
|
b6c39918e0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 18:17:40 +08:00 |
|
joylink_cuiweidong
|
679d714b29
|
道岔绘图代码调整
|
2020-09-03 18:17:15 +08:00 |
|
fan
|
890fc5f851
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-03 14:44:28 +08:00 |
|
fan
|
5f0b8a05ac
|
运行图流程调整
|
2020-09-03 14:44:16 +08:00 |
|
zyy
|
ab538b9bb2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuBar.vue
|
2020-09-03 14:22:44 +08:00 |
|
zyy
|
31eb1f8446
|
调整目的码接口
|
2020-09-03 14:17:52 +08:00 |
|
joylink_cuiweidong
|
9a2e007d3f
|
福州一号线新版 扣车样式调整 站台操作调整
|
2020-09-03 11:14:51 +08:00 |
|
joylink_cuiweidong
|
7044642105
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 18:41:09 +08:00 |
|
joylink_cuiweidong
|
2ed40ee117
|
宁波一号线实训操作代码调整
|
2020-09-02 18:40:51 +08:00 |
|
fan
|
d40491fb41
|
merge
|
2020-09-02 18:06:48 +08:00 |
|
fan
|
3445f98618
|
宁波三号线菜单调整
|
2020-09-02 18:02:50 +08:00 |
|
joylink_cuiweidong
|
1427b42d25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 18:00:08 +08:00 |
|
joylink_cuiweidong
|
6680ea03cf
|
道岔绘图调整（除了哈尔滨线路外，其余线路反位不显示岔芯 直角梯形D）
|
2020-09-02 17:59:50 +08:00 |
|
zyy
|
69388e4f91
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 17:11:23 +08:00 |
|
zyy
|
efcd46cf37
|
增加宁波三区段样式，增加目的码表单
|
2020-09-02 17:11:06 +08:00 |
|
joylink_cuiweidong
|
647897b2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 14:33:58 +08:00 |
|
joylink_cuiweidong
|
2010edad72
|
宁波一号线站台设置停站时间操作代码调整
|
2020-09-02 14:33:41 +08:00 |
|
fan
|
910517e076
|
剧本调整
|
2020-09-02 10:59:04 +08:00 |
|
fan
|
5f04b0e25b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 10:18:28 +08:00 |
|
fan
|
dda0a719ba
|
宁波三菜单调整
|
2020-09-02 10:17:58 +08:00 |
|
joylink_cuiweidong
|
61d9f294d8
|
哈尔滨线路代码调整
|
2020-09-02 10:15:50 +08:00 |
|
fan
|
0d026649f3
|
删除日志
|
2020-09-02 09:23:27 +08:00 |
|
fan
|
86c1dff4be
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-02 09:17:50 +08:00 |
|
fan
|
ecbb6a964f
|
接收重置仿真信息时清除活动列车
|
2020-09-02 09:17:27 +08:00 |
|
zyy
|
c93cff772d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 18:09:38 +08:00 |
|
zyy
|
a3489f0942
|
调整区段显示及优化
|
2020-09-01 18:09:25 +08:00 |
|
fan
|
a5cbbcb3af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 17:11:24 +08:00 |
|
fan
|
fcd2c41517
|
成员司机排序&福州新版折返策略教学调整
|
2020-09-01 17:11:09 +08:00 |
|
joylink_cuiweidong
|
bcc92b6672
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-01 16:45:39 +08:00 |
|
joylink_cuiweidong
|
8a4d98612e
|
哈尔滨线路实训代码调整
|
2020-09-01 16:45:23 +08:00 |
|
zyy
|
57cb96eb48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/mapsystemNew/common/index.vue
|
2020-09-01 15:11:59 +08:00 |
|
zyy
|
5590e43bd5
|
调整代码
|
2020-09-01 15:10:35 +08:00 |
|
joylink_cuiweidong
|
c76205790a
|
宁波一号线实训操作代码调整
|
2020-08-31 15:58:55 +08:00 |
|
joylink_cuiweidong
|
3ff902ee14
|
区段鼠标事件调整
|
2020-08-31 13:41:33 +08:00 |
|
fan
|
246568175f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:28:32 +08:00 |
|
fan
|
c44a081afa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 13:27:38 +08:00 |
|
fan
|
8c07cf764a
|
代码调整
|
2020-08-31 13:27:27 +08:00 |
|
zyy
|
41fe728af4
|
调整运行图显示
|
2020-08-31 13:25:26 +08:00 |
|
joylink_cuiweidong
|
2637b952f3
|
代码调整
|
2020-08-31 10:31:36 +08:00 |
|
joylink_cuiweidong
|
b98039d5fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-31 10:13:39 +08:00 |
|
joylink_cuiweidong
|
8027bc90ae
|
宁波福州佛山默认不显示道岔区段的名称调整
|
2020-08-31 10:13:26 +08:00 |
|
zyy
|
778387a0e9
|
调整扣车流程, 状态
|
2020-08-31 10:11:02 +08:00 |
|
zyy
|
ae02d527c9
|
调整福州线路新版操作
|
2020-08-28 17:47:17 +08:00 |
|
zyy
|
5dcfee72d6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 17:22:26 +08:00 |
|
zyy
|
adb62a3209
|
增加列车右键操作，调整配置
|
2020-08-28 17:22:12 +08:00 |
|
fan
|
ba505a899e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 16:58:33 +08:00 |
|
fan
|
a28f7a3975
|
调度大赛调整
|
2020-08-28 16:58:17 +08:00 |
|
joylink_cuiweidong
|
d5dabca2c6
|
代码调整
区段（parentCode）字段处理
|
2020-08-28 16:52:19 +08:00 |
|
joylink_cuiweidong
|
b4c5a29026
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 14:43:47 +08:00 |
|
joylink_cuiweidong
|
3ffffffe8d
|
宁波一号线实训调整
剧本编制代码调整
|
2020-08-28 14:43:30 +08:00 |
|
zyy
|
a5180c306c
|
调整运行图
|
2020-08-28 14:29:59 +08:00 |
|
fan
|
4c8e447d59
|
运行图参数调整
|
2020-08-28 13:16:14 +08:00 |
|
zyy
|
d991a65517
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-28 11:31:10 +08:00 |
|
zyy
|
1f8641e3ea
|
调整运行图
|
2020-08-28 11:30:55 +08:00 |
|
fan
|
0adf841597
|
行调大赛调整
|
2020-08-28 10:59:44 +08:00 |
|
fan
|
3c016a5c4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 17:21:13 +08:00 |
|
fan
|
deded7ed6e
|
宁波三号线菜单调整
|
2020-08-27 16:48:03 +08:00 |
|
zyy
|
ad29ed8890
|
调整考试系统加载流程
|
2020-08-27 16:43:37 +08:00 |
|
zyy
|
06699507e4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 13:13:29 +08:00 |
|
zyy
|
8a3287ca22
|
删除多余代码注释
|
2020-08-27 13:13:15 +08:00 |
|
fan
|
9dc290a550
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 10:45:54 +08:00 |
|
fan
|
f2469920fe
|
菜单配置调整
|
2020-08-27 10:45:43 +08:00 |
|
fan
|
a01267abe1
|
区段切除报错调整
|
2020-08-27 10:45:06 +08:00 |
|
zyy
|
c2f549523a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-27 09:56:15 +08:00 |
|
zyy
|
699053f46f
|
调整西安运行图流程
|
2020-08-27 09:56:00 +08:00 |
|
fan
|
7a7ae9591a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 18:24:58 +08:00 |
|
fan
|
f3e6291582
|
区段切除报错调整
|
2020-08-26 18:24:14 +08:00 |
|
zyy
|
bbae7bfb1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-26 17:44:17 +08:00 |
|
zyy
|
fc14cc41a7
|
调整发布地图导出，调整大屏流程
|
2020-08-26 17:44:01 +08:00 |
|
fan
|
9fcb1cd9bb
|
代码调整
|
2020-08-25 18:50:42 +08:00 |
|
fan
|
932360dd88
|
merge
|
2020-08-25 17:10:08 +08:00 |
|
fan
|
f611f5057d
|
西安二菜单调整
|
2020-08-25 17:02:48 +08:00 |
|
joylink_cuiweidong
|
a9fd33c413
|
哈尔滨线路实训操作调整
|
2020-08-25 16:54:16 +08:00 |
|
joylink_cuiweidong
|
1668b25337
|
哈尔滨线路实训操作代码调整
|
2020-08-25 16:38:08 +08:00 |
|
joylink_cuiweidong
|
f2957c370c
|
哈尔滨线路实训操作代码调整
|
2020-08-25 15:09:04 +08:00 |
|
joylink_cuiweidong
|
2dad56ac07
|
哈尔滨线路实训操作调整
|
2020-08-25 15:01:47 +08:00 |
|
joylink_cuiweidong
|
5549b7bc9f
|
哈尔滨线路实训操作代码调整
|
2020-08-25 14:49:19 +08:00 |
|
joylink_cuiweidong
|
92ba51a548
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 14:17:44 +08:00 |
|
joylink_cuiweidong
|
2320ae42a9
|
剧本预览代码调整
|
2020-08-25 14:17:04 +08:00 |
|
zyy
|
69f7b9deca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 13:51:42 +08:00 |
|
zyy
|
13160dfc91
|
增加西安二号线列车右键菜单
|
2020-08-25 13:51:27 +08:00 |
|
joylink_cuiweidong
|
9fc8948bba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 13:15:47 +08:00 |
|
joylink_cuiweidong
|
65a10b26af
|
哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
|
2020-08-25 13:15:32 +08:00 |
|
zyy
|
54720bc848
|
处理西安二号线列车冲突代码
|
2020-08-25 09:33:20 +08:00 |
|
zyy
|
1112ee8322
|
删除西安二号线列车多余菜单样式
|
2020-08-25 09:31:07 +08:00 |
|
fan
|
664e174fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-25 09:25:50 +08:00 |
|
fan
|
6a268fa095
|
宁波三菜单调整
|
2020-08-25 09:25:36 +08:00 |
|
joylink_cuiweidong
|
b1380e5e45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 19:18:31 +08:00 |
|
joylink_cuiweidong
|
8db06da732
|
哈尔滨线路操作代码调整
|
2020-08-24 19:18:12 +08:00 |
|
fan
|
009d911a75
|
merge
|
2020-08-24 18:27:09 +08:00 |
|
fan
|
44791d3d54
|
宁波三号线菜单调整
|
2020-08-24 18:25:07 +08:00 |
|
zyy
|
19b6f7fb6e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 18:17:30 +08:00 |
|
zyy
|
50c185671f
|
调整西安二号线列车操作
|
2020-08-24 18:17:17 +08:00 |
|
joylink_cuiweidong
|
15ba67c43a
|
西安二号线折返策略代码调整
|
2020-08-24 18:15:55 +08:00 |
|
joylink_cuiweidong
|
5410cb037c
|
西安二号线折返策略代码调整
|
2020-08-24 17:52:27 +08:00 |
|
zyy
|
23b024dff4
|
调整折返策略状态显示
|
2020-08-24 17:21:12 +08:00 |
|
zyy
|
18235dc096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 16:44:19 +08:00 |
|
zyy
|
b1d42694fd
|
调整西安二号线列车右键菜单操作
|
2020-08-24 16:44:04 +08:00 |
|
joylink_cuiweidong
|
ea1955cf34
|
哈尔滨线路 站台实训调整
|
2020-08-24 16:42:05 +08:00 |
|
joylink_cuiweidong
|
e4a13de455
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 16:11:50 +08:00 |
|
joylink_cuiweidong
|
e6193e3469
|
哈尔滨线路实训操作代码调整
|
2020-08-24 16:11:31 +08:00 |
|
zyy
|
59a3fbb082
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 16:00:15 +08:00 |
|
zyy
|
6afae4e1bc
|
调整西安二号线排列进路操作
|
2020-08-24 16:00:00 +08:00 |
|
fan
|
0e26ab9d6f
|
西安二列车操作调整
|
2020-08-24 15:01:47 +08:00 |
|
fan
|
b83673146e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-24 13:48:35 +08:00 |
|
fan
|
94f7fd7698
|
宁波三菜单调整
|
2020-08-24 13:48:19 +08:00 |
|
zyy
|
7942f339ac
|
调整折返模式 状态显示
|
2020-08-24 13:31:47 +08:00 |
|
zyy
|
b262288524
|
增加西安二号线折返策略配置，增加联锁配置
|
2020-08-24 11:30:57 +08:00 |
|
fan
|
5df9b4aa6f
|
宁波三号线进路样式调整
|
2020-08-21 14:14:26 +08:00 |
|
fan
|
f5cd2af55d
|
宁波三号线menubar菜单调整
|
2020-08-21 08:51:20 +08:00 |
|
fan
|
428d547a25
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 16:57:58 +08:00 |
|
fan
|
3f67544296
|
宁波三号线menubar样式调整
|
2020-08-20 16:57:46 +08:00 |
|
zyy
|
d026ce783f
|
调整车站配置
|
2020-08-20 16:43:35 +08:00 |
|
zyy
|
33e773a940
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 16:02:32 +08:00 |
|
zyy
|
41b9adcc28
|
调整宁波三号线列车配置
|
2020-08-20 16:02:21 +08:00 |
|
fan
|
af132ae2dd
|
宁波三号线菜单调整
|
2020-08-20 15:42:47 +08:00 |
|
fan
|
862262a6c4
|
merge
|
2020-08-20 13:19:14 +08:00 |
|
fan
|
a44132056c
|
地图绘制添加防淹门
|
2020-08-20 13:17:58 +08:00 |
|
zyy
|
e6fb5c0f17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-20 09:32:34 +08:00 |
|
zyy
|
8f6388e1c2
|
调整多余输出
|
2020-08-20 09:32:22 +08:00 |
|
fan
|
d729e84615
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 18:27:45 +08:00 |
|
fan
|
d1cff9ff94
|
宁波三号线站台样式调整
|
2020-08-19 18:27:36 +08:00 |
|
joylink_cuiweidong
|
9d0fe20a88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 17:21:35 +08:00 |
|
joylink_cuiweidong
|
b3b37fd19f
|
宁波三号线 信号机绘图代码调整
|
2020-08-19 17:21:19 +08:00 |
|
fan
|
3520e53679
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 17:14:37 +08:00 |
|
fan
|
509b92c71a
|
宁波三号线样式调整
|
2020-08-19 17:14:27 +08:00 |
|
zyy
|
87275e3021
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:45:16 +08:00 |
|
zyy
|
db065dc76a
|
调整宁波三号线 道岔样式
|
2020-08-19 16:45:05 +08:00 |
|
fan
|
1afb1f3a09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 16:39:19 +08:00 |
|
fan
|
94fbb77912
|
宁波三号线区段调整
|
2020-08-19 16:39:09 +08:00 |
|
zyy
|
2e6d45baab
|
调整宁波三号线配置
|
2020-08-19 15:50:33 +08:00 |
|
fan
|
101ddea2b1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-19 14:12:20 +08:00 |
|
fan
|
d92a86f146
|
代码调整
|
2020-08-19 14:11:58 +08:00 |
|
zyy
|
280b766d91
|
增加宁波三号线配置
|
2020-08-19 14:06:01 +08:00 |
|
zyy
|
70945cbbc1
|
调整区段配置
|
2020-08-19 13:43:13 +08:00 |
|
zyy
|
901af70400
|
调整线路右键操作
|
2020-08-18 16:41:19 +08:00 |
|
zyy
|
899facde01
|
调整发布地图导出名称，注释区段流程
|
2020-08-18 16:02:22 +08:00 |
|
zyy
|
a2dc987445
|
调整区段检测
|
2020-08-18 14:07:29 +08:00 |
|
zyy
|
98e78b3532
|
调整发布地图 导入 导出逻辑及请求配置
|
2020-08-17 17:35:00 +08:00 |
|
zyy
|
e383ab201d
|
调整哈尔滨线路延续保护计时，增加配置项
|
2020-08-17 16:48:19 +08:00 |
|
zyy
|
9f22395605
|
删除多余右键操作组件，调整发布状态
|
2020-08-17 14:46:48 +08:00 |
|
zyy
|
f98faaab8c
|
删除输出
|
2020-08-17 13:26:44 +08:00 |
|
zyy
|
1744ea1262
|
调整信号机高亮配置
|
2020-08-17 13:25:36 +08:00 |
|
zyy
|
179ad8fa1d
|
调整信号机字段调整
|
2020-08-14 16:02:01 +08:00 |
|
zyy
|
d1fdb7af5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 14:32:29 +08:00 |
|
zyy
|
3d4230e78d
|
调整佛山线路错误提示，增加联锁配置字段
|
2020-08-14 14:32:14 +08:00 |
|
joylink_cuiweidong
|
4964bdeaa2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-14 13:29:23 +08:00 |
|
joylink_cuiweidong
|
255c59629b
|
道岔故障模式下右键菜单代码调整
|
2020-08-14 13:28:44 +08:00 |
|
zyy
|
a1856ca710
|
调整延时保护计时位置
|
2020-08-14 13:17:29 +08:00 |
|
zyy
|
3132b982fb
|
调整延时保护计时逻辑
|
2020-08-14 10:49:11 +08:00 |
|
zyy
|
c948e517b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 19:27:13 +08:00 |
|
zyy
|
86d6cf7a14
|
调整区段延时解锁流程
|
2020-08-13 19:27:02 +08:00 |
|
joylink_cuiweidong
|
2615460674
|
剧本编制代码调整
|
2020-08-13 17:25:52 +08:00 |
|
joylink_cuiweidong
|
0ed57e5488
|
剧本编制代码调整
|
2020-08-13 16:45:27 +08:00 |
|
zyy
|
5ff93390cd
|
调整右键操作整合
|
2020-08-13 15:41:40 +08:00 |
|
zyy
|
2e2feac47d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 11:03:43 +08:00 |
|
zyy
|
6e61050067
|
整合右键操作
|
2020-08-13 11:03:28 +08:00 |
|
joylink_cuiweidong
|
9c5a8238de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-13 10:47:19 +08:00 |
|
joylink_cuiweidong
|
60b07ef132
|
剧本编制控制权转移代码还原
|
2020-08-13 10:46:26 +08:00 |
|
zyy
|
54bef31576
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 18:26:40 +08:00 |
|
zyy
|
36a0b1dd93
|
调整代码
|
2020-08-12 18:26:27 +08:00 |
|
joylink_cuiweidong
|
c3c65fba5c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 17:34:55 +08:00 |
|
joylink_cuiweidong
|
8fd00b3493
|
剧本录制控制权转移代码调整
|
2020-08-12 17:34:37 +08:00 |
|
fan
|
0348d143b5
|
合并代码
|
2020-08-12 11:04:04 +08:00 |
|
fan
|
30e30d5ef3
|
佛山线路问题调整&iscs样式调整
|
2020-08-12 11:02:47 +08:00 |
|
joylink_cuiweidong
|
55911240b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-12 10:03:14 +08:00 |
|
joylink_cuiweidong
|
1f0aaffe6f
|
佛山有轨电车信号机优化（全线信号机设置成图样类型）
|
2020-08-12 10:02:56 +08:00 |
|
zyy
|
0e36937718
|
添加区段操作
|
2020-08-12 10:02:19 +08:00 |
|
zyy
|
2d5f4520d4
|
增加佛山线路 强制取消扣车
|
2020-08-12 09:50:10 +08:00 |
|
zyy
|
20706dd67f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 18:37:43 +08:00 |
|
zyy
|
a2f9e18847
|
调整地图导出流程
|
2020-08-10 18:37:34 +08:00 |
|
joylink_cuiweidong
|
95a4bf40e9
|
宁波一号线 佛山有轨电车 控制权转移代码调整
|
2020-08-10 18:23:14 +08:00 |
|
zyy
|
a4beb31ee6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-10 13:02:11 +08:00 |
|
zyy
|
fda63a7ca6
|
调整多余注释
|
2020-08-10 13:01:59 +08:00 |
|
joylink_cuiweidong
|
fd6360611b
|
福州一号线，西安三号线控制权转移代码调整
|
2020-08-07 18:20:45 +08:00 |
|
joylink_cuiweidong
|
c4c1f79258
|
控制权转移代码调整
|
2020-08-07 17:33:12 +08:00 |
|
joylink_cuiweidong
|
1895dc42b0
|
西安三号线控制权转移代码调整
|
2020-08-07 17:13:12 +08:00 |
|
joylink_cuiweidong
|
fda52feb52
|
代码调整
|
2020-08-07 14:12:32 +08:00 |
|
joylink_cuiweidong
|
cc6bbe8073
|
北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整
|
2020-08-07 14:00:32 +08:00 |
|
joylink_cuiweidong
|
e2a7f160cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/Station/index.js
|
2020-08-07 13:23:08 +08:00 |
|
joylink_cuiweidong
|
e08dcd9c8d
|
宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
|
2020-08-07 13:17:09 +08:00 |
|
fan
|
be5f817f03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:28:59 +08:00 |
|
fan
|
ea5cb27128
|
运行图预览调整
|
2020-08-07 11:28:50 +08:00 |
|
zyy
|
1f2f7bcf89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-07 11:10:04 +08:00 |
|
zyy
|
4a1d3d3863
|
增加车站批量设置，调整车站绘图逻辑
|
2020-08-07 11:09:49 +08:00 |
|
fan
|
8e73c01b3f
|
成都一列车样式调整
|
2020-08-07 10:15:39 +08:00 |
|
joylink_cuiweidong
|
849770ab0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 19:34:46 +08:00 |
|
joylink_cuiweidong
|
abb0143988
|
控制权转移代码调整
|
2020-08-06 19:34:13 +08:00 |
|
zyy
|
0e9b731e93
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:08:07 +08:00 |
|
zyy
|
cde3b39753
|
调整地图绘制流程，调整信号机
|
2020-08-06 15:07:50 +08:00 |
|
fan
|
492c79ffb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 15:02:46 +08:00 |
|
fan
|
e3e62f85f9
|
佛山目的地码显示长度调整&联锁配置添加参数generateFls
|
2020-08-06 15:02:22 +08:00 |
|
joylink_cuiweidong
|
c7f6639801
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-06 13:22:19 +08:00 |
|
joylink_cuiweidong
|
026a8d9a7f
|
仿真左上角菜单样式调整
|
2020-08-06 13:21:55 +08:00 |
|
zyy
|
aa63af422b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/newMapdraft/mapoperate/signal/index.vue
|
2020-08-06 11:18:48 +08:00 |
|
zyy
|
7ddbe10832
|
增加信号机批量操作
|
2020-08-06 11:15:46 +08:00 |
|
fan
|
d7fefc6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 15:12:51 +08:00 |
|
fan
|
aea8dc7eca
|
清理多余状态
|
2020-08-05 15:12:40 +08:00 |
|
zyy
|
33b9618b77
|
调整地图绘制类型显示
|
2020-08-05 14:28:55 +08:00 |
|
zyy
|
1db980b000
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:14:48 +08:00 |
|
zyy
|
e852eb95db
|
调整流程
|
2020-08-05 13:14:30 +08:00 |
|
joylink_cuiweidong
|
4a8d6fabe3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-05 13:04:12 +08:00 |
|
joylink_cuiweidong
|
96f6d5030b
|
哈尔滨一号线 自动触发进路 绘图代码调整
|
2020-08-05 13:03:53 +08:00 |
|
zyy
|
8bdf189e9c
|
调整哈尔滨操作
|
2020-08-05 10:27:55 +08:00 |
|
zyy
|
6dbac54d1f
|
调整地图绘制相关流程
|
2020-08-04 17:31:07 +08:00 |
|
zyy
|
bd8054bef8
|
删除注释
|
2020-08-03 19:01:16 +08:00 |
|
zyy
|
86197114a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-08-03 19:00:04 +08:00 |
|
zyy
|
9aee216961
|
调整哈尔滨操作判断
|
2020-08-03 18:59:48 +08:00 |
|
joylink_cuiweidong
|
dbc017763a
|
宁波线控制权转移代码调整
|
2020-08-03 18:52:39 +08:00 |
|
zyy
|
0f03eee53f
|
调整宁波道岔状态
|
2020-08-03 15:56:56 +08:00 |
|
zyy
|
60986fbfeb
|
大屏修改
|
2020-08-03 15:22:46 +08:00 |
|
zyy
|
31be09323b
|
调整综合演练顶部菜单判断，增加哈尔滨项目 行调设备登陆显示指令模式
|
2020-08-03 14:12:56 +08:00 |
|
joylink_cuiweidong
|
88b03d240b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 17:30:43 +08:00 |
|
joylink_cuiweidong
|
5bb59c855e
|
佛山控制权转移代码调整
|
2020-07-31 17:30:26 +08:00 |
|
zyy
|
e2c32f2e68
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:22:43 +08:00 |
|
zyy
|
70114a0014
|
调整宁波线路操作
|
2020-07-31 16:22:29 +08:00 |
|
joylink_cuiweidong
|
48cd28bd88
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-31 16:03:48 +08:00 |
|
joylink_cuiweidong
|
ff912ff0f5
|
宁波一号线 运行图预览加点选
|
2020-07-31 16:03:32 +08:00 |
|
fan
|
06ed0a6f76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new
|
2020-07-31 15:53:36 +08:00 |
|
fan
|
deb60acd14
|
绘图调整兼容数据&综合仿真观众咱不关闭三维驾驶&设备配置规整
|
2020-07-31 15:53:25 +08:00 |
|
zyy
|
a011ab03f8
|
增加宁波指令
|
2020-07-31 15:27:37 +08:00 |
|
joylink_cuiweidong
|
329b3efef3
|
宁波一号线 站遥控 控制权转移代码调整
|
2020-07-30 18:59:48 +08:00 |
|
joylink_cuiweidong
|
c2c3fc0b22
|
运行图加载根据车次号 运行图颜色代码调整
|
2020-07-30 16:44:41 +08:00 |
|
zyy
|
33969bd5e8
|
调整哈尔滨站台操作
|
2020-07-30 10:03:00 +08:00 |
|
zyy
|
ef1fd94643
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:41:32 +08:00 |
|
zyy
|
841946ce29
|
调整按钮样式
|
2020-07-29 17:41:19 +08:00 |
|
joylink_cuiweidong
|
652968bf1b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 17:19:30 +08:00 |
|
joylink_cuiweidong
|
7e920993f4
|
宁波一号线控制权转换代码调整
|
2020-07-29 17:19:14 +08:00 |
|
zyy
|
0110502711
|
删除多余注释
|
2020-07-29 16:59:57 +08:00 |
|
joylink_cuiweidong
|
b9f8e1d3ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 16:02:32 +08:00 |
|
joylink_cuiweidong
|
2ba34b5d0b
|
宁波一号线控制权转换代码调整
|
2020-07-29 16:02:14 +08:00 |
|
fan
|
7403c53baa
|
merge
|
2020-07-29 14:16:32 +08:00 |
|
fan
|
fff5acab5d
|
创建考试调整&路由replace调整
|
2020-07-29 14:14:34 +08:00 |
|
joylink_cuiweidong
|
40a7170f69
|
西安三号线宁波一号线 控制权菜单显示代码调整
|
2020-07-29 14:10:44 +08:00 |
|
joylink_cuiweidong
|
7ad5e06a07
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_01/menus/passiveDialog/control.vue
|
2020-07-29 13:59:48 +08:00 |
|
joylink_cuiweidong
|
c3e6cf2b56
|
代码调整
|
2020-07-29 13:56:50 +08:00 |
|
fan
|
a18c84f684
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-29 11:14:57 +08:00 |
|
fan
|
24e3a606fa
|
调整会话按钮名称&宁波一剩余菜单回车快捷键
|
2020-07-29 11:14:45 +08:00 |
|
joylink_cuiweidong
|
a13b21613f
|
宁波一号线 键盘操作调整（回车事件）
|
2020-07-29 10:39:58 +08:00 |
|
joylink_cuiweidong
|
ed4b5047bd
|
代码调整
|
2020-07-28 18:47:05 +08:00 |
|
joylink_cuiweidong
|
c0e3df14bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 18:30:10 +08:00 |
|
fan
|
32a8daff56
|
merge
|
2020-07-28 18:30:44 +08:00 |
|
joylink_cuiweidong
|
9cc57c0a44
|
宁波一号线 键盘操作调整（回车事件）
|
2020-07-28 18:29:56 +08:00 |
|
fan
|
f13ba95407
|
宁波菜单回车快捷键（区段、信号机、车站）&设备登录综合演练不显示cctv视图设备视图三维视图&会话切换公共调整
|
2020-07-28 18:28:31 +08:00 |
|
zyy
|
6ca803d06d
|
调整车站颜色，功能栏宽度判断
|
2020-07-28 17:55:07 +08:00 |
|
zyy
|
ac43981c7d
|
调整哈尔滨车站操作
|
2020-07-28 16:59:32 +08:00 |
|
zyy
|
73f3cb0d0d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:41:36 +08:00 |
|
zyy
|
eec51e7cfd
|
调整哈尔滨车站操作
|
2020-07-28 16:41:21 +08:00 |
|
fan
|
10918d1f06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 16:29:06 +08:00 |
|
fan
|
0ad13f9fe8
|
宁波菜单弹框回车快捷键
|
2020-07-28 16:28:55 +08:00 |
|
zyy
|
2fd8c44f85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-28 14:44:52 +08:00 |
|
zyy
|
9f53e6e5f0
|
调整综合演练按钮显示逻辑，调整聊天窗口逻辑
|
2020-07-28 14:44:37 +08:00 |
|
fan
|
594087489a
|
调整角色切换bug&通号界面添加成员管理&仿真按钮offset位置修复
|
2020-07-28 14:11:17 +08:00 |
|
zyy
|
027f15102e
|
调整地图加载流程
|
2020-07-28 11:29:39 +08:00 |
|
zyy
|
59a75280a6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/lesson/lessoncategory/edit/chapter/list.vue
# src/views/lesson/trainingRule/list.vue
# src/views/newMap/displayNew/index.vue
|
2020-07-27 18:09:38 +08:00 |
|
zyy
|
42d9906550
|
调整地图加载多余配置，增加宁波右键列车新指令
|
2020-07-27 18:04:47 +08:00 |
|
fan
|
7661d36ca4
|
宁波行调添加单锁&获取操作类型map调整
|
2020-07-27 15:22:26 +08:00 |
|
fan
|
8e6d424453
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 14:12:02 +08:00 |
|
fan
|
a74993f217
|
添加地图配置项rmAtpSpeed，urmAtpSpeed&调整课程创建
|
2020-07-27 14:11:43 +08:00 |
|
zyy
|
a8d584ae89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-27 13:15:12 +08:00 |
|
zyy
|
2c39916217
|
调整运行图预览逻辑
|
2020-07-27 13:15:01 +08:00 |
|
fan
|
a5a55af5ef
|
加载仿真计划失表取消loading状态&暂撤销宁波一计轴故障修改
|
2020-07-27 10:00:08 +08:00 |
|
fan
|
95d754d57c
|
调整宁波线计轴故障为粉色光带
|
2020-07-27 09:12:08 +08:00 |
|
zyy
|
8b5122a88f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 17:17:52 +08:00 |
|
zyy
|
cc5d68de39
|
调整综合演练流程，增加列车操作
|
2020-07-24 17:17:40 +08:00 |
|
fan
|
8a660e75f0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:29:01 +08:00 |
|
fan
|
75164e9a5f
|
调整综合仿真现地行调切换显示
|
2020-07-24 15:28:45 +08:00 |
|
joylink_cuiweidong
|
f06a025792
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 15:24:45 +08:00 |
|
joylink_cuiweidong
|
d5215a3c1c
|
哈尔滨线路 停站时间状态绘图调整
|
2020-07-24 15:23:55 +08:00 |
|
fan
|
fd4acc0a82
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-24 14:21:22 +08:00 |
|
fan
|
d4da17ae09
|
调整哈尔滨成都一故障样式&哈尔滨现地切换显示
|
2020-07-24 14:20:38 +08:00 |
|
joylink_cuiweidong
|
196a611d70
|
仿真聊天代码调整
|
2020-07-24 10:35:05 +08:00 |
|
fan
|
14d787ea9c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:57:43 +08:00 |
|
fan
|
a9233a082e
|
代码调整
|
2020-07-23 17:57:35 +08:00 |
|
zyy
|
2434de38bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 17:09:43 +08:00 |
|
zyy
|
9ec64f1eeb
|
调整加载方式及判断
|
2020-07-23 17:09:29 +08:00 |
|
joylink_cuiweidong
|
81bfb35e67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:43:01 +08:00 |
|
joylink_cuiweidong
|
6210df54de
|
代码调整
|
2020-07-23 16:42:39 +08:00 |
|
fan
|
9d7c11dca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 16:07:44 +08:00 |
|
fan
|
e561f77c12
|
代码调整&socket重连前进行初始化
|
2020-07-23 16:07:27 +08:00 |
|
joylink_cuiweidong
|
72b137435c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-23 13:38:59 +08:00 |
|
joylink_cuiweidong
|
478a8f0ba4
|
宁波线的列车，RM模式的时候，前面的箭头设置为灰色
|
2020-07-23 13:38:31 +08:00 |
|
zyy
|
11c021feb8
|
调整屏蔽门绘图
|
2020-07-23 13:16:45 +08:00 |
|