fan
|
676fc71ee5
|
国际化调整
|
2019-09-19 16:12:05 +08:00 |
|
joylink_cuiweidong
|
94eeeb0916
|
国际化调整
|
2019-09-19 14:58:41 +08:00 |
|
fan
|
cf8f562a48
|
国际化调整
|
2019-09-19 14:14:49 +08:00 |
|
sunzhenyu
|
183f972884
|
pull
|
2019-09-17 13:16:49 +08:00 |
|
sunzhenyu
|
b8afc684a3
|
pull
|
2019-09-17 10:51:38 +08:00 |
|
zyy
|
ba21d7af9d
|
desc: 修改权限打包字段， 修改地图绘制区段逻辑
|
2019-09-06 17:21:54 +08:00 |
|
zyy
|
509e5218a7
|
desc: 调整引用问题
|
2019-09-04 17:58:22 +08:00 |
|
zyy
|
118ed1296c
|
desc: 增加琏计划运行图修改
|
2019-09-04 16:32:41 +08:00 |
|
zyy
|
6b9047c919
|
desc: 调整请求位置
|
2019-09-04 15:06:26 +08:00 |
|
zyy
|
a037937627
|
desc: 调整运行图生成逻辑
|
2019-09-04 14:47:52 +08:00 |
|
zyy
|
b96701aceb
|
desc: 调整运行图加载
|
2019-09-04 11:28:24 +08:00 |
|
sunzhenyu
|
3d977cc124
|
pull
|
2019-09-03 16:50:15 +08:00 |
|
ival
|
61de3c222d
|
App.vue页面增加全局尺寸混入并存放在app store，其他页面删除混入
|
2019-09-02 15:37:57 +08:00 |
|
sunzhenyu
|
d7efef41e4
|
pull
|
2019-08-29 17:16:33 +08:00 |
|
ival
|
adc6828060
|
修改跳转路由后，页面不加载的问题
|
2019-08-20 10:34:41 +08:00 |
|
zyy
|
e08a400b06
|
desc: 修改琏计划运行图创建加载
|
2019-08-16 17:13:12 +08:00 |
|
zyy
|
b84b6ea500
|
desc: 修改地图编辑页面逻辑
|
2019-08-16 15:12:03 +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
|
78a805cd2f
|
修改皮肤skinStyle为skinCode
|
2019-08-14 09:35:38 +08:00 |
|
zyy
|
9049d793cc
|
desc: 修改琏计划界面样式，修改界面交互
|
2019-08-13 15:54:26 +08:00 |
|
ival
|
763cff0a7c
|
修改页面不刷新的问题
|
2019-08-09 18:29:08 +08:00 |
|
ival
|
6fad38621b
|
修改运行图编辑因为家在地图数据而报错的问题
|
2019-08-09 16:57:07 +08:00 |
|
ival
|
dbc3cbf482
|
修改运行图编辑工具报错bug
|
2019-08-08 13:36:53 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
ival
|
276f68e7bc
|
修改优化代码
|
2019-07-30 16:47:11 +08:00 |
|
ival
|
ce82f25422
|
修改代码
|
2019-07-30 09:48:14 +08:00 |
|
ival
|
05c90f1079
|
修改代码
|
2019-07-29 16:03:14 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|