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

6013 Commits

Author SHA1 Message Date
zyy
fccbc9ecd0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:42:05 +08:00
zyy
f205ddf0fc 删除多余配置 2020-07-10 18:41:29 +08:00
fan
32f4657f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:30:46 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
sunzhenyu
9cc69e471b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 18:13:18 +08:00
sunzhenyu
e95d97136a 三维编辑器存读数据测试 2020-07-10 18:13:09 +08:00
joylink_cuiweidong
9627e85bf0 剧本编制 会话消息代码调整 2020-07-10 18:06:55 +08:00
joylink_cuiweidong
bf7ae6684e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:33:55 +08:00
joylink_cuiweidong
fe3ca3af2f 剧本编制代码调整 2020-07-10 17:33:37 +08:00
zyy
e6e0bb6d51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:23:31 +08:00
zyy
1c98da6c11 调整路由配置 2020-07-10 17:23:17 +08:00
sunzhenyu
4dfe9d661b 修改录制三维驾驶托管逻辑 2020-07-10 17:15:57 +08:00
sunzhenyu
135d40ba49 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 17:15:13 +08:00
joylink_cuiweidong
5deef9fe6b 剧本编制代码调整 2020-07-10 17:14:30 +08:00
sunzhenyu
8831528b9a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 16:42:21 +08:00
sunzhenyu
eada9df066 修改录制三维状态 2020-07-10 16:42:12 +08:00
joylink_cuiweidong
2b5b21c1cf 剧本编制 角色列表代码调整 2020-07-10 16:40:42 +08:00
joylink_cuiweidong
6d3cd29a48 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 15:34:35 +08:00
joylink_cuiweidong
4bd986b7eb 剧本编制代码调整 2020-07-10 15:34:19 +08:00
sunzhenyu
b1f2f173b2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 14:48:01 +08:00
sunzhenyu
8b3b151b95 修改三维驾驶录制获取驾驶员托管状态接口 2020-07-10 14:47:52 +08:00
joylink_cuiweidong
c432c8ffcb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 14:46:38 +08:00
joylink_cuiweidong
54a5a29f26 剧本预览代码调整 2020-07-10 14:46:18 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +08:00
sunzhenyu
9ff6b5f574 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 11:32:37 +08:00
sunzhenyu
8f8192a8f7 修改综合演练三维退出重定向 2020-07-10 11:32:26 +08:00
zyy
7263bb669d 删除socket提示信息 2020-07-10 11:26:15 +08:00
zyy
9def448e4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:56:16 +08:00
zyy
6cc8b3beaa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
 2020-07-10 10:55:48 +08:00
