Commit Graph

241 Commits

Author SHA1 Message Date
zyy
2e7e25dd06 增加功能按钮绘图方式 2020-03-17 16:12:15 +08:00
fan
0377ef014b 合并代码 2020-03-16 17:16:59 +08:00
fan
4a2c539553 哈尔滨现地显示 2020-03-13 13:01:58 +08:00
joylink_fanyuhong
cf456057c3 调整老版本地图报错 2020-03-11 19:54:48 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
zyy
6d0849f5b3 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/utils/parser.js
2020-03-06 10:23:14 +08:00
zyy
a1f752fe59 调整地图绘制矩形框保存字段 2020-03-06 10:21:41 +08:00
joylink_fanyuhong
217864dbd4 站台功能按钮 2020-03-06 10:05:21 +08:00
joylink_fanyuhong
c9e8827c3a 合并代码 2020-03-05 16:43:53 +08:00
joylink_fanyuhong
8d58125e1f 自动进路和引导总锁 2020-03-05 16:39:49 +08:00
zyy
30c672026f 增加矩形包围框 2020-03-05 15:48:51 +08:00
zyy
af5c108610 创建自动折返模块 2020-03-04 20:59:16 +08:00
joylink_fanyuhong
28db37a54f 成都三现地操作调整 2020-03-03 17:34:50 +08:00
joylink_fanyuhong
c1c624dfff Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-02 14:47:08 +08:00
joylink_fanyuhong
692f30fd9f 运行图导入和列车调整 2020-03-02 14:46:59 +08:00
joylink_zyy
446593fded 调整哈尔滨道岔显示问题 2020-02-29 00:04:24 +08:00
joylink_fanyuhong
41bc739eab 运行图预览 2020-02-27 22:09:51 +08:00
joylink_fanyuhong
bd7069f6f4 调整运行图预览尺寸 2020-02-27 18:51:48 +08:00
joylink_fanyuhong
3197641b97 仿真调整 2020-02-25 10:36:18 +08:00
joylink_fanyuhong
4c1b03e3d7 操作调整 2020-02-12 18:37:24 +08:00
zyy
b81f6fc967 宁波一号线右键操作 2020-02-12 18:06:30 +08:00
zyy
d22f2582c3 增加车次窗右键操作 2020-02-12 17:43:18 +08:00
joylink_fanyuhong
4275b4dc4a 操作调整 2020-02-12 15:14:14 +08:00
joylink_fanyuhong
50a4f8ab0b 成都三号线调整 2020-02-10 19:10:43 +08:00
zyy
13fcc80c41 desc: 增加状态 2020-02-07 18:19:56 +08:00
joylink_fanyuhong
50c9ab0d96 iscs调整 2020-02-05 14:43:12 +08:00
zyy
7fd8e11649 搭建iscs系统架子 2020-01-20 14:04:31 +08:00
joylink_cuiweidong
d8086e1311 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/iscs/utils/parser.js
2020-01-19 13:52:24 +08:00
joylink_cuiweidong
d957ea049b iscs 生成uid代码调整 2020-01-19 13:49:55 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
joylink_cuiweidong
0bb7b11271 iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整 2020-01-17 17:27:11 +08:00
fan
019ca66662 Merge remote-tracking branch 'origin/dev_iscs' into dev 2020-01-16 18:16:23 +08:00
zyy
27257482ab 调整线路配置项,增加 ISCS 绘图元素 2020-01-16 18:02:57 +08:00
joylink_cuiweidong
5357d5c23c 解决 页面刷新 用户进入房间的问题 2020-01-16 15:08:03 +08:00
zyy
714c55ec8b 增加iscs绘制 2020-01-16 14:52:45 +08:00
joylink_cuiweidong
4315cdade3 socket弹出层处理 2020-01-15 14:32:17 +08:00
fan
a03b002beb iscs调整 2020-01-15 13:27:07 +08:00
joylink_cuiweidong
e0824e33a0 房间的订阅代码调整 2020-01-15 13:20:48 +08:00
joylink_cuiweidong
2f120b8c19 sock代码调整 2020-01-14 18:18:54 +08:00
fan
75334d11fa 删除公共topic 2020-01-14 17:14:45 +08:00
joylink_cuiweidong
82b5bba847 解决连接关闭后xhr_streaming无限循环的问题 2020-01-14 15:19:31 +08:00
fan
365f36edef iscs 绘图 2020-01-14 09:06:03 +08:00
zyy
fa643db9db 调整成都一号线 请求堆栈 取消请求流程 2020-01-10 11:27:43 +08:00
fan
a4ebf22bab 成都一号线菜单调整 2020-01-09 17:48:25 +08:00
zyy
2310fec6ef 兼容老板地图状态,调整宁波线批量扣车数据 2020-01-07 18:03:49 +08:00
zyy
5a3b415202 删除运行图工具栏 2020-01-07 14:49:51 +08:00
fan
100b852a9c 修复:顶掉用户,再次登录未获取新用户信息 2020-01-03 18:17:40 +08:00
zyy
5db5bb40f8 Merge branch 'dev_cmd' into dev 2020-01-02 10:47:08 +08:00