Commit Graph

56 Commits

Author SHA1 Message Date
zyy
0d91bc7c49 调整时间格式 2020-02-13 13:42:19 +08:00
zyy
42c11d0b7c 修改创建运行图表单 2020-02-13 12:14:39 +08:00
zyy
e884f3adc6 新增创建运行图表单 2020-02-10 16:27:43 +08:00
fan
4e136ca8b3 成都一号线样式调整 2020-01-10 18:51:57 +08:00
zyy
197d75342c 调整宁波一号线批量扣车逻辑 2020-01-09 09:54:34 +08:00
fan
cf34d61746 设备管理-配置编辑 除了输出地址、输入地址外,其他的变为输入框,限制输入最大字符数为4,且每位必须是16进制数 2020-01-07 09:18:06 +08:00
fan
cb0f21a183 网关字地址可以为0,所有数据不可为小数 2020-01-03 13:49:40 +08:00
joylink_cuiweidong
8e82ceab27 权限打包页面接口调整(/api/lesson) 2019-12-26 13:12:23 +08:00
zyy
3101af9948 增加线路皮肤配置,调整联锁站台显示列表 2019-12-19 18:04:28 +08:00
joylink_cuiweidong
df31cb9138 代码调整 2019-12-12 10:40:54 +08:00
joylink_cuiweidong
424ec26538 用户权限统计代码调整 2019-12-10 17:11:14 +08:00
joylink_cuiweidong
6d26e8e217 进路添加是否先锁闭字段 2019-12-09 18:54:11 +08:00
joylink_cuiweidong
97eeda5eeb 订单创建代码调整 2019-12-09 14:51:01 +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
ival
9e5838c647 删除多余指令 2019-11-12 09:24:11 +08:00
fan
3674833434 周末问题调整 2019-11-11 09:20:24 +08:00
fan
b8b73a2151 merge 2019-11-08 18:45:08 +08:00
fan
daec7d5e4d bug 调整 2019-11-08 18:43:46 +08:00
ival
6049c04a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
#	src/utils/baseUrl.js
2019-11-08 18:16:43 +08:00
ival
0776d08053 修改仿真房间代码 2019-11-08 18:15:52 +08:00
fan
7e13f98167 发布课程管理form 添加城市与地图的级联关系 2019-11-08 10:57:07 +08:00
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
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理, 增加登陆页面登陆说明 2019-10-09 17:05:10 +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
0b1ae44c19 desc: 调整三号线现地操作 2019-09-26 09:23:02 +08:00
joylink_cuiweidong
f8a872b40c 国际化调整 2019-09-17 17:53:42 +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
4da9dc977b 修改右键菜单,文字颜色 2019-08-19 11:16:29 +08:00
fan
04baa2756e 修改:代码调整 2019-08-16 17:50:57 +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
45417f0072 修改代码 2019-08-13 18:14:19 +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