Commit Graph

902 Commits

Author SHA1 Message Date
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
fan
e38833b119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:27:31 +08:00
fan
8b2cd16fe9 运行图调整 2020-12-22 17:27:04 +08:00
sunzhenyu
af7e9d8dbf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 14:08:33 +08:00
sunzhenyu
e3b9c2f682 修改北交大客流人数颜色图示 2020-12-22 14:08:25 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
joylink_cuiweidong
ceb288d960 Merge remote-tracking branch 'remotes/origin/test' 2020-12-18 19:09:24 +08:00
fan
941e0a791a 留言板调整 2020-12-18 13:38:13 +08:00
joylink_fanyuhong
e534232f2d 留言板调整
(cherry picked from commit 0dbc19027a)
2020-12-18 09:18:43 +08:00
joylink_fanyuhong
0dbc19027a 留言板调整 2020-12-17 22:46:09 +08:00
joylink_fanyuhong
1e9bc8adb5 Merge remote-tracking branch 'origin/test' 2020-12-17 20:56:05 +08:00
fan
ca8da79986 merge 2020-12-17 13:20:47 +08:00
fan
855295ca75 通用ibp&留言板管理&贵装备课程发布调整 2020-12-17 13:19:12 +08:00
joylink_cuiweidong
fdfd54f452 北交大客流项目 代码调整 2020-12-17 09:59:06 +08:00
zyy
f7703476e8 Merge branch 'test' 2020-12-16 18:23:21 +08:00
joylink_cuiweidong
90f0b4e918 运行图编制代码调整 2020-12-16 14:51:59 +08:00
fan
3aadd5d682 Merge remote-tracking branch 'origin/test' 2020-12-16 14:00:49 +08:00
fan
bd0aac34fe 综合演练现地显示调整 2020-12-16 13:25:55 +08:00
fan
d5b0508467 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 10:55:25 +08:00
fan
eebb034208 现地增加ibp& 现地切换值班员角色调整 2020-12-16 10:54:55 +08:00
joylink_cuiweidong
1715dcad32 北交大 客流数据代码调整 2020-12-16 10:18:58 +08:00
joylink_cuiweidong
525fc25469 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 09:42:15 +08:00
joylink_cuiweidong
0a5eb83904 代码调整 2020-12-16 09:41:53 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
joylink_cuiweidong
1453d5538a 北交大客流仿真代码调整 2020-12-15 18:09:10 +08:00
joylink_cuiweidong
845b620e65 北交大仿真 切换客流数据调整 2020-12-15 16:20:11 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
joylink_cuiweidong
c3fc4a1797 Merge remote-tracking branch 'remotes/origin/test' 2020-12-11 20:18:58 +08:00
joylink_cuiweidong
d8c6a8657b 哈尔滨运行图编制代码调整 2020-12-11 20:17:18 +08:00
zyy
085990f755 增加站台紧急按钮批量删除,增加区段批量删除范围 2020-12-08 11:09:02 +08:00
sunzhenyu
d973dbc46e 修改三维设备界面隐藏显示 2020-12-07 17:14:06 +08:00
zyy
cbe5307f98 Merge remote-tracking branch 'remotes/origin/test' 2020-12-06 21:56:35 +08:00
joylink_cuiweidong
cd39147257 实训平台代码调整 2020-12-04 18:10:07 +08:00
joylink_cuiweidong
23cbc94c78 代码调整 2020-12-02 18:37:32 +08:00
joylink_cuiweidong
95c685bfab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/displayNew/demonMenu.vue
2020-12-02 17:49:08 +08:00
joylink_cuiweidong
b51ebde280 北交大客流仿真系统代码调整 2020-12-02 17:45:19 +08:00
fan
d96df1ce68 个人信息关闭后终止状态&贵装备展示留言板 2020-12-02 15:23:23 +08:00
zyy
b93af93af3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 10:21:06 +08:00
zyy
20e774c8b8 删除多余配置 2020-12-01 10:20:54 +08:00
fan
388f9a14ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-30 18:25:41 +08:00
fan
97a373b9d9 代码调整 2020-11-30 18:22:22 +08:00
joylink_cuiweidong
888001c65e 删除暂时无用代码 2020-11-30 16:12:24 +08:00
joylink_cuiweidong
f9bac6886a 删除暂时无用代码 2020-11-30 10:23:32 +08:00
sunzhenyu
dda3cedf30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 17:50:39 +08:00
sunzhenyu
7491a63b42 三维客流退出样式 2020-11-27 17:50:33 +08:00
joylink_cuiweidong
c1507b01e1 地图数据加载到缓存store里(刷新之后数据会丢失)
删除暂时无用的代码
2020-11-27 17:37:13 +08:00
joylink_cuiweidong
b3f538fa09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 15:04:15 +08:00
joylink_cuiweidong
93e936a766 北交大 客流项目代码调整 2020-11-27 15:03:55 +08:00
fan
056570c096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:18:42 +08:00
fan
76f9db3eb6 留言板添加至新标签页
(cherry picked from commit a509af1e09)
2020-11-27 14:17:54 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
joylink_cuiweidong
a5dad072ca 实训平台代码调整 2020-11-25 18:28:20 +08:00
joylink_cuiweidong
2732e60a94 教学系统 实训代码调整 2020-11-25 15:52:52 +08:00
joylink_cuiweidong
e355191291 教学系统 实训代码调整 2020-11-25 09:45:59 +08:00
joylink_cuiweidong
c7a98096a2 教学系统 代码调整 2020-11-24 19:17:10 +08:00
zyy
e249c344eb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:35:27 +08:00
zyy
9ba73cbb77 调整哈尔滨综合监控数据 2020-11-24 17:35:14 +08:00
sunzhenyu
6ce808b8f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-24 17:32:43 +08:00
sunzhenyu
7ef4994a09 修改三维客流视窗跳转方式 2020-11-24 17:32:37 +08:00
joylink_cuiweidong
465e0e5860 北交大系统 仿真页面代码调整
教学 实训列表文字调整
2020-11-24 17:11:00 +08:00
joylink_cuiweidong
872824dff1 绘图代码调整 2020-11-24 16:53:13 +08:00
fan
906208b236 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-23 18:04:02 +08:00
joylink_cuiweidong
96a57af6fc 代码调整 2020-11-23 18:00:45 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
joylink_cuiweidong
acd3e5c6ff 删除无效的文件 2020-11-23 10:47:33 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
a131fd12d7 代码调整 2020-11-20 14:59:24 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
756aca9281 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 14:22:15 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
zyy
a50264a8df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 13:22:19 +08:00
zyy
a6e0808092 调整客流量流程 2020-11-20 13:22:03 +08:00
fan
4ae8979563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 11:22:42 +08:00
fan
9d4f0d6804 留言板表情包调整 2020-11-20 11:22:21 +08:00
zyy
c10283c256 增加客流量数据渲染 2020-11-20 11:13:47 +08:00
joylink_cuiweidong
99e7abd361 运行图编制代码调整 2020-11-19 17:02:55 +08:00
fan
9b9fcd01e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 14:17:46 +08:00
fan
11b54cef43 留言板表情包 2020-11-19 14:17:01 +08:00
joylink_cuiweidong
3052bf2843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 13:48:30 +08:00
joylink_cuiweidong
954cb25ab0 北京交大项目 添加客流视图(未处理状态) 2020-11-19 13:48:11 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
zyy
6897317693 增加索引 2020-11-18 13:16:47 +08:00
zyy
d8c25dde1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 13:15:40 +08:00
zyy
83e74cc53b 增加运行图客流量配置 2020-11-18 13:15:28 +08:00
fan
4c7e601406 调整北交大按钮顺序 2020-11-18 11:01:22 +08:00
fan
c1a357fe28 留言板项目接口调整 2020-11-18 10:55:11 +08:00
fan
dc57a1a82b 北交大添加留言板&联系方式&背景图片压缩 2020-11-18 09:31:10 +08:00
fan
6bd3f751c8 留言板调整
(cherry picked from commit cd59d4e26e)
2020-11-17 19:18:31 +08:00
fan
9a470268b2 留言板调整 2020-11-17 19:06:59 +08:00
fan
842c10a3f3 留言板调整
(cherry picked from commit c53c744edc)
2020-11-17 18:51:38 +08:00
fan
731a2af939 留言板报错调整 2020-11-17 18:39:11 +08:00
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
242ca313a0 删除接口调整 2020-11-17 17:17:23 +08:00
fan
19a03ab258 留言板调整 2020-11-17 16:55:05 +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
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
90a2e6d228 代码调整 2020-11-13 18:29:01 +08:00
joylink_cuiweidong
bdc9be6465 仿真运行图 表号排序 代码调整 2020-11-13 17:10:54 +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
927d7b9f16 交大项目调整 2020-11-13 13:31:44 +08:00
sunzhenyu
9a286521a6 merge 2020-11-13 09:36:44 +08:00
zyy
009f7b57a2 调整国赛场景说明 2020-11-13 09:34:12 +08:00
zyy
9ed22a6075 Merge remote-tracking branch 'remotes/origin/test' 2020-11-12 19:43:20 +08:00
zyy
19e1a4208e 增加场景说明 2020-11-12 19:42:33 +08:00
joylink_cuiweidong
bc71bf5a1d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-12 19:05:37 +08:00
joylink_cuiweidong
e5e7111965 运行图绘制代码调整 2020-11-12 19:04:57 +08:00
zyy
eb9c9d8ee3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-11-12 15:42:18 +08:00
zyy
c875c1bac0 调整格式 2020-11-12 15:41:35 +08:00
sunzhenyu
6ef0a46870 urlmerge 2020-11-12 15:00:14 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
zyy
866bf2414b 调整实操菜单 2020-11-11 16:56:38 +08:00
zyy
286acf7348 调整剧本场景编辑 2020-11-11 16:09:43 +08:00
joylink_cuiweidong
5012f9ce58 代码调整 2020-11-11 09:13:41 +08:00
joylink_cuiweidong
d6c55ad016 修改角色 车辆段 为 车辆段信号楼 2020-11-10 16:20:03 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
zyy
35b3d115fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 18:25:08 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
joylink_cuiweidong
110ff2b1c2 仿真退出 重置状态 代码调整
删除无用的文件
2020-11-09 16:15:20 +08:00
joylink_cuiweidong
b439232fef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 15:17:31 +08:00
joylink_cuiweidong
8d14c93231 仿真代码调整 2020-11-09 15:17:11 +08:00
fan
0553c4ce5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 11:31:45 +08:00
fan
a6ebcda15e 北交大项目调整 2020-11-09 11:31:20 +08:00
sunzhenyu
3a76731646 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 18:28:39 +08:00
sunzhenyu
3ad0ccffc1 增加三维客流规划模块 2020-11-06 18:28:30 +08:00
joylink_cuiweidong
42fb506612 剧本预览代码调整 2020-11-06 17:44:36 +08:00
joylink_cuiweidong
0a4de52bb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 15:04:47 +08:00
joylink_cuiweidong
5eedbdf1e5 剧本录制代码调整 2020-11-06 15:04:18 +08:00
zyy
a7519ae06e 调整剧本描述,及样式 2020-11-06 14:50:13 +08:00
zyy
8f1e38ce29 调整剧本显示,菜单显示 2020-11-06 14:11:16 +08:00
zyy
f3162dfbd8 调整场景描述位置,调整列车清空逻辑 2020-11-06 13:41:33 +08:00
fan
a36acdbd45 按钮顺序调整 2020-11-06 13:20:15 +08:00
zyy
e897673742 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-06 10:51:12 +08:00
zyy
e792597fd8 调整场景显示 2020-11-06 10:50:58 +08:00
fan
08580da2a9 剧本提示控制模式=》系统/站遥控&条件管理清除stop 2020-11-06 09:48:51 +08:00
fan
f09b1aa17d 按计划行车状态判断调整 2020-11-05 17:32:48 +08:00
lVAL
cfc6f9648a 修改重置背景,按计划行车状态错误的问题 2020-11-05 16:58:42 +08:00
joylink_cuiweidong
241633ef53 竞赛 选择角色 默认选id最小的行调 2020-11-05 15:50:35 +08:00
joylink_cuiweidong
c4b88ec9e1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-05 13:33:53 +08:00
joylink_cuiweidong
3639cc32e6 剧本动作 转换函数代码调整 2020-11-05 13:33:38 +08:00
fan
38f3f82e18 剧本录制会话文字发送 2020-11-05 13:17:40 +08:00
joylink_cuiweidong
af316d4906 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 18:35:50 +08:00
joylink_cuiweidong
fc46f0b55e 运行图 车次号方向代码调整 2020-11-04 18:35:27 +08:00
fan
56888289d6 调整供电线type判断 2020-11-04 18:10:48 +08:00
fan
6f440e6215 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 18:09:16 +08:00
fan
9a9355fcac 调整仿真开始判断 2020-11-04 18:09:04 +08:00
joylink_cuiweidong
04c51b0aca 剧本提示代码调整 2020-11-04 17:15:53 +08:00
fan
06c252cd58 merge 2020-11-04 14:51:54 +08:00
fan
6993ad8d8e 剧本条件 2020-11-04 14:48:36 +08:00
lVAL
872a71c7b5 增加 替换背景的操作 2020-11-04 14:42:48 +08:00
sunzhenyu
2c1b9fcc45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-04 10:34:43 +08:00
sunzhenyu
23b98c7c46 增加客流规划界面 2020-11-04 10:34:33 +08:00
fan
55dda9ca10 添加停车场信号楼角色 2020-11-04 09:26:22 +08:00
fan
a1be6dbfb9 暂提 2020-11-03 18:52:33 +08:00
fan
0603e45a07 设置头码车调整参数 2020-11-03 18:23:30 +08:00
joylink_cuiweidong
8ad829cf24 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:06:50 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
2020-11-03 16:06:11 +08:00
fan
4e0b6dc7e6 取消实训考试重置默认状态 2020-11-03 14:06:30 +08:00
fan
dcd0607973 北交大项目登录 2020-11-03 13:39:14 +08:00
fan
ccabd4a729 实训问题调整 2020-11-02 19:08:04 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
joylink_cuiweidong
9f95af633a 代码调整 2020-11-02 10:01:24 +08:00
joylink_fanyuhong
1a6897b849 Merge remote-tracking branch 'origin/test'
# Conflicts:
#	src/utils/baseUrl.js
2020-10-30 18:27:56 +08:00
joylink_cuiweidong
f749e4fc2a 竞赛代码调整 2020-10-30 16:04:32 +08:00
joylink_cuiweidong
0bac44bba7 竞赛代码调整 2020-10-30 15:52:23 +08:00
joylink_cuiweidong
12f08768da 代码调整 2020-10-30 15:36:39 +08:00
joylink_cuiweidong
7665c3a97d 剧本编制代码调整
仿真 剧本 会话 综合演练 添加 电力调度角色
2020-10-30 11:24:42 +08:00
joylink_cuiweidong
7c865e969b 场景编制代码调整 2020-10-29 18:48:59 +08:00
joylink_cuiweidong
286f0b314e 场景编制代码调整 2020-10-29 18:12:42 +08:00
joylink_cuiweidong
54b6095b5a 代码调整 2020-10-29 09:41:56 +08:00
joylink_cuiweidong
f70294f5b2 代码调整 2020-10-28 16:40:33 +08:00
zyy
0084c4687e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-28 16:15:08 +08:00
zyy
6124f6c38a 删除多余配置 2020-10-28 16:14:57 +08:00
joylink_cuiweidong
cdb56ef33b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
2020-10-28 15:56:23 +08:00