Commit Graph

33 Commits

Author SHA1 Message Date
joylink_cuiweidong
4f866bf257 故障操作代码调整 2020-07-01 11:27:09 +08:00
fan
3b171130f9 福州列车显示调整&表单组件button增加loading 2020-06-16 18:36:18 +08:00
fan
fb40db0ad8 裁判搜索条件调整 2020-05-29 18:24:51 +08:00
fan
ff3d4329d6 调整生成试卷 2020-05-27 16:36:55 +08:00
joylink_cuiweidong
a354264097 竞赛代码调整 2020-05-26 13:03:37 +08:00
zyy
8882f716e4 调整运行图导入 2020-04-22 18:37:09 +08:00
zyy
415d762294 调整地图绘制区段显隐关系 2020-04-22 18:02:43 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
joylink_cuiweidong
4cc24e3cd2 课程章节分页代码调整 2020-04-13 10:05:09 +08:00
joylink_cuiweidong
df31cb9138 代码调整 2019-12-12 10:40:54 +08:00
fan
d7df05f475 代码调整 2019-11-14 16:22:39 +08:00
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
bd2e82c0ea 权限分发转赠归属人查询 & 其他问题调整 2019-11-13 14:29:20 +08:00
fan
3674833434 周末问题调整 2019-11-11 09:20:24 +08:00
zyy
c08e2afaaa desc: 调整高度样式 2019-10-29 13:15:57 +08:00
fan
9c99b2f451 queryform 调整 2019-10-28 10:26:33 +08:00
fan
515a9a60ae 代码调整 2019-10-22 13:40:42 +08:00
fan
2988f40d29 产品分化调整 2019-10-11 17:35:22 +08:00
fan
5a21420a18 课程发布审批流程暂存 2019-10-11 08:55:02 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口,修改显示字段内容 2019-09-02 17:05:53 +08:00
zyy
0398179e0d desc: 用户权限流程修改,接口对接 2019-08-30 17:00:18 +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
72d3a5f475 修改进路查询方式 2019-08-14 15:19:11 +08:00
ival
fc4cf549b2 切换系统语言 2019-08-13 17:33:46 +08:00
ival
0eaa4dbe1f 修改国际化配置 2019-08-13 11:10:55 +08:00
zyy
b67a37bc33 desc: 修改查询问题 2019-08-08 15:27:30 +08:00
fan
33844220d3 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 14:37:39 +08:00
ival
66c599c0da 修改格式问题 2019-08-08 14:32:32 +08:00
fan
bcf73c78c2 调整:代码迁移+列车调整 2019-08-08 13:47:30 +08:00
zyy
04e13a7a73 调整代码 2019-08-02 10:36:17 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00