Commit Graph

11841 Commits

Author SHA1 Message Date
fan
93930bb8c3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-19 10:09:07 +08:00
fan
19ff4db593 信号按钮调整 2022-07-19 10:08:40 +08:00
joylink_cuiweidong
efab2fb9f2 大铁项目 ctc 行车日志 代码调整 2022-07-18 17:49:13 +08:00
joylink_cuiweidong
deece104b1 大铁项目 ctc 运行图初始化信息 改完通过接口拉取 2022-07-18 17:18:55 +08:00
joylink_cuiweidong
4b1c1aae49 TYJL-III型 区段 添加 分路不良标记 2022-07-18 16:37:08 +08:00
joylink_cuiweidong
d67b390b46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 16:19:01 +08:00
joylink_cuiweidong
4583733127 大铁项目 切换角色 ctc 行车日志 数据切换 2022-07-18 16:17:53 +08:00
fan
fa3c110fbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 15:05:49 +08:00
fan
46ab43aef3 车务终端分散自律亮灯&占线板默认选中 2022-07-18 15:01:35 +08:00
joylink_cuiweidong
953b63bd1a 代码调整 2022-07-18 13:49:24 +08:00
joylink_cuiweidong
b3e3dd7898 代码调整 2022-07-18 13:22:48 +08:00
fan
2011f1838c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-18 13:08:01 +08:00
fan
e176823ec6 占线板&进路序列调整 2022-07-18 13:07:45 +08:00
Yuan
3c82c261fa Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly 2022-07-15 18:27:10 +08:00
Yuan
fbf6e5fa2c resolve conflict 2022-07-15 18:10:37 +08:00
Yuan
e947e50a0d 增加几个按钮类型 2022-07-15 18:08:39 +08:00
Yuan
0943fc515d bugfix 2022-07-15 17:19:35 +08:00
fan
bfc336fb4c 长兴技校三方登录配置 2022-07-15 17:12:49 +08:00
fan
470c223a59 环境参数判断调整 2022-07-15 16:57:17 +08:00
fan
2125809e41 长兴技校不展示设计平台&环境参数判断调整 2022-07-15 16:47:45 +08:00
fan
65cb35036d local-test打包调整 2022-07-15 16:23:38 +08:00
fan
c188d28caf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 16:16:07 +08:00
fan
f43a29fd11 长兴技术学校登录页 2022-07-15 16:15:58 +08:00
fan
636803400a 画面调整 2022-07-15 15:55:03 +08:00
joylink_cuiweidong
bb193a7e5d 代码调整 2022-07-15 14:44:44 +08:00
joylink_cuiweidong
898cadb72d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 11:34:32 +08:00
joylink_cuiweidong
9fe5f79092 代码调整 2022-07-15 11:32:43 +08:00
Yuan
d8e3ad4fcb Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2022-07-15 10:41:16 +08:00
Yuan
e6730ec264 stage 2022-07-15 10:40:37 +08:00
fan
e2480e28dc 打包调整 2022-07-15 10:39:57 +08:00
Yuan
505c0ae95d resolve conflict 2022-07-15 10:21:21 +08:00
Yuan
acb63a1a8a stage 2022-07-15 10:19:15 +08:00
fan
a86509d7d3 打包调整 2022-07-15 10:01:48 +08:00
Yuan
827faf8987 打包指令修改 2022-07-15 09:58:49 +08:00
fan
744385424e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 09:57:14 +08:00
fan
1d6997db39 画面调整暂提 2022-07-15 09:57:03 +08:00
fan
39369648bb 站间透明问题调整 2022-07-15 09:56:11 +08:00
dong
07ce9db767 教学通用项目隐藏设计平台入口 2022-07-15 09:33:59 +08:00
fan
97535872da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-15 09:17:12 +08:00
fan
b5a67f7fbe 车务终端非常站控模式下 不能操作 2022-07-14 18:13:46 +08:00
joylink_cuiweidong
b1a546828d 代码调整 2022-07-14 13:52:20 +08:00
joylink_cuiweidong
cf10f19b96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-14 13:20:29 +08:00
joylink_cuiweidong
68110a77c1 代码调整 2022-07-14 13:20:05 +08:00
fan
dd935f0aec 添加地图功能配置项 2022-07-14 11:08:02 +08:00
fan
cc285801f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-14 09:46:50 +08:00
fan
6dc29405da 仿真缩放比例 增加0.3、0.5、0.7 2022-07-14 09:46:26 +08:00
dong
e348123ecb 文件管理只有管理员能看见 2022-07-13 18:00:52 +08:00
fan
11d75a76a6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 17:31:23 +08:00
fan
6d34c5fde6 站间透明问题修复2 2022-07-13 17:31:10 +08:00
joylink_cuiweidong
e21ea808e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2022-07-13 16:43:49 +08:00