Commit Graph

8344 Commits

Author SHA1 Message Date
joylink_cuiweidong
64ecefcf6d 代码调整 2020-11-16 15:01:43 +08:00
joylink_cuiweidong
8bb621a4ef 仿真 初始化 按计划行车 代码调整 2020-11-16 14:37:35 +08:00
joylink_cuiweidong
bc0aa31a50 代码调整 2020-11-16 13:32:19 +08:00
joylink_cuiweidong
389bac03a4 竞赛平台添加 联系我们按钮及弹窗 2020-11-16 13:10:10 +08:00
zyy
3d3138b6a9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:57:56 +08:00
zyy
3cb0d10704 调整实操场景样式,说明点击问题 2020-11-16 10:57:44 +08:00
fan
c63f8097e7 合并区域控制器故障 2020-11-16 10:54:25 +08:00
joylink_cuiweidong
59940ece21 竞赛平台 实操删除 切换地图 按钮 2020-11-16 10:53:16 +08:00
fan
217ae8c2de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:11:57 +08:00
fan
a520ca5676 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:11:30 +08:00
fan
697dfdd365 样式调整 2020-11-16 10:11:07 +08:00
joylink_cuiweidong
a4af480ab8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:08:58 +08:00
joylink_cuiweidong
e3b4e46f2e 车站绘图代码调整 2020-11-16 10:08:37 +08:00
sunzhenyu
301ffac035 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:07:44 +08:00
sunzhenyu
4f9a8dd379 修改三维客流车门动画重置 2020-11-16 10:07:33 +08:00
joylink_cuiweidong
c1c9e4ee49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 09:33:16 +08:00
joylink_cuiweidong
c986a37eb0 删除无用文件 2020-11-16 09:33:02 +08:00
sunleking
dd3de164d0 增加三维客流加载 2020-11-13 21:48:52 +08:00
sunleking
44abae132e merge 2020-11-13 21:09:46 +08:00
sunleking
b55c98e60f url 2020-11-13 21:09:15 +08:00
sunzhenyu
ea4ce90b19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 18:31:55 +08:00
sunzhenyu
c02d37872c 修改北交大三维客流显示 2020-11-13 18:31:48 +08:00
joylink_cuiweidong
d57d5bdd2b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 18:29:19 +08:00
joylink_cuiweidong
90a2e6d228 代码调整 2020-11-13 18:29:01 +08:00
sunzhenyu
f32137ad7f merge 2020-11-13 18:27:12 +08:00
sunzhenyu
015632678f 修改三维客流模块 2020-11-13 18:26:22 +08:00
fan
c4dd7aa559 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 17:11:51 +08:00
fan
affba7de60 merge 2020-11-13 17:11:31 +08:00
joylink_cuiweidong
7745a78fa1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 17:11:13 +08:00
joylink_cuiweidong
bdc9be6465 仿真运行图 表号排序 代码调整 2020-11-13 17:10:54 +08:00
fan
64fbcc1223 问题调整 2020-11-13 17:07:26 +08:00
zyy
c760d65ec1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 17:05:22 +08:00
zyy
a752dcd2e5 调整路径配置,删除多余配置 2020-11-13 17:05:10 +08:00
joylink_cuiweidong
6cfd36fc4c 发布地图管理 地图排序 代码调整 2020-11-13 16:49:38 +08:00
joylink_cuiweidong
e25dc471a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 15:11:08 +08:00
joylink_cuiweidong
8be4500764 代码调整 2020-11-13 15:10:44 +08:00
zyy
b68424c3db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 14:20:47 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
joylink_cuiweidong
95bb8dff30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 14:14:34 +08:00
joylink_cuiweidong
0e7f27c1db 运行图 测试代码调整 2020-11-13 14:14:18 +08:00
fan
e971797748 一键生成子系统及权限 2020-11-13 13:57:54 +08:00
fan
17b1242a0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 13:31:55 +08:00
fan
927d7b9f16 交大项目调整 2020-11-13 13:31:44 +08:00
joylink_cuiweidong
720c527683 系统生成子系统代码优化 2020-11-13 11:31:05 +08:00
joylink_cuiweidong
34db1f439f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-11-13 10:23:25 +08:00
joylink_cuiweidong
f4c88f7939 车站绘图代码调整 2020-11-13 10:21:36 +08:00
fan
eebe696ef6 调整baseurl 2020-11-13 10:17:47 +08:00
fan
f258d9b0b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 10:16:10 +08:00
fan
b597d4efea 列车重叠调整 2020-11-13 10:13:05 +08:00
sunzhenyu
9a286521a6 merge 2020-11-13 09:36:44 +08:00