joylink_cuiweidong
4c307cc848 剧本编制代码调整 2020-07-10 10:53:44 +08:00
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +08:00
joylink_cuiweidong
40fe41a8ff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:36:35 +08:00
joylink_cuiweidong
e13fcb02e5 故障设置代码调整 2020-07-10 10:36:10 +08:00
sunzhenyu
3a25657440 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:28:01 +08:00
sunzhenyu
3e84301b42 修改综合演练切换带三维界面的处理 2020-07-10 10:27:49 +08:00
fan
0d5be61a17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 10:00:51 +08:00
fan
ac3da3ef00 成员管理总数在线人数调整 2020-07-10 10:00:20 +08:00
sunzhenyu
ca83846790 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-10 09:17:15 +08:00
sunzhenyu
ccd14e903d 三维编辑器修改 2020-07-10 09:17:00 +08:00
sunleking
07d9f8603d 修改hideibp隐藏三维界面 2020-07-09 21:44:11 +08:00
zyy
1847267bef 调整列车大屏状态修改 2020-07-09 19:07:57 +08:00
zyy
ab2d2b004e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 18:52:25 +08:00
zyy
7b6148919c 调整综合监控默认进入第一个界面 2020-07-09 18:52:13 +08:00
fan
cb1e54b410 教研==》教员 2020-07-09 18:27:31 +08:00
fan
4098cba048 heb替换hyd 2020-07-09 18:04:11 +08:00
fan
3061b83c6a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:45:02 +08:00
fan
3301d2bebf 哈尔滨打包调整 2020-07-09 17:44:48 +08:00
joylink_cuiweidong
0c9cd52c9a 剧本编制代码调整 2020-07-09 17:39:43 +08:00
fan
82c0cf200d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:38:27 +08:00
fan
81de72cab0 哈尔滨打包调整 2020-07-09 17:38:16 +08:00
sunzhenyu
41a0ac6ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 17:23:19 +08:00
joylink_cuiweidong
5532bc5eba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 16:54:51 +08:00
joylink_cuiweidong
3aa0d55ea3 剧本编制代码调整 2020-07-09 16:54:31 +08:00
sunzhenyu
f424184363 修改录制界面三维驾驶初始车辆显示 2020-07-09 16:39:58 +08:00
sunzhenyu
df3b8eebd7 修改综合演练三维驾驶退出 2020-07-09 16:03:33 +08:00
sunzhenyu
93e0b71ab4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:46:19 +08:00
sunzhenyu
27d4c93775 修改三维编辑器 2020-07-09 15:46:12 +08:00
joylink_cuiweidong
9b3cd2dc3d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:45:47 +08:00
fan
22f94f7ef5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:47:07 +08:00
fan
81be7e776d 设备登录调整 2020-07-09 15:46:52 +08:00
joylink_cuiweidong
ffab9631ce 代码调整 2020-07-09 15:45:32 +08:00
joylink_cuiweidong
84485c6f1d 剧本编制代码调整 2020-07-09 15:44:12 +08:00
joylink_cuiweidong
b7d0f11b9c 去掉断点 2020-07-09 15:16:12 +08:00
joylink_cuiweidong
15c6a151c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 15:09:35 +08:00
joylink_cuiweidong
763d04d630 剧本编制 切换角色 过滤掉不在线的司机 2020-07-09 15:09:18 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
6aa7fdf1bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 13:06:04 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
fan
577cc3c887 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:33 +08:00
zyy
8a4bbbd682 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 11:07:20 +08:00
zyy
a16f8ebf00 配置哈尔滨项目路由 2020-07-09 11:07:06 +08:00
fan
e658fb7889 哈尔滨项目调整 2020-07-09 11:07:04 +08:00
joylink_cuiweidong
9e71ca967f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:51:14 +08:00
joylink_cuiweidong
c315f9121a 剧本编制代码调整 2020-07-09 10:50:56 +08:00
fan
6bfe538bfc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:25:16 +08:00
fan
b14a730bab 哈尔滨项目调整 2020-07-09 10:25:04 +08:00
joylink_cuiweidong
0c95382b7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:18:16 +08:00
joylink_cuiweidong
96ff4c49f6 剧本编制代码调整 2020-07-09 10:17:55 +08:00
zyy
f48d584a8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-09 10:16:49 +08:00
zyy
49ac7ba919 调整路由校验权限流程 2020-07-09 10:16:33 +08:00
fan
b07991b21f 登录页面调整 2020-07-09 09:38:51 +08:00
joylink_cuiweidong
3cd9d9416b 剧本代码调整 2020-07-08 18:56:32 +08:00
joylink_cuiweidong
dac800a86f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:36:07 +08:00
joylink_cuiweidong
b1005fd2ac 剧本编制代码调整 2020-07-08 18:35:46 +08:00
zyy
3693994526 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 18:35:25 +08:00
zyy
c4ffc859ce 调整大屏配置逻辑，登陆权限流程 2020-07-08 18:35:12 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +08:00
fan
14835db67b 仿真清除数据调整 2020-07-08 18:06:22 +08:00
fan
62430ea87b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 17:36:43 +08:00
fan
050fc8141c 设备登录调整 2020-07-08 17:36:32 +08:00
sunzhenyu
eff2657d08 修改综合演练屏蔽门直接显示 2020-07-08 17:24:38 +08:00
fan
3196304f1c 调整虚拟屏蔽门登录跳转路径 2020-07-08 16:43:18 +08:00
fan
5edd9f536e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 16:30:06 +08:00
fan
5b1aad5fc7 调整虚拟屏蔽门配置 2020-07-08 16:29:40 +08:00
sunzhenyu
faa57eb3c9 修改三维设备切换模型bug 2020-07-08 16:15:35 +08:00
zyy
6ff8019898 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 15:49:41 +08:00
zyy
fd89fe974e 调整列车驾驶设备 2020-07-08 15:49:16 +08:00
fan
e8d54bc1d0 合并代码 2020-07-08 15:42:23 +08:00
fan
714113c819 设备登录调整 2020-07-08 15:40:55 +08:00
zyy
7c8d1319f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:40:18 +08:00
zyy
753172433c 调整实训流程 2020-07-08 14:40:04 +08:00
sunzhenyu
6c1c6a8574 修改三维cctv综合演练样式 2020-07-08 14:08:22 +08:00
sunzhenyu
0f39cbd2e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 14:07:32 +08:00
fan
49cd6213c9 调整cctv登录路径 2020-07-08 14:05:46 +08:00
sunzhenyu
2cbe94a16d 修改cctv无贴图配置 2020-07-08 14:04:14 +08:00
fan
3ba4ebe807 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:49:23 +08:00
fan
db5c516813 成员参数调整 2020-07-08 13:49:14 +08:00
sunzhenyu
7d8f4e6de2 修改三维设备在设备管理中显示样式 2020-07-08 13:28:06 +08:00
sunzhenyu
37a323ff23 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:19:49 +08:00
sunzhenyu
3161e256b8 修改设备界面query 2020-07-08 13:19:40 +08:00
fan
4a5923f263 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:11:36 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
joylink_cuiweidong
fe3ee372e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 13:05:53 +08:00
joylink_cuiweidong
fc97643116 剧本编制代码调整 2020-07-08 13:05:09 +08:00
fan
b3ce617230 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 11:09:36 +08:00
fan
413307d6a5 操作类型调整 2020-07-08 11:09:26 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
fan
0847988f81 试卷管理问题调整 2020-07-08 10:43:56 +08:00
zyy
6a14aaeace 调整大屏退出流程 2020-07-08 10:41:28 +08:00
zyy
6c1e78be50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:33:31 +08:00
zyy
6112d720be 调整贵州项目大屏配置 2020-07-08 10:33:15 +08:00
fan
d863e88a70 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:31:56 +08:00
fan
de617cde50 设备登录调整&试卷管理调整 2020-07-08 10:31:33 +08:00
sunzhenyu
73d1af19d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 10:21:24 +08:00
sunzhenyu
9c0df60188 三维编辑器修改，三维cctv仿真结束登出 2020-07-08 10:21:14 +08:00
joylink_cuiweidong
eb6aca6114 剧本录制接口调整 2020-07-08 09:39:25 +08:00
joylink_cuiweidong
2121bcbb76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-08 09:22:10 +08:00
joylink_cuiweidong
30b1163017 故障代码调整 
设备代码调整
 2020-07-08 09:21:54 +08:00
