ival
|
1dbc428e19
|
修改代码
|
2019-11-15 16:50:09 +08:00 |
|
ival
|
d599e561f6
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/store/modules/exam.js
# src/utils/baseUrl.js
# src/views/display/menuExam.vue
|
2019-11-15 16:34:54 +08:00 |
|
zyy
|
9a82914c11
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-15 16:31:55 +08:00 |
|
zyy
|
9bfad2fdeb
|
desc: 修改代码
|
2019-11-15 16:31:48 +08:00 |
|
ival
|
a60b41398b
|
修改代码
|
2019-11-15 16:29:11 +08:00 |
|
joylink_cuiweidong
|
1818ddaeb1
|
代码调整
|
2019-11-15 13:19:17 +08:00 |
|
ival
|
6ce30aaee2
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
# src/permission.js
# src/views/display/demon/chartView.vue
# src/views/display/demon/chatBox.vue
# src/views/exam/detail/courseDetail.vue
|
2019-11-14 14:03:41 +08:00 |
|
ival
|
c5c813753c
|
修改代码
|
2019-11-14 13:59:33 +08:00 |
|
fan
|
e41d324c27
|
删除实训平台运行图编辑，修改综合演练值班员角色调整问题
|
2019-11-14 11:30:32 +08:00 |
|
zyy
|
27ad7849b3
|
desc: 修改代码
|
2019-11-14 09:22:00 +08:00 |
|
ival
|
93546fe1fc
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
|
2019-11-13 11:10:26 +08:00 |
|
ival
|
0c3a91319d
|
修改代码
|
2019-11-13 11:10:15 +08:00 |
|
zyy
|
0a3e1963a8
|
调整版本
|
2019-11-13 10:34:19 +08:00 |
|
zyy
|
9cf4fc7c2f
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/theme/beijing_01/planSchedule/schedule.vue
# src/jmap/theme/chengdu_03/planSchedule/schedule.vue
# src/jmap/theme/fuzhou_01/planSchedule/schedule.vue
|
2019-11-12 17:26:25 +08:00 |
|
zyy
|
0cb102186f
|
desc: 修改echarts加载方式
|
2019-11-12 17:20:23 +08:00 |
|
joylink_cuiweidong
|
d2354b602f
|
具体线路下的skinCode修改
|
2019-11-12 15:39:18 +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 |
|
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 |
|
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 |
|
joylink_cuiweidong
|
c4f79f3b1a
|
skinCode调整
|
2019-11-11 18:28:21 +08:00 |
|
joylink_cuiweidong
|
16b0aab0e5
|
运行图skinCode修改
|
2019-11-11 17:38:43 +08:00 |
|
joylink_cuiweidong
|
e8c8e491f5
|
skinCode调整
|
2019-11-11 15:54: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 |
|
zyy
|
a348552d1e
|
desc: 增加选中批量设置集中站操作
|
2019-11-08 18:32:39 +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 |
|
zyy
|
4483ee9253
|
desc: 导入运行图增加提示
|
2019-11-08 14:56:39 +08:00 |
|
zyy
|
7a359e5f6e
|
desc: 修改代码
|
2019-11-08 14:36:41 +08:00 |
|
zyy
|
16e13f38b5
|
desc: 调整格式
|
2019-11-07 18:46:17 +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
|
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 |
|
zyy
|
9f1f02bf0e
|
desc: 增加绘图撤销，重做
|
2019-11-06 18:37:32 +08:00 |
|
fan
|
46b35323d9
|
西铁院登录页样式调整，测试问题调整
# Conflicts:
# src/views/scriptManage/create.vue
|
2019-11-06 09:51:52 +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 |
|
fan
|
1bd3debbde
|
西铁院登录页样式调整，测试问题调整
|
2019-11-04 18:41:58 +08:00 |
|
zyy
|
3e502ffca2
|
Merge branch 'test'
|
2019-11-01 15:20:18 +08:00 |
|
zyy
|
aaa0eeedd8
|
desc: 调整国际化
|
2019-11-01 13:51:00 +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 |
|
fan
|
0489cf2fd3
|
删除接口：/api/map/{skinCode}/train
|
2019-10-30 11:18:41 +08:00 |
|
joylink_cuiweidong
|
72b4fc5f25
|
Merge remote-tracking branch 'remotes/origin/test'
|
2019-10-29 16:53:23 +08:00 |
|
zyy
|
60c58fe290
|
desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联
|
2019-10-28 18:42:31 +08:00 |
|
zyy
|
3bc3e66085
|
Merge branch 'test'
# Conflicts:
# src/utils/baseUrl.js
|
2019-10-22 16:32:29 +08:00 |
|
zyy
|
83c53b0640
|
desc: 修改代码
|
2019-10-22 16:29:11 +08:00 |
|
zyy
|
0eb05638a0
|
desc: 调整列车识别号初始化
|
2019-10-22 15:42:07 +08:00 |
|
zyy
|
3c67e18350
|
desc: 修改代码
|
2019-10-22 15:24:36 +08:00 |
|
zyy
|
a61f917f4a
|
desc: 调整站台扣车状态显示
|
2019-10-22 14:07:20 +08:00 |
|
zyy
|
0c6de0e011
|
desc: 修改代码
|
2019-10-22 13:41:23 +08:00 |
|
zyy
|
74a2bbb1c6
|
desc: 调整成都三号现地，行调实训操作
|
2019-10-18 18:20:17 +08:00 |
|
ival
|
155c36d8cc
|
修改代码
|
2019-10-18 13:00:47 +08:00 |
|
ival
|
8e836143fc
|
修改
|
2019-10-18 11:32:51 +08:00 |
|
zyy
|
82aff22132
|
desc: 修改代码
|
2019-10-18 11:25:26 +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 |
|
zyy
|
b006de669d
|
desc: 调整信号机自排开，自排关，流程
|
2019-10-17 17:56:24 +08:00 |
|
fan
|
ee62ceb0e5
|
产品分化调整
|
2019-10-17 16:04:07 +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 |
|
joylink_cuiweidong
|
664435bdd7
|
剧本国际化调整
|
2019-10-16 17:05:38 +08:00 |
|
joylink_cuiweidong
|
35eacb299c
|
剧本预览页面调整
|
2019-10-16 16:36:25 +08:00 |
|
joylink_cuiweidong
|
df5a76ea41
|
剧本管理英文版英文用词修改
|
2019-10-16 11:20:36 +08:00 |
|
zyy
|
99edd29aea
|
desc: 调整格式化问题， 调整列车详情国际化
|
2019-10-12 13:25:47 +08:00 |
|
zyy
|
3b7605f996
|
desc: 调整正式上国际版仿真报错
|
2019-10-11 16:01:26 +08:00 |
|
zyy
|
f7cf33a5e2
|
desc: 调整登陆页面样式
|
2019-10-10 18:05:26 +08:00 |
|
joylink_cuiweidong
|
1d760d5688
|
产品分化路由修改
|
2019-10-10 13:45:51 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
zyy
|
a8302b610e
|
desc: 注释多余代码
|
2019-09-29 11:09:02 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +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 |
|
joylink_cuiweidong
|
1e4deb2353
|
国际化调整
|
2019-09-24 17:02:29 +08:00 |
|
joylink_cuiweidong
|
9b3be49329
|
解决 地图仿真,用户删除，可以修改的bug
|
2019-09-24 16:30:55 +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 |
|
joylink_cuiweidong
|
1f101d5468
|
国际化调整
|
2019-09-24 14:59:58 +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 |
|
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 |
|
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 |
|
ival
|
a789f301c3
|
修改福州线国际化导致的操作问题以及eslint的问题
|
2019-09-23 09:46:39 +08:00 |
|
ival
|
39d3ee757a
|
修改代码
|
2019-09-23 09:12:36 +08:00 |
|