joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
2,030 Commits 20 Branches 0 Tags 448 MiB
f2dd239467
Commit Graph

169 Commits

Author SHA1 Message Date
fan
16b2dbda05 综合演练真实设备调整 2019-10-23 16:33:23 +08:00
fan
dff5d96d4d Merge remote-tracking branch 'origin/dev' into test 2019-10-23 16:19:22 +08:00
fan
3119f4f308 设计平台课程设计调整 2019-10-23 15:01:25 +08:00
joylink_cuiweidong
51bf37e9c7 Merge remote-tracking branch 'remotes/origin/dev' into test 2019-10-23 13:36:19 +08:00
fan
f8b149fa5a 同一个标签切换平台404问题 2019-10-23 10:43:29 +08:00
fan
cf5f902a45 代码调整 2019-10-23 10:18:28 +08:00
joylink_cuiweidong
e854c32390 Merge branch 'dev' into test 2019-10-22 20:10:05 +08:00
fan
332fa22b81 登录配置调整 2019-10-22 20:04:55 +08:00
fan
9134be8c19 问题调整 2019-10-22 18:18:21 +08:00
fan
0cafd0c7f3 设计平台课程系统调整 2019-10-22 17:24:41 +08:00
joylink_cuiweidong
bddddedbf2 Merge branch 'dev' into test 
# Conflicts:
#	src/utils/baseUrl.js
 2019-10-22 16:13:13 +08:00
zyy
0eb05638a0 desc: 调整列车识别号初始化 2019-10-22 15:42:07 +08:00
fan
a49b195090 调整代码 2019-10-22 14:28:22 +08:00
zyy
0c6de0e011 desc: 修改代码 2019-10-22 13:41:23 +08:00
fan
902b1a494b 接口调整 2019-10-18 18:36:45 +08:00
zyy
82aff22132 desc: 修改代码 2019-10-18 11:25:26 +08:00
sunzhenyu
4a8e5a9cb2 url 2019-10-18 10:06:04 +08:00
sunzhenyu
f78d9865a2 Merge branch '3dtest' into test 2019-10-17 18:56:56 +08:00
sunzhenyu
7d98ea5f18 pull 2019-10-17 18:49:19 +08:00
fan
11190ef66f 代码整合调整 2019-10-17 10:13:08 +08:00
fan
ece8f0cf21 Merge remote-tracking branch 'origin/dev_product' into dev_merger 
# Conflicts:
#	src/router/index.js
#	src/scripts/ConstDic.js
 2019-10-17 09:36:32 +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
25c4cf957d 西铁院项目调整 2019-10-16 17:37:03 +08:00
zyy
bba506b46d Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-10-16 17:13:28 +08:00
zyy
cf49d3a50e desc: 修改国际化实训名称详情 2019-10-16 17:13:20 +08:00
joylink_cuiweidong
089290e979 剧本国际化调整以及剧本增加语言参数 2019-10-15 16:18:25 +08:00
fan
0640586712 西铁院暂存 2019-10-15 13:04:28 +08:00
joylink_cuiweidong
232789ca73 产品分化路由处理 2019-10-15 11:05:30 +08:00
fan
729be7ec69 西铁院暂存 2019-10-15 09:39:01 +08:00
sunzhenyu
1ddb55091a 修改行车逻辑 2019-10-14 18:18:11 +08:00
sunzhenyu
8b71f08de0 修改行车逻辑 2019-10-12 19:03:21 +08:00
fan
a24603aedf 综合仿真页面跳转调整 2019-10-12 11:03:15 +08:00
zyy
aa0199754a desc: 调整创建权限流程，创建字段修改 2019-10-11 15:27:14 +08:00
zyy
f7cf33a5e2 desc: 调整登陆页面样式 2019-10-10 18:05:26 +08:00
joylink_cuiweidong
059a4134d5 产品分化路由调整以及剧本发布样式调整 2019-10-10 14:08:23 +08:00
fan
3381424f0d 产品分化调整 2019-10-10 09:33:56 +08:00
zyy
a8e491ea6e desc: 所有弹窗可拖拽处理， 增加登陆页面登陆说明 2019-10-09 17:05:10 +08:00
sunzhenyu
0e251fc8cb 测试 2019-10-09 17:00:58 +08:00
sunzhenyu
2defa3c89d 仿真载入新数据 2019-10-09 14:31:11 +08:00
joylink_cuiweidong
b7cb2a36db 产品分化 剧本接口调整 2019-10-09 10:14:30 +08:00
joylink_cuiweidong
2d1f13299e 产品分化运行图接口调整 2019-10-08 18:35:02 +08:00
zyy
df43ef4cc3 desc: 调整登陆界面显示 2019-10-08 16:08:13 +08:00
joylink_cuiweidong
a46f94f85e 产品分化 设计系统调整 2019-09-30 17:31:40 +08:00
zyy
64a601c967 desc: 调整登陆页面样式 2019-09-29 16:09:40 +08:00
sunzhenyu
aace4f9337 修改列车进站和转换区段速度 2019-09-29 14:05:33 +08:00
fan
56878d56ec storage存储关联用户 2019-09-29 13:40:01 +08:00
zyy
a8302b610e desc: 注释多余代码 2019-09-29 11:09:02 +08:00
zyy
f74ce907b8 desc: 调整获取二维码登陆接口 2019-09-27 15:29:25 +08:00
fan
1ced811496 产品分化调整 2019-09-27 14:46:08 +08:00
zyy
f712c93622 desc: 调整权限分发 组织结构配置 2019-09-27 10:06:46 +08:00
zyy
01cb0a699b desc: 调整权限字段限制， 配置英文版登陆页面 2019-09-26 17:42:25 +08:00
fan
b7043ff7de Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product 2019-09-23 17:49:16 +08:00
fan
d063625c45 产品分化调整 2019-09-23 17:49:04 +08:00
joylink_cuiweidong
5ba93805c1 菜单栏调整 2019-09-23 17:47:54 +08:00
zyy
2d60c78a74 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/jmap/theme/fuzhou_01/planSchedule/menuBar.vue
 2019-09-23 13:37:59 +08:00