fan
4d30e317c6 合并代码 2020-07-07 19:02:16 +08:00
fan
086e56c1a7 设备登录调整 2020-07-07 19:00:48 +08:00
zyy
9416ae6729 调整判断 2020-07-07 18:49:14 +08:00
zyy
2c362db7c1 调整贵州项目试卷关联关系 2020-07-07 18:48:12 +08:00
zyy
db230c2622 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 18:33:59 +08:00
zyy
3c34494608 调整试卷班级关系 2020-07-07 18:33:43 +08:00
joylink_cuiweidong
f4f5173ea3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/system/deviceManage/editConfig.vue
 2020-07-07 18:26:56 +08:00
joylink_cuiweidong
ac9a39f94c 设备管理代码调整 2020-07-07 18:25:05 +08:00
fan
276d2a8cdf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 18:23:04 +08:00
fan
85210dbf18 设备登录调整 2020-07-07 18:22:54 +08:00
joylink_cuiweidong
8d18151425 登陆页面代码调整 2020-07-07 17:54:11 +08:00
fan
a543aa79d1 设备登录调整 2020-07-07 17:45:26 +08:00
zyy
e710e5eb34 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 17:37:59 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37:45 +08:00
joylink_cuiweidong
00a4a8c184 自动设置故障（zc故障）代码调整 2020-07-07 17:08:01 +08:00
joylink_cuiweidong
e0eb8f30dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:30:23 +08:00
joylink_cuiweidong
e2af1335a3 修改枚举 2020-07-07 16:30:06 +08:00
zyy
2d9bfeee2e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:17:44 +08:00
zyy
bb500d4c29 调整贵州装备试卷关系，样式 2020-07-07 16:17:29 +08:00
joylink_cuiweidong
b1bca0a1df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:09:29 +08:00
joylink_cuiweidong
3480ebb7b0 设备管理代码调整 2020-07-07 16:09:14 +08:00
fan
ed92adad02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 16:08:03 +08:00
fan
9dd81d0fd1 实训类型调整 2020-07-07 16:07:48 +08:00
joylink_cuiweidong
02d486c1af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 15:43:46 +08:00
joylink_cuiweidong
c345a60997 项目登陆路径调整（变成 design/login?project=xxx） 2020-07-07 15:42:56 +08:00
fan
a902265f0e 调整贵装备学生管理浮点数问题 2020-07-07 15:09:45 +08:00
fan
f83a60bd88 聊天室调整 2020-07-07 14:58:10 +08:00
fan
aced111815 聊天室调整 2020-07-07 14:11:04 +08:00
joylink_fanyuhong
24daf6aea1 聊天室调整 2020-07-07 13:15:20 +08:00
fan
5dc5b256bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-07 10:55:07 +08:00
fan
0fd852cc5a 聊天室调整 2020-07-07 10:54:57 +08:00
joylink_cuiweidong
92da104ad0 zc故障灯状态修改 2020-07-07 10:00:55 +08:00
fan
421e591f52 Merge remote-tracking branch 'origin/test_device_login' into test 
# Conflicts:
#	src/layout/components/Title.vue
#	src/views/demonstration/detail/index.vue
 2020-07-07 09:47:21 +08:00
