ival
|
79219792c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:44:30 +08:00 |
|
ival
|
89239b7fe1
|
修改代码
|
2019-11-12 13:44:10 +08:00 |
|
joylink_cuiweidong
|
b1d19febe6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:40:05 +08:00 |
|
joylink_cuiweidong
|
5ce2e1a5b7
|
仿真skinCode调整
|
2019-11-12 13:39:52 +08:00 |
|
zyy
|
092603c2cc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 13:36:27 +08:00 |
|
zyy
|
7018b4c308
|
desc: 修改代码
|
2019-11-12 13:36:21 +08:00 |
|
fan
|
52e3bfe38a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-12 09:40:57 +08:00 |
|
fan
|
92f2292592
|
暂无法购买，添加提示
|
2019-11-12 09:40:36 +08:00 |
|
ival
|
dfa6c7bf37
|
修改代码
|
2019-11-12 09:30:31 +08:00 |
|
ival
|
1d0a920f7c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-12 09:24:26 +08:00 |
|
ival
|
9e5838c647
|
删除多余指令
|
2019-11-12 09:24:11 +08:00 |
|
program-walker
|
11f2fda309
|
Merge remote-tracking branch 'origin/test'
|
2019-11-11 20:06:02 +08:00 |
|
program-walker
|
17a29d92c9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 20:05:26 +08:00 |
|
program-walker
|
6acea50779
|
注销退出监听处理
|
2019-11-11 20:04:31 +08:00 |
|
zyy
|
e9ef8efa17
|
Merge branch 'dev' into test
|
2019-11-11 19:29:31 +08:00 |
|
zyy
|
db1681b54e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 19:24:39 +08:00 |
|
zyy
|
6e29cec983
|
desc: 修改代码
|
2019-11-11 19:24:30 +08:00 |
|
fan
|
50d942284c
|
Merge remote-tracking branch 'origin/test'
|
2019-11-11 19:07:13 +08:00 |
|
fan
|
154e15b428
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-11 18:53:41 +08:00 |
|
fan
|
e069821071
|
路由跳转调整
|
2019-11-11 18:53:11 +08:00 |
|
joylink_cuiweidong
|
e4dffd17af
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 18:45:09 +08:00 |
|
fan
|
90a45dc5bd
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-11 18:42:34 +08:00 |
|
fan
|
c35cef4800
|
样式调整
|
2019-11-11 18:42:14 +08:00 |
|
sunzhenyu
|
e36ef1b3da
|
三维行车测试
|
2019-11-11 18:32:03 +08:00 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
joylink_cuiweidong
|
9851ac01a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-11 17:39:23 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
ival
|
912f61cda7
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 17:03:36 +08:00 |
|
ival
|
87f0b2a69d
|
修改代码
|
2019-11-11 17:03:21 +08:00 |
|
joylink_cuiweidong
|
4c0f965a47
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-11 15:54:15 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54:04 +08:00 |
|
sunzhenyu
|
cda7d04dcc
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-11 15:17:08 +08:00 |
|
sunzhenyu
|
f5de76ff63
|
测试
|
2019-11-11 15:16:18 +08:00 |
|
fan
|
6ca155617f
|
label 调整
|
2019-11-11 14:08:54 +08:00 |
|
fan
|
04ec094ded
|
样式调整
|
2019-11-11 13:34:35 +08:00 |
|
fan
|
bf7b12cacb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/lesson/trainingmanage/index.vue
|
2019-11-11 13:23:35 +08:00 |
|
fan
|
907d95879e
|
代码调整
|
2019-11-11 13:22:22 +08:00 |
|
joylink_cuiweidong
|
b3a4e6ca8c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/global.js
|
2019-11-11 13:11:50 +08:00 |
|
fan
|
56d11976db
|
设计平台剧本课程运行图统一风格样式
|
2019-11-11 13:10:36 +08:00 |
|
joylink_cuiweidong
|
aade09a303
|
权限分发调整
|
2019-11-11 13:10:23 +08:00 |
|
fan
|
be6bd12b52
|
代码调整
|
2019-11-11 09:56:11 +08:00 |
|
fan
|
3674833434
|
周末问题调整
|
2019-11-11 09:20:24 +08:00 |
|
fan
|
23abc6dfe0
|
Merge remote-tracking branch 'origin/test'
|
2019-11-08 20:31:54 +08:00 |
|
fan
|
30f1997a08
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 20:31:10 +08:00 |
|
fan
|
00458ff53f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 20:25:26 +08:00 |
|
fan
|
46c6282a14
|
代码调整
|
2019-11-08 20:25:04 +08:00 |
|
ival
|
a067444fd0
|
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# src/App.vue
# src/views/display/menuDemon.vue
# src/views/orderauthor/permission/create/permission.vue
# src/views/scriptManage/create.vue
# src/views/trainRoom/index.vue
|
2019-11-08 20:08:03 +08:00 |
|
ival
|
62097db613
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 20:04:32 +08:00 |
|
ival
|
8855bb6c27
|
修改代码
|
2019-11-08 20:03:33 +08:00 |
|
ival
|
058e8cdcd5
|
修改
|
2019-11-08 19:34:12 +08:00 |
|
sunzhenyu
|
e805a97a6d
|
修改转换数据计算
|
2019-11-08 19:33:43 +08:00 |
|
ival
|
1e1400ac68
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 19:33:05 +08:00 |
|
ival
|
b049ff3be2
|
修改代码
|
2019-11-08 19:32:21 +08:00 |
|
joylink_cuiweidong
|
d64e838bcb
|
代码调整
|
2019-11-08 19:29:39 +08:00 |
|
joylink_cuiweidong
|
8f0ef88f59
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 18:58:03 +08:00 |
|
joylink_cuiweidong
|
fcf4f542e0
|
代码调整
|
2019-11-08 18:57:27 +08:00 |
|
fan
|
62a7cce5f1
|
返回仿真不退出全屏
|
2019-11-08 18:52:09 +08:00 |
|
fan
|
b8b73a2151
|
merge
|
2019-11-08 18:45:08 +08:00 |
|
fan
|
daec7d5e4d
|
bug 调整
|
2019-11-08 18:43:46 +08:00 |
|
sunzhenyu
|
84dc26574b
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 18:42:43 +08:00 |
|
sunzhenyu
|
957f13fd2f
|
行车逻辑测试
|
2019-11-08 18:42:37 +08:00 |
|
zyy
|
a348552d1e
|
desc: 增加选中批量设置集中站操作
|
2019-11-08 18:32:39 +08:00 |
|
ival
|
4816ca97b8
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/views/display/designIndex.vue
# src/views/display/index.vue
|
2019-11-08 18:20:56 +08:00 |
|
joylink_cuiweidong
|
ee600f8915
|
skinCode调整
|
2019-11-08 18:19:35 +08:00 |
|
ival
|
46effe5ca8
|
提交代码
|
2019-11-08 18:17:34 +08:00 |
|
ival
|
6049c04a74
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-11-08 18:16:43 +08:00 |
|
fan
|
2d04c6aa6a
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:57 +08:00 |
|
ival
|
0776d08053
|
修改仿真房间代码
|
2019-11-08 18:15:52 +08:00 |
|
fan
|
2974f613f3
|
订阅topic 区分平台--调整
|
2019-11-08 18:15:23 +08:00 |
|
fan
|
f75f992776
|
订阅topic 区分平台
|
2019-11-08 17:52:30 +08:00 |
|
fan
|
75a871265e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-08 16:22:32 +08:00 |
|
fan
|
e677b24f6d
|
调整查询地图列表接口
|
2019-11-08 16:22:05 +08:00 |
|
joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
joylink_cuiweidong
|
b923fa2a6b
|
代码调整
|
2019-11-08 15:17:04 +08:00 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
zyy
|
4c48145465
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
|
2019-11-08 14:37:17 +08:00 |
|
zyy
|
7a359e5f6e
|
desc: 修改代码
|
2019-11-08 14:36:41 +08:00 |
|
joylink_cuiweidong
|
11226b84ab
|
运行图设计代码调整
|
2019-11-08 14:35:58 +08:00 |
|
sunzhenyu
|
0a77a56196
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-08 14:31:23 +08:00 |
|
sunzhenyu
|
8e11c76cd7
|
测试站台停车坐标
|
2019-11-08 14:31:15 +08:00 |
|
fan
|
06f6b920e9
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-11-08 14:00:09 +08:00 |
|
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
|
0e674de983
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 13:02:28 +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 |
|
joylink_cuiweidong
|
2f1cc475a1
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/en/map.js
# src/utils/baseUrl.js
|
2019-11-08 09:41:33 +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 |
|
sunzhenyu
|
523a2ac803
|
修改道岔模型，编辑器显示停车点
|
2019-11-08 09:16:14 +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 |
|
sunzhenyu
|
0a77b1e4f6
|
注释
|
2019-11-06 13:34:52 +08:00 |
|
sunzhenyu
|
3e3cb9bfd2
|
对齐站台隧道
|
2019-11-06 12:18:50 +08:00 |
|
fan
|
85f6ed24ab
|
查询地图列表ou 调整
|
2019-11-06 11:14:35 +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
|
80864b13e4
|
浏览器图标调整
|
2019-11-06 10:42:08 +08:00 |
|
fan
|
8b2e1d2d29
|
登录页样式调整
|
2019-11-06 09:52:15 +08:00 |
|
fan
|
46b35323d9
|
西铁院登录页样式调整，测试问题调整
# Conflicts:
# src/views/scriptManage/create.vue
|
2019-11-06 09:51:52 +08:00 |
|
fan
|
50aee38b48
|
西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化
|
2019-11-06 09:41:32 +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 |
|
sunzhenyu
|
57235b8965
|
修改路径判定
|
2019-11-05 18:26:12 +08:00 |
|
sunzhenyu
|
e5d6b79ed1
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-05 17:30:47 +08:00 |
|
sunzhenyu
|
a340496eac
|
修改模型路径，修改轨迹判定
|
2019-11-05 17:30:39 +08:00 |
|
joylink_cuiweidong
|
94120489a4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-05 17:22:03 +08:00 |
|
joylink_cuiweidong
|
2228b1f089
|
权限转增接口调整
|
2019-11-05 17:21:05 +08:00 |
|
joylink_cuiweidong
|
8d4964a304
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/i18n/langs/zh/router.js
|
2019-11-05 16:59:25 +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 |
|
ival
|
5fc745b799
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-05 14:16:09 +08:00 |
|
ival
|
37fdeec4e3
|
修改代码
|
2019-11-05 14:15:55 +08:00 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
7921c9fde4
|
登录页样式调整
|
2019-11-05 13:15:59 +08:00 |
|
sunzhenyu
|
2c2efe9360
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-11-04 18:57:43 +08:00 |
|
sunzhenyu
|
4532446048
|
修改路劲判断函数，区分仿真和沙盘加载显示内容，测试站台模型
|
2019-11-04 18:57:35 +08:00 |
|
fan
|
d54ed0329b
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 18:42:07 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
joylink_cuiweidong
|
cf69d44833
|
代码优化
系统管理用户实训统计接口调整
|
2019-11-04 14:05:55 +08:00 |
|
fan
|
347e49f55c
|
调整接口
|
2019-11-04 13:29:51 +08:00 |
|
fan
|
b87fa71979
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-11-04 11:29:46 +08:00 |
|
fan
|
d381ed6a88
|
西铁院title、logo修改，综合演练房间角色调整后，角色顺序不再变化
|
2019-11-04 11:29:35 +08:00 |
|
zyy
|
cf754056a8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-04 11:12:15 +08:00 |
|
zyy
|
7c69263701
|
desc: 修改代码
|
2019-11-04 11:12:08 +08:00 |
|
joylink_cuiweidong
|
075cdf5fd9
|
页面样式调整
代码优化
|
2019-11-04 10:59:50 +08:00 |
|
zyy
|
1c373822ee
|
desc: 修改代码
|
2019-11-04 10:33:45 +08:00 |
|
zyy
|
645326bf6a
|
Merge branch 'dev' into test
|
2019-11-01 18:09:17 +08:00 |
|
zyy
|
92b06df4b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 18:08:12 +08:00 |
|
zyy
|
bc332c1a9d
|
desc: 调整国际化，高度问题
|
2019-11-01 18:08:05 +08:00 |
|
joylink_cuiweidong
|
0217650979
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-11-01 17:49:05 +08:00 |
|
joylink_cuiweidong
|
ad48fb931c
|
国际化调整
|
2019-11-01 17:35:04 +08:00 |
|
joylink_cuiweidong
|
c361b639ad
|
国际化调整
|
2019-11-01 17:30:06 +08:00 |
|
joylink_cuiweidong
|
96452b8dde
|
代码调整
|
2019-11-01 17:08:28 +08:00 |
|
zyy
|
3e502ffca2
|
Merge branch 'test'
|
2019-11-01 15:20:18 +08:00 |
|
zyy
|
a43f1bd2c9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 15:19:22 +08:00 |
|
zyy
|
a133abc1d4
|
desc: 修改代码
|
2019-11-01 15:19:15 +08:00 |
|
joylink_cuiweidong
|
f3298cdb83
|
页面调整
|
2019-11-01 15:12:00 +08:00 |
|
zyy
|
6d6e851449
|
Merge branch 'dev' into test
|
2019-11-01 13:51:26 +08:00 |
|
zyy
|
3bcb637d1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 13:51:08 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +08:00 |
|
joylink_cuiweidong
|
0c938f5928
|
接口调整
|
2019-11-01 13:36:14 +08:00 |
|
joylink_cuiweidong
|
ccd71601d1
|
接口调整
|
2019-11-01 11:28:10 +08:00 |
|
joylink_cuiweidong
|
444d60ce2a
|
接口调整
|
2019-11-01 10:28:15 +08:00 |
|
joylink_cuiweidong
|
76e904455a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-01 10:07:00 +08:00 |
|
joylink_cuiweidong
|
d0608dd29e
|
接口调整
文件位置调整
|
2019-11-01 10:06:47 +08:00 |
|
zyy
|
90c8349a8f
|
Merge branch 'dev' into test
|
2019-10-31 18:44:04 +08:00 |
|
zyy
|
dd23ca545d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 18:43:19 +08:00 |
|
zyy
|
53d4483081
|
desc: 修改代码
|
2019-10-31 18:43:05 +08:00 |
|
fan
|
cf39a8fa89
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 17:49:20 +08:00 |
|
joylink_cuiweidong
|
8035833c1c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:45:28 +08:00 |
|
joylink_cuiweidong
|
cfdea6ea12
|
接口调整
|
2019-10-31 17:45:15 +08:00 |
|
zyy
|
7a0d40184f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 17:30:31 +08:00 |
|
zyy
|
7ec68a75e3
|
desc: 删除多余文件， 调整路径配置
|
2019-10-31 17:30:24 +08:00 |
|
fan
|
3ae1de5a23
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 16:56:31 +08:00 |
|
fan
|
7455fb17ea
|
发布地图管理国际化调整，添加ibp角色多人时disable为true 调整
|
2019-10-31 16:52:49 +08:00 |
|
joylink_cuiweidong
|
24a56a9695
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/views/lesson/lessoncategory/edit/lesson/index.vue
|
2019-10-31 16:11:29 +08:00 |
|
fan
|
a250d54cb4
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/router/index.js
|
2019-10-31 16:04:57 +08:00 |
|
joylink_cuiweidong
|
ad97697406
|
接口调整
|
2019-10-31 15:56:07 +08:00 |
|
fan
|
a24ff9ad60
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:54:46 +08:00 |
|
fan
|
a914bdd8cb
|
ibp数据调整
|
2019-10-31 15:54:28 +08:00 |
|
zyy
|
834d4e30cd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 15:44:51 +08:00 |
|
zyy
|
ff4829e037
|
desc: 调整路径
|
2019-10-31 15:44:43 +08:00 |
|
ival
|
6df897316b
|
移植system
|
2019-10-31 15:43:37 +08:00 |
|
ival
|
07ef079f1b
|
修改代码
|
2019-10-31 15:34:38 +08:00 |
|
ival
|
9ceacf7cef
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-31 15:22:13 +08:00 |
|
ival
|
1179c9acd6
|
移植system
|
2019-10-31 15:20:16 +08:00 |
|
fan
|
0f6381e782
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 15:18:08 +08:00 |
|
fan
|
b9470b512e
|
ibp数据调整
|
2019-10-31 15:17:08 +08:00 |
|
zyy
|
dfd148897b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 14:47:20 +08:00 |
|
zyy
|
dc8524e52a
|
desc: 调整试题高度
|
2019-10-31 14:47:05 +08:00 |
|
fan
|
b5db06f833
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-31 14:40:14 +08:00 |
|
fan
|
4c524eb1a7
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-31 14:38:54 +08:00 |
|
fan
|
547589331b
|
发布地图管理调整调整
|
2019-10-31 14:35:28 +08:00 |
|
joylink_cuiweidong
|
50e74a0372
|
代码调整
|
2019-10-31 14:06:00 +08:00 |
|
fan
|
dceba96db0
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# src/views/jlmap3d/drive/jl3ddrive.vue
|
2019-10-31 14:00:42 +08:00 |
|
fan
|
aefbd0f5e5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:58:01 +08:00 |
|
fan
|
934b67fea3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-31 13:57:36 +08:00 |
|
sunzhenyu
|
2a39905de3
|
修改仿真渲染设置
|
2019-10-31 13:57:29 +08:00 |
|
fan
|
3996f03e55
|
实训首页样式调整和复制地图调整
|
2019-10-31 13:57:17 +08:00 |
|
joylink_cuiweidong
|
c031125e97
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-31 13:56:53 +08:00 |
|
joylink_cuiweidong
|
681ac5e886
|
路由调整
接口调整
|
2019-10-31 13:56:42 +08:00 |
|
sunzhenyu
|
675dc32516
|
注释
|
2019-10-31 13:38:40 +08:00 |
|
sunzhenyu
|
3d9a458d42
|
修改三维数据接口,修改渲染范围
|
2019-10-31 13:26:40 +08:00 |
|
zyy
|
a87372ea2c
|
desc: 发布高度调整
|
2019-10-31 13:24:45 +08:00 |
|
sunzhenyu
|
72988575eb
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-31 13:07:04 +08:00 |
|
sunzhenyu
|
26f0b6dde0
|
修改行车逻辑，减少画面渲染
|
2019-10-31 13:06:56 +08:00 |
|
joylink_cuiweidong
|
b5b08a0afd
|
接口调整
|
2019-10-31 11:03:19 +08:00 |
|
fan
|
ea219e6310
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
# src/views/publish/publishMap/project.vue
|
2019-10-31 10:36:30 +08:00 |
|
fan
|
900abcbe36
|
添加复制地图和调整实训平台树节点key
|
2019-10-31 10:32:46 +08:00 |
|
zyy
|
c006a98f2e
|
desc: 修改代码
|
2019-10-31 10:09:43 +08:00 |
|
zyy
|
fec1f776cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-31 09:22:01 +08:00 |
|
zyy
|
7175a4d917
|
desc: 调整代码
|
2019-10-31 09:21:31 +08:00 |
|
fan
|
6d37627e3d
|
发布地图管理调整
|
2019-10-31 09:09:43 +08:00 |
|
joylink_cuiweidong
|
3636bd06b4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 19:37:07 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
fan
|
00dcbdf7bd
|
任务管理调整
|
2019-10-30 19:36:26 +08:00 |
|
fan
|
6e6fe0bf59
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 19:05:20 +08:00 |
|
fan
|
3dff70d821
|
运行图调整
|
2019-10-30 19:04:21 +08:00 |
|
zyy
|
2d8547182b
|
desc: 调整文件位置
|
2019-10-30 18:38:00 +08:00 |
|
zyy
|
75f9cf8a70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/chengdu_03/planSchedule/menuBar.vue
|
2019-10-30 18:25:50 +08:00 |
|
zyy
|
10565fdd6b
|
desc: 调整地图绘制高度问题
|
2019-10-30 18:25:13 +08:00 |
|
fan
|
0311e5ee4f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:18:32 +08:00 |
|
fan
|
1242c7e3d7
|
修改接口：/api/runPlan/template/{id}/copyAs/{skinCode} 改为 /api/runPlan/template/{id}/copyAs/{mapId}
|
2019-10-30 18:18:09 +08:00 |
|
joylink_cuiweidong
|
2df4c5f8cb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 18:07:45 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
fan
|
5bca5be2e4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 18:03:42 +08:00 |
|
fan
|
fa1fc4c3cf
|
删除接口：/api/mapPrd/tree
|
2019-10-30 18:03:30 +08:00 |
|
fan
|
e5c832aa00
|
修改接口：/api/mapPrd/{skinStyle}/list 改为 /api/mapPrd/{mapId}/list
|
2019-10-30 17:41:29 +08:00 |
|
ival
|
a97c1945c0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 17:26:31 +08:00 |
|
ival
|
7d1d7758e4
|
增加时间北京颜色
|
2019-10-30 17:26:16 +08:00 |
|
fan
|
36c33ed416
|
修改接口：/api/runPlan/template/skin/{mapId} 改为 /api/runPlan/template/{mapId}/list
|
2019-10-30 17:21:32 +08:00 |
|
fan
|
0f778f94c6
|
所有 /api/mapSkin 开始的接口路径都改为 /api/realLine
|
2019-10-30 17:00:50 +08:00 |
|
fan
|
f2e4885f78
|
删除接口：/api/runPlan/draft/tree
|
2019-10-30 16:58:44 +08:00 |
|
fan
|
6d0edb2370
|
合并代码
|
2019-10-30 16:57:01 +08:00 |
|
fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
joylink_cuiweidong
|
85733f5f0a
|
接口调整
无效文件删除
|
2019-10-30 14:40:31 +08:00 |
|
joylink_cuiweidong
|
de1b8d579e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/map/runplan/index.vue
|
2019-10-30 14:04:22 +08:00 |
|
joylink_cuiweidong
|
c80d2ed536
|
接口调整
多余文件删除
|
2019-10-30 14:00:50 +08:00 |
|
zyy
|
443051edc3
|
desc: 调整代码
|
2019-10-30 13:58:34 +08:00 |
|
fan
|
375773cceb
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:56:43 +08:00 |
|
fan
|
b6f11064da
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-30 13:07:27 +08:00 |
|
fan
|
2107549d72
|
更换接口：/api/map/skin/{skinCode}/version;/api/map/skin/{skinCode}/details
|
2019-10-30 13:07:07 +08:00 |
|
fan
|
0489cf2fd3
|
删除接口：/api/map/{skinCode}/train
|
2019-10-30 11:18:41 +08:00 |
|
zyy
|
850f492b45
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-30 10:15:24 +08:00 |
|
zyy
|
6aa05c217f
|
desc: 修改代码
|
2019-10-30 10:15:18 +08:00 |
|
joylink_cuiweidong
|
81921a4a0d
|
国际化调整
|
2019-10-30 09:58:23 +08:00 |
|
joylink_cuiweidong
|
e8cacb4a84
|
样式调整
|
2019-10-29 18:55:10 +08:00 |
|
fan
|
b9f4f15601
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-29 18:36:46 +08:00 |
|
fan
|
e2e1411b23
|
国际化调整
|
2019-10-29 18:36:16 +08:00 |
|
zyy
|
3fa60b2e8b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/scripts/ConstDic.js
# src/views/lesson/lessoncategory/edit/sorttree/index.vue
# src/views/lesson/lessoncategory/index.vue
# src/views/login/index.vue
|
2019-10-29 17:36:48 +08:00 |
|
zyy
|
df8d104bd1
|
desc: 高度修改，登陆页面英文调整
|
2019-10-29 17:33:11 +08:00 |
|
joylink_cuiweidong
|
72b4fc5f25
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-29 16:53:23 +08:00 |
|
joylink_cuiweidong
|
c45b991c22
|
代码调整
|
2019-10-29 16:49:48 +08:00 |
|
joylink_cuiweidong
|
462b0cfb6c
|
样式调整
|
2019-10-29 16:23:57 +08:00 |
|
joylink_cuiweidong
|
e3dccd58c8
|
地图设计样式调整
|
2019-10-29 15:48:38 +08:00 |
|
fan
|
f1ccb7438d
|
代码调整
|
2019-10-29 15:40:47 +08:00 |
|
fan
|
a6b0caab34
|
西铁院调整
|
2019-10-29 15:06:15 +08:00 |
|
fan
|
27317bf24a
|
西铁院调整
|
2019-10-29 14:41:47 +08:00 |
|
fan
|
041d926b80
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/router/index.js
# src/utils/baseUrl.js
|
2019-10-29 14:16:49 +08:00 |
|
fan
|
973168970c
|
西铁院项目调整
|
2019-10-29 14:14:14 +08:00 |
|
joylink_cuiweidong
|
b1c3e10eb1
|
课程设计内容排序样式调整
|
2019-10-29 13:43:23 +08:00 |
|
zyy
|
0222dfe5c2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-29 13:16:04 +08:00 |
|
zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +08:00 |
|
joylink_cuiweidong
|
9fc78c18c3
|
课程设计内容排序调整
运行图发布弹出提示调整
|
2019-10-29 13:06:55 +08:00 |
|
joylink_cuiweidong
|
8ad40cf998
|
代码调整
|
2019-10-29 09:43:56 +08:00 |
|
joylink_cuiweidong
|
7246568801
|
代码调整
|
2019-10-28 19:16:07 +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 |
|
joylink_cuiweidong
|
b5a8b10e4e
|
剧本预览接口调整
|
2019-10-28 19:12:31 +08:00 |
|
zyy
|
d056b8bfc8
|
desc: 调整个人信息修改接口参数
|
2019-10-28 19:01:29 +08:00 |
|
zyy
|
60c58fe290
|
desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联
|
2019-10-28 18:42:31 +08:00 |
|
fan
|
b8834f5bb4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-28 18:36:26 +08:00 |
|
zyy
|
8e71ff7287
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2019-10-28 17:53:39 +08:00 |
|
zyy
|
178e49187d
|
desc: 调整高度自适应， 调整地图绘制创建区段，道岔逻辑优化
|
2019-10-28 17:51:59 +08:00 |
|
fan
|
42cdacbcd0
|
西铁院项目路由调整
|
2019-10-28 17:08:22 +08:00 |
|
joylink_cuiweidong
|
538e3e0697
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
# src/views/designPlatform/mapPreview.vue
|
2019-10-28 15:12:08 +08:00 |
|
joylink_cuiweidong
|
7ee5cbcab3
|
代码调整
|
2019-10-28 15:00:50 +08:00 |
|
zyy
|
ab9d300e2e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/mapPreview.vue
|
2019-10-28 11:08:50 +08:00 |
|
zyy
|
285b80ffb7
|
desc: 调整检测高度问题
|
2019-10-28 11:07:33 +08:00 |
|
joylink_cuiweidong
|
9bd9e7fd8a
|
代码调整
|
2019-10-28 10:36:20 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
fan
|
9c99b2f451
|
queryform 调整
|
2019-10-28 10:26:33 +08:00 |
|
fan
|
b8d8bcaaf7
|
Merge remote-tracking branch 'origin/test'
|
2019-10-25 18:54:16 +08:00 |
|
sunzhenyu
|
300aa624df
|
更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效
|
2019-10-25 18:42:56 +08:00 |
|
fan
|
50f87895c6
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 18:30:45 +08:00 |
|
fan
|
78f9d58321
|
登录token存储修改
|
2019-10-25 18:30:23 +08:00 |
|
zyy
|
700ae4ad84
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 18:20:32 +08:00 |
|
zyy
|
18ad9e1faa
|
desc: 调整个人信息
|
2019-10-25 18:20:24 +08:00 |
|
joylink_cuiweidong
|
0f39f495af
|
发布地图管理页面添加更新城市
|
2019-10-25 17:50:55 +08:00 |
|
fan
|
73e9c995c2
|
综合演练房间快速入口添加线路
|
2019-10-25 17:49:44 +08:00 |
|
fan
|
d5b6f172e9
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-10-25 17:09:02 +08:00 |
|
fan
|
ceb7fa7e5e
|
西铁院运行图编制调整
|
2019-10-25 16:59:23 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +08:00 |
|
joylink_cuiweidong
|
6df1eecfc3
|
代码调整
|
2019-10-25 16:33:35 +08:00 |
|
fan
|
0c5fb4c6f4
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-25 14:43:00 +08:00 |
|
joylink_cuiweidong
|
5905f0ed63
|
国际化调整
|
2019-10-25 14:41:23 +08:00 |
|
zyy
|
32d3983d70
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-25 14:34:19 +08:00 |
|
zyy
|
bced191397
|
desc: 增加以link为基础删除区段及相关道岔
|
2019-10-25 14:34:10 +08:00 |
|
joylink_cuiweidong
|
dc1c69fe16
|
已发布地图剧本列表页面调整
|
2019-10-25 14:14:27 +08:00 |
|
joylink_cuiweidong
|
ba7583cd1c
|
综合演练进入房间 没有输入发送文字禁用
|
2019-10-25 13:47:25 +08:00 |
|
fan
|
ca736a93f3
|
登录过期不显示获取子系统信息失败
|
2019-10-25 13:16:07 +08:00 |
|
fan
|
2e49c6499f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-25 13:00:04 +08:00 |
|
fan
|
bfce5a2103
|
问题调整
|
2019-10-25 12:59:24 +08:00 |
|
joylink_cuiweidong
|
da7564402c
|
代码调整
|
2019-10-25 10:39:41 +08:00 |
|
zyy
|
6f4c8e02ba
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:28:15 +08:00 |
|
zyy
|
033c6f40fa
|
desc: 调整高度
|
2019-10-24 18:28:06 +08:00 |
|
fan
|
0c67d2a077
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 18:19:28 +08:00 |
|
fan
|
6fa98a6585
|
代码调整
|
2019-10-24 18:19:06 +08:00 |
|
joylink_cuiweidong
|
7530489fa5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-24 18:12:10 +08:00 |
|
joylink_cuiweidong
|
f597ce530f
|
已发布地图 地图预览
管理员 课程设计可见
|
2019-10-24 18:11:58 +08:00 |
|
fan
|
5a808c1cd4
|
语言切换调整
|
2019-10-24 16:50:45 +08:00 |
|
fan
|
237d821f33
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 16:46:49 +08:00 |
|
fan
|
2c729abb01
|
网页title和图标调整
|
2019-10-24 16:46:34 +08:00 |
|
zyy
|
08067bb4e8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Entry.vue
|
2019-10-24 15:32:40 +08:00 |
|
zyy
|
68560f0d37
|
desc: 增加修改个人信息弹窗
|
2019-10-24 15:31:29 +08:00 |
|
fan
|
fe68f93aea
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 15:16:10 +08:00 |
|
fan
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +08:00 |
|
joylink_cuiweidong
|
24ad2d65e3
|
代码调整
|
2019-10-24 14:41:00 +08:00 |
|
joylink_cuiweidong
|
e8b8d5a91d
|
菜单栏昵称样式调整
|
2019-10-24 14:32:44 +08:00 |
|
joylink_cuiweidong
|
c0394657a8
|
代码调整
|
2019-10-24 14:13:20 +08:00 |
|
fan
|
4a0c04d98a
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-24 14:03:38 +08:00 |
|
fan
|
b6ffc55efd
|
登录页面整合
|
2019-10-24 14:03:19 +08:00 |
|
joylink_cuiweidong
|
6dc74ac5c8
|
代码优化
实训平台横向滚动条处理
实训平台和设计平台跳转文字调整
|
2019-10-24 11:20:00 +08:00 |
|
zyy
|
c9849613fc
|
Merge branch 'test'
|
2019-10-24 09:50:31 +08:00 |
|
zyy
|
17626459f5
|
Merge branch 'dev' into test
|
2019-10-24 09:49:49 +08:00 |
|
zyy
|
dd89b94e64
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/layout/components/Logout.vue
|
2019-10-24 09:47:57 +08:00 |
|
zyy
|
f24259c76d
|
desc: 个人信息修改
|
2019-10-24 09:46:58 +08:00 |
|
joylink_cuiweidong
|
a1761fd2fc
|
添加copyRight
|
2019-10-23 19:15:02 +08:00 |
|
fan
|
62de921294
|
问题调整
|
2019-10-23 19:00:35 +08:00 |
|
joylink_cuiweidong
|
15b423a38b
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-23 17:47:20 +08:00 |
|
joylink_cuiweidong
|
5e798387d7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-23 17:44:41 +08:00 |
|
fan
|
667b967c06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:42:40 +08:00 |
|
fan
|
787580f964
|
路由调整调整
|
2019-10-23 17:41:50 +08:00 |
|
joylink_cuiweidong
|
f483a1c115
|
运行图审核接口调整
|
2019-10-23 17:41:24 +08:00 |
|
fan
|
a926ee4d64
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 17:20:45 +08:00 |
|
fan
|
c83e882f6a
|
国际化调整
|
2019-10-23 17:20:32 +08:00 |
|
joylink_cuiweidong
|
02ea111c61
|
路由处理
|
2019-10-23 16:43:28 +08:00 |
|
fan
|
0a39680f6c
|
综合演练真实设备调整
|
2019-10-23 16:39:16 +08:00 |
|
sunzhenyu
|
ebf11ca7b0
|
url
|
2019-10-23 16:36:57 +08:00 |
|
sunzhenyu
|
9267c3a14b
|
pull
|
2019-10-23 16:36:18 +08:00 |
|
sunzhenyu
|
aa02794959
|
修改列车速度，自动驾驶路径判断修改
|
2019-10-23 16:35:56 +08:00 |
|
fan
|
16b2dbda05
|
综合演练真实设备调整
|
2019-10-23 16:33:23 +08:00 |
|
fan
|
dff5d96d4d
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-23 16:19:22 +08:00 |
|
fan
|
d6b677201e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 16:14:03 +08:00 |
|
fan
|
8710a6231a
|
综合演练房间调整
|
2019-10-23 16:13:36 +08:00 |
|
joylink_cuiweidong
|
1761fbdca8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 16:10:20 +08:00 |
|
joylink_cuiweidong
|
0b23a7f9a0
|
右上角用户昵称样式调整
|
2019-10-23 16:09:44 +08:00 |
|
fan
|
5abc54c522
|
合代码
|
2019-10-23 15:03:35 +08:00 |
|
fan
|
3119f4f308
|
设计平台课程设计调整
|
2019-10-23 15:01:25 +08:00 |
|
joylink_cuiweidong
|
b0c589cd2a
|
权限管理编辑权限样式调整
设计平台添加跳转实训平台的链接
|
2019-10-23 14:57:45 +08:00 |
|
zyy
|
15510a07cf
|
desc: 修改区段点击bug
|
2019-10-23 14:43:25 +08:00 |
|
joylink_cuiweidong
|
2fa5966055
|
剧本审核通过bug调整
登录全屏调整
|
2019-10-23 14:33:45 +08:00 |
|
fan
|
7a073334d5
|
去除添加plc真实设备限制
|
2019-10-23 13:50:04 +08:00 |
|
fan
|
8839122191
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 13:41:48 +08:00 |
|
fan
|
abd4fbbf64
|
开放plc真实设备
|
2019-10-23 13:41:33 +08:00 |
|
joylink_cuiweidong
|
51bf37e9c7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 13:36:19 +08:00 |
|
joylink_cuiweidong
|
8320f57345
|
路由调整
|
2019-10-23 13:35:14 +08:00 |
|
fan
|
d55f740065
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 13:33:40 +08:00 |
|
fan
|
89d71ed661
|
发现问题调整
|
2019-10-23 13:33:09 +08:00 |
|
joylink_cuiweidong
|
1c38f16199
|
回车登录调整
|
2019-10-23 13:32:00 +08:00 |
|
joylink_cuiweidong
|
16d2b61d0f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-23 11:03:20 +08:00 |
|
joylink_cuiweidong
|
f5dc8818fe
|
登录页面添加键盘回车登录
|
2019-10-23 11:02:44 +08:00 |
|
fan
|
f8b149fa5a
|
同一个标签切换平台404问题
|
2019-10-23 10:43:29 +08:00 |
|
fan
|
cf5f902a45
|
代码调整
|
2019-10-23 10:18:28 +08:00 |
|
joylink_cuiweidong
|
4944f47060
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-23 10:06:23 +08:00 |
|
joylink_cuiweidong
|
bca8c68b65
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 10:05:41 +08:00 |
|
fan
|
c843e25094
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-23 09:59:39 +08:00 |
|
fan
|
43d900747a
|
增加地图发布仅管理员可见
|
2019-10-23 09:59:28 +08:00 |
|
joylink_cuiweidong
|
aa6cb458de
|
登录修改
|
2019-10-23 09:58:05 +08:00 |
|
joylink_cuiweidong
|
43c5392205
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-22 20:23:29 +08:00 |
|
joylink_cuiweidong
|
7f0ddd384b
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-22 20:10:29 +08:00 |
|
joylink_cuiweidong
|
e854c32390
|
Merge branch 'dev' into test
|
2019-10-22 20:10:05 +08:00 |
|
joylink_cuiweidong
|
7550d82f2b
|
登录修改
|
2019-10-22 20:09:29 +08:00 |
|
fan
|
332fa22b81
|
登录配置调整
|
2019-10-22 20:04:55 +08:00 |
|
fan
|
48fafacdc2
|
获取上次用户登录系统
|
2019-10-22 20:01:03 +08:00 |
|
fan
|
01cf337b63
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 19:49:59 +08:00 |
|
fan
|
21510d9464
|
创建章节修改
|
2019-10-22 19:49:37 +08:00 |
|
program-walker
|
6fa2b2e636
|
登陆逻辑修改
|
2019-10-22 19:47:36 +08:00 |
|
fan
|
5c5c2412fd
|
章节下添加创建章节
|
2019-10-22 19:23:01 +08:00 |
|
fan
|
ff37fe128e
|
问题调整
|
2019-10-22 18:49:46 +08:00 |
|
sunzhenyu
|
5aa564d00a
|
修改驾驶模型渲染范围，修改行车速度
|
2019-10-22 18:35:56 +08:00 |
|
fan
|
4bd232bd67
|
地图系统结构调整
|
2019-10-22 18:34:05 +08:00 |
|
fan
|
4f14075072
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 18:20:10 +08:00 |
|
joylink_cuiweidong
|
2bd13ad075
|
实训tree 样式调整
|
2019-10-22 18:19:18 +08:00 |
|
fan
|
9134be8c19
|
问题调整
|
2019-10-22 18:18:21 +08:00 |
|
sunzhenyu
|
c7cb769c1a
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-22 17:42:20 +08:00 |
|
sunzhenyu
|
61b9c9705c
|
设置模型路径
|
2019-10-22 17:33:17 +08:00 |
|
fan
|
6760cdc7e3
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 17:24:51 +08:00 |
|
fan
|
0cafd0c7f3
|
设计平台课程系统调整
|
2019-10-22 17:24:41 +08:00 |
|
zyy
|
3bc3e66085
|
Merge branch 'test'
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-22 16:32:29 +08:00 |
|
zyy
|
ac35d9dbfd
|
Merge branch 'dev' into test
|
2019-10-22 16:29:50 +08:00 |
|
zyy
|
d97c1096b0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 16:29:19 +08:00 |
|
zyy
|
83c53b0640
|
desc: 修改代码
|
2019-10-22 16:29:11 +08:00 |
|
joylink_cuiweidong
|
a160c19a3d
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-22 16:13:27 +08:00 |
|
joylink_cuiweidong
|
bddddedbf2
|
Merge branch 'dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-22 16:13:13 +08:00 |
|
joylink_cuiweidong
|
2282f27239
|
设计系统运行图样式调整
|
2019-10-22 16:10:39 +08:00 |
|
fan
|
6f314ba150
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 16:06:20 +08:00 |
|
fan
|
0e23a62b39
|
调整代码
|
2019-10-22 16:05:58 +08:00 |
|
zyy
|
0eb05638a0
|
desc: 调整列车识别号初始化
|
2019-10-22 15:42:07 +08:00 |
|
sunzhenyu
|
dcd5c7bf1e
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-22 15:41:51 +08:00 |
|
sunzhenyu
|
388d647ba3
|
修改通信消息判断顺序
|
2019-10-22 15:41:39 +08:00 |
|
zyy
|
8f01ed2e57
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 15:24:43 +08:00 |
|
zyy
|
3c67e18350
|
desc: 修改代码
|
2019-10-22 15:24:36 +08:00 |
|
joylink_cuiweidong
|
c08064faa0
|
Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test
|
2019-10-22 15:14:54 +08:00 |
|
joylink_cuiweidong
|
b26ab2fc15
|
删除地图系统接口调整以及西铁院系统tree接口调整
|
2019-10-22 15:13:58 +08:00 |
|
joylink_cuiweidong
|
df4113ff29
|
代码结构整理
修改 退出系统仍然自动登录的bug
子系统生成接口调整
|
2019-10-22 14:43:27 +08:00 |
|
fan
|
e89211a873
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 14:28:41 +08:00 |
|
fan
|
a49b195090
|
调整代码
|
2019-10-22 14:28:22 +08:00 |
|
zyy
|
2eb3dc9842
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 14:07:27 +08:00 |
|
zyy
|
a61f917f4a
|
desc: 调整站台扣车状态显示
|
2019-10-22 14:07:20 +08:00 |
|
fan
|
6d665acbb5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:51:17 +08:00 |
|
fan
|
089e45bf33
|
实训录制演示功能调整
|
2019-10-22 13:50:58 +08:00 |
|
zyy
|
ac0fafebc0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-22 13:41:29 +08:00 |
|
zyy
|
0c6de0e011
|
desc: 修改代码
|
2019-10-22 13:41:23 +08:00 |
|
fan
|
b7a16a9074
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-22 13:40:55 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +08:00 |
|
joylink_cuiweidong
|
7785b9a9af
|
设计平台 系统管理 子系统 修改接口以及国际化
|
2019-10-22 11:20:43 +08:00 |
|
joylink_cuiweidong
|
c04abcc67a
|
设计平台 系统管理 子系统 创建子系统接口调整
|
2019-10-22 09:36:37 +08:00 |
|
joylink_cuiweidong
|
9fcdda5d60
|
设计平台 系统管理 子系统 创建子系统接口
|
2019-10-21 18:03:13 +08:00 |
|
sunzhenyu
|
b5a822afea
|
增加webworker停止
|
2019-10-21 17:59:48 +08:00 |
|
sunzhenyu
|
3c9f448419
|
Merge branch '3dtest' into test
|
2019-10-21 16:52:01 +08:00 |
|
sunzhenyu
|
bd683656a8
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-21 16:51:09 +08:00 |
|
sunzhenyu
|
71d9ea6151
|
修改三维编辑
|
2019-10-21 16:16:34 +08:00 |
|
joylink_cuiweidong
|
343372d83a
|
设计平台地图三维路径调整
|
2019-10-21 16:12:03 +08:00 |
|
fan
|
04bebc8201
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-21 16:08:07 +08:00 |
|
fan
|
81edd3c5c2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-21 16:07:28 +08:00 |
|
fan
|
b68dd99bde
|
仿真路由调整
|
2019-10-21 16:07:15 +08:00 |
|
joylink_cuiweidong
|
1a046c2b7f
|
设计平台系统管理子系统生成页面调整
|
2019-10-21 15:50:15 +08:00 |
|
sunzhenyu
|
ca36aa478d
|
增加三维编辑
|
2019-10-21 14:29:45 +08:00 |
|
joylink_cuiweidong
|
c9ad0a8be5
|
自动登录页面处理
|
2019-10-21 14:14:22 +08:00 |
|
sunzhenyu
|
394baf72a7
|
模型测试
|
2019-10-21 14:09:19 +08:00 |
|
fan
|
36b0b048bd
|
仿真路由调整
|
2019-10-21 14:09:03 +08:00 |
|
fan
|
7e7fc2256c
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-21 13:17:30 +08:00 |
|
fan
|
4b41c9fd27
|
考试路由调整
|
2019-10-21 13:16:49 +08:00 |
|
fan
|
be2bbc67cd
|
接口参数调整
|
2019-10-21 11:15:15 +08:00 |
|
fan
|
9ed65095cc
|
接口参数调整
|
2019-10-21 10:50:31 +08:00 |
|
fan
|
9d072c4a6c
|
产品分化调整
|
2019-10-21 10:02:49 +08:00 |
|
fan
|
34a8cbf270
|
接口调整
|
2019-10-21 08:59:27 +08:00 |
|
fan
|
77d024c08c
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/designPlatform/demonList.vue
|
2019-10-21 08:58:17 +08:00 |
|
fan
|
902b1a494b
|
接口调整
|
2019-10-18 18:36:45 +08:00 |
|
joylink_cuiweidong
|
fd4df4f178
|
设计平台地图列表页面调整
|
2019-10-18 18:35:17 +08:00 |
|
ival
|
94288eaecc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 18:31:29 +08:00 |
|
ival
|
36950a331e
|
修改比例
|
2019-10-18 18:31:14 +08:00 |
|
zyy
|
9087a33937
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 18:20:24 +08:00 |
|
zyy
|
74a2bbb1c6
|
desc: 调整成都三号现地，行调实训操作
|
2019-10-18 18:20:17 +08:00 |
|
joylink_cuiweidong
|
170c7bcc9e
|
课程设计界面参数调整
|
2019-10-18 18:13:54 +08:00 |
|
ival
|
0864369b35
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 17:54:10 +08:00 |
|
ival
|
9a14de60ef
|
修改电子显示屏
|
2019-10-18 17:53:57 +08:00 |
|
joylink_cuiweidong
|
ecef9a4c74
|
设计平台地图列表接口调整
|
2019-10-18 17:45:08 +08:00 |
|
fan
|
b23bff36f0
|
打开实训录制按钮
|
2019-10-18 17:32:14 +08:00 |
|
fan
|
911b8a9057
|
接口调整
|
2019-10-18 17:23:25 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +08:00 |
|
joylink_cuiweidong
|
1b342fee6e
|
地图列表获取城市列表样式调整
|
2019-10-18 16:57:40 +08:00 |
|
sunzhenyu
|
5c79ab8216
|
去掉辅助线
|
2019-10-18 15:43:00 +08:00 |
|
ival
|
5e83d06250
|
修改计时组件样式
|
2019-10-18 15:35:48 +08:00 |
|
sunzhenyu
|
45c2954f53
|
注释
|
2019-10-18 15:30:26 +08:00 |
|
sunzhenyu
|
a7e7988754
|
修复路径判断
|
2019-10-18 15:29:17 +08:00 |
|
ival
|
ef6977249b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 15:18:04 +08:00 |
|
ival
|
03c2317503
|
拆分指令
|
2019-10-18 15:17:33 +08:00 |
|
joylink_cuiweidong
|
3f82e45fcb
|
登录页面 密码隐藏显示
|
2019-10-18 14:36:14 +08:00 |
|
ival
|
155c36d8cc
|
修改代码
|
2019-10-18 13:00:47 +08:00 |
|
ival
|
8e836143fc
|
修改
|
2019-10-18 11:32:51 +08:00 |
|
joylink_cuiweidong
|
d89b692b80
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 11:27:10 +08:00 |
|
joylink_cuiweidong
|
c80c9d467c
|
剧本列表预览调整
|
2019-10-18 11:26:11 +08:00 |
|
zyy
|
f92f306dc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-18 11:25:33 +08:00 |
|
zyy
|
82aff22132
|
desc: 修改代码
|
2019-10-18 11:25:26 +08:00 |
|
sunzhenyu
|
4a8e5a9cb2
|
url
|
2019-10-18 10:06:04 +08:00 |
|
joylink_cuiweidong
|
b96ca27907
|
Merge branch 'dev_product' into dev
|
2019-10-17 19:20:12 +08:00 |
|
joylink_cuiweidong
|
b14e2d18f4
|
剧本预览页面调整
|
2019-10-17 18:59:46 +08:00 |
|
sunzhenyu
|
f78d9865a2
|
Merge branch '3dtest' into test
|
2019-10-17 18:56:56 +08:00 |
|
sunzhenyu
|
9bd43b2ee2
|
修改模型路径
|
2019-10-17 18:56:25 +08:00 |
|
zyy
|
140d84bf56
|
desc: 调整登陆页面样式
|
2019-10-17 18:55:46 +08:00 |
|
sunzhenyu
|
f847629b92
|
修改文字显示，行车路径，行车计算
|
2019-10-17 18:48:36 +08:00 |
|
zyy
|
7b5255c3eb
|
desc: 调整格式化，样式
|
2019-10-17 18:27:49 +08:00 |
|
fan
|
0ebab6201f
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/views/scriptManage/home.vue
|
2019-10-17 18:09:02 +08:00 |
|
fan
|
f6e8375bf8
|
实训管理调整
|
2019-10-17 18:06:49 +08:00 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
zyy
|
0ef17b7a86
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-17 17:56:31 +08:00 |
|
fan
|
ab815ec493
|
实训管理调整
|
2019-10-17 17:56:25 +08:00 |
|
zyy
|
b006de669d
|
desc: 调整信号机自排开，自排关，流程
|
2019-10-17 17:56:24 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
fan
|
fa4c7a6599
|
样式微调
|
2019-10-17 16:26:36 +08:00 |
|
fan
|
0fd879dd5d
|
样式微调
|
2019-10-17 16:23:14 +08:00 |
|
fan
|
ee62ceb0e5
|
产品分化调整
|
2019-10-17 16:04:07 +08:00 |
|
fan
|
3fef2c1c9d
|
代码调整
|
2019-10-17 14:51:37 +08:00 |
|
fan
|
6924577078
|
代码调整
|
2019-10-17 14:39:37 +08:00 |
|
fan
|
6e139bcdbb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger
# Conflicts:
# src/router/index.js
|
2019-10-17 14:39:08 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +08:00 |
|
fan
|
05530e1568
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_merger
|
2019-10-17 14:33:19 +08:00 |
|
fan
|
4d4f9e4020
|
代码整合调整
|
2019-10-17 14:32:29 +08:00 |
|
fan
|
00c4415fcc
|
代码整合调整
|
2019-10-17 14:31:59 +08:00 |
|
joylink_cuiweidong
|
9cd7234081
|
剧本列表页面调整
|
2019-10-17 13:54:41 +08:00 |
|
zyy
|
5d13162c6b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-17 11:21:01 +08:00 |
|
zyy
|
5d7f736873
|
desc: 调整考试系统英文名称
|
2019-10-17 11:20:09 +08:00 |
|
fan
|
d90ebd353c
|
Merge remote-tracking branch 'origin/test'
|
2019-10-17 10:17:12 +08:00 |
|
fan
|
a9721b05eb
|
ibp调整
|
2019-10-17 10:16:23 +08:00 |
|
fan
|
11190ef66f
|
代码整合调整
|
2019-10-17 10:13:08 +08:00 |
|
joylink_cuiweidong
|
a264ab51cb
|
已发布地图剧本列表页面调整
|
2019-10-17 10:06:52 +08:00 |
|
fan
|
0118f94e6c
|
整合产品分化
|
2019-10-17 09:46:48 +08:00 |
|
fan
|
ece8f0cf21
|
Merge remote-tracking branch 'origin/dev_product' into dev_merger
# Conflicts:
# src/router/index.js
# src/scripts/ConstDic.js
|
2019-10-17 09:36:32 +08:00 |
|
fan
|
1ece7eb215
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-17 09:30:02 +08:00 |
|
fan
|
5ba5ca7ea7
|
Merge remote-tracking branch 'origin/dev_product' into dev
# Conflicts:
# src/components/QueryListPage/QueryForm.vue
# src/i18n/langs/en/rules.js
# src/i18n/langs/en/scriptRecord.js
# src/i18n/langs/zh/lesson.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/scriptRecord.js
# src/jmap/theme/fuzhou_01/menus/menuDialog/stationControlConvert.vue
# src/jmap/theme/fuzhou_01/menus/passiveDialog/alarm.vue
# src/permission.js
# src/router/index.js
# src/utils/baseUrl.js
# src/views/demonstration/detail/index.vue
# src/views/display/tipExamList.vue
# src/views/lesson/lessoncategory/edit/lesson/publish.vue
# src/views/lesson/taskmanage/createTask.vue
# src/views/lesson/trainingRule/list.vue
# src/views/login/index.vue
# src/views/planMonitor/editTool/statusBar.vue
# src/views/scriptManage/home.vue
# src/views/teach/category/tree.vue
# src/views/trainRoom/index.vue
|
2019-10-17 09:16:40 +08:00 |
|
fan
|
25c4cf957d
|
西铁院项目调整
|
2019-10-16 17:37:03 +08:00 |
|
zyy
|
bba506b46d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-16 17:13:28 +08:00 |
|
zyy
|
cf49d3a50e
|
desc: 修改国际化实训名称详情
|
2019-10-16 17:13:20 +08:00 |
|
joylink_cuiweidong
|
664435bdd7
|
剧本国际化调整
|
2019-10-16 17:05:38 +08:00 |
|
fan
|
8ba89a8735
|
Merge remote-tracking branch 'origin/test'
|
2019-10-16 17:04:58 +08:00 |
|
fan
|
355e06ae2e
|
注释plc相关接口
|
2019-10-16 17:03:21 +08:00 |
|
fan
|
54b078792c
|
西铁院暂存
|
2019-10-16 16:58:40 +08:00 |
|
joylink_cuiweidong
|
35eacb299c
|
剧本预览页面调整
|
2019-10-16 16:36:25 +08:00 |
|
fan
|
f9a3461c63
|
Merge remote-tracking branch 'origin/test'
|
2019-10-16 16:25:05 +08:00 |
|
fan
|
f4fc3d0b0b
|
暂存
|
2019-10-16 15:43:07 +08:00 |
|
fan
|
0edfc7ad6e
|
扣车指示灯状态调整
|
2019-10-16 15:31:23 +08:00 |
|
fan
|
126886e1ce
|
西铁院暂存
|
2019-10-16 15:28:29 +08:00 |
|
fan
|
f0bf595b60
|
国际化添加左、右
|
2019-10-16 14:16:48 +08:00 |
|
fan
|
dd8c1e07f4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-16 14:01:40 +08:00 |
|
fan
|
1caad290e5
|
ibp盘添加扣车关联
|
2019-10-16 14:00:30 +08:00 |
|
joylink_cuiweidong
|
df5a76ea41
|
剧本管理英文版英文用词修改
|
2019-10-16 11:20:36 +08:00 |
|
joylink_cuiweidong
|
571e221413
|
用户剧本预览页面调整
|
2019-10-16 09:18:26 +08:00 |
|
program-walker
|
939fd55c5f
|
Merge remote-tracking branch 'origin/test'
|
2019-10-15 22:21:56 +08:00 |
|
program-walker
|
4268c9a17c
|
Merge remote-tracking branch 'origin/master'
|
2019-10-15 22:21:47 +08:00 |
|
sunzhenyu
|
6fa90f5c79
|
修改行车逻辑
|
2019-10-15 19:03:21 +08:00 |
|
joylink_cuiweidong
|
c2479d2f68
|
剧本国际化调整
|
2019-10-15 16:46:32 +08:00 |
|
joylink_cuiweidong
|
a33c44dfea
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/scriptManage/scriptRecord/addAction.vue
|
2019-10-15 16:30:45 +08:00 |
|
joylink_cuiweidong
|
089290e979
|
剧本国际化调整以及剧本增加语言参数
|
2019-10-15 16:18:25 +08:00 |
|
zyy
|
6faa018c71
|
desc: 新增剧本编辑页面可拖拽宽度
|
2019-10-15 15:24:41 +08:00 |
|
joylink_cuiweidong
|
ec16767772
|
剧本预览调整
|
2019-10-15 13:41:23 +08:00 |
|
fan
|
0640586712
|
西铁院暂存
|
2019-10-15 13:04:28 +08:00 |
|
fan
|
1ec45e2c19
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:06:16 +08:00 |
|
joylink_cuiweidong
|
232789ca73
|
产品分化路由处理
|
2019-10-15 11:05:30 +08:00 |
|
fan
|
0fc9db098c
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-15 11:04:43 +08:00 |
|
fan
|
729be7ec69
|
西铁院暂存
|
2019-10-15 09:39:01 +08:00 |
|
sunzhenyu
|
1ddb55091a
|
修改行车逻辑
|
2019-10-14 18:18:11 +08:00 |
|
joylink_cuiweidong
|
aba4efe129
|
运行图页面调整
|
2019-10-14 17:03:54 +08:00 |
|
joylink_cuiweidong
|
bca95d4ca1
|
运行图增加计划和删除计划 更新运行图数据
|
2019-10-14 15:35:11 +08:00 |
|
joylink_cuiweidong
|
5e320978a9
|
产品分化剧本页面调整
|
2019-10-14 13:58:26 +08:00 |
|
fan
|
d6dbb01bba
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-14 13:54:45 +08:00 |
|
fan
|
0a1ec28511
|
产品分化调整
|
2019-10-14 13:54:19 +08:00 |
|
joylink_cuiweidong
|
a622effdde
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/i18n/langs/en/approval.js
# src/i18n/langs/zh/approval.js
|
2019-10-14 13:12:30 +08:00 |
|
joylink_cuiweidong
|
c60471023f
|
产品分化剧本管理调整
|
2019-10-14 13:10:36 +08:00 |
|
fan
|
6d15a95b3f
|
产品分化运行图发布调整
|
2019-10-14 13:04:23 +08:00 |
|
sunzhenyu
|
8b71f08de0
|
修改行车逻辑
|
2019-10-12 19:03:21 +08:00 |
|
fan
|
38f4dc1093
|
产品分化调整
|
2019-10-12 18:43:41 +08:00 |
|
fan
|
5af0c7e4c9
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-12 17:16:09 +08:00 |
|
fan
|
8366f9a788
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
# src/router/index.js
|
2019-10-12 17:15:48 +08:00 |
|
joylink_cuiweidong
|
12eed3629a
|
运行图 发布审核流程调整
|
2019-10-12 17:15:25 +08:00 |
|
fan
|
722596cdf4
|
产品分化调整
|
2019-10-12 17:14:03 +08:00 |
|
joylink_cuiweidong
|
af2c431511
|
运行图剧本 审核流程调整
|
2019-10-12 16:47:54 +08:00 |
|
sunzhenyu
|
b32b03bc81
|
修改link为主轨迹运行
|
2019-10-12 16:36:51 +08:00 |
|
zyy
|
842f29e5d9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/jointTraining/index.vue
|
2019-10-12 13:35:56 +08:00 |
|
zyy
|
99edd29aea
|
desc: 调整格式化问题， 调整列车详情国际化
|
2019-10-12 13:25:47 +08:00 |
|
joylink_cuiweidong
|
6adc8cdd5b
|
剧本国际化调整
|
2019-10-12 13:04:56 +08:00 |
|
joylink_cuiweidong
|
bf66b2c9e0
|
剧本发布申请页面调整
|
2019-10-12 11:11:34 +08:00 |
|
fan
|
a24603aedf
|
综合仿真页面跳转调整
|
2019-10-12 11:03:15 +08:00 |
|
zyy
|
e03aefd80d
|
desc: 调整字段
|
2019-10-11 19:10:27 +08:00 |
|
zyy
|
ef3f909a2d
|
desc: 调整字段显示
|
2019-10-11 19:02:12 +08:00 |
|
zyy
|
3b8da62bf2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-11 18:40:37 +08:00 |
|
zyy
|
5e8089cacd
|
desc: 修改权限字段
|
2019-10-11 18:40:32 +08:00 |
|
fan
|
862f251adb
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-11 17:45:36 +08:00 |
|
fan
|
de7909cad1
|
ibp微调
|
2019-10-11 17:45:13 +08:00 |
|
fan
|
2988f40d29
|
产品分化调整
|
2019-10-11 17:35:22 +08:00 |
|
fan
|
3326f1c917
|
ibp调整
|
2019-10-11 17:17:05 +08:00 |
|
zyy
|
1e3486efc6
|
desc: 增加权限分发列表【设置失效】功能
|
2019-10-11 16:09:15 +08:00 |
|
zyy
|
3b7605f996
|
desc: 调整正式上国际版仿真报错
|
2019-10-11 16:01:26 +08:00 |
|
zyy
|
aa0199754a
|
desc: 调整创建权限流程，创建字段修改
|
2019-10-11 15:27:14 +08:00 |
|
fan
|
a4ccfee26d
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-10-11 08:57:38 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
zyy
|
8b05776895
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-10 18:05:36 +08:00 |
|
zyy
|
f7cf33a5e2
|
desc: 调整登陆页面样式
|
2019-10-10 18:05:26 +08:00 |
|
joylink_cuiweidong
|
2a4bb6dba2
|
剧本发布申请页面
|
2019-10-10 17:37:07 +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
|
f2d614d5af
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-10 16:12:47 +08:00 |
|
fan
|
977a6d8b47
|
产品分化调整
|
2019-10-10 16:07:13 +08:00 |
|
joylink_cuiweidong
|
ca2aced01a
|
ibp盘调整
|
2019-10-10 14:17:54 +08:00 |
|
joylink_cuiweidong
|
059a4134d5
|
产品分化路由调整以及剧本发布样式调整
|
2019-10-10 14:08:23 +08:00 |
|
fan
|
697deaa887
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-10 13:56:50 +08:00 |
|
fan
|
758eccd074
|
产品分化调整
|
2019-10-10 13:56:33 +08:00 |
|
joylink_cuiweidong
|
1d760d5688
|
产品分化路由修改
|
2019-10-10 13:45:51 +08:00 |
|
fan
|
95a6103575
|
产品分化调整
|
2019-10-10 13:16:00 +08:00 |
|
fan
|
c9f9aa6869
|
产品分化调整
|
2019-10-10 13:02:43 +08:00 |
|
fan
|
f7e85b493c
|
添加发布申请路由
|
2019-10-10 10:32:57 +08:00 |
|
fan
|
bf9c6959ab
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-10-10 10:22:24 +08:00 |
|
fan
|
e1b4633409
|
错别字修改
|
2019-10-10 10:22:05 +08:00 |
|
fan
|
0a36fee338
|
产品分化调整
|
2019-10-10 10:21:22 +08:00 |
|
fan
|
3381424f0d
|
产品分化调整
|
2019-10-10 09:33:56 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
sunzhenyu
|
0e251fc8cb
|
测试
|
2019-10-09 17:00:58 +08:00 |
|
fan
|
44415d44b4
|
撤销选中路由修改
|
2019-10-09 15:21:09 +08:00 |
|
fan
|
e27a189952
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-10-09 15:14:21 +08:00 |
|
fan
|
417c78ec72
|
产品分化调整优化
|
2019-10-09 15:14:00 +08:00 |
|
joylink_cuiweidong
|
28ca25b822
|
处理设计平台菜单栏显示的问题
|
2019-10-09 14:56:32 +08:00 |
|
sunzhenyu
|
2defa3c89d
|
仿真载入新数据
|
2019-10-09 14:31:11 +08:00 |
|
joylink_cuiweidong
|
bb9cfc965d
|
产品分化 实训平台加载剧本接口修改
|
2019-10-09 14:01:02 +08:00 |
|
joylink_cuiweidong
|
62621b77a0
|
产品分化 设计平台页面调整
|
2019-10-09 11:28:11 +08:00 |
|
joylink_cuiweidong
|
b7cb2a36db
|
产品分化 剧本接口调整
|
2019-10-09 10:14:30 +08:00 |
|
fan
|
ff9364382c
|
ibp盘调整车站一
|
2019-10-09 10:07:43 +08:00 |
|
joylink_cuiweidong
|
121a86d6be
|
ibp 盘调整
|
2019-10-09 09:22:12 +08:00 |
|
joylink_cuiweidong
|
2d1f13299e
|
产品分化运行图接口调整
|
2019-10-08 18:35:02 +08:00 |
|
joylink_cuiweidong
|
ec4e78548f
|
产品分化页面调整
|
2019-10-08 16:09:18 +08:00 |
|
zyy
|
88c1212af0
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-10-08 16:08:19 +08:00 |
|
zyy
|
df43ef4cc3
|
desc: 调整登陆界面显示
|
2019-10-08 16:08:13 +08:00 |
|
joylink_cuiweidong
|
672c075ada
|
ibp 车站名称以及上下行车站名称修改
|
2019-10-08 15:51:19 +08:00 |
|
joylink_cuiweidong
|
88cead3f28
|
ibp盘触摸屏的拖拽事件添加
|
2019-10-08 14:55:40 +08:00 |
|
joylink_cuiweidong
|
db971bf591
|
产品分化运行图修改
|
2019-10-08 14:12:53 +08:00 |
|
joylink_cuiweidong
|
873fbcd686
|
超时登出处理
|
2019-10-08 09:51:13 +08:00 |
|
sunzhenyu
|
2c5284b6c4
|
增加信号机位置重置
|
2019-09-30 18:38:42 +08:00 |
|
joylink_cuiweidong
|
35faeb8583
|
产品分化 设计平台 剧本修改
|
2019-09-30 18:13:24 +08:00 |
|
fan
|
ca413e3331
|
设计平台运行图调整
|
2019-09-30 18:11:31 +08:00 |
|
fan
|
5e5a17fee9
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-30 17:56:26 +08:00 |
|
fan
|
641345e801
|
设计平台调整
|
2019-09-30 17:56:16 +08:00 |
|
joylink_cuiweidong
|
a46f94f85e
|
产品分化 设计系统调整
|
2019-09-30 17:31:40 +08:00 |
|
fan
|
588c886f3b
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-30 16:20:51 +08:00 |
|
fan
|
5075e999b9
|
设计平台调整
|
2019-09-30 16:20:31 +08:00 |
|
zyy
|
95877f344e
|
desc: 提示国际化修改逻辑
|
2019-09-30 16:13:59 +08:00 |
|
joylink_cuiweidong
|
cad6eeb98e
|
产品分化 删除地图调整
|
2019-09-30 16:00:52 +08:00 |
|
joylink_cuiweidong
|
e9638517d8
|
产品分化 运行图列表调整
|
2019-09-30 15:18:34 +08:00 |
|
joylink_cuiweidong
|
4fb174f185
|
产品分化 创建运行图调整
|
2019-09-30 14:17:20 +08:00 |
|
fan
|
2be7de7527
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/api/designPlatform.js
|
2019-09-30 13:26:13 +08:00 |
|
fan
|
5d27847379
|
设计平台系统调整
|
2019-09-30 13:24:47 +08:00 |
|
joylink_cuiweidong
|
c7b5188d74
|
产品分化 设计平台调整
|
2019-09-30 10:46:29 +08:00 |
|
zyy
|
25cb199850
|
desc: 调整登陆页面样式
|
2019-09-29 19:20:10 +08:00 |
|
joylink_cuiweidong
|
2e1f6739eb
|
产品分化调整
|
2019-09-29 16:54:11 +08:00 |
|
sunzhenyu
|
2551a4d595
|
Merge branch 'dev' into 3dtest
|
2019-09-29 16:13:21 +08:00 |
|
zyy
|
6dfdc0ccfc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-29 16:09:48 +08:00 |
|
zyy
|
64a601c967
|
desc: 调整登陆页面样式
|
2019-09-29 16:09:40 +08:00 |
|
joylink_cuiweidong
|
53a9dc5feb
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-29 15:57:33 +08:00 |
|
joylink_cuiweidong
|
8d4bf59c34
|
产品分化调整
|
2019-09-29 15:57:19 +08:00 |
|
fan
|
c9570a4631
|
暂时提交
|
2019-09-29 15:55:01 +08:00 |
|
fan
|
dae0ceff57
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 15:38:38 +08:00 |
|
joylink_cuiweidong
|
0aa02cc85c
|
产品分化 地图右键操作调整
|
2019-09-29 15:25:23 +08:00 |
|
fan
|
7c69943277
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 14:28:05 +08:00 |
|
fan
|
6c8a8574da
|
暂时提交
|
2019-09-29 14:27:58 +08:00 |
|
joylink_cuiweidong
|
a502d0a118
|
产品分化 设计平台页面调整以及接口调整
|
2019-09-29 14:21:06 +08:00 |
|
sunzhenyu
|
c1d20befc1
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-29 14:06:02 +08:00 |
|
sunzhenyu
|
aace4f9337
|
修改列车进站和转换区段速度
|
2019-09-29 14:05:33 +08:00 |
|
fan
|
a88cbe11d6
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-29 13:40:15 +08:00 |
|
fan
|
56878d56ec
|
storage存储关联用户
|
2019-09-29 13:40:01 +08:00 |
|
zyy
|
a8302b610e
|
desc: 注释多余代码
|
2019-09-29 11:09:02 +08:00 |
|
sunzhenyu
|
3dccd86682
|
修改自动轨道link
|
2019-09-29 09:21:38 +08:00 |
|
sunzhenyu
|
ba4c041468
|
修改道岔生成
|
2019-09-27 18:46:27 +08:00 |
|
joylink_cuiweidong
|
2a9f7b38df
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-27 18:20:10 +08:00 |
|
joylink_cuiweidong
|
1e95cae5e5
|
产品分化 设计系统界面调整
|
2019-09-27 18:16:27 +08:00 |
|
fan
|
fd99f913de
|
城市轨道实训平台调整
|
2019-09-27 18:02:32 +08:00 |
|
zyy
|
f74ce907b8
|
desc: 调整获取二维码登陆接口
|
2019-09-27 15:29:25 +08:00 |
|
fan
|
bc29c3fb3a
|
合并代码
|
2019-09-27 14:49:11 +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 |
|
zyy
|
f334814012
|
desc: 增加琏计划心跳接口
|
2019-09-27 10:53:48 +08:00 |
|
zyy
|
2d2cc343a8
|
desc: 调整白名单顺序
|
2019-09-27 10:25:48 +08:00 |
|
joylink_cuiweidong
|
58b429f852
|
地图设计右键操作添加
|
2019-09-27 10:16:11 +08:00 |
|
zyy
|
f712c93622
|
desc: 调整权限分发 组织结构配置
|
2019-09-27 10:06:46 +08:00 |
|
zyy
|
5c973ba468
|
desc: 调整英文版登陆窗口， 登陆样式调整
|
2019-09-26 18:40:38 +08:00 |
|
zyy
|
31a024b9ea
|
desc: 调整国际化
|
2019-09-26 18:13:31 +08:00 |
|
joylink_cuiweidong
|
9d41af74bd
|
产品分化 导入地图按钮名称修改
|
2019-09-26 17:46:27 +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 |
|
joylink_cuiweidong
|
5e3e4b77e1
|
产品分化调整
|
2019-09-26 17:41:58 +08:00 |
|
joylink_cuiweidong
|
92169c34ab
|
产品分化调整
|
2019-09-26 16:40:39 +08:00 |
|
fan
|
b69433d8c4
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-26 16:14:15 +08:00 |
|
fan
|
31721a4738
|
产品分化调整
|
2019-09-26 16:14:07 +08:00 |
|
joylink_cuiweidong
|
1c73b2dba9
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-26 15:51:34 +08:00 |
|
joylink_cuiweidong
|
3f516ae26b
|
产品分化 地图绘制按钮调整
|
2019-09-26 15:51:22 +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 |
|
fan
|
613f1f3b95
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/router/index.js
|
2019-09-26 15:13:47 +08:00 |
|
fan
|
1fb0cf3e94
|
产品分化调整
|
2019-09-26 15:08:53 +08:00 |
|
joylink_cuiweidong
|
6664d33ed2
|
产品分化剧本设计调整
|
2019-09-26 13:21:15 +08:00 |
|
joylink_cuiweidong
|
293cee8d2f
|
剧本管理bug修改
|
2019-09-26 11:07:30 +08:00 |
|
joylink_cuiweidong
|
5964baeea1
|
国际化调整
|
2019-09-26 10:59:38 +08:00 |
|
joylink_cuiweidong
|
0bb8e6ba0b
|
产品分化剧本修改
|
2019-09-26 10:54:07 +08:00 |
|
zyy
|
bf085f5de6
|
Merge branch 'master' into dev
|
2019-09-26 10:06:27 +08:00 |
|
zyy
|
7ae79fd7e4
|
desc: 调整二维码字段
|
2019-09-26 10:03:20 +08:00 |
|
zyy
|
488ec91f23
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-26 09:23:09 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +08:00 |
|
joylink_cuiweidong
|
bde4904b2a
|
产品分化调整
|
2019-09-26 09:07:19 +08:00 |
|
fan
|
0fac6ce22e
|
产品分化调整
|
2019-09-25 18:56:30 +08:00 |
|
joylink_cuiweidong
|
1f27473d44
|
Merge branch 'dev_product' of https://git.qcloud.com/joylink/jl-nclient into dev_product
|
2019-09-25 15:34:40 +08:00 |
|
joylink_cuiweidong
|
edcfd5f738
|
产品分化调整
|
2019-09-25 15:34:29 +08:00 |
|
fan
|
37dd77bc55
|
上下拖拽尺寸调整
|
2019-09-25 15:32:44 +08:00 |
|
sunzhenyu
|
f5c362ff0b
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-25 14:55:34 +08:00 |
|
sunzhenyu
|
4faceb5bd0
|
修改样式
|
2019-09-25 14:55:29 +08:00 |
|
fan
|
00f6a41eeb
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-25 14:52:30 +08:00 |
|
fan
|
6e14ba3382
|
设计平台调整
|
2019-09-25 14:52:21 +08:00 |
|
sunzhenyu
|
af17dbece4
|
新数据存读
|
2019-09-25 14:49:25 +08:00 |
|
joylink_cuiweidong
|
7f77c3d33f
|
产品分化 标题,路由调整
|
2019-09-25 14:45:18 +08:00 |
|
joylink_cuiweidong
|
7abd6ddeea
|
产品分化调整
|
2019-09-25 13:45:20 +08:00 |
|
fan
|
5f7fe163d5
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-25 13:05:10 +08:00 |
|
fan
|
e7d7ad76f0
|
实训平台调整
|
2019-09-25 13:05:01 +08:00 |
|
joylink_cuiweidong
|
2c32dbc655
|
产品分化菜单栏调整
|
2019-09-25 11:21:31 +08:00 |
|
zyy
|
df670c63c3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-25 10:46:41 +08:00 |
|
zyy
|
b3830f2cc5
|
desc: 新增现地 自动生成课程
|
2019-09-25 10:46:35 +08:00 |
|
fan
|
8d11f5858d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-25 09:39:14 +08:00 |
|
fan
|
a73ae082a8
|
elementUI图标替换英文X
|
2019-09-25 09:39:04 +08:00 |
|
fan
|
575ca24299
|
产品分化调整：添加测试路由跳转
|
2019-09-25 09:32:48 +08:00 |
|
fan
|
155229e205
|
产品分化调整：注释测试路由跳转
|
2019-09-25 09:29:00 +08:00 |
|
fan
|
87acc40279
|
产品分化调整
|
2019-09-25 09:21:35 +08:00 |
|
fan
|
522b94fcfe
|
产品分化调整
|
2019-09-25 09:18:28 +08:00 |
|
joylink_cuiweidong
|
341097de50
|
产品分化调整
|
2019-09-24 17:40:04 +08:00 |
|
joylink_cuiweidong
|
1e4deb2353
|
国际化调整
|
2019-09-24 17:02:29 +08:00 |
|
joylink_cuiweidong
|
9b3be49329
|
解决 地图仿真,用户删除，可以修改的bug
|
2019-09-24 16:30:55 +08:00 |
|
fan
|
8daaffc854
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
# Conflicts:
# src/views/login/index.vue
|
2019-09-24 15:56:49 +08:00 |
|
fan
|
7e72a54f8c
|
控制只在第一次进入时变全屏
|
2019-09-24 15:54:59 +08:00 |
|
fan
|
bcc4ab1906
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-24 15:31:25 +08:00 |
|
fan
|
5a65547d9b
|
删除多余标点
|
2019-09-24 15:30:54 +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
|
b998eee746
|
产品分化调整
|
2019-09-24 15:03:03 +08:00 |
|
joylink_cuiweidong
|
1f101d5468
|
国际化调整
|
2019-09-24 14:59:58 +08:00 |
|
joylink_cuiweidong
|
27d7431b9e
|
国际化调整
|
2019-09-24 14:09:26 +08:00 |
|
joylink_cuiweidong
|
589306de80
|
产品分化菜单栏调整
|
2019-09-24 13:47:52 +08:00 |
|
joylink_cuiweidong
|
0d1a4982ee
|
解决 支付产品名称没有拿到的问题
|
2019-09-24 13:44:35 +08:00 |
|
fan
|
d863e61b33
|
Revert "revert 01c97f45aea75ec8db5a0726c82a2e83fa14750e"
This reverts commit 6ad0eebb2e.
|
2019-09-24 13:32:28 +08:00 |
|
fan
|
6ad0eebb2e
|
revert 01c97f45ae
|
2019-09-24 13:23:50 +08:00 |
|
fan
|
17b4d631d4
|
演练室样式微调
|
2019-09-24 13:16:14 +08:00 |
|
fan
|
d4ec49ea16
|
国际化调整
|
2019-09-24 12:58:41 +08:00 |
|
fan
|
bc3ec657d2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-24 11:33:06 +08:00 |
|
fan
|
1f047ea340
|
Merge remote-tracking branch 'origin/test' into dev
|
2019-09-24 11:32:44 +08:00 |
|
fan
|
e95023fcf3
|
国际化调整
|
2019-09-24 11:26:28 +08:00 |
|
fan
|
ce7decc188
|
产品分化调整
|
2019-09-24 11:05:10 +08:00 |
|
joylink_cuiweidong
|
823eb02b90
|
产品分化菜单栏调整
|
2019-09-24 10:51:41 +08:00 |
|
fan
|
e2ee048f56
|
产品分化调整
|
2019-09-23 18:06:29 +08:00 |
|
fan
|
622ba7b5f2
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:53:16 +08:00 |
|
joylink_cuiweidong
|
fd8a1817c5
|
菜单栏调整
|
2019-09-23 17:52:44 +08:00 |
|
fan
|
9c3071dc4b
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:51:34 +08:00 |
|
joylink_cuiweidong
|
7514a7657f
|
菜单栏调整
|
2019-09-23 17:50:07 +08:00 |
|
fan
|
b7043ff7de
|
Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product
|
2019-09-23 17:49:16 +08:00 |
|
fan
|
d063625c45
|
产品分化调整
|
2019-09-23 17:49:04 +08:00 |
|
joylink_cuiweidong
|
5ba93805c1
|
菜单栏调整
|
2019-09-23 17:47:54 +08:00 |
|
zyy
|
2d60c78a74
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
|
2019-09-23 13:37:59 +08:00 |
|
zyy
|
01c97f45ae
|
desc: 调整琏计划导入excel, 样式， 流程
|
2019-09-23 13:37:11 +08:00 |
|
fan
|
9d6a52d3c0
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-23 10:14:48 +08:00 |
|
ival
|
00312b33e1
|
修改selected prop default的情况
|
2019-09-23 10:02:31 +08:00 |
|
ival
|
9c20ec9df5
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-09-23 09:54:55 +08:00 |
|
fan
|
517ddbcff0
|
国际化调整
|
2019-09-23 09:48:13 +08:00 |
|
ival
|
a789f301c3
|
修改福州线国际化导致的操作问题以及eslint的问题
|
2019-09-23 09:46:39 +08:00 |
|
ival
|
39d3ee757a
|
修改代码
|
2019-09-23 09:12:36 +08:00 |
|
sunzhenyu
|
103929b23f
|
修改区段坐标，增加道岔，信号机，站台位置
|
2019-09-20 19:03:01 +08:00 |
|
sunzhenyu
|
3dfa7d6000
|
隧道，信号机自动部署测试
|
2019-09-19 18:55:18 +08:00 |
|
fan
|
dc5edddde0
|
国际化调整
|
2019-09-19 18:53:28 +08:00 |
|
fan
|
a182d7d0b2
|
国际化调整
|
2019-09-19 18:51:57 +08:00 |
|
zyy
|
bdfd65eadb
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:34:12 +08:00 |
|
zyy
|
9371d956af
|
desc: 调整冲突, 增加导入运行图国际化
|
2019-09-19 17:34:04 +08:00 |
|
joylink_cuiweidong
|
d798439a26
|
链计划 国际化调整
|
2019-09-19 17:32:33 +08:00 |
|
joylink_cuiweidong
|
4f4912fcbc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:31:02 +08:00 |
|
zyy
|
b5b9f4c1ff
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/en/tip.js
# src/i18n/langs/zh/rules.js
# src/i18n/langs/zh/tip.js
# src/views/planMonitor/editTool/menuBar.vue
# src/views/planMonitor/editTool/menus/createEmptyPlan.vue
# src/views/planMonitor/editTool/menus/editPlanName.vue
# src/views/planMonitor/editTool/menus/modifyingTask.vue
# src/views/planMonitor/editTool/menus/openRunPlan.vue
|
2019-09-19 17:28:31 +08:00 |
|
zyy
|
48ea44a980
|
desc: 调整权限国际化，调整琏计划导入运行图逻辑
|
2019-09-19 17:22:48 +08:00 |
|
joylink_cuiweidong
|
33caa49dcf
|
国际化提交
|
2019-09-19 17:15:30 +08:00 |
|
joylink_cuiweidong
|
98054a93ff
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-19 17:11:11 +08:00 |
|
joylink_cuiweidong
|
706a9502d8
|
国际化调整
|
2019-09-19 17:11:00 +08:00 |
|
fan
|
9b40afa4ea
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-19 16:12:22 +08:00 |
|
fan
|
676fc71ee5
|
国际化调整
|
2019-09-19 16:12:05 +08:00 |
|
joylink_cuiweidong
|
94eeeb0916
|
国际化调整
|
2019-09-19 14:58:41 +08:00 |
|
fan
|
607abd877f
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-19 14:15:22 +08:00 |
|
fan
|
cf8f562a48
|
国际化调整
|
2019-09-19 14:14:49 +08:00 |
|
joylink_cuiweidong
|
0e7fdb354c
|
国际化调整
|
2019-09-19 13:19:35 +08:00 |
|
zyy
|
4f716b502c
|
desc: 恢复权限创建按钮
|
2019-09-19 09:34:18 +08:00 |
|
sunzhenyu
|
c4e8bee27a
|
merge
|
2019-09-19 09:26:51 +08:00 |
|
sunzhenyu
|
71a33b5042
|
merge
|
2019-09-19 09:25:04 +08:00 |
|
ival
|
8b4aee040a
|
注释掉订单入口
|
2019-09-18 18:45:18 +08:00 |
|
ival
|
e224ed8bea
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-18 18:44:04 +08:00 |
|
ival
|
aa727c0f09
|
修改信号解封不能操作菜单的问题
|
2019-09-18 18:43:50 +08:00 |
|
zyy
|
591110ddec
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/zh/orderAuthor.js
# src/i18n/langs/zh/permission.js
# src/views/orderauthor/permission/create/order.vue
|
2019-09-18 18:41:46 +08:00 |
|
zyy
|
1d26a9f1fb
|
desc: 新增创建权限流程
|
2019-09-18 18:39:55 +08:00 |
|
joylink_cuiweidong
|
6b3fe88797
|
仿真国际化修改
|
2019-09-18 18:36:47 +08:00 |
|
joylink_cuiweidong
|
5f4412dd40
|
国际化调整
|
2019-09-18 17:28:24 +08:00 |
|
sunzhenyu
|
b2f1bfae58
|
加入正常铁轨，测试隧道，隧道需要根据section再生成待修改
|
2019-09-18 16:07:40 +08:00 |
|
joylink_cuiweidong
|
9ace0842a5
|
发布内容管理 国际化
|
2019-09-18 16:04:34 +08:00 |
|
joylink_cuiweidong
|
ae68018734
|
发布内容管理 国际化
|
2019-09-18 13:36:57 +08:00 |
|
sunzhenyu
|
0ae296a87f
|
pull前准备
|
2019-09-18 13:21:36 +08:00 |
|
sunzhenyu
|
d5380f8bf2
|
pull
|
2019-09-18 13:20:38 +08:00 |
|
sunzhenyu
|
dfef5a28e9
|
修改三维界面声音返回和退出播放bug，更换音轨
|
2019-09-18 13:20:08 +08:00 |
|
joylink_cuiweidong
|
9bc06e4f59
|
地图绘制国际化调整
|
2019-09-18 11:11:23 +08:00 |
|
ival
|
e699d0176e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-18 10:04:26 +08:00 |
|
ival
|
f13685da07
|
修改代码
|
2019-09-18 10:03:58 +08:00 |
|
joylink_cuiweidong
|
3059b7006d
|
国际化调整
|
2019-09-17 18:39:32 +08:00 |
|
joylink_cuiweidong
|
f8a872b40c
|
国际化调整
|
2019-09-17 17:53:42 +08:00 |
|
ival
|
7b0cf81d45
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-17 16:54:14 +08:00 |
|
ival
|
0b7b0e39c1
|
过滤首页订阅的地图没有name的数据
|
2019-09-17 16:53:29 +08:00 |
|
joylink_cuiweidong
|
ffdba3dc22
|
国际化调整
|
2019-09-17 16:08:11 +08:00 |
|
joylink_cuiweidong
|
021132ba0d
|
国际化调整
|
2019-09-17 14:14:29 +08:00 |
|
joylink_cuiweidong
|
a116539d80
|
国际化调整
|
2019-09-17 13:54:10 +08:00 |
|
joylink_cuiweidong
|
2c7f48fb28
|
课程模块国际化调整
|
2019-09-17 13:19:43 +08:00 |
|
sunzhenyu
|
2cd39f6fbd
|
baseurl
|
2019-09-17 13:18:19 +08:00 |
|
sunzhenyu
|
d1b9589188
|
pull
|
2019-09-17 13:17:15 +08:00 |
|
sunzhenyu
|
183f972884
|
pull
|
2019-09-17 13:16:49 +08:00 |
|
joylink_cuiweidong
|
9ed649200c
|
地图绘制 模块 国际化调整
|
2019-09-17 11:29:34 +08:00 |
|
sunzhenyu
|
9fd032372c
|
修改下行方向初始轨迹，修改音频大小
|
2019-09-17 10:50:59 +08:00 |
|
joylink_cuiweidong
|
b68b10b125
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-17 10:03:13 +08:00 |
|
joylink_cuiweidong
|
51eab16476
|
国际化调整
|
2019-09-17 09:49:24 +08:00 |
|
joylink_cuiweidong
|
7f934a428f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 19:09:23 +08:00 |
|
joylink_cuiweidong
|
9cefb34ce1
|
国际化调整
|
2019-09-16 19:09:11 +08:00 |
|
fan
|
b1706b17c0
|
国际化调整
|
2019-09-16 19:07:40 +08:00 |
|
fan
|
bb272ae559
|
国际化调整
|
2019-09-16 19:06:18 +08:00 |
|
fan
|
a6ff9e2c08
|
国际化调整
|
2019-09-16 19:00:52 +08:00 |
|
sunzhenyu
|
3e2b812029
|
修改列车初始化获取轨迹和位置代码，修改倒车卡轨迹bug，增加跟速度相关的轨道声音
|
2019-09-16 18:47:15 +08:00 |
|
joylink_cuiweidong
|
c1bee69b5c
|
国际化调整
|
2019-09-16 18:40:41 +08:00 |
|
zyy
|
b9534a26e6
|
Merge branch 'dev' into test
|
2019-09-16 18:16:14 +08:00 |
|
zyy
|
815c2e6db4
|
desc: 调整信号机显示位置
|
2019-09-16 17:58:01 +08:00 |
|
zyy
|
607024c551
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 17:31:17 +08:00 |
|
zyy
|
c5c71253df
|
desc: 调整信号机字段显示，调整创建权限逻辑
|
2019-09-16 17:31:12 +08:00 |
|
joylink_cuiweidong
|
25402786f8
|
国际化调整
|
2019-09-16 16:08:55 +08:00 |
|
zyy
|
7abab1ba28
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-16 16:00:09 +08:00 |
|
zyy
|
ab9a02e232
|
desc: 调整琏计划运行图样式
|
2019-09-16 15:59:53 +08:00 |
|
ival
|
0cd99f16f1
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/views/publish/publishMap/index.vue
|
2019-09-16 14:31:56 +08:00 |
|
ival
|
b52bb52888
|
修改地图导出以及登录失败错误信息提示
|
2019-09-16 14:29:43 +08:00 |
|
joylink_cuiweidong
|
382b81b94e
|
国际化调整
|
2019-09-16 13:55:18 +08:00 |
|
joylink_cuiweidong
|
87637e89ae
|
弹出层国际化调整
|
2019-09-16 11:17:42 +08:00 |
|
joylink_cuiweidong
|
711f3195e3
|
国际化调整
|
2019-09-16 10:25:39 +08:00 |
|
fan
|
836aa798dd
|
国际化调整
|
2019-09-16 09:06:19 +08:00 |
|
fan
|
6e44740fe2
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-16 09:05:33 +08:00 |
|
fan
|
126fc80ea4
|
国际化调整菜单
|
2019-09-16 08:56:37 +08:00 |
|
joylink_cuiweidong
|
3f772f0cd5
|
地图右键菜单国际化
|
2019-09-12 18:37:42 +08:00 |
|
joylink_cuiweidong
|
88d96ace7d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-12 17:38:17 +08:00 |
|
joylink_cuiweidong
|
24bbeda269
|
地图右键菜单国际化
|
2019-09-12 17:38:04 +08:00 |
|
fan
|
a362e629c7
|
国际化调整
|
2019-09-12 17:34:40 +08:00 |
|
fan
|
60522271fc
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/menu.js
# src/i18n/langs/zh/menu.js
|
2019-09-12 17:34:17 +08:00 |
|
fan
|
d9b8f1e8fd
|
国际化菜单调整调整
|
2019-09-12 17:28:02 +08:00 |
|
zyy
|
c777b3dbcc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/rules.js
# src/i18n/langs/zh/rules.js
|
2019-09-12 16:31:35 +08:00 |
|
zyy
|
f48a513df0
|
desc: 调整绘图逻辑，流程，字段显示
|
2019-09-12 16:30:42 +08:00 |
|
joylink_cuiweidong
|
6d03379cb0
|
地图右键菜单国际化
|
2019-09-12 16:03:03 +08:00 |
|
joylink_cuiweidong
|
b08cddc237
|
地图菜单国际化
|
2019-09-12 15:14:13 +08:00 |
|
joylink_cuiweidong
|
71a0f2d921
|
仿真国际化
|
2019-09-12 13:35:25 +08:00 |
|
fan
|
cf45174dad
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-12 13:22:40 +08:00 |
|
fan
|
2dffe78baf
|
国际化调整
|
2019-09-12 13:22:30 +08:00 |
|
joylink_cuiweidong
|
22a77b63fd
|
仿真 国际化调整
|
2019-09-12 09:37:40 +08:00 |
|
fan
|
63fb67b4cc
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-12 09:26:13 +08:00 |
|
fan
|
7a284fea4a
|
国际化调整
|
2019-09-12 09:25:33 +08:00 |
|
sunzhenyu
|
33442d2969
|
自动化test
|
2019-09-11 18:12:52 +08:00 |
|
fan
|
b06f4d1ad4
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 17:12:00 +08:00 |
|
fan
|
436cd0418f
|
国际化调整
|
2019-09-11 17:11:51 +08:00 |
|
fan
|
1afb81bba5
|
权限打包调整
|
2019-09-11 17:09:51 +08:00 |
|
joylink_cuiweidong
|
76335c8d12
|
仿真购买 国际化调整
|
2019-09-11 16:23:14 +08:00 |
|
joylink_cuiweidong
|
1830952064
|
仿真 国际化调整
|
2019-09-11 15:33:00 +08:00 |
|
fan
|
6b80ac2452
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 15:26:57 +08:00 |
|
fan
|
0c11453197
|
权限打包搜索条件调整
|
2019-09-11 15:26:40 +08:00 |
|
joylink_cuiweidong
|
37f1631585
|
仿真国际化调整
|
2019-09-11 14:35:26 +08:00 |
|
fan
|
fd4c2de338
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
# Conflicts:
# src/i18n/langs/en/index.js
# src/i18n/langs/zh/index.js
|
2019-09-11 14:31:32 +08:00 |
|
fan
|
d1c146f9da
|
权限回收调整
|
2019-09-11 14:28:22 +08:00 |
|
joylink_cuiweidong
|
ef5d425942
|
考试 仿真国际化调整
|
2019-09-11 13:40:46 +08:00 |
|
fan
|
41b70bc477
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-11 13:20:30 +08:00 |
|
fan
|
9c5f1f7633
|
国际化调整
|
2019-09-11 13:20:03 +08:00 |
|
joylink_cuiweidong
|
b13638803a
|
教学 仿真 国际化调整
|
2019-09-11 11:32:31 +08:00 |
|
joylink_cuiweidong
|
5c184755e2
|
教学仿真 国际化调整
|
2019-09-11 11:30:44 +08:00 |
|
joylink_cuiweidong
|
d31f4e8493
|
教学和考试的仿真 国际化调整
|
2019-09-11 11:02:18 +08:00 |
|
fan
|
fa4ccafc58
|
权限分发调整
|
2019-09-11 10:42:15 +08:00 |
|
fan
|
5c2e2cebe8
|
权限分发调整
|
2019-09-11 10:35:34 +08:00 |
|
joylink_cuiweidong
|
1ced2a4911
|
国际化调整
|
2019-09-11 09:34:12 +08:00 |
|
fan
|
7bb4ac4a06
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-11 09:26:38 +08:00 |
|
fan
|
3e1bd3fcd7
|
国际化考试系统大屏统计系统
|
2019-09-11 09:25:16 +08:00 |
|
joylink_cuiweidong
|
e1378c0961
|
国际化调整
|
2019-09-10 19:08:48 +08:00 |
|
joylink_cuiweidong
|
875d5d6c64
|
国际化调整
|
2019-09-10 17:32:41 +08:00 |
|
joylink_cuiweidong
|
4b8a3acca8
|
国际化调整以及ibp盘调整
|
2019-09-10 16:14:54 +08:00 |
|
fan
|
c96260215c
|
ibp调整代码
|
2019-09-10 14:27:53 +08:00 |
|
fan
|
5612cfc06e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-10 10:26:27 +08:00 |
|
fan
|
8083656e16
|
ibp删除钥匙孔
|
2019-09-10 10:26:18 +08:00 |
|
joylink_cuiweidong
|
dc44cd3198
|
钥匙组件调整
|
2019-09-10 10:20:15 +08:00 |
|
fan
|
0c9e367f3d
|
ibp修改扶梯框边框宽度，调整select默认状态
|
2019-09-10 10:16:02 +08:00 |
|
joylink_cuiweidong
|
eaaccddc20
|
通化门，后卫寨 钥匙组件数据调整
|
2019-09-10 10:10:49 +08:00 |
|
joylink_cuiweidong
|
d6ab9b00e2
|
钥匙组件数据重新调整
|
2019-09-09 19:30:12 +08:00 |
|
joylink_cuiweidong
|
26472da421
|
钥匙组件代码重新封装
|
2019-09-09 19:03:23 +08:00 |
|
fan
|
a32bda33f1
|
ibp调整代码
|
2019-09-09 18:03:32 +08:00 |
|
fan
|
7620d82d6e
|
ibp调整背景图片加载方式
|
2019-09-09 16:22:45 +08:00 |
|
fan
|
80ce4e19a8
|
ibp调整
|
2019-09-09 16:11:43 +08:00 |
|
fan
|
c661945847
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-09 10:41:27 +08:00 |
|
fan
|
6eb3fecc4b
|
信号机调整
|
2019-09-09 10:41:14 +08:00 |
|
sunzhenyu
|
4e1f95e900
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-09 10:22:21 +08:00 |
|
sunzhenyu
|
fd8f3e4dd0
|
修改过去不标准贴图，修改代码生成的不标准材质
|
2019-09-09 10:22:10 +08:00 |
|
fan
|
6472afe009
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 18:46:54 +08:00 |
|
fan
|
31454a72c5
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 18:18:18 +08:00 |
|
fan
|
760aa02496
|
ibp调整页面
|
2019-09-06 18:17:54 +08:00 |
|
ival
|
1a516880b5
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 17:55:34 +08:00 |
|
ival
|
1918a634b1
|
修改变量
|
2019-09-06 17:55:18 +08:00 |
|
fan
|
621fe61d36
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:43:09 +08:00 |
|
fan
|
6b96fc928d
|
ibp删除console
|
2019-09-06 17:42:36 +08:00 |
|
fan
|
4cd1da15c0
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:38:18 +08:00 |
|
fan
|
3ea2c656de
|
ibp调整电子钟停止
|
2019-09-06 17:37:43 +08:00 |
|
fan
|
3abd85ab67
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:25:35 +08:00 |
|
fan
|
a9ec1672ae
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 17:24:45 +08:00 |
|
fan
|
05b41d659e
|
ibp拖动鼠标样式调整
|
2019-09-06 17:24:32 +08:00 |
|
zyy
|
37e8046241
|
Merge branch 'dev' into test
|
2019-09-06 17:22:36 +08:00 |
|
zyy
|
46a3f64f4d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 17:22:03 +08:00 |
|
zyy
|
ba21d7af9d
|
desc: 修改权限打包字段， 修改地图绘制区段逻辑
|
2019-09-06 17:21:54 +08:00 |
|
fan
|
c3a98567a3
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-09-06 17:03:07 +08:00 |
|
fan
|
9d5c5646a2
|
ibp盘调整
|
2019-09-06 17:01:51 +08:00 |
|
fan
|
ddfeeb6718
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 16:55:31 +08:00 |
|
fan
|
3faf8f3906
|
ibp盘调整
|
2019-09-06 16:54:55 +08:00 |
|
ival
|
f774edd652
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 16:11:46 +08:00 |
|
ival
|
7c5d453c29
|
修改绘制地图同步数据逻辑
|
2019-09-06 16:11:28 +08:00 |
|
zyy
|
0cfc1dc972
|
Merge branch 'dev' into test
|
2019-09-06 15:55:06 +08:00 |
|
zyy
|
10c4083ad3
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 15:54:11 +08:00 |
|
zyy
|
7b0b0d6d0c
|
desc: 修改绘制地图赋值
|
2019-09-06 15:54:05 +08:00 |
|
fan
|
327c35355f
|
ibp盘调整
|
2019-09-06 15:21:21 +08:00 |
|
fan
|
80edc1ad20
|
ibp盘调整
|
2019-09-06 15:08:47 +08:00 |
|
fan
|
32dab2fa7d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 14:48:47 +08:00 |
|
fan
|
ceccbbc825
|
ibp盘调整
|
2019-09-06 14:48:06 +08:00 |
|
joylink_cuiweidong
|
37b72ddf7e
|
枣园站 ibp盘绘制
|
2019-09-06 14:23:31 +08:00 |
|
zyy
|
1faa4e0add
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-06 14:21:08 +08:00 |
|
zyy
|
11a49d1442
|
desc: 增加加载运行图模板接口，调整地图绘制优化
|
2019-09-06 14:21:01 +08:00 |
|
joylink_cuiweidong
|
d05a6583df
|
ibp盘 圆形指示灯 调整
|
2019-09-06 10:55:34 +08:00 |
|
fan
|
20acc0e667
|
ibp盘调整
|
2019-09-06 10:27:13 +08:00 |
|
fan
|
f8df75252f
|
ibp盘调整
|
2019-09-06 10:07:01 +08:00 |
|
fan
|
f5f7113c01
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-06 09:55:27 +08:00 |
|
fan
|
fa604188b0
|
ibp盘调整
|
2019-09-06 09:55:16 +08:00 |
|
joylink_cuiweidong
|
a3980e689e
|
修改钥匙，电话端子，提示框，线等组件的结构
|
2019-09-06 09:49:58 +08:00 |
|
fan
|
7f0d548cb4
|
ibp盘调整
|
2019-09-05 19:27:30 +08:00 |
|
fan
|
455202a851
|
ibp盘调整
|
2019-09-05 18:54:54 +08:00 |
|
fan
|
84d2c2f014
|
ibp盘调整
|
2019-09-05 17:47:05 +08:00 |
|
fan
|
4d3eda2131
|
ibp盘调整
|
2019-09-05 10:01:56 +08:00 |
|
fan
|
9ba4ce7681
|
ibp盘图片调整
|
2019-09-05 09:54:53 +08:00 |
|
fan
|
c4bf259918
|
销毁实例前清除ibp数据
|
2019-09-05 09:35:32 +08:00 |
|
fan
|
063b6392fc
|
查询剧本列表接口调整展示调整
|
2019-09-05 09:07:16 +08:00 |
|
zyy
|
2dadba36dd
|
Merge branch 'dev' into test
|
2019-09-04 19:07:43 +08:00 |
|
zyy
|
935e42fa5b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:07:04 +08:00 |
|
zyy
|
921ef7c03d
|
desc: 调整接口请求次数
|
2019-09-04 19:06:55 +08:00 |
|
ival
|
664fbb8f7f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 19:04:58 +08:00 |
|
ival
|
99ffd6d36c
|
删除注释
|
2019-09-04 19:03:04 +08:00 |
|
ival
|
33c4a3afc2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 19:00:38 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
joylink_cuiweidong
|
e537726127
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:29 +08:00 |
|
fan
|
fefe8bd104
|
ibp盘数据调整
|
2019-09-04 18:49:09 +08:00 |
|
joylink_cuiweidong
|
19870bb7c4
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 18:49:04 +08:00 |
|
joylink_cuiweidong
|
38f7b1a6e2
|
修复 时间组件拖拽 位置数据不更新的问题
|
2019-09-04 18:48:53 +08:00 |
|
fan
|
e24a0e1b4d
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 18:48:10 +08:00 |
|
fan
|
8df4cfd6e1
|
ibp代码调整
|
2019-09-04 18:47:49 +08:00 |
|
zyy
|
0f9b0f84a5
|
desc: 删除多余打印
|
2019-09-04 18:29:47 +08:00 |
|
zyy
|
1d7809bc33
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:58:56 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
sunzhenyu
|
ebd1b211d1
|
Merge branch 'dev' of git.cloud.tencent.com:joylink/jl-nclient into dev
|
2019-09-04 17:36:15 +08:00 |
|
joylink_cuiweidong
|
24fae2c33c
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 17:26:34 +08:00 |
|
joylink_cuiweidong
|
53e3bf3899
|
解决 拖拽电梯 位置数据不更新的问题
|
2019-09-04 17:26:20 +08:00 |
|
ival
|
ba5de09724
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-04 17:20:18 +08:00 |
|
ival
|
8b56d035eb
|
修改按钮顺序
|
2019-09-04 17:19:26 +08:00 |
|
ival
|
4e7db47748
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-04 17:16:00 +08:00 |
|
ival
|
92531836fe
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 16:58:25 +08:00 |
|
ival
|
f925043e41
|
增加大屏角色
|
2019-09-04 16:58:13 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
6b9047c919
|
desc: 调整请求位置
|
2019-09-04 15:06:26 +08:00 |
|
zyy
|
949d51923e
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 14:47:58 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
fan
|
f065661cd4
|
ibp代码调整
|
2019-09-04 14:42:04 +08:00 |
|
joylink_cuiweidong
|
a169ed0e81
|
ibp电梯拖拽事件调整 touch事件添加
|
2019-09-04 13:18:16 +08:00 |
|
fan
|
2d0c7a547b
|
ibp代码调整
|
2019-09-04 13:14:37 +08:00 |
|
fan
|
4cbdf38845
|
代码调整
|
2019-09-04 13:08:51 +08:00 |
|
fan
|
d303ca087e
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 13:07:09 +08:00 |
|
fan
|
8a9092b2b4
|
ibp代码调整
|
2019-09-04 13:06:15 +08:00 |
|
ival
|
ec51f2de2c
|
修改代码
|
2019-09-04 13:04:56 +08:00 |
|
ival
|
eb7dafd1b2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 13:02:43 +08:00 |
|
ival
|
89fc3c0547
|
增加角色分配统计
|
2019-09-04 13:02:28 +08:00 |
|
zyy
|
8e06abcad9
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 11:28:36 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
joylink_cuiweidong
|
67f925ef7f
|
代码调整
|
2019-09-04 11:05:57 +08:00 |
|
joylink_cuiweidong
|
969fe6ac5a
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/ibp/shape/background.js
|
2019-09-04 11:02:02 +08:00 |
|
joylink_cuiweidong
|
3a196ffac4
|
ibp 拖拽事件处理
|
2019-09-04 11:00:01 +08:00 |
|
fan
|
eb26f87560
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-04 10:57:14 +08:00 |
|
fan
|
743fa388c4
|
代码调整
|
2019-09-04 10:56:44 +08:00 |
|
ival
|
d7fb121c2b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-04 10:13:42 +08:00 |
|
ival
|
df839856d9
|
修改IBP盘角色修改
|
2019-09-04 10:13:26 +08:00 |
|
zyy
|
51274a044b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 18:59:52 +08:00 |
|
zyy
|
abec58b726
|
desc: 修改弹窗点击蒙层不取消
|
2019-09-03 18:59:46 +08:00 |
|
fan
|
cb7d08bc93
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 18:45:39 +08:00 |
|
fan
|
ce5d0424d5
|
ibp代码调整
|
2019-09-03 18:45:02 +08:00 |
|
sunzhenyu
|
b7bffeb467
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-09-03 18:40:37 +08:00 |
|
sunzhenyu
|
58541f0654
|
mmi显示补漏
|
2019-09-03 18:40:24 +08:00 |
|
ival
|
f12b521da4
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-09-03 18:38:15 +08:00 |
|
ival
|
0879aef961
|
增加派班计划loading
|
2019-09-03 18:37:00 +08:00 |
|
ival
|
790ce4551a
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:58:43 +08:00 |
|
ival
|
c1af062bbd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/utils/baseUrl.js
|
2019-09-03 17:36:01 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
zyy
|
0af24a4306
|
Merge branch 'dev' into test
|
2019-09-03 17:03:42 +08:00 |
|
zyy
|
bd494599a6
|
desc: 修改显示权限title
|
2019-09-03 17:03:05 +08:00 |
|
sunzhenyu
|
9211396f99
|
修改state
|
2019-09-03 17:01:00 +08:00 |
|
sunzhenyu
|
1af9b755d7
|
t ：Merge branch 'test' into dev
|
2019-09-03 16:56:20 +08:00 |
|
sunzhenyu
|
2ea8521928
|
a
|
2019-09-03 16:53:50 +08:00 |
|
sunzhenyu
|
6fc5f991ef
|
区分cctv和正常镜头渲染，减少通信驱动的循环体，减少循环遍历的数据中内容，修改场景背景
|
2019-09-03 16:45:56 +08:00 |
|
fan
|
dafa95baed
|
Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
|
2019-09-03 16:14:13 +08:00 |
|
fan
|
ae853226d7
|
ibp调整
|
2019-09-03 16:14:00 +08:00 |
|
zyy
|
0372dd202d
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 16:13:29 +08:00 |
|
zyy
|
40b67b8cf3
|
desc: 调整修改权限逻辑
|
2019-09-03 16:13:23 +08:00 |
|
ival
|
b8d2f43ebd
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:46:31 +08:00 |
|
ival
|
dfcdb5628f
|
优化IBP盘代码
|
2019-09-03 15:46:16 +08:00 |
|
zyy
|
10ab09451b
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 15:22:58 +08:00 |
|
zyy
|
27f05bdd0d
|
desc: 增加缓存列表
|
2019-09-03 15:22:50 +08:00 |
|
ival
|
6eb0ac89b8
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-09-03 14:40:02 +08:00 |
|
ival
|
c433cb5045
|
添加加载脚本失败后，提示后台错误
|
2019-09-03 14:39:50 +08:00 |
|