Commit Graph

3053 Commits

Author SHA1 Message Date
joylink_cuiweidong
4315cdade3 socket弹出层处理 2020-01-15 14:32:17 +08:00
fan
699d548b84 iscs调整 2020-01-15 14:26:25 +08:00
fan
308e0960b0 iscs调整 2020-01-15 14:04:33 +08:00
fan
f13f7c9964 iscs调整 2020-01-15 14:03:25 +08:00
fan
31f6277107 iscs调整 2020-01-15 13:33:11 +08:00
fan
a03b002beb iscs调整 2020-01-15 13:27:07 +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
9233728346 iscs调整 2020-01-15 10:11:26 +08:00
joylink_cuiweidong
388690c181 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-14 18:19:14 +08:00
joylink_cuiweidong
2f120b8c19 sock代码调整 2020-01-14 18:18:54 +08:00
fan
e8039732ab iscs调整 2020-01-14 18:17:51 +08:00
fan
7b7d332035 修改重连时间 2020-01-14 17:26:41 +08:00
fan
75334d11fa 删除公共topic 2020-01-14 17:14:45 +08:00
fan
9688838869 哈尔滨盈达科技调整 2020-01-14 16:58:23 +08:00
fan
05906492c5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-14 16:54:03 +08:00
fan
8d597eccfd 哈尔滨盈达科技调整 2020-01-14 16:53:46 +08:00
joylink_cuiweidong
a38e824548 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-14 16:49:03 +08:00
joylink_cuiweidong
59cfe5f3b7 sock断线和重连的弹出框调整 2020-01-14 16:48:49 +08:00
fan
e9499916f5 登录页面添加备案号 2020-01-14 16:39:26 +08:00
fan
0b6663cb1d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-14 16:34:20 +08:00
fan
a5fda7476b Merge remote-tracking branch 'origin/test' into dev 2020-01-14 16:32:47 +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
ca9b991fe6 哈尔滨盈达调整 2020-01-14 16:21:14 +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
e2e5cec0a3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-14 15:32:48 +08:00
zyy
27d34a91ff 调整打包配置 2020-01-14 15:32:41 +08:00
joylink_cuiweidong
e59dcdcf01 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/utils/sock.js
2020-01-14 15:21:18 +08:00
joylink_cuiweidong
82b5bba847 解决连接关闭后xhr_streaming无限循环的问题 2020-01-14 15:19:31 +08:00
fan
2c0458a558 socket 2020-01-14 15:13:56 +08:00
fan
63cd08ccf6 socket 2020-01-14 14:03:56 +08:00
zyy
8569ee4635 Merge branch 'dev' into test 2020-01-14 09:58:12 +08:00
fan
e4ccfa40d2 iscs 绘图 2020-01-14 09:55:57 +08:00
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00
zyy
5d84791c47 修正道岔显示 2020-01-13 17:44:53 +08:00
zyy
9d42feb47e 增加绘图图层 全选 2020-01-13 17:31:58 +08:00
zyy
1fab892047 新增扣车请求参数 2020-01-13 17:07:06 +08:00
zyy
c98dc7ba67 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 16:52:10 +08:00
zyy
5217a334d5 调整宁波一号线站台状态显示 2020-01-13 16:52:00 +08:00
joylink_cuiweidong
753bd88ab2 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 16:46:44 +08:00
joylink_cuiweidong
557b1cbfeb 新版绘图 生成道岔计轴区段代码调整 2020-01-13 16:46:10 +08:00
fan
376362d6c9 删除日志 2020-01-13 16:45:47 +08:00
fan
7d579300b0 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 16:31:01 +08:00
fan
b1bb638af3 修复:路由改变未在地图数据改变前及时清除定时器导致的地图数据污染保存的问题 2020-01-13 16:30:38 +08:00
fan
8c43ac0b07 iscs 2020-01-13 15:25:10 +08:00
zyy
c5733e20c7 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-13 14:40:31 +08:00