fan
a9b3f614c8 聊天室调整 2020-07-07 09:39:27 +08:00
joylink_cuiweidong
a6b2f62c3e 北京一成都线路手动设置zc故障 2020-07-06 18:45:15 +08:00
zyy
8d09215323 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 18:18:13 +08:00
joylink_cuiweidong
bcc24751b4 手动zc故障代码调整 2020-07-06 18:17:44 +08:00
zyy
642027a42f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 18:17:03 +08:00
zyy
67edc61d0e 调整大屏分屏预览页面 2020-07-06 18:16:49 +08:00
fan
87d8dd9ea7 聊天室调整 2020-07-06 18:14:03 +08:00
fan
9883d0ed3c 聊天室调整 2020-07-06 18:00:44 +08:00
joylink_cuiweidong
dd8e0f650e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:49:35 +08:00
joylink_cuiweidong
5f1a5b3092 西安线路和宁波一号线添加动手zc故障 2020-07-06 17:49:17 +08:00
zyy
6be93b39ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-06 17:02:31 +08:00
zyy
2c5c30216f 调整大屏预览流程，增加大屏分屏配置 2020-07-06 17:02:13 +08:00
joylink_cuiweidong
5cf1fdab5d 新版地图右键操作代码调整 2020-07-06 15:40:59 +08:00
joylink_cuiweidong
75244ca959 任何创建者 创建试卷 有试用选项 2020-07-06 13:31:49 +08:00
fan
75e838b96f 聊天室调整 2020-07-03 18:42:29 +08:00
joylink_cuiweidong
ebf86de377 故障操作代码调整 2020-07-03 18:39:24 +08:00
joylink_cuiweidong
9bef909f27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 18:14:49 +08:00
joylink_cuiweidong
9d85fa7eca 信号机绘图代码调整 2020-07-03 18:14:24 +08:00
sunzhenyu
2a0a45ccef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 17:24:48 +08:00
sunzhenyu
937fc4b1f9 修复通号三维重复显示设备间bug 2020-07-03 17:24:41 +08:00
joylink_cuiweidong
147f2570ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 17:13:44 +08:00
joylink_cuiweidong
654b79fc27 故障操作代码调整 2020-07-03 17:13:24 +08:00
sunzhenyu
8213999c4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 16:35:50 +08:00
sunzhenyu
75d754e56c 修改通号三维视角 2020-07-03 16:35:43 +08:00
joylink_cuiweidong
3ae8582f05 剧本接口调整（预览与 删除剧本开始执行接口） 2020-07-03 16:29:40 +08:00
sunzhenyu
2282376acf 修改通号三维bug 2020-07-03 16:29:07 +08:00
zyy
ab94e1f981 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 15:19:12 +08:00
zyy
8a5845749e 调整绘图流程逻辑 删除多余配置 2020-07-03 15:18:58 +08:00
fan
8fa62ec9ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 13:55:20 +08:00
fan
0a594f5e09 屏蔽门故障打开 2020-07-03 13:55:04 +08:00
sunzhenyu
92d39f28ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 13:49:13 +08:00
sunzhenyu
0b08bfae9f 综合演练三维通号增加设备间，三维编辑器资源管理链接配置 2020-07-03 13:49:05 +08:00
fan
b98f811998 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 11:28:44 +08:00
fan
9142ea7e40 获取项目下所有设备接口还原 2020-07-03 11:28:26 +08:00
joylink_cuiweidong
41cc1af21a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 11:27:29 +08:00
joylink_cuiweidong
ec1c5a9bbb 信号机故障 绘图代码调整 2020-07-03 11:27:01 +08:00
zyy
84937e8c5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 11:12:10 +08:00
zyy
f91fc75528 调整西安线路进路状态 2020-07-03 11:11:57 +08:00
fan
aa66cbb277 列车驾驶模式显示调整 2020-07-03 11:02:35 +08:00
fan
671dff4016 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 10:37:41 +08:00
fan
189c649a89 调整因缓存路由导致的项目进入其他地图页面错误 2020-07-03 10:37:33 +08:00
joylink_cuiweidong
92c10db690 剧本录制代码调整 2020-07-03 09:46:26 +08:00
fan
e9e5cf4b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-03 09:26:27 +08:00
fan
63bac7ecf3 铁科院登录调整 2020-07-03 09:26:17 +08:00
zyy
fa5097cd8d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 18:47:57 +08:00
zyy
3b39a9a04b 调整区段字段，控制权操作 2020-07-02 18:47:39 +08:00
joylink_cuiweidong
2141c8d426 成都三号线信号机操作代码调整 2020-07-02 18:28:12 +08:00
fan
872122e92b 综合演练仿真调整 2020-07-02 17:57:48 +08:00
joylink_cuiweidong
ac4c0baecf 西安三号线 仿真右侧列车列表代码调整 
修改故障枚举
修改退出聊天会话接口
 2020-07-02 17:44:20 +08:00
