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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
zyy
|
60c58fe290
|
desc: 调整个人地图绘制 允许滚轮事件, 地图绘制区段坐标关联
|
2019-10-28 18:42:31 +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 |
|