joylink_cuiweidong
|
713f411ffc
|
运行图设计调整
|
2019-11-08 13:47:51 +08:00 |
|
fan
|
71171625fa
|
删除console
|
2019-11-08 13:44:49 +08:00 |
|
fan
|
7648bbb5f5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 13:41:41 +08:00 |
|
fan
|
b4ba9cb3b8
|
代码修改
|
2019-11-08 13:41:22 +08:00 |
|
joylink_cuiweidong
|
32f0006726
|
剧本录制调整
|
2019-11-08 13:01:41 +08:00 |
|
joylink_cuiweidong
|
84562c94dc
|
剧本代码调整
|
2019-11-08 10:59:56 +08:00 |
|
fan
|
7e13f98167
|
发布课程管理form 添加城市与地图的级联关系
|
2019-11-08 10:57:07 +08:00 |
|
fan
|
f8d6a3eb9f
|
课程发布管理添加归属地图
|
2019-11-08 10:21:54 +08:00 |
|
fan
|
c203f7b839
|
skinCode 调整
|
2019-11-08 10:08:28 +08:00 |
|
fan
|
89528c3f8f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 09:30:19 +08:00 |
|
fan
|
54609d383a
|
产品编码修改
|
2019-11-08 09:29:58 +08:00 |
|
ival
|
ddfa368268
|
修改代码
|
2019-11-08 09:13:38 +08:00 |
|
ival
|
a2a793d36d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/trainRoom/index.vue
|
2019-11-08 09:03:28 +08:00 |
|
ival
|
b99f994541
|
修改代码
|
2019-11-08 09:02:18 +08:00 |
|
joylink_cuiweidong
|
2bef8e867b
|
剧本添加列车驾驶模式指令
|
2019-11-07 19:39:52 +08:00 |
|
zyy
|
5a2ff68b15
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 18:46:23 +08:00 |
|
zyy
|
16e13f38b5
|
desc: 调整格式
|
2019-11-07 18:46:17 +08:00 |
|
fan
|
a82474dc14
|
产品编码修改
|
2019-11-07 17:18:08 +08:00 |
|
fan
|
5b1372f260
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-07 16:43:12 +08:00 |
|
fan
|
d3e1086596
|
添加ibp局部选中拖拽
|
2019-11-07 16:42:56 +08:00 |
|
joylink_cuiweidong
|
b4400f9226
|
代码调整
|
2019-11-07 16:26:55 +08:00 |
|
joylink_cuiweidong
|
6102c29116
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 15:55:02 +08:00 |
|
joylink_cuiweidong
|
5465eb61c1
|
prdCode改成prdId
|
2019-11-07 15:54:49 +08:00 |
|
zyy
|
42a5f7076a
|
desc: 调整区段绘图逻辑优化
|
2019-11-07 15:20:39 +08:00 |
|
zyy
|
4e1ee242a5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-07 10:42:32 +08:00 |
|
zyy
|
d2e99dbfd3
|
desc: 调整代码
|
2019-11-07 10:42:22 +08:00 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
zyy
|
796ef7087f
|
desc: 修改代码
|
2019-11-06 18:49:55 +08:00 |
|
ival
|
45455859b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:40:33 +08:00 |
|
ival
|
b39bb21854
|
修改代码
|
2019-11-06 18:40:23 +08:00 |
|
zyy
|
1a4dbf49d2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-06 18:39:04 +08:00 |
|
zyy
|
18fb36b1b9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/config/skinCode/fuzhou_01.js
# src/jmap/map.js
|
2019-11-06 18:38:50 +08:00 |
|
joylink_cuiweidong
|
521a50ccb6
|
代码调整
|
2019-11-06 18:38:28 +08:00 |
|
zyy
|
9f1f02bf0e
|
desc: 增加绘图撤销，重做
|
2019-11-06 18:37:32 +08:00 |
|
joylink_cuiweidong
|
9424dfb001
|
权限分发调整
|
2019-11-06 13:41:02 +08:00 |
|
fan
|
7753e82fa9
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 10:49:42 +08:00 |
|
fan
|
42d9e1e7a1
|
浏览器图标调整
# Conflicts:
# src/App.vue
|
2019-11-06 10:49:32 +08:00 |
|
joylink_cuiweidong
|
568e335a59
|
代码调整
|
2019-11-06 10:42:53 +08:00 |
|
fan
|
7ff1878389
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-06 09:33:08 +08:00 |
|
fan
|
24f313045b
|
国际化修正
|
2019-11-06 08:57:35 +08:00 |
|
joylink_cuiweidong
|
5b4f9084d2
|
代码调整
|
2019-11-05 19:22:21 +08:00 |
|
joylink_cuiweidong
|
6a2a0b0b5e
|
代码调整
权限分发国际化调整
|
2019-11-05 19:03:20 +08:00 |
|
joylink_cuiweidong
|
2228b1f089
|
权限转增接口调整
|
2019-11-05 17:21:05 +08:00 |
|
joylink_cuiweidong
|
47da2feb36
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 16:53:58 +08:00 |
|
joylink_cuiweidong
|
f8298400f1
|
代码优化
权限分发转赠接口调整
|
2019-11-05 16:53:39 +08:00 |
|
fan
|
8f8caba6a3
|
系统通知样式调整
|
2019-11-05 16:45:09 +08:00 |
|
fan
|
1b3fc52f98
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-05 16:40:55 +08:00 |
|
fan
|
ce7ca4b9d8
|
添加系统通知功能
|
2019-11-05 16:40:36 +08:00 |
|
ival
|
632784d376
|
修改代码
|
2019-11-05 15:32:27 +08:00 |
|
ival
|
e72c1b8b05
|
增加键盘监听
|
2019-11-05 14:17:19 +08:00 |
|