joylink_cuiweidong
caf5f327b9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 16:01:41 +08:00
joylink_cuiweidong
1b714c86c8 成都三号线 站台操作代码调整 2020-07-02 16:01:22 +08:00
sunzhenyu
b4d6bbbc03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-02 15:33:42 +08:00
sunzhenyu
c34aa9d223 增加三维资源模型上传页面 2020-07-02 15:33:35 +08:00
joylink_cuiweidong
146d6c2d0b 成都三号线站台操作代码调整 2020-07-02 13:28:36 +08:00
joylink_cuiweidong
50c7363791 故障操作代码调整 2020-07-02 10:10:16 +08:00
zyy
58a874c9b8 调整设置和取消故障的时候，默认选择第一个选项 2020-07-02 09:56:51 +08:00
zyy
901dad45ee 调整宁波线路区段计算提示位置逻辑 2020-07-02 09:35:41 +08:00
fan
13a4ee614c 综合演练仿真调整 2020-07-01 18:52:29 +08:00
zyy
649704d3ee 增加实训类型 2020-07-01 18:49:35 +08:00
zyy
e0b45e01b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 18:08:57 +08:00
zyy
64d415dbb3 调整地图绘图数据模型 2020-07-01 18:08:42 +08:00
joylink_cuiweidong
eef26afafa 成都三号线右键菜单调整 2020-07-01 17:29:10 +08:00
joylink_cuiweidong
47186e0948 成都三号线右键操作代码调整 2020-07-01 16:56:00 +08:00
joylink_cuiweidong
4fe4fd44b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 16:10:23 +08:00
joylink_cuiweidong
b0f7d125a3 成都三号线右键操作代码调整 2020-07-01 16:10:07 +08:00
zyy
07bca42db2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 14:52:40 +08:00
zyy
3c6d5b903d 调整联锁配置，调整数据模型 2020-07-01 14:52:27 +08:00
joylink_cuiweidong
9068de551c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 14:22:51 +08:00
joylink_cuiweidong
e66723adff 右键操作折返策略代码调整 
地图绘图转化函数调整
 2020-07-01 14:22:06 +08:00
