Commit Graph

77 Commits

Author SHA1 Message Date
zyy
93b92ad36a 调整报名系统增加电话验证码 2020-05-20 14:35:55 +08:00
fan
92eaa38aef 贵州装备班级相关&绘图逻辑区段调整 2020-05-12 19:07:48 +08:00
fan
ce8d6244f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-28 16:17:55 +08:00
fan
1457492257 西安二操作调整 2020-04-28 16:17:42 +08:00
zyy
4a1c36bfd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
2020-04-28 15:44:35 +08:00
zyy
96bf9c7f7d 调整右键菜单 2020-04-28 15:43:19 +08:00
joylink_cuiweidong
1ee3ea61c7 西安二号线 操作 背景样式调整 2020-04-28 14:55:57 +08:00
fan
af5567d598 西安二操作问题调整 2020-04-28 10:27:07 +08:00
zyy
9ea5cefdc0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/index.vue
2020-04-27 18:35:44 +08:00
zyy
9427cc5759 调整西安二号线右键菜单显示 2020-04-27 18:33:29 +08:00
fan
fa60706b66 西安二号线操作调整 2020-04-27 14:01:23 +08:00
zyy
cc6c7f92ec 调整西安二号线右键样式 2020-04-26 18:38:27 +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
fan
ee209d5dbf 综合演练二维码下添加房间号 2020-04-16 17:23:43 +08:00
joylink_cuiweidong
4cc24e3cd2 课程章节分页代码调整 2020-04-13 10:05:09 +08:00
fan
5c55261f55 本地导入调整 2020-04-10 09:09:06 +08:00
fan
1e4b7bbfd9 本地导入 2020-04-09 18:54:22 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
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