zyy
01c97f45ae desc: 调整琏计划导入excel, 样式， 流程 2019-09-23 13:37:11 +08:00
fan
517ddbcff0 国际化调整 2019-09-23 09:48:13 +08:00
zyy
48ea44a980 desc: 调整权限国际化，调整琏计划导入运行图逻辑 2019-09-19 17:22:48 +08:00
zyy
4f716b502c desc: 恢复权限创建按钮 2019-09-19 09:34:18 +08:00
ival
8b4aee040a 注释掉订单入口 2019-09-18 18:45:18 +08:00
sunzhenyu
0ae296a87f pull前准备 2019-09-18 13:21:36 +08:00
sunzhenyu
d5380f8bf2 pull 2019-09-18 13:20:38 +08:00
ival
f13685da07 修改代码 2019-09-18 10:03:58 +08:00
ival
7b0cf81d45 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-17 16:54:14 +08:00
ival
0b7b0e39c1 过滤首页订阅的地图没有name的数据 2019-09-17 16:53:29 +08:00
sunzhenyu
2cd39f6fbd baseurl 2019-09-17 13:18:19 +08:00
sunzhenyu
183f972884 pull 2019-09-17 13:16:49 +08:00
zyy
f48a513df0 desc: 调整绘图逻辑，流程，字段显示 2019-09-12 16:30:42 +08:00
zyy
7b0b0d6d0c desc: 修改绘制地图赋值 2019-09-06 15:54:05 +08:00
zyy
11a49d1442 desc: 增加加载运行图模板接口，调整地图绘制优化 2019-09-06 14:21:01 +08:00
zyy
6b9047c919 desc: 调整请求位置 2019-09-04 15:06:26 +08:00
ival
89fc3c0547 增加角色分配统计 2019-09-04 13:02:28 +08:00
ival
df839856d9 修改IBP盘角色修改 2019-09-04 10:13:26 +08:00
ival
0879aef961 增加派班计划loading 2019-09-03 18:37:00 +08:00
ival
c1af062bbd Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 
# Conflicts:
#	src/utils/baseUrl.js
 2019-09-03 17:36:01 +08:00
ival
c97996fceb 设置冲突列颜色 2019-09-03 17:35:23 +08:00
zyy
40b67b8cf3 desc: 调整修改权限逻辑 2019-09-03 16:13:23 +08:00
ival
c433cb5045 添加加载脚本失败后，提示后台错误 2019-09-03 14:39:50 +08:00
zyy
5591796596 desc: 调整socket重连问题 2019-09-03 13:15:47 +08:00
ival
f1ab89a131 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 11:13:00 +08:00
ival
d60c989405 增加IBP盘操作 2019-09-03 11:12:48 +08:00
zyy
0938be08f5 Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev 2019-09-03 10:46:04 +08:00
zyy
870a4de01b desc: 修改socekt断连逻辑, 调整权限显示及细节，样式问题 2019-09-03 10:45:58 +08:00
ival
41111ebab2 修改IPB盘尺寸问题 2019-09-03 09:34:21 +08:00
zyy
d38b3761b8 desc: 对接权限编辑接口，修改显示字段内容 2019-09-02 17:05:53 +08:00
sunzhenyu
d7efef41e4 pull 2019-08-29 17:16:33 +08:00
joylink_cuiweidong
2e53745790 剧本管理模块 2019-08-15 14:06:53 +08:00
zyy
ed8b14dac2 desc: 修改综合演练，socket创建 2019-08-14 16:15:44 +08:00
ival
5cd6150c16 修改required未定义的问题 2019-08-12 19:02:38 +08:00
ival
6785738122 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-12 18:22:29 +08:00
ival
dc0b5301e0 增加导出部分地图数据 2019-08-12 18:22:14 +08:00
joylink_cuiweidong
19d26919fc 处理录制剧本时地图不加载的问题 2019-08-12 17:35:55 +08:00
ival
0bc9d40ad1 修改打包配置 2019-08-12 11:01:00 +08:00
ival
fc6279efdf 修改加载方式 2019-08-12 09:36:27 +08:00
ival
763cff0a7c 修改页面不刷新的问题 2019-08-09 18:29:08 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
zyy
2443fd102c desc: 调整站台字段 2019-08-08 14:47:34 +08:00
ival
dbc3cbf482 修改运行图编辑工具报错bug 2019-08-08 13:36:53 +08:00
ival
45295404c3 1. 修改福州线，取消扣车被禁用的问题 
2. 修改i18n的获取当前语言的函数
 2019-08-08 13:23:54 +08:00