zyy
d2e5000307 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 13:34:25 +08:00
zyy
086cf6d3a0 调整成都三号线现地操作实训配置 2020-07-01 13:34:08 +08:00
joylink_cuiweidong
e5fff7388b 地图绘制 显示条件（showCondition）调整 2020-07-01 13:18:43 +08:00
sunzhenyu
9d855f5910 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 12:11:30 +08:00
sunzhenyu
49cd3fee81 修改通号设备故障名称显示 2020-07-01 12:11:19 +08:00
joylink_cuiweidong
778bd7568b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 11:27:25 +08:00
joylink_cuiweidong
4f866bf257 故障操作代码调整 2020-07-01 11:27:09 +08:00
zyy
556eea0e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-01 09:39:25 +08:00
zyy
485533ff33 调整成都三号线现地操作 2020-07-01 09:39:13 +08:00
joylink_cuiweidong
ff1e707112 故障代码调整 2020-07-01 09:32:36 +08:00
joylink_cuiweidong
c0e3c99dc8 故障代码调整 2020-07-01 09:32:01 +08:00
joylink_cuiweidong
79534ffa5e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 19:17:45 +08:00
joylink_cuiweidong
1c6eb510c9 故障代码调整 2020-06-30 19:17:29 +08:00
fan
ce180b1448 综合演练仿真调整 2020-06-30 18:35:57 +08:00
zyy
e6f635ed72 Merge branch 'master' into test 2020-06-30 17:03:54 +08:00
zyy
4eee003b97 调整成都按钮发送事件 2020-06-30 17:03:35 +08:00
zyy
7eeece3b59 调整mapDevice 数据更新 2020-06-30 16:20:51 +08:00
zyy
6337b5f8da Merge branch 'test' 2020-06-30 16:10:35 +08:00
zyy
58a9b27939 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 15:44:48 +08:00
zyy
b43009ab06 调整权限分配时间限制 2020-06-30 15:44:31 +08:00
joylink_cuiweidong
b934ee7edb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:56 +08:00
fan
6a0433f12f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:43:20 +08:00
fan
755eab6301 调整考试系统获取数据为空时未清除原有数据 2020-06-30 14:42:56 +08:00
joylink_cuiweidong
619adde869 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:41:40 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +08:00
zyy
405158b2e3 调整成都三号线现地操作定义 2020-06-30 14:39:09 +08:00
fan
8f4cecec0c 综合演练调整 2020-06-30 14:27:32 +08:00
zyy
9748ca2f63 调整成都三号线操作定义，位置提示 2020-06-30 13:32:50 +08:00
zyy
82415903f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 11:19:58 +08:00
zyy
7df86adff1 调整表单赋值拷贝 2020-06-30 11:19:33 +08:00
joylink_cuiweidong
f6982eb966 解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题 
仿真代码调整
 2020-06-29 17:33:19 +08:00
