zyy
|
c08e2afaaa
|
desc: 调整高度样式
|
2019-10-29 13:15:57 +08:00 |
|
joylink_cuiweidong
|
7ed9387731
|
更新发布课程信息
地图预览bug调整
|
2019-10-28 10:29:17 +08:00 |
|
fan
|
9c99b2f451
|
queryform 调整
|
2019-10-28 10:26:33 +08:00 |
|
fan
|
515a9a60ae
|
代码调整
|
2019-10-22 13:40:42 +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 |
|
fan
|
2988f40d29
|
产品分化调整
|
2019-10-11 17:35:22 +08:00 |
|
fan
|
5a21420a18
|
课程发布审批流程暂存
|
2019-10-11 08:55:02 +08:00 |
|
fan
|
641345e801
|
设计平台调整
|
2019-09-30 17:56:16 +08:00 |
|
fan
|
1ced811496
|
产品分化调整
|
2019-09-27 14:46:08 +08:00 |
|
zyy
|
01cb0a699b
|
desc: 调整权限字段限制， 配置英文版登陆页面
|
2019-09-26 17:42:25 +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
|
c3f600b015
|
优化代码
|
2019-08-08 15:57:36 +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 |
|
fan
|
d580c31e58
|
调整：table页form表头不生效
|
2019-07-30 09:45:52 +08:00 |
|
zyy
|
e32ab592a4
|
desc: 修改代码
|
2019-07-25 15:48:51 +08:00 |
|
ival
|
3780ebefad
|
增加nclient工程
|
2019-07-02 16:29:52 +08:00 |
|