Commit Graph

8161 Commits

Author SHA1 Message Date
fan
6e35c6446e 展示更多距离调整 2020-11-17 18:33:21 +08:00
fan
d48d2564bc 留言板问题调整 2020-11-17 18:31:29 +08:00
fan
a22dd39077 留言板问题调整 2020-11-17 18:29:03 +08:00
fan
46ad5e4b68 quill 添加图片上传超限提示 2020-11-17 17:25:34 +08:00
fan
242ca313a0 删除接口调整 2020-11-17 17:17:23 +08:00
fan
3d7a5ddde0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-17 16:55:15 +08:00
fan
19a03ab258 留言板调整 2020-11-17 16:55:05 +08:00
sunzhenyu
05d4e319f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-17 10:20:23 +08:00
sunzhenyu
ea6103a861 修改三维客流列车显示 2020-11-17 10:19:59 +08:00
fan
df386dcb75 按钮判断条件调整
(cherry picked from commit 45bb150440)
2020-11-16 19:38:37 +08:00
fan
d477f46bc7 调整场景列表高度 2020-11-16 19:35:12 +08:00
fan
2c54e68928 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
#	src/views/newMap/displayNew/dispatherContest/sceneList.vue
2020-11-16 19:29:49 +08:00
fan
1de24c5d31 留言板功能部分实现 2020-11-16 19:26:23 +08:00
sunzhenyu
c5212b67ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 18:22:36 +08:00
joylink_cuiweidong
79673768f0 竞赛平台 代码调整 2020-11-16 18:22:21 +08:00
sunzhenyu
5c8beedb15 修改三维客流模块,区分列车和车站视角,修改车站初始视角 2020-11-16 18:22:04 +08:00
joylink_cuiweidong
3b8a59a24f 系统管理 数据字典管理代码调整 2020-11-16 17:33:17 +08:00
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