joylink_cuiweidong
22883f5aa4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 15:55:50 +08:00
joylink_cuiweidong
ccb976f078 仿真代码调整 2020-06-29 15:55:31 +08:00
fan
f7e162cab0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 14:25:45 +08:00
fan
3f80fc1d0e 公共菜单提取 2020-06-29 14:25:35 +08:00
zyy
4f8371ce22 调整成都三号线 行调实操 2020-06-29 13:27:01 +08:00
fan
a689103abe 综合演练调整 2020-06-29 13:11:27 +08:00
zyy
6e542dcaf5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 09:53:45 +08:00
zyy
db1c1daf2f 调整成都三号线行调操作，及现地样式 2020-06-29 09:53:30 +08:00
fan
103ae24b64 仿真成员管理 2020-06-29 09:12:30 +08:00
joylink_cuiweidong
237aece890 代码调整 2020-06-28 18:34:32 +08:00
zyy
2ddd8f12d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 16:04:18 +08:00
zyy
7873917d43 调整数据模型过滤空置，调整成都3号线实操 2020-06-28 16:03:59 +08:00
joylink_cuiweidong
be2a5e7150 福州一号线行调操作调整 2020-06-28 15:55:25 +08:00
fan
fe7b727f31 福州行调仿真增加信号机操作 2020-06-28 15:28:20 +08:00
joylink_cuiweidong
f4e6c4bee3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 15:27:28 +08:00
joylink_cuiweidong
36883d9587 iscs 转换函数代码调整 
ibp盘绘制代码调整
 2020-06-28 15:27:10 +08:00
fan
9637c7edc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 14:50:22 +08:00
fan
1fc6bd7058 控制权转移调整 2020-06-28 14:50:09 +08:00
fan
4f248c3b19 综合演练界面调整&项目配置整理 2020-06-28 14:27:28 +08:00
joylink_cuiweidong
d76dfe293e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:44:22 +08:00
joylink_cuiweidong
24c975184c 设计平台 课程设计代码优化 2020-06-28 13:44:04 +08:00
zyy
621a077e86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:27:24 +08:00
zyy
e3ee44aae7 调整道岔失表状态，成都3号线实操定义 2020-06-28 13:27:10 +08:00
joylink_cuiweidong
daa2415d15 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:09:47 +08:00
joylink_cuiweidong
4060947de7 实训编辑制作模式删除 2020-06-28 11:09:31 +08:00
fan
fd2347e4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:01:34 +08:00
fan
618419e4ba 佛山信号机操作调整 2020-06-28 11:01:13 +08:00
joylink_cuiweidong
dea4481783 北京一号线现地操作代码调整 2020-06-28 10:38:34 +08:00
fan
80524d254d 项目配置调整 2020-06-28 10:33:35 +08:00
fan
d7a5b555a2 设备登录调整 2020-06-24 18:40:48 +08:00
zyy
6b78dc89f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:40:09 +08:00
zyy
b5a22e2dd1 调整佛山实训定义操作配置 2020-06-24 18:39:49 +08:00
joylink_cuiweidong
c0c60e0bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:39:11 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +08:00
zyy
5620f497da Merge branch 'test' 
# Conflicts:
#	src/layout/components/userInfo.vue
 2020-06-24 17:41:55 +08:00
