fan
|
4918c78204
|
删除接口：/api/runPlan/draft/station/{skinCode}/bySkin
|
2019-10-30 16:50:35 +08:00 |
|
fan
|
0489cf2fd3
|
删除接口：/api/map/{skinCode}/train
|
2019-10-30 11:18:41 +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
|
35eacb299c
|
剧本预览页面调整
|
2019-10-16 16:36:25 +08:00 |
|
zyy
|
a8e491ea6e
|
desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明
|
2019-10-09 17:05:10 +08:00 |
|
zyy
|
0b1ae44c19
|
desc: 调整三号线现地操作
|
2019-09-26 09:23:02 +08:00 |
|
zyy
|
a0ee753bfd
|
desc: 调整成都三号线自动生成课程配置，部分内容 (待调)
|
2019-09-24 15:06:45 +08:00 |
|
zyy
|
01c97f45ae
|
desc: 调整琏计划导入excel, 样式， 流程
|
2019-09-23 13:37:11 +08:00 |
|
ival
|
aa727c0f09
|
修改信号解封不能操作菜单的问题
|
2019-09-18 18:43:50 +08:00 |
|
ival
|
02fc21e544
|
增加仿真的大屏角色以及IBP角色
|
2019-09-04 19:00:22 +08:00 |
|
ival
|
c97996fceb
|
设置冲突列颜色
|
2019-09-03 17:35:23 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
ival
|
546957e926
|
增加排版计划处理
|
2019-08-30 15:46:08 +08:00 |
|
ival
|
1616639f6f
|
修改运行图接口
|
2019-08-29 13:52:34 +08:00 |
|
ival
|
cc54830f01
|
修改代码格式以及操作的bug
|
2019-08-29 10:33:50 +08:00 |
|
ival
|
28c6e05c41
|
修改获取列车数据没有刷新，导致加载的问题
|
2019-08-20 09:55:49 +08:00 |
|
ival
|
87e35cb38d
|
同步master代码以及修改交路的问题
|
2019-08-14 16:37:17 +08:00 |
|
ival
|
3bb449080f
|
Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
# src/i18n/langs/zh/tip.js
# src/jlmap3d/jl3ddrive/jl3ddrive.js
# src/views/components/pay/index.vue
# src/views/demonstration/detail/index.vue
# src/views/display/index.vue
# src/views/exam/detail/courseDetail.vue
# src/views/exam/detail/examDetail.vue
# src/views/exam/detail/questionDetail.vue
# src/views/jlmap3d/drive/jl3ddrive.vue
# src/views/jlmap3d/simulation/jl3dsimulation.vue
# src/views/jointTraining/index.vue
# src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
# src/views/map/mapdraft/mapedit/mapoperate/section.vue
# src/views/map/mapdraft/mapedit/mapoperate/signal.vue
# src/views/map/mapdraft/mapedit/mapoperate/station.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
# src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
# src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
# src/views/map/mapdraft/mapedit/mapoperate/switch.vue
# src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
# src/views/map/mapdraft/mapedit/routeoperate/detail.vue
# src/views/map/mapdraft/mapedit/routeoperate/preview.vue
# src/views/map/mapdraft/mapedit/routeoperate/related.vue
# src/views/map/mapdraft/mapedit/routeoperate/route.vue
# src/views/map/mapdraft/mapmanage/operateMenu.vue
# src/views/map/product/draft.vue
# src/views/map/product/list.vue
# src/views/map/skinStyle/draft.vue
# src/views/map/skinStyle/index.vue
# src/views/planMonitor/detail.vue
# src/views/planMonitor/editTool/index.vue
# src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
# src/views/planMonitor/editTool/schedule.vue
# src/views/teach/detail/index.vue
# src/views/teach/practical/index.vue
|
2019-08-14 15:57:52 +08:00 |
|
ival
|
4a224b630f
|
增加首先显示
|
2019-08-14 14:52:21 +08:00 |
|
ival
|
ed05cb123e
|
修改类车添加功能
|
2019-08-14 13:38:28 +08:00 |
|
ival
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
ival
|
db109f2a9e
|
调整地图进路相关的接口
|
2019-08-13 16:59:38 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
a779d6ad29
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
2019-08-12 18:30:33 +08:00 |
|
fan
|
0b5cfcc9a7
|
调整：代码修改
|
2019-08-12 13:40:34 +08:00 |
|
fan
|
a9d00b042e
|
调整：代码修改
|
2019-08-12 10:57:38 +08:00 |
|
fan
|
367edf0118
|
调整：代码修改
|
2019-08-09 17:38:20 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
ival
|
66a13e6ede
|
修改运行图
|
2019-08-09 09:33:35 +08:00 |
|
zyy
|
a288a21456
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:34:41 +08:00 |
|
zyy
|
b20686c0fa
|
desc: 修改 订阅综合演练房间号发送判断，修改代码格式
|
2019-08-08 18:34:35 +08:00 |
|
ival
|
c89c781735
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 18:09:52 +08:00 |
|
ival
|
4f9478d495
|
修改代码格式
|
2019-08-08 18:09:10 +08:00 |
|
fan
|
62d9b6fc5d
|
调整：title修改
|
2019-08-08 18:00:30 +08:00 |
|
zyy
|
399006e31f
|
desc: 修改传入select默认值
|
2019-08-08 16:54:49 +08:00 |
|
zyy
|
40ab6b247b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/beijing_01/menus/index.vue
|
2019-08-08 16:48:06 +08:00 |
|
zyy
|
6c5469ec90
|
修改代码格式
|
2019-08-08 16:47:34 +08:00 |
|
ival
|
01b871fa77
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-08 16:37:31 +08:00 |
|
ival
|
3adc1aafb1
|
修改界面菜单栏加载后出发 缩放按钮重新调整位置
删除代码中的无用代码
|
2019-08-08 16:37:15 +08:00 |
|
zyy
|
ff101dd603
|
删除debugger
|
2019-08-08 16:02:58 +08:00 |
|
zyy
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +08:00 |
|
ival
|
45295404c3
|
1. 修改福州线，取消扣车被禁用的问题
2. 修改i18n的获取当前语言的函数
|
2019-08-08 13:23:54 +08:00 |
|
zyy
|
f231ffd6f1
|
desc: 增加成都四号线地图配置
|
2019-08-08 09:47:39 +08:00 |
|
ival
|
b6baa2e420
|
修改 设置设备名称的设置方法
|
2019-08-06 17:46:41 +08:00 |
|
zyy
|
8fe358896e
|
desc: 修改车次窗菜单BUG
|
2019-08-06 13:56:42 +08:00 |
|
zyy
|
e71c68f7bc
|
修改signal 状态管理
|
2019-08-06 10:54:22 +08:00 |
|
zyy
|
71381ff174
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-06 10:11:43 +08:00 |
|
zyy
|
98a0533b20
|
修改代码格式
|
2019-08-06 10:11:32 +08:00 |
|
ival
|
3ae415d6e9
|
修改背景线，鼠标特效
|
2019-08-05 18:42:37 +08:00 |
|