Commit Graph

308 Commits

Author SHA1 Message Date
fan
d518ae9907 成员列表报错调整 2020-07-21 15:38:47 +08:00
fan
dcc36af6cc 成员列表报错调整 2020-07-21 15:09:43 +08:00
fan
b51b8680c2 会话调整 2020-07-21 14:56:46 +08:00
fan
ebeda7eb0d 会话调整 2020-07-21 13:57:45 +08:00
fan
1ea1583874 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:51:29 +08:00
fan
9ffd832562 会话调整 2020-07-21 13:51:13 +08:00
zyy
7498e7c844 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-21 13:38:13 +08:00
zyy
4bb41700bc 列车提示信息调整,哈尔滨线路操作 2020-07-21 13:37:59 +08:00
fan
337a2c127d 会话调整 2020-07-21 13:36:03 +08:00
fan
39afe867a4 会话调整 2020-07-21 13:32:43 +08:00
fan
acd929239b 会话调整 2020-07-21 13:22:58 +08:00
joylink_cuiweidong
57ffa85451 剧本预览代码调整 2020-07-21 10:49:01 +08:00
fan
00608f2cb2 heb取消无法登录提示&会话、设备代码调整 2020-07-20 15:19:11 +08:00
fan
23885760f3 会话调整 2020-07-20 13:38:54 +08:00
fan
00a98a5b14 merger 2020-07-20 13:29:32 +08:00
fan
6f20f4db18 会话调整 2020-07-20 13:18:38 +08:00
fan
826b4da854 公共会话切换 2020-07-20 10:48:53 +08:00
joylink_cuiweidong
39eace3b40 剧本预览代码调整 2020-07-20 10:28:31 +08:00
fan
3038d5571f 会话调整 2020-07-17 19:07:34 +08:00
fan
fefd4b53b6 会话调整&设备配置调整 2020-07-17 16:35:24 +08:00
fan
0a50c69b2c 设备配置调整 2020-07-16 19:11:20 +08:00
fan
c761e07ba2 设备配置调整 2020-07-16 13:31:05 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整
绘图高级页面代码调整
2020-07-14 18:21:40 +08:00
zyy
b2f9e388aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:14:53 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
fan
9efc0d4bfb 成员管理高度调整 2020-07-14 17:30:35 +08:00
fan
286d38db5c 会话调整 2020-07-14 17:21:39 +08:00
zyy
c2d158da5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:35:19 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
fan
135fe2d917 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:32:29 +08:00
fan
0db415d5ca 北信坤成页面调整&&综合演练会话调整 2020-07-14 15:32:18 +08:00
zyy
dfc478b8d4 调整哈尔滨综合演练按钮位置,调整角色设置样式 2020-07-14 14:30:37 +08:00
zyy
8fb216dbae 增加项目中设备管理页面 2020-07-14 13:27:00 +08:00
fan
1b3a491d52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-13 14:35:07 +08:00
fan
0ca0153c60 旧地图综合演练调整 2020-07-13 14:34:56 +08:00
zyy
6817323fe1 调整宁波列车故障右键 2020-07-13 14:30:01 +08:00
fan
b10f08df67 设备登录调整&成员管理调整 2020-07-10 18:30:37 +08:00
fan
31c8e8828f 通号打开三维界面 2020-07-10 14:39:47 +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
zyy
348b07afa4 调整大屏系统列车显示问题 2020-07-10 10:52:31 +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
sunleking
07d9f8603d 修改hideibp隐藏三维界面 2020-07-09 21:44:11 +08:00
fan
8af4eb6187 设备登录调整 2020-07-09 15:06:15 +08:00
fan
404c56e874 过滤司机角色调整 2020-07-09 13:05:50 +08:00
fan
37d88998ab 清除会话@成员 2020-07-08 18:22:14 +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
fan
db5c516813 成员参数调整 2020-07-08 13:49:14 +08:00
fan
1076eb2215 设备登录调整 2020-07-08 13:11:22 +08:00
zyy
b58a4afdda 调整列车过滤 2020-07-08 10:56:14 +08:00
joylink_cuiweidong
30b1163017 故障代码调整
设备代码调整
2020-07-08 09:21:54 +08:00
zyy
6b0d31dbbc 调整配置项 2020-07-07 17:37: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
0fd852cc5a 聊天室调整 2020-07-07 10:54:57 +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
fan
87d8dd9ea7 聊天室调整 2020-07-06 18:14:03 +08:00
fan
9883d0ed3c 聊天室调整 2020-07-06 18:00:44 +08:00
zyy
2c5c30216f 调整大屏预览流程,增加大屏分屏配置 2020-07-06 17:02:13 +08:00
fan
75e838b96f 聊天室调整 2020-07-03 18:42:29 +08:00
fan
872122e92b 综合演练仿真调整 2020-07-02 17:57:48 +08:00
joylink_cuiweidong
50c7363791 故障操作代码调整 2020-07-02 10:10:16 +08:00
fan
13a4ee614c 综合演练仿真调整 2020-07-01 18:52:29 +08:00
fan
ce180b1448 综合演练仿真调整 2020-06-30 18:35:57 +08:00
joylink_cuiweidong
bb6c5319c7 故障管理页面代码调整 2020-06-30 14:41:22 +08:00
fan
8f4cecec0c 综合演练调整 2020-06-30 14:27:32 +08:00
joylink_cuiweidong
f6982eb966 解决 实训平台邀请综合演练 设计平台弹出邀请弹窗的问题
仿真代码调整
2020-06-29 17:33:19 +08:00
fan
a689103abe 综合演练调整 2020-06-29 13:11:27 +08:00
fan
103ae24b64 仿真成员管理 2020-06-29 09:12:30 +08:00
fan
4f248c3b19 综合演练界面调整&项目配置整理 2020-06-28 14:27:28 +08:00
fan
d7a5b555a2 设备登录调整 2020-06-24 18:40:48 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
sunzhenyu
47d77d6925 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 18:17:00 +08:00
sunzhenyu
b70feae183 增加三维驾驶超速报警和牵引状态mmi显示,增加剧本设计中三维驾驶 2020-06-17 18:16:49 +08:00
joylink_cuiweidong
556d7fa109 仿真右侧列车显示代码调整 2020-06-17 15:31:15 +08:00
zyy
28cc15fd10 调整综合监控数据,调整系统右键菜单样式 2020-06-15 17:16:26 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
joylink_cuiweidong
cb3663722f 代码调整 2020-06-11 09:43:02 +08:00
zyy
e688625887 调整大屏高度计算 2020-06-10 17:59:51 +08:00
fan
9b489d088b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 16:57:04 +08:00
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
joylink_cuiweidong
b169bb1e20 佛山有轨电车指令代码调整 2020-06-10 13:24:12 +08:00
sunzhenyu
a18a7bccc6 merge jointtrainningnew/index.vue 2020-06-08 18:26:30 +08:00
sunzhenyu
b33f4c17b2 merge pull 2020-06-08 18:24:09 +08:00
sunzhenyu
6cae01f373 增加三维驾驶换端操作,修改三维cctv中前往站台找不到路径点bug,增加综合演练车站cctv 2020-06-08 18:22:12 +08:00
joylink_cuiweidong
98ed49715a 综合演练仿真会话自动播放调整 2020-06-08 13:55:26 +08:00
joylink_cuiweidong
6f59f03acd 裁判系统 获取参赛者的历史对话 2020-06-08 11:28:40 +08:00
joylink_cuiweidong
38b7580f79 佛山线路 道岔在单锁的状态时,使用道岔单解的功能,未起到双确认调整
停站时间没有具体停站多少时间调整
2020-06-05 18:48:07 +08:00
joylink_cuiweidong
4d918cc6a7 裁判平台回放代码调整 2020-06-05 15:54:03 +08:00
fan
7d8a8f8fb6 实操竞赛计时调整&iscs调整 2020-06-05 14:46:37 +08:00
fan
c7d07ebd9d 合并代码 2020-06-05 09:39:48 +08:00
fan
6dfbe18485 实操竞赛比赛计时&题目展示&结果展示 2020-06-05 09:38:14 +08:00
joylink_cuiweidong
74b6e66aff 裁判系统回放代码调整 2020-06-05 09:35:00 +08:00
joylink_cuiweidong
d560d11ef5 裁判系统 回放页面调整 2020-06-04 17:51:30 +08:00
joylink_cuiweidong
8ea4e49e0a 代码调整 2020-06-04 16:38:28 +08:00
joylink_cuiweidong
aa5a00b401 竞赛裁判平台代码调整 2020-06-04 10:22:02 +08:00
joylink_cuiweidong
efc8d80899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 18:24:14 +08:00
joylink_cuiweidong
7946d9f6e7 仿真聊天代码调整 2020-06-03 18:23:48 +08:00
fan
44bb0f0f29 实操竞赛调整 2020-06-03 18:17:52 +08:00
joylink_cuiweidong
156a746a07 综合演练仿真聊天 请求会话成员代码调整 退出会话代码调整 2020-06-03 16:44:38 +08:00
joylink_cuiweidong
d8d896fc5f 综合演练结束仿真,其他成员不退出仿真 调整 2020-06-03 16:19:49 +08:00
joylink_cuiweidong
00705cd006 综合演练仿真聊天 退出群聊代码调整 2020-06-03 11:20:46 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
joylink_cuiweidong
7549203f97 综合演练仿真会话代码调整 2020-06-02 19:26:36 +08:00
joylink_cuiweidong
4c38334d2c 西安三号线 按计划行车/添加列车 列车列表代码调整 2020-06-02 18:30:12 +08:00
joylink_cuiweidong
ee9714a705 综合演练仿真聊天代码调整 2020-06-01 11:33:22 +08:00
joylink_cuiweidong
3012601bf6 综合演练仿真 聊天代码调整 2020-06-01 11:28:04 +08:00
joylink_cuiweidong
8b23874ea5 综合演练仿真聊天代码调整 2020-05-29 18:15:51 +08:00
joylink_cuiweidong
9477a7ddc2 综合演练仿真聊天代码调整 2020-05-29 17:28:40 +08:00
joylink_cuiweidong
933db5fb50 综合演练 仿真聊天 代码调整 2020-05-29 16:56:02 +08:00
joylink_cuiweidong
7449b6b2a3 综合演练 仿真聊天代码调整 2020-05-29 14:03:43 +08:00
joylink_cuiweidong
8c99f4a3ce 西安一/三号线的侧边栏 代码调整 2020-05-29 09:16:35 +08:00
joylink_cuiweidong
65569da4cd 西安一/三号线的侧边栏 代码调整 2020-05-28 18:38:49 +08:00
joylink_cuiweidong
c502d755f9 竞赛平台代码调整 2020-05-28 15:28:18 +08:00
joylink_cuiweidong
27981666b1 仿真聊天代码调整 2020-05-28 13:21:51 +08:00
joylink_cuiweidong
062cdc69dd 综合演练聊天代码调整 2020-05-28 10:35:16 +08:00
joylink_cuiweidong
a471120ea0 综合演练 聊天代码调整 2020-05-28 10:16:13 +08:00
joylink_cuiweidong
4afcef1ce2 综合演练 聊天 创建群聊代码调整 2020-05-27 19:02:39 +08:00
joylink_cuiweidong
681e67468f 竞赛代码调整 2020-05-26 10:18:54 +08:00
zyy
dc33306c96 调整参赛人员路由判断 2020-05-25 18:26:05 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
joylink_cuiweidong
3d10668abf 竞赛系统代码调整 2020-05-25 15:43:36 +08:00
joylink_cuiweidong
992892ee6b 竞赛代码调整 2020-05-25 14:55:42 +08:00
joylink_cuiweidong
af46cd3ff9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 13:49:14 +08:00
zyy
9d7e4f928f 调整竞赛系统进入仿真界面流程 2020-05-25 13:48:43 +08:00
joylink_cuiweidong
3b0d842b97 竞赛代码调整 2020-05-25 13:40:25 +08:00
zyy
04f41456d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/jsxt/competition/examDetail.vue
#	src/views/jsxt/refereeList/index.vue
2020-05-25 10:47:20 +08:00
zyy
cf8e39f765 调整流程 2020-05-25 10:45:56 +08:00
joylink_cuiweidong
d41f874bdc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
#	src/views/jsxt/refereeList/index.vue
2020-05-25 10:36:21 +08:00
fan
58118ba06a 西安一三日期显示调整 2020-05-25 10:32:14 +08:00
fan
23167aa4a9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:34:19 +08:00
fan
86edffb984 竞赛考试结果调整 2020-05-22 16:34:05 +08:00
joylink_cuiweidong
ba42e40200 竞赛系统代码调整 2020-05-22 16:30:18 +08:00
joylink_cuiweidong
4210599f6b 竞赛裁判系统代码调整 2020-05-22 11:07:10 +08:00
joylink_cuiweidong
3b81436fbb 竞赛裁判系统代码调整
综合演练 仿真开始 修改成员角色代码调整
2020-05-22 10:43:23 +08:00
joylink_cuiweidong
480df83efa 竞赛裁判系统代码调整 2020-05-22 09:32:48 +08:00
joylink_cuiweidong
16513c64d5 剧本编制代码调整 2020-05-22 09:07:39 +08:00
joylink_cuiweidong
9dc0995e59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/views/newMap/jointTrainingNew/menuDemon.vue
2020-05-21 17:01:36 +08:00
joylink_cuiweidong
3a48755817 竞赛裁判系统代码调整 2020-05-21 16:59:36 +08:00
zyy
81973b6967 添加实操考试 结束生成分值流程 2020-05-21 15:18:00 +08:00