Commit Graph

1897 Commits

Author SHA1 Message Date
joylink_cuiweidong
5357d5c23c 解决 页面刷新 用户进入房间的问题 2020-01-16 15:08:03 +08:00
joylink_cuiweidong
e0824e33a0 房间的订阅代码调整 2020-01-15 13:20:48 +08:00
fan
f9bca1759d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-15 10:31:24 +08:00
fan
e80c0cd07f 延续保护解锁区段不可修改 2020-01-15 10:30:59 +08:00
zyy
77791a00ad 调整车次窗表单样式,调整事件阻止 2020-01-15 10:29:30 +08:00
fan
9688838869 哈尔滨盈达科技调整 2020-01-14 16:58:23 +08:00
fan
8d597eccfd 哈尔滨盈达科技调整 2020-01-14 16:53:46 +08:00
fan
e9499916f5 登录页面添加备案号 2020-01-14 16:39:26 +08:00
fan
0ba7385e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-14 16:21:35 +08:00
fan
fbc0e5b28a 哈尔滨盈达调整 2020-01-14 16:19:36 +08:00
sunzhenyu
31d2381e13 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-01-14 16:09:30 +08:00
sunzhenyu
e19e44835f 修改背景自适应,修改三维地图编辑逻辑存读以及三维沙盘加载 2020-01-14 16:09:08 +08:00
zyy
8569ee4635 Merge branch 'dev' into test 2020-01-14 09:58:12 +08:00
zyy
9d42feb47e 增加绘图图层 全选 2020-01-13 17:31:58 +08:00
joylink_cuiweidong
557b1cbfeb 新版绘图 生成道岔计轴区段代码调整 2020-01-13 16:46:10 +08:00
fan
b1bb638af3 修复:路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题 2020-01-13 16:30:38 +08:00
fan
f9930a084d Merge remote-tracking branch 'origin/dev' into test 2020-01-13 13:57:01 +08:00
fan
d81a87caa2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:56:22 +08:00
fan
a6476ea5d9 添加登录页哈尔滨盈达科技 2020-01-13 13:56:03 +08:00
joylink_cuiweidong
6802f2621a 新版地图绘制键盘delete删除元素代码调整 2020-01-13 13:48:45 +08:00
zyy
d295fb72a5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:45:50 +08:00
zyy
6feb0ec9c0 新版地图: 调整默认状态,站台状态配置完成。其他元素暂未配置 2020-01-13 13:45:39 +08:00
fan
a3c6d2973b Merge remote-tracking branch 'origin/dev' into test 2020-01-13 13:38:15 +08:00
fan
2dc52d75f6 添加登录页哈尔滨盈达科技 2020-01-13 13:37:52 +08:00
fan
dba81ee41d Merge remote-tracking branch 'origin/dev' into test 2020-01-13 13:35:13 +08:00
fan
73c1171b54 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 13:33:44 +08:00
fan
662e38a22c 添加登录页哈尔滨盈达科技 2020-01-13 13:33:35 +08:00
joylink_cuiweidong
50ad3bb036 新版绘图道岔代码拆分 2020-01-13 11:25:51 +08:00
fan
e8b616b705 成都一号线菜单调整 2020-01-09 18:21:04 +08:00
fan
09b27a8d62 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-09 09:02:22 +08:00
fan
2b4aa891eb 成都一号线右键菜单调整 2020-01-09 09:02:02 +08:00
zyy
d79641e0e4 调整指令字典中条件参数 2020-01-08 17:21:17 +08:00
zyy
786a37ee2c 增加宁波一号线控制权转移 2020-01-08 14:59:27 +08:00
fan
b84f86916f Merge remote-tracking branch 'origin/dev' into test 2020-01-08 09:42:36 +08:00
zyy
473b289692 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 14:49:58 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
1f88b03322 连接真实设备-国际化提示调整 2020-01-07 13:50:09 +08:00
fan
1a2ab7018c 设备管理-配置编辑 提示文字修改 2020-01-07 13:20:47 +08:00
fan
9a2d5f4602 Merge remote-tracking branch 'origin/dev' into test 2020-01-07 13:11:57 +08:00
fan
f4c8832133 设备管理-配置编辑 信号机配置调整 2020-01-07 13:11:13 +08:00
fan
e4678d6f1a Merge remote-tracking branch 'origin/dev' into test 2020-01-07 13:06:16 +08:00
fan
5dc3eb83f8 设备管理-配置编辑 信号机配置调整 2020-01-07 13:05:06 +08:00
fan
2d8d16c0e7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-07 10:59:38 +08:00
zyy
3ebebd7e13 Merge branch 'dev' into test 2020-01-07 10:53:32 +08:00
zyy
5eb56d0a96 调整旧版地图右键菜单操作 2020-01-07 10:52:44 +08:00
sunzhenyu
7acd86d332 修改继电器显示逻辑 2020-01-07 10:51:19 +08:00
sunzhenyu
60e1750611 增加继电器数量 2020-01-07 10:41:21 +08:00
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
9944bdef33 设备管理-配置编辑 除了输出地址、输入地址外,其他的变为输入框,限制输入最大字符数为4,且每位必须是16进制数 2020-01-07 09:27:49 +08:00