Commit Graph

152 Commits

Author SHA1 Message Date
fan
437491c9e7 调整 2020-03-31 13:13:21 +08:00
fan
a3b6c3b59c 创建线下用户 2020-03-30 20:28:20 +08:00
fan
9c18770137 生成线下用户 2020-03-30 17:15:45 +08:00
fan
338a9e9683 生成线下用户 2020-03-30 16:52:53 +08:00
fan
238f8a3d88 生成线下用户 2020-03-30 15:29:07 +08:00
fan
b229e9c08a 生成线下用户 2020-03-30 15:28:13 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
fan
39420c1432 存在仿真管理调整 2020-03-24 09:23:24 +08:00
zyy
1c78d52fed 调整ibp文件配置路径 2020-03-16 11:02:33 +08:00
joylink_zyy
0e570584bc 调整ibp绘制地图 2020-03-13 21:17:20 +08:00
joylink_fanyuhong
09278e4b1e 排序操作 2020-03-03 18:47:32 +08:00
joylink_fanyuhong
e60fde1a5a 地图排序 2020-03-03 14:24:25 +08:00
joylink_fanyuhong
a853439255 地图排序 2020-03-03 11:08:41 +08:00
zyy
a033690502 调整综合监控文件位置及加载方式 2020-01-20 09:20:09 +08:00
fan
b2cd2dd4ca Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-20 09:06:15 +08:00
fan
0f93d8f203 iscs系统调整 2020-01-20 09:05:52 +08:00
joylink_cuiweidong
10e2c426e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:56:48 +08:00
joylink_cuiweidong
8d948c82b1 iscs系统 乘客信息页面调整 2020-01-19 18:56:36 +08:00
zyy
1e78cb64f8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:36:23 +08:00
zyy
f42c48a0c4 调整iscs为新的系统 2020-01-19 18:36:17 +08:00
joylink_cuiweidong
caed94f56d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 18:35:02 +08:00
joylink_cuiweidong
2d30c5f0e7 iscs 组件代码调整 2020-01-19 18:34:28 +08:00
fan
7048991824 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 17:34:25 +08:00
fan
53a89cc970 iscs调整 2020-01-19 15:29:05 +08:00
joylink_cuiweidong
0d3a095a81 iscs 绘图组件代码调整 2020-01-19 14:56:22 +08:00
fan
40cca79ce8 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:23:17 +08:00
fan
e858a6d25b iscs调整 2020-01-19 14:22:37 +08:00
zyy
9d0c88633d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:21:28 +08:00
zyy
323eda0e07 调整iscs样式 2020-01-19 14:21:22 +08:00
joylink_cuiweidong
8b47257b6e iscs 组件代码调整 2020-01-19 14:15:09 +08:00
joylink_cuiweidong
0247dce3aa Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:09:31 +08:00
joylink_cuiweidong
1d56688732 iscs 各组件生成uid方法修改 2020-01-19 14:09:15 +08:00
fan
0f50e1b00a Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 14:03:51 +08:00
fan
df39d836dc iscs调整 2020-01-19 14:03:32 +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
298dddf718 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-19 11:22:58 +08:00
zyy
2d5074d6d1 增加进路数据状态维护 2020-01-19 11:22:48 +08:00
fan
15ca63be84 iscs调整 2020-01-19 10:05:55 +08:00
fan
d744d7a69e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/iscs/constant/deviceRender.js
#	src/iscs/constant/deviceType.js
#	src/iscs/shape/factory.js
#	src/iscs/utils/parser.js
2020-01-17 18:49:15 +08:00
fan
87e62a6631 iscs综合监控 2020-01-17 18:45:28 +08:00
zyy
0bee3cc61d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 17:48:15 +08:00
zyy
1779f856be 新增iscs系统 2020-01-17 17:48:08 +08:00
joylink_cuiweidong
0bb7b11271 iscs bas 状态管理代码调整 生成uid代码调整 组件代码调整 2020-01-17 17:27:11 +08:00
joylink_cuiweidong
7987f6bd12 iscs bas 组件 uid 代码修改 2020-01-17 15:42:20 +08:00
zyy
3ec7d0a7e5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 15:32:08 +08:00
zyy
e4b20395c4 增加iscs系统,调整成都一号线运行图导入 2020-01-17 15:31:58 +08:00
joylink_cuiweidong
22419fa6c9 iscs bas 组件代码调整 2020-01-17 15:15:58 +08:00
fan
95e5c9f603 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-01-17 14:20:49 +08:00
fan
582fc354db 快速入口增加参数projectCode 2020-01-17 14:20:31 +08:00