Commit Graph

23 Commits

Author SHA1 Message Date
joylink_cuiweidong
cad56a82e9 Merge branch 'dev_prd' into dev
# Conflicts:
#	src/views/demonstration/detail/index.vue
2019-12-30 18:45:05 +08:00
fan
15f7aa656e 新版地图包加载仿真 2019-12-30 09:57:54 +08:00
fan
c7078dcdb9 新版地图包加载仿真 2019-12-30 09:00:16 +08:00
joylink_cuiweidong
40bc4840e7 prdType 接口调整 2019-12-27 19:36:29 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
joylink_cuiweidong
5465eb61c1 prdCode改成prdId 2019-11-07 15:54:49 +08:00
joylink_cuiweidong
b9111b8219 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/designPlatform/mapPreview.vue
2019-10-28 19:14:49 +08:00
fan
1caad290e5 ibp盘添加扣车关联 2019-10-16 14:00:30 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
3da74652c5 增加派班计划 2019-08-30 09:00:36 +08:00
ival
1616639f6f 修改运行图接口 2019-08-29 13:52:34 +08:00
joylink_cuiweidong
aab5bcc995 剧本录制添加成员角色 2019-08-21 18:45:16 +08:00
joylink_cuiweidong
7f2c741818 剧本列表页面 样式调整 2019-08-20 17:54:40 +08:00
joylink_cuiweidong
4dbe34cf4f 剧本编制模块修改 2019-08-19 18:24:06 +08:00
joylink_cuiweidong
ecefa16f5e 剧本编制修改 2019-08-16 17:15:20 +08:00
joylink_cuiweidong
b73baebbb8 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-08-16 13:50:51 +08:00
fan
50e9549260 剧本接口调整 2019-08-16 13:43:46 +08:00
joylink_cuiweidong
f722a0bc27 录制剧本模块修改 2019-08-16 09:25:12 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
joylink_cuiweidong
e105327af6 加载剧本调整 2019-08-12 20:04:53 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
joylink_cuiweidong
b166dbd769 剧本 任务录制模块提交 2019-08-08 10:31:46 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00