zyy
678f0ba839 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 17:37:24 +08:00
zyy
c570e418e1 调整佛山操作定义，调整个人信息 2020-06-24 17:37:09 +08:00
fan
92000b3d09 宁波一运行图预览调整 2020-06-24 17:31:21 +08:00
joylink_cuiweidong
f3859ba247 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:22:18 +08:00
joylink_cuiweidong
73b2da9421 右键操作取消故障代码调整 2020-06-24 16:21:56 +08:00
fan
8722316b7d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:19:59 +08:00
fan
2399be67d0 宁波道岔失表增加表示红色矩形 2020-06-24 16:19:47 +08:00
zyy
6bba94355a Merge branch 'test' 2020-06-24 16:04:47 +08:00
zyy
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +08:00
zyy
81ecb046ba 删除创建道岔区段字符 2020-06-24 15:45:46 +08:00
zyy
74b5f8a291 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:44:14 +08:00
zyy
e4b730f300 调整配置 2020-06-24 15:43:58 +08:00
fan
599afaaeae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:02:23 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
joylink_cuiweidong
12ab61179e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:07:22 +08:00
joylink_cuiweidong
5715c7cc98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:48 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义，删除区段定义 2020-06-24 14:06:17 +08:00
joylink_cuiweidong
eec3d47b84 西安二号线操作代码整理 2020-06-24 14:06:12 +08:00
fan
e71f74a769 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 13:28:07 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整（未完） 2020-06-24 13:27:58 +08:00
joylink_cuiweidong
ccdbf781a0 西安二号线信号机右键操作代码调整 2020-06-24 11:25:17 +08:00
joylink_cuiweidong
555552af28 删除多余的文件 2020-06-24 10:56:40 +08:00
fan
45b88d3a46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 10:00:24 +08:00
fan
8c476d0dcc 新建课程参数丢失问题调整 2020-06-24 10:00:13 +08:00
fan
0128576386 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:25:04 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
joylink_cuiweidong
45a0f35901 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:24:36 +08:00
joylink_cuiweidong
0f7cdb2b8e 剧本编制代码调整 2020-06-24 09:24:08 +08:00
joylink_cuiweidong
b85362460e 剧本代码调整 2020-06-23 18:59:20 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
zyy
47a9ee6e1f 调整正式上个人信息样式名称 2020-06-23 17:01:10 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
f1004dd52a 剧本编制代码调整 2020-06-23 15:15:46 +08:00
joylink_cuiweidong
df475ab28a 剧本编制修改会话代码调整 2020-06-23 14:17:35 +08:00
joylink_cuiweidong
2462ba7413 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:58:20 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
zyy
293a9b0204 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:52:47 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
joylink_cuiweidong
3aba371b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:28:05 +08:00
joylink_cuiweidong
9752bd4244 佛山右键操作代码调整 2020-06-23 13:27:46 +08:00
zyy
5984d0c7ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 11:24:18 +08:00
zyy
98b24fac42 删除多余注释 2020-06-23 11:24:02 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
68624ba8ac 剧本编制修改会话代码调整 2020-06-23 10:27:18 +08:00
sunzhenyu
869ddc78b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 10:08:01 +08:00
sunzhenyu
01351fb34a test 2020-06-23 10:07:52 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00
zyy
88211cee8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 09:27:10 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
joylink_cuiweidong
d789a30333 剧本编制代码调整 2020-06-22 18:37:09 +08:00
joylink_cuiweidong
d3d17f7bf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 14:30:14 +08:00