joylink_cuiweidong
|
95ae0de627
|
skinCode调整
|
2019-11-08 16:12:23 +08:00 |
|
joylink_cuiweidong
|
0e674de983
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-11-08 13:02:28 +08:00 |
|
fan
|
f8d6a3eb9f
|
课程发布管理添加归属地图
|
2019-11-08 10:21:54 +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 |
|
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
|
42a5f7076a
|
desc: 调整区段绘图逻辑优化
|
2019-11-07 15:20:39 +08:00 |
|
joylink_cuiweidong
|
5cb7fe51b9
|
skinCode处理
|
2019-11-07 10:25:34 +08:00 |
|
joylink_cuiweidong
|
9424dfb001
|
权限分发调整
|
2019-11-06 13:41:02 +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
|
6a2a0b0b5e
|
代码调整
权限分发国际化调整
|
2019-11-05 19:03:20 +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 |
|
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 |
|
joylink_cuiweidong
|
1a13c9ad2c
|
权限分发接口调整
|
2019-11-05 13:20:27 +08:00 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +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 |
|
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
|
6d6e851449
|
Merge branch 'dev' into test
|
2019-11-01 13:51:26 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +08:00 |
|
zyy
|
90c8349a8f
|
Merge branch 'dev' into test
|
2019-10-31 18:44:04 +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 |
|
fan
|
7455fb17ea
|
发布地图管理国际化调整，添加ibp角色多人时disable为true 调整
|
2019-10-31 16:52:49 +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
|
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
|
3996f03e55
|
实训首页样式调整和复制地图调整
|
2019-10-31 13:57:17 +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 |
|
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
|
6d37627e3d
|
发布地图管理调整
|
2019-10-31 09:09:43 +08:00 |
|
joylink_cuiweidong
|
de76904dfc
|
接口调整
|
2019-10-30 19:36:29 +08:00 |
|
joylink_cuiweidong
|
ce0230150b
|
接口调整
|
2019-10-30 18:07:09 +08:00 |
|
joylink_cuiweidong
|
81921a4a0d
|
国际化调整
|
2019-10-30 09:58:23 +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
|
df8d104bd1
|
desc: 高度修改，登陆页面英文调整
|
2019-10-29 17:33:11 +08:00 |
|
joylink_cuiweidong
|
9fc78c18c3
|
课程设计内容排序调整
运行图发布弹出提示调整
|
2019-10-29 13:06:55 +08:00 |
|
zyy
|
178e49187d
|
desc: 调整高度自适应， 调整地图绘制创建区段，道岔逻辑优化
|
2019-10-28 17:51:59 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
sunzhenyu
|
300aa624df
|
更换threejs到109版本，修改路劲弧度，修改渲染注册，测试光效
|
2019-10-25 18:42:56 +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
|
ceb7fa7e5e
|
西铁院运行图编制调整
|
2019-10-25 16:59:23 +08:00 |
|
fan
|
12d25d1643
|
运行图测试运行调整，西铁院登录页路由调整
|
2019-10-25 16:45:17 +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
|
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
|
62541373f1
|
导航栏右侧menu调整
|
2019-10-24 15:15:52 +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 |
|
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
|
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 |
|
joylink_cuiweidong
|
f483a1c115
|
运行图审核接口调整
|
2019-10-23 17:41:24 +08:00 |
|
fan
|
c83e882f6a
|
国际化调整
|
2019-10-23 17:20:32 +08:00 |
|
fan
|
dff5d96d4d
|
Merge remote-tracking branch 'origin/dev' into test
|
2019-10-23 16:19:22 +08:00 |
|
fan
|
3119f4f308
|
设计平台课程设计调整
|
2019-10-23 15:01:25 +08:00 |
|
joylink_cuiweidong
|
51bf37e9c7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
2019-10-23 13:36:19 +08:00 |
|
fan
|
89d71ed661
|
发现问题调整
|
2019-10-23 13:33:09 +08:00 |
|
joylink_cuiweidong
|
e854c32390
|
Merge branch 'dev' into test
|
2019-10-22 20:10:05 +08:00 |
|
fan
|
4bd232bd67
|
地图系统结构调整
|
2019-10-22 18:34:05 +08:00 |
|
joylink_cuiweidong
|
bddddedbf2
|
Merge branch 'dev' into test
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-22 16:13:13 +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 |
|
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
|
bd683656a8
|
Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test
|
2019-10-21 16:51:09 +08:00 |
|
joylink_cuiweidong
|
1a046c2b7f
|
设计平台系统管理子系统生成页面调整
|
2019-10-21 15:50:15 +08:00 |
|
sunzhenyu
|
ca36aa478d
|
增加三维编辑
|
2019-10-21 14:29:45 +08:00 |
|
fan
|
b23bff36f0
|
打开实训录制按钮
|
2019-10-18 17:32:14 +08:00 |
|
fan
|
d5063802f4
|
接口调整
|
2019-10-18 17:15:04 +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 |
|
joylink_cuiweidong
|
99b2cfc05b
|
剧本预览页面调整
|
2019-10-17 18:06:04 +08:00 |
|
fan
|
ab815ec493
|
实训管理调整
|
2019-10-17 17:56:25 +08:00 |
|
fan
|
534fa388e8
|
添加子系统生成页面
|
2019-10-17 17:11:15 +08:00 |
|
zyy
|
6ca619b71f
|
desc: 修改格式化
|
2019-10-17 14:35:10 +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
|
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 |
|