Commit Graph

481 Commits

Author SHA1 Message Date
zyy
d161492fed 添加题库管理流程 2020-05-26 15:59:11 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
fan
eba0bff786 竞赛系统 2020-05-19 10:18:01 +08:00
zyy
09b3b684cf 调整竞赛系统路由 2020-05-19 09:03:38 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
zyy
6391e8e881 调整竞赛系统路径,页面路由配置 2020-05-15 16:01:16 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
joylink_cuiweidong
4d1f6a6a9d 新版绘图 高级数据 交路 生成站间运行时间 接口调整 2020-04-26 13:18:25 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
fan
f375b97631 派班工作站调整 2020-04-20 15:38:30 +08:00
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
fan
4231966cac 取消cdn加载&调整快速入口进入房间 2020-04-17 09:13:40 +08:00
fan
ee209d5dbf 综合演练二维码下添加房间号 2020-04-16 17:23:43 +08:00
fan
d69e155e91 贵州装备添加联锁角色&&项目配置规整(未完) 2020-04-16 15:52:56 +08:00
fan
a1869a531f 集中站分隔调整&线路管理配置调整 2020-04-15 14:13:08 +08:00
fan
2613b68413 佛山列车显示调整&西安二号线集中站分割符 2020-04-14 18:51:09 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
fan
0079b698e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 16:45:48 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
zyy
402a383bf6 删除多余打印,调整名称 2020-04-07 16:19:24 +08:00
fan
8f30d436ee 调整绘图&三维跳转页面icon 2020-04-01 16:24:03 +08:00
fan
225a739f60 打包本地项目不进行cdn加载 2020-04-01 13:47:29 +08:00
fan
b778621329 Merge branch 'dev_pack' into test
# Conflicts:
#	package.json
#	vue.config.js
2020-04-01 10:33:26 +08:00
fan
8e3d9b541c 调整本地项目加入新房间失败提示&除dev其他打包开启gzip 2020-04-01 10:22:03 +08:00
fan
eddca622df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-31 18:51:02 +08:00
fan
bfd5b07145 调整本地项目综合演练 2020-03-31 18:50:16 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板,三维模型资源改本地 2020-03-31 18:30:15 +08:00
fan
335132c9b9 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 16:55:58 +08:00
fan
007c3658c6 调整本地项目 2020-03-31 16:54:04 +08:00
zyy
4ef3c69f9f 调整显示内容 判断 2020-03-31 15:34:55 +08:00
fan
724e198f79 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 13:47:25 +08:00
fan
5563212ec0 调整哈尔滨项目 2020-03-31 13:45:45 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
9d38968751 佛山样式调整&&宁波显示调整 2020-03-25 15:22:52 +08:00
fan
df70024740 代码调整 2020-03-24 18:42:18 +08:00
fan
9ff1d7e30c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/store/modules/socket.js
2020-03-24 10:13:01 +08:00
fan
2501a1a70a 综合演练问题调整 2020-03-23 16:00:28 +08:00
zyy
473d60ca0c Merge branch 'dev' into test 2020-03-20 13:08:35 +08:00
fan
404d867767 绘图&成三现地调整 2020-03-20 11:09:06 +08:00
zyy
3b645724cc Merge branch 'dev' into test 2020-03-19 18:40:12 +08:00
fan
36b7d7309a 增加绘图表示灯&&线条颜色 2020-03-19 16:17:34 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
fan
bd2938173a Merge remote-tracking branch 'origin/dev' into test 2020-03-11 16:59:47 +08:00
fan
0aac76bb0e Merge remote-tracking branch 'origin/dev' into test 2020-03-11 10:54:08 +08:00