Commit Graph

33 Commits

Author SHA1 Message Date
fan
758eccd074 产品分化调整 2019-10-10 13:56:33 +08:00
fan
417c78ec72 产品分化调整优化 2019-10-09 15:14:00 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
fan
fd99f913de 城市轨道实训平台调整 2019-09-27 18:02:32 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
fan
522b94fcfe 产品分化调整 2019-09-25 09:18:28 +08:00
fan
ce7decc188 产品分化调整 2019-09-24 11:05:10 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
joylink_cuiweidong
a116539d80 国际化调整 2019-09-17 13:54:10 +08:00
joylink_cuiweidong
b08cddc237 地图菜单国际化 2019-09-12 15:14:13 +08:00
zyy
f73d7f4b9f desc: 打包权限列表展示 2019-09-02 17:34:34 +08:00
zyy
fa91bc22d9 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/views/orderauthor/author/draft/ruleForm.vue
2019-09-02 17:06:32 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口,修改显示字段内容 2019-09-02 17:05:53 +08:00
ival
3ade8f6d92 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-02 15:38:11 +08:00
ival
61de3c222d App.vue页面增加全局尺寸混入并存放在app store,其他页面删除混入 2019-09-02 15:37:57 +08:00
zyy
6fa64dd26b desc: 修改显示字段,增加loading 2019-09-02 11:04:23 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +08:00
zyy
c22d97b944 desc: 教学系统国际化 2019-08-21 13:46:36 +08:00
ival
ae500285ba 修改实训加载顺序错误的问题 2019-08-19 15:59:04 +08:00
fan
2115c952cc 修改:loading调整 2019-08-19 14:09:37 +08:00
ival
068dbdbbde 修改代码 2019-08-19 10:58:14 +08:00
ival
fd2b66e984 Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/rules.js
#	src/views/trainRoom/index.vue
2019-08-14 16:50:50 +08:00
ival
b1fd1f43e9 删除返回主页的错误 2019-08-14 16:46:44 +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
6343a79f81 修改接口 2019-08-14 14:01:28 +08:00
ival
576ac7eacb 修改导航配置 2019-08-14 10:36:55 +08:00
ival
25479392ff 修改配置 2019-08-14 10:12:51 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
fan
367edf0118 调整:代码修改 2019-08-09 17:38:20 +08:00
fan
74f7785663 调整:限制仿真多次加载 2019-08-09 15:52:55 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00