fan
|
38f4dc1093
|
产品分化调整
|
2019-10-12 18:43:41 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
joylink_cuiweidong
|
e31bd2730f
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:18:43 +08:00 |
|
joylink_cuiweidong
|
17ed79b2dd
|
产品分化课程设计页面调整
刷新页面菜单栏选中状态调整
|
2019-10-10 16:18:31 +08:00 |
|
fan
|
977a6d8b47
|
产品分化调整
|
2019-10-10 16:07:13 +08:00 |
|
fan
|
c9f9aa6869
|
产品分化调整
|
2019-10-10 13:02:43 +08:00 |
|
fan
|
3381424f0d
|
产品分化调整
|
2019-10-10 09:33:56 +08:00 |
|
fan
|
417c78ec72
|
产品分化调整优化
|
2019-10-09 15:14:00 +08:00 |
|
fan
|
641345e801
|
设计平台调整
|
2019-09-30 17:56:16 +08:00 |
|
fan
|
5075e999b9
|
设计平台调整
|
2019-09-30 16:20:31 +08:00 |
|
fan
|
5d27847379
|
设计平台系统调整
|
2019-09-30 13:24:47 +08:00 |
|
fan
|
c9570a4631
|
暂时提交
|
2019-09-29 15:55:01 +08:00 |
|
fan
|
6c8a8574da
|
暂时提交
|
2019-09-29 14:27:58 +08:00 |
|
fan
|
f9bdaaac4f
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 14:48:50 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
joylink_cuiweidong
|
58b429f852
|
地图设计右键操作添加
|
2019-09-27 10:16:11 +08:00 |
|
fan
|
31721a4738
|
产品分化调整
|
2019-09-26 16:14:07 +08:00 |
|
fan
|
1fb0cf3e94
|
产品分化调整
|
2019-09-26 15:08:53 +08:00 |
|
fan
|
0fac6ce22e
|
产品分化调整
|
2019-09-25 18:56:30 +08:00 |
|
fan
|
436cd0418f
|
国际化调整
|
2019-09-11 17:11:51 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
fan
|
614aae8be0
|
国际化调整
|
2019-08-22 09:06:48 +08:00 |
|
zyy
|
1132e5fb4c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/global.js
# src/i18n/langs/zh/index.js
# src/i18n/langs/zh/rules.js
# src/views/map/runplan/manage/create.vue
|
2019-08-21 13:47:40 +08:00 |
|
zyy
|
c22d97b944
|
desc: 教学系统国际化
|
2019-08-21 13:46:36 +08:00 |
|
ival
|
4270053326
|
修改国际化
|
2019-08-21 11:28:56 +08:00 |
|
ival
|
ae500285ba
|
修改实训加载顺序错误的问题
|
2019-08-19 15:59:04 +08:00 |
|
ival
|
94f3659cf3
|
修改国际化
|
2019-08-19 15:19:33 +08:00 |
|
fan
|
a669d093b1
|
修改：删除全局loading
|
2019-08-19 13:27:15 +08:00 |
|
zyy
|
2e7715ea0a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/mapdraft/mapedit/index.vue
# src/views/map/mapdraft/mapedit/mapoperate/trainwindow.vue
|
2019-08-16 15:13:58 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +08:00 |
|
joylink_cuiweidong
|
2598087dac
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/en/map.js
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/map.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/tip.js
# src/utils/baseUrl.js
# src/views/map/mapdraft/mapedit/routingoperate/detail.vue
# src/views/map/mapdraft/mapedit/routingoperate/route.vue
# src/views/map/mapdraft/mapedit/switchoperate/detail.vue
|
2019-08-16 13:45:49 +08:00 |
|
joylink_cuiweidong
|
ca7b21e61e
|
修改剧本管理界面
|
2019-08-15 09:04:17 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
ival
|
6343a79f81
|
修改接口
|
2019-08-14 14:01:28 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
joylink_cuiweidong
|
19d26919fc
|
处理录制剧本时地图不加载的问题
|
2019-08-12 17:35:55 +08:00 |
|
zyy
|
e7d1f478be
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-12 15:19:33 +08:00 |
|
zyy
|
fcb6076d64
|
desc: 增加地图编辑国际化
|
2019-08-12 15:19:26 +08:00 |
|
joylink_cuiweidong
|
1b01141b88
|
修改剧本编辑 字段名称
|
2019-08-12 14:21:32 +08:00 |
|
joylink_cuiweidong
|
47b2be3a8b
|
剧本创建修改查询接口调整
|
2019-08-12 11:31:43 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
fan
|
74f7785663
|
调整：限制仿真多次加载
|
2019-08-09 15:52:55 +08:00 |
|
ival
|
05aa351a85
|
修改代码
|
2019-08-09 15:13:16 +08:00 |
|
ival
|
7af324ab1e
|
国际化配置
|
2019-08-09 15:10:13 +08:00 |
|
ival
|
01b871fa77
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:37:31 +08:00 |
|
ival
|
3adc1aafb1
|
修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
|
2019-08-08 16:37:15 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
zyy
|
b67a37bc33
|
desc: 修改查询问题
|
2019-08-08 15:27:30 +08:00 |
|