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
|
a789f301c3
|
修改福州线国际化导致的操作问题以及eslint的问题
|
2019-09-23 09:46:39 +08:00 |
|
ival
|
39d3ee757a
|
修改代码
|
2019-09-23 09:12:36 +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 |
|
joylink_cuiweidong
|
6b3fe88797
|
仿真国际化修改
|
2019-09-18 18:36:47 +08:00 |
|
joylink_cuiweidong
|
ffdba3dc22
|
国际化调整
|
2019-09-17 16:08:11 +08:00 |
|
joylink_cuiweidong
|
9ed649200c
|
地图绘制 模块 国际化调整
|
2019-09-17 11:29:34 +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
|
bb272ae559
|
国际化调整
|
2019-09-16 19:06:18 +08:00 |
|
fan
|
a6ff9e2c08
|
国际化调整
|
2019-09-16 19:00:52 +08:00 |
|
joylink_cuiweidong
|
c1bee69b5c
|
国际化调整
|
2019-09-16 18:40:41 +08:00 |
|
joylink_cuiweidong
|
25402786f8
|
国际化调整
|
2019-09-16 16:08:55 +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
|
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 |
|
joylink_cuiweidong
|
6d03379cb0
|
地图右键菜单国际化
|
2019-09-12 16:03:03 +08:00 |
|
joylink_cuiweidong
|
b08cddc237
|
地图菜单国际化
|
2019-09-12 15:14:13 +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
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35: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 |
|
ival
|
98e6755aba
|
修改解析错误的问题
|
2019-08-12 10:41:24 +08:00 |
|
ival
|
bfddddf7e6
|
修改代码
|
2019-08-09 17:25:45 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
ival
|
66a13e6ede
|
修改运行图
|
2019-08-09 09:33: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 |
|