joylink_cuiweidong
|
3c76a3139c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 09:54:26 +08:00 |
|
joylink_cuiweidong
|
5b5d635f07
|
bug103 设置停站时间范围改为15-300S 修改
|
2021-01-20 09:54:01 +08:00 |
|
lVAL
|
55dd8adc7d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-20 09:49:27 +08:00 |
|
lVAL
|
68366b25b1
|
删除错误的 配置，打开生产source-map
|
2021-01-20 09:49:15 +08:00 |
|
|
|
6742f0810f
|
修改productionSourceMap配置
(cherry picked from commit 340fccb474)
|
2021-01-20 09:09:54 +08:00 |
|
fan
|
92929a02fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 19:03:53 +08:00 |
|
fan
|
0126066322
|
调整传输信号机选择
|
2021-01-19 19:03:42 +08:00 |
|
lVAL
|
332aa9b61a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 18:22:14 +08:00 |
|
lVAL
|
35a98a6e00
|
修改 nameAlone 报错的优化
|
2021-01-19 18:22:04 +08:00 |
|
joylink_cuiweidong
|
10ed69f5ec
|
代码调整
|
2021-01-19 17:44:18 +08:00 |
|
joylink_cuiweidong
|
745dbd6859
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 17:15:07 +08:00 |
|
joylink_cuiweidong
|
df6ede1e4b
|
南京二号线 站台操作调整
|
2021-01-19 17:14:47 +08:00 |
|
sunzhenyu
|
f798de0fcf
|
修改三维沙盘站台提示标位置，去除无用log
|
2021-01-19 16:39:42 +08:00 |
|
sunzhenyu
|
4b09761b01
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:27:17 +08:00 |
|
sunzhenyu
|
a2bb806b03
|
修改三维铁轨透明贴图渲染，修改佛山线场景漫游轨迹
|
2021-01-19 16:27:09 +08:00 |
|
fan
|
b4059db243
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 16:08:04 +08:00 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
joylink_cuiweidong
|
9828c65b26
|
代码调整
|
2021-01-19 14:07:57 +08:00 |
|
joylink_cuiweidong
|
be344cf815
|
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-19 14:00:32 +08:00 |
|
joylink_cuiweidong
|
d404ed01dc
|
代码调整
|
2021-01-19 13:57:35 +08:00 |
|
fan
|
606c4ae301
|
menuButton调整
|
2021-01-19 13:56:45 +08:00 |
|
fan
|
12be0c61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:26:05 +08:00 |
|
fan
|
daea6e1760
|
传输信号机选中状态
|
2021-01-19 13:25:53 +08:00 |
|
lVAL
|
5f80334433
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:04:06 +08:00 |
|
lVAL
|
696af622b7
|
调整南京2岔芯设置限速和设置封锁
|
2021-01-19 13:03:43 +08:00 |
|
fan
|
49405666df
|
传输信号机参数调整
|
2021-01-19 11:18:24 +08:00 |
|
fan
|
732c44fea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 11:10:04 +08:00 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
lVAL
|
7afd9025b5
|
增加南京2站台取消设置指令
|
2021-01-19 10:39:01 +08:00 |
|
lVAL
|
396d7ec14e
|
修改南京2号线菜单配置方式
|
2021-01-19 10:31:31 +08:00 |
|
lVAL
|
267a815956
|
修改南京2按钮配置
|
2021-01-19 09:54:45 +08:00 |
|
joylink_cuiweidong
|
05a8c85d6b
|
代码调整
|
2021-01-19 09:20:37 +08:00 |
|
joylink_cuiweidong
|
4cbc3de4ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 18:06:23 +08:00 |
|
joylink_cuiweidong
|
ba80512efa
|
南京二号线 站台添加 月台 按钮
|
2021-01-18 18:06:08 +08:00 |
|
sunzhenyu
|
19cede5338
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 17:59:14 +08:00 |
|
sunzhenyu
|
2463d09bcc
|
修改三维驾驶更新本地客户端驾驶员
|
2021-01-18 17:59:04 +08:00 |
|
fan
|
07ad4c85dd
|
被覆盖代码重新提交
|
2021-01-18 17:41:46 +08:00 |
|
lVAL
|
b156097cba
|
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-18 17:35:19 +08:00 |
|
lVAL
|
aed7f034b1
|
南京2车站操作设备并且状态刷新后，页面操作菜单disabled刷新问题
|
2021-01-18 17:32:20 +08:00 |
|
fan
|
f18c48ffa8
|
南京二号线初始获取车站调整&计轴占用状态调整
|
2021-01-18 17:24:00 +08:00 |
|
fan
|
057687a678
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:57:03 +08:00 |
|
lVAL
|
9617c36d01
|
修改控制模式 disabled 控制
|
2021-01-18 16:53:54 +08:00 |
|
fan
|
1ba5d404b5
|
南京二号线进路锁闭封锁状态调整
|
2021-01-18 16:51:45 +08:00 |
|
fan
|
58f1bc5950
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 16:22:38 +08:00 |
|
fan
|
cff6a78d3a
|
南京二号线行调点击空白关闭
|
2021-01-18 16:22:26 +08:00 |
|
lVAL
|
198602923c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:49:00 +08:00 |
|
lVAL
|
7d61451fa9
|
修改 应答器 创建的几个优化问题，以及南京线路中心左键弹窗，右键不弹
|
2021-01-18 15:48:05 +08:00 |
|
fan
|
14091957d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:41:43 +08:00 |
|
fan
|
5f3300e889
|
信号机添加所属车站&批量设置
|
2021-01-18 15:41:28 +08:00 |
|
joylink_cuiweidong
|
d322aad5d4
|
南京二号线 站台安全门 通信正常开启状态 调整
|
2021-01-18 15:16:00 +08:00 |
|
