zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
zyy
|
91a93da574
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-26 17:42:32 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
fan
|
bc68f1adc9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-26 15:43:56 +08:00 |
|
fan
|
2ce7cde8cb
|
调整icon导致x替换问题
|
2019-09-26 15:43:19 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +08:00 |
|
fan
|
a73ae082a8
|
elementUI图标替换英文X
|
2019-09-25 09:39:04 +08:00 |
|
zyy
|
8212759438
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-24 15:06:56 +08:00 |
|
zyy
|
a0ee753bfd
|
desc: 调整成都三号线自动生成课程配置，部分内容 (待调)
|
2019-09-24 15:06:45 +08:00 |
|
fan
|
d4ec49ea16
|
国际化调整
|
2019-09-24 12:58:41 +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 |
|
joylink_cuiweidong
|
b166dbd769
|
剧本 任务录制模块提交
|
2019-08-08 10:31:46 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
ival
|
9152b6a55e
|
增加 Line 和 Text 设备移植，以及调试代码
|
2019-07-30 12:37:31 +08:00 |
|
ival
|
4dec6ac93d
|
调试仿真
|
2019-07-26 15:52:50 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|