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 |
|
zyy
|
dcead8d707
|
增加点击事件取消选中状态为全局混入，删除多余线路utils配置
|
2020-01-13 14:40:24 +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
|
d22008a6f7
|
成都一号线样式调整
|
2020-01-13 10:15:28 +08:00 |
|
fan
|
67ea835805
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 18:52:36 +08:00 |
|
fan
|
4e136ca8b3
|
成都一号线样式调整
|
2020-01-10 18:51:57 +08:00 |
|
zyy
|
28bac5e7bc
|
调整svg加载路径
|
2020-01-10 17:25:14 +08:00 |
|
zyy
|
d3d64c7c91
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 17:11:41 +08:00 |
|
zyy
|
5d6a994cbc
|
删除宁波批量扣车反向操作
|
2020-01-10 17:11:35 +08:00 |
|
fan
|
d77559211c
|
成都一、三号线z站台参数调整
|
2020-01-10 15:15:00 +08:00 |
|
fan
|
9f14f4bbda
|
成都一号线菜单调整
|
2020-01-10 14:51:55 +08:00 |
|
fan
|
1254ba912c
|
成都一号线菜单调整
|
2020-01-10 14:50:04 +08:00 |
|
zyy
|
a7b97dd7cc
|
调整宁波一号线请求参数
|
2020-01-10 14:41:20 +08:00 |
|
zyy
|
19edd695be
|
删除多余输出
|
2020-01-10 11:28:43 +08:00 |
|
zyy
|
fa643db9db
|
调整成都一号线 请求堆栈 取消请求流程
|
2020-01-10 11:27:43 +08:00 |
|
zyy
|
2b56d3f636
|
修改样式
|
2020-01-10 10:29:52 +08:00 |
|
zyy
|
021f3bc148
|
Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
|
2020-01-10 09:32:38 +08:00 |
|
zyy
|
bd0518acc7
|
调整成都一号线操作堆样式流程
|
2020-01-10 09:32:32 +08:00 |
|
fan
|
06c6ec66e5
|
成都一号线菜单样式调整
|
2020-01-09 18:49:58 +08:00 |
|
fan
|
e8b616b705
|
成都一号线菜单调整
|
2020-01-09 18:21:04 +08:00 |
|