fan
|
93eaaacd96
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:34:35 +08:00 |
|
fan
|
0caf3d233a
|
排列进路
|
2021-01-15 13:34:25 +08:00 |
|
joylink_cuiweidong
|
0f4f6ef5f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 13:27:09 +08:00 |
|
joylink_cuiweidong
|
53b51a7b63
|
道岔 生成逻辑代码调整
|
2021-01-15 13:26:42 +08:00 |
|
lVAL
|
25e89c9b1c
|
配置强解 道岔和区段，（道岔等待后端确定指令）
|
2021-01-15 12:25:25 +08:00 |
|
lVAL
|
2024cef7c9
|
修改南京仿真bar遮挡运行图的问题
|
2021-01-15 12:18:27 +08:00 |
|
fan
|
12925e92bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:21:22 +08:00 |
|
fan
|
29c8e5b4b9
|
暂提
|
2021-01-15 11:21:11 +08:00 |
|
lVAL
|
80f8ecf19f
|
修改南京2号线 tempData 报错问题
|
2021-01-15 11:16:17 +08:00 |
|
lVAL
|
356042f673
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 11:00:05 +08:00 |
|
lVAL
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
joylink_cuiweidong
|
04e4df6225
|
代码调整
|
2021-01-15 10:38:35 +08:00 |
|
joylink_cuiweidong
|
4e28468ad9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 10:33:15 +08:00 |
|
joylink_cuiweidong
|
a86c76422f
|
岔心绘图代码调整
区段绘图（左右关联区段 关系）调整
|
2021-01-15 10:32:57 +08:00 |
|
lVAL
|
48955258ea
|
修改应答器 绘制card css
|
2021-01-15 09:54:56 +08:00 |
|
lVAL
|
4c89a777ba
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:53:46 +08:00 |
|
lVAL
|
c6c59f48b7
|
修改代码
|
2021-01-15 09:53:37 +08:00 |
|
fan
|
0671c6e733
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:42:36 +08:00 |
|
fan
|
15928a6248
|
道岔封锁状态调整
|
2021-01-15 09:42:19 +08:00 |
|
lVAL
|
1c06c408ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:39:35 +08:00 |
|
lVAL
|
cb364658fc
|
修改替换错误
|
2021-01-15 09:39:27 +08:00 |
|
sunzhenyu
|
5bbe37c30b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-15 09:35:57 +08:00 |
|
sunzhenyu
|
b6ab1b3c6a
|
测试版本三维沙盘增加镜头控制模型大小，信号机朝向，修改单线路
|
2021-01-15 09:35:49 +08:00 |
|
lVAL
|
41f1253746
|
修改 南京2号线 中心操作弹窗为非模式对话框
|
2021-01-15 09:34:16 +08:00 |
|
lVAL
|
284899599c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/nanjing_02/menus/menuButton.vue
|
2021-01-14 18:38:29 +08:00 |
|
lVAL
|
b5c2202114
|
增加 南京线增加参数选择的步骤功能
|
2021-01-14 18:37:31 +08:00 |
|
joylink_cuiweidong
|
c8d0bf50f5
|
代码调整
|
2021-01-14 17:11:10 +08:00 |
|
joylink_cuiweidong
|
06edd5f531
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 17:00:04 +08:00 |
|
joylink_cuiweidong
|
3dd6696140
|
代码调整
|
2021-01-14 16:59:41 +08:00 |
|
fan
|
359e24dfbd
|
merge
|
2021-01-14 16:35:45 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +08:00 |
|
joylink_cuiweidong
|
c4f6cde2c4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 16:04:03 +08:00 |
|
joylink_cuiweidong
|
28babc78f9
|
岔心 绘图调整
|
2021-01-14 16:03:48 +08:00 |
|
lVAL
|
2fc70489eb
|
修改南京2号线菜单皮肤
|
2021-01-14 15:44:56 +08:00 |
|
lVAL
|
51096d5ea1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 15:32:33 +08:00 |
|
lVAL
|
eb7fa1f5cb
|
修改实现南京2行调和现地界面操作
|
2021-01-14 15:32:17 +08:00 |
|
joylink_cuiweidong
|
8118b1ffad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:59:12 +08:00 |
|
joylink_cuiweidong
|
cadda00719
|
区段 物理区段 实际长度修改 bug调整
|
2021-01-14 14:58:42 +08:00 |
|
fan
|
ec87dc8eaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:43:03 +08:00 |
|
fan
|
9c7c0f674e
|
南京二号线状态调整
|
2021-01-14 14:42:53 +08:00 |
|
lVAL
|
44adeaf24a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-14 14:15:18 +08:00 |
|
lVAL
|
22403b198d
|
修改南京2号线菜单，以及样式
|
2021-01-14 14:15:02 +08:00 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +08:00 |
|
joylink_cuiweidong
|
3be5df98e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:33:21 +08:00 |
|
joylink_cuiweidong
|
becb6a03df
|
岔心代码调整
|
2021-01-13 18:33:07 +08:00 |
|
lVAL
|
1dfa8f5b19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 18:08:02 +08:00 |
|
lVAL
|
37bc98d706
|
修改应答器 计算方式
|
2021-01-13 18:07:49 +08:00 |
|
joylink_cuiweidong
|
c42a184b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:54:11 +08:00 |
|
joylink_cuiweidong
|
7ac59f6006
|
岔心 绘图代码调整
|
2021-01-13 17:53:51 +08:00 |
|
lVAL
|
9f4155b70d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-13 17:45:49 +08:00 |
|