Commit Graph

3275 Commits

Author SHA1 Message Date
fan
c09021067a 设备管理-配置编辑 除了输出地址、输入地址外,其他的变为输入框,限制输入最大字符数为4,且每位必须是16进制数 2020-01-07 09:36:19 +08:00
sunzhenyu
b66b80b2b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-07 09:28:10 +08:00
fan
b24b27f477 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 09:28:13 +08:00
fan
9944bdef33 设备管理-配置编辑 除了输出地址、输入地址外,其他的变为输入框,限制输入最大字符数为4,且每位必须是16进制数 2020-01-07 09:27:49 +08:00
sunzhenyu
f1f21006fe 修改继电器通信,修改新数据三维化部分操作 2020-01-07 09:27:41 +08:00
zyy
ea528dacef Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 09:23:11 +08:00
zyy
0330e08f89 调整车站状态显示,调整右键菜单显示,设置默认状态 2020-01-07 09:23:04 +08:00
fan
2d78605468 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 09:20:10 +08:00
fan
cf34d61746 设备管理-配置编辑 除了输出地址、输入地址外,其他的变为输入框,限制输入最大字符数为4,且每位必须是16进制数 2020-01-07 09:18:06 +08:00
fan
f2b62f281e 指令调整,公共地图宽度调整 2020-01-06 18:39:44 +08:00
fan
4d912022d5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-06 14:46:22 +08:00
fan
287eab2431 代码调整 2020-01-06 14:46:03 +08:00
fan
2554ed1135 代码调整 2020-01-06 14:43:08 +08:00
zyy
cabf30ed49 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-06 14:42:37 +08:00
zyy
3d8fcd305a 调整宁波一号线右键菜单流程 2020-01-06 14:42:28 +08:00
fan
68a7171495 国际化调整 2020-01-06 11:25:07 +08:00
sunzhenyu
505e9a0da4 修改区段数值匹配 2020-01-03 19:01:34 +08:00
fan
79aaba36da 连接真实设备添加连接状态 2020-01-03 18:42:08 +08:00
fan
100b852a9c 修复:顶掉用户,再次登录未获取新用户信息 2020-01-03 18:17:40 +08:00
fan
cd04327fa9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 17:01:12 +08:00
fan
673df154b4 国际化和连接真实设备调整 2020-01-03 17:00:33 +08:00
sunzhenyu
9cd76ee143 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-03 16:56:44 +08:00
sunzhenyu
71cadb56e8 修改编辑器轨道匹配逻辑 2020-01-03 16:56:36 +08:00
zyy
9d205b7a2b Merge branch 'dev' into test 2020-01-03 16:44:39 +08:00
zyy
6e0ab142f7 创建试卷过滤控制,避免其他错误 2020-01-03 16:43:07 +08:00
zyy
f813906f03 Merge branch 'dev' into test 2020-01-03 16:18:21 +08:00
zyy
ad9d14e842 调整站台右键显示 2020-01-03 16:17:40 +08:00
zyy
28e0617c87 删除注释,信号机流程完成 2020-01-03 16:01:57 +08:00
zyy
308f82c14e 提交请求进路接口 2020-01-03 15:52:51 +08:00
zyy
c13963f793 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 15:50:32 +08:00
zyy
4f2fb97477 调整宁波线右键菜单显示 2020-01-03 15:50:26 +08:00
fan
766a169282 指令调整参数 2020-01-03 15:03:45 +08:00
fan
1695bb1d21 恢复退出仿真 2020-01-03 14:57:26 +08:00
fan
cb0f21a183 网关字地址可以为0,所有数据不可为小数 2020-01-03 13:49:40 +08:00
fan
b43d04a238 取消真实设备接口写死 2020-01-03 11:32:27 +08:00
fan
a384a8da19 Merge remote-tracking branch 'origin/dev' into test 2020-01-03 11:20:44 +08:00
fan
dd57e3e85c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-03 11:18:36 +08:00
fan
e022b00a00 项目设备综合演练调整 2020-01-03 11:18:18 +08:00
zyy
2c01e8ace1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 18:40:36 +08:00
zyy
59e5c5fef7 调整相关用户的列表 名称变昵称显示 2020-01-02 18:40:30 +08:00
joylink_cuiweidong
e1d979e89a 代码调整 2020-01-02 17:06:35 +08:00
fan
c8a6e0d8ec Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-02 17:01:23 +08:00
fan
65b766e27f 项目设备管理 2020-01-02 17:01:11 +08:00
zyy
0b3e3311f0 删除控制模式 2020-01-02 14:57:13 +08:00
zyy
496a00c8fe 调整道岔区段坐标点bug 2020-01-02 14:30:03 +08:00
zyy
764f7c479e 调整右键菜单获取 2020-01-02 11:08:01 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00
zyy
e750406484 Merge branch 'dev_cmd' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_cmd 2020-01-02 10:46:17 +08:00
zyy
7c5352ce7c 调整宁波一号线站台操作 2020-01-02 10:46:09 +08:00
fan
8466bcb059 成都三指令调整 2020-01-02 09:49:41 +08:00