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

3693 Commits

Author SHA1 Message Date
fan
139066d66f 综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理 2020-06-10 16:56:52 +08:00
sunzhenyu
4cec1efc09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 16:30:58 +08:00
sunzhenyu
365cd7de44 增加列车开关门操作 2020-06-10 16:30:23 +08:00
joylink_cuiweidong
c953d98ffa 佛山线路 现地信号机 操作调整 2020-06-10 14:37:43 +08:00
joylink_cuiweidong
4118eb7a32 线路配置添加参数 列车控制模式/级别 2020-06-10 13:42:06 +08:00
joylink_cuiweidong
c73769f90d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-10 13:24:27 +08:00
joylink_cuiweidong
b169bb1e20 佛山有轨电车指令代码调整 2020-06-10 13:24:12 +08:00
fan
1d56ae8249 合并代码 2020-06-09 18:33:17 +08:00
fan
fa8c31b2d4 iscs 照明系统模式表&时间表 2020-06-09 18:31:21 +08:00
zyy
d360dc26b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-09 17:48:28 +08:00
zyy
015dd9e113 调整综合监控数据，调整绘图 2020-06-09 17:48:08 +08:00
fan
c119d5130f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-09 14:39:43 +08:00
fan
4b67f81cf0 iscs 小系统模式表 2020-06-09 14:39:32 +08:00
joylink_cuiweidong
6b551b04fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-09 13:34:48 +08:00
joylink_cuiweidong
83e8a6658a 线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路） 2020-06-09 13:34:32 +08:00
zyy
f43d964d29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-06-09 13:26:01 +08:00
zyy
8c52fcc8ef 调整iscs 鼠标事件流程 2020-06-09 13:24:18 +08:00
fan
0902d10f4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-08 18:41:00 +08:00
fan
de2defc461 iscs 小系统模式表&交互 2020-06-08 18:40:48 +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
404a23e35e iscs 小系统代码调整 2020-06-08 17:59:28 +08:00
joylink_cuiweidong
98ed49715a 综合演练仿真会话自动播放调整 2020-06-08 13:55:26 +08:00
joylink_cuiweidong
6f59f03acd 裁判系统 获取参赛者的历史对话 2020-06-08 11:28:40 +08:00
fan
1170ed5f0c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 18:59:42 +08:00
fan
fc0772a11c iscs调整&站后折返显示调整 2020-06-05 18:59:35 +08:00
sunzhenyu
4f6e4ff2fc 修改三维驾驶列车排序，修改三维驾驶面板图标刷新，完善三维cctv的乘客上下车，优化ai逻辑，修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug 2020-06-05 18:56:42 +08:00
joylink_cuiweidong
99346c4b02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 18:48:26 +08:00
joylink_cuiweidong
38b7580f79 佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整 
停站时间没有具体停站多少时间调整
 2020-06-05 18:48:07 +08:00
zyy
c86bb0bff3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 18:04:42 +08:00
zyy
768c62333c 调整站台操作，增加综合监控调节 2020-06-05 18:04:27 +08:00
joylink_cuiweidong
4d918cc6a7 裁判平台回放代码调整 2020-06-05 15:54:03 +08:00
joylink_cuiweidong
cf0a078635 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 14:53:43 +08:00
joylink_cuiweidong
7c76ba9021 裁判系统回放代码调整 2020-06-05 14:53:18 +08:00
zyy
465da976d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 14:52:20 +08:00
fan
e98dab8d56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 14:46:47 +08:00
fan
7d8a8f8fb6 实操竞赛计时调整&iscs调整 2020-06-05 14:46:37 +08:00
joylink_cuiweidong
6f0cc20a42 新版剧本修改对话代码调整 2020-06-05 14:12:22 +08:00
joylink_cuiweidong
767e5cc48a 裁判系统代码调整 2020-06-05 13:41:47 +08:00
zyy
fbf26cfafc 调整综合监控绘图元素，保存绘图数据 2020-06-05 13:24:38 +08:00
joylink_cuiweidong
ea6d74d3c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 13:06:40 +08:00
joylink_cuiweidong
7f72ed4048 裁判系统代码调整 2020-06-05 13:05:33 +08:00
zyy
8bd88fe20b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 10:32:56 +08:00
zyy
f4fca9a083 调整策略右键弹出窗口，增加综合监控元素配置 2020-06-05 10:32:32 +08:00
joylink_cuiweidong
e3b2726d8b 裁判系统查看理论考试结果页面调整 2020-06-05 10:31:58 +08:00
zyy
3b137ffae9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-05 10:14:23 +08:00
zyy
30d76e763e 调整折返按钮 状态返回处理 2020-06-05 10:14:12 +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
46afe1aa96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-04 19:20:18 +08:00
joylink_cuiweidong
7764f89797 裁判系统代码调整 2020-06-04 19:19:58 +08:00
zyy
a4df31fcc3 调整字段显示 2020-06-04 18:24:39 +08:00
zyy
24f089be32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-04 17:59:08 +08:00
zyy
4a03d8613b 调整车站折返策略 2020-06-04 17:58:42 +08:00
joylink_cuiweidong
78d8da26b0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-04 17:52:12 +08:00
joylink_cuiweidong
d560d11ef5 裁判系统 回放页面调整 2020-06-04 17:51:30 +08:00
zyy
5a9a837e02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
#	src/utils/baseUrl.js
#	src/views/iscs/iscsDraw/iscsBasOperate/index.vue
 2020-06-04 17:32:45 +08:00
zyy
9be9c9a313 增加西安 三号线设置折返策略元素 2020-06-04 17:29:18 +08:00
joylink_cuiweidong
8ea4e49e0a 代码调整 2020-06-04 16:38:28 +08:00
joylink_cuiweidong
d28aa00c78 裁判系统 代码调整 2020-06-04 15:49:23 +08:00
joylink_cuiweidong
2ee3ecd2b0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-04 15:11:21 +08:00
joylink_cuiweidong
59487c992d 裁判系统代码调整 2020-06-04 15:10:54 +08:00
fan
7f08ae9e71 调整教学时切换题group为刷新的问题&自排全开全关=》自排单开单关 2020-06-04 14:21:19 +08:00
fan
d7c55ab346 调整实训考试本地缓存时间超出考试时间时剩余时间显示问题 2020-06-04 13:31:02 +08:00
fan
1d5210db45 调整课程新建时路由参数drawWay丢失的问题 2020-06-04 13:20:32 +08:00
fan
70a3e96d64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-04 11:17:58 +08:00
fan
5ad0464fcd iscs调整 2020-06-04 11:17:43 +08:00
joylink_cuiweidong
0cf0caef1d 裁判系统代码调整 
佛山左下角信息窗口调整
 2020-06-04 11:12:55 +08:00
joylink_cuiweidong
aa5a00b401 竞赛裁判平台代码调整 2020-06-04 10:22:02 +08:00
fan
bf07ea8e0a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 18:36:05 +08:00
fan
ae53e208bb 实操竞赛结果调整 2020-06-03 18:35:43 +08:00
fan
f4d402322a 实操竞赛结果调整 2020-06-03 18:35:10 +08:00
sunzhenyu
afc9392bd6 merge 2020-06-03 18:33:22 +08:00
sunzhenyu
7562b932fe 修改驾驶按钮逻辑，三维cctv增加列车进出站 2020-06-03 18:32:46 +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
49c61f8c8d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 16:20:13 +08:00
joylink_cuiweidong
d8d896fc5f 综合演练结束仿真，其他成员不退出仿真 调整 2020-06-03 16:19:49 +08:00
fan
046a09f8b5 调整实操竞赛&星期显示 2020-06-03 16:18:40 +08:00
fan
6ac7b9b932 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 15:29:06 +08:00
fan
0f5185702b 合并代码 2020-06-03 15:28:57 +08:00
zyy
ce5318386e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 14:47:38 +08:00
zyy
31fab488c0 调整区段保存流程 2020-06-03 14:47:26 +08:00
fan
f6997d3bd9 合并代码 2020-06-03 14:30:14 +08:00
fan
8bf9f77e0b 西安三号线控制权调整&iscs调整 2020-06-03 14:27:54 +08:00
joylink_cuiweidong
9c2831bd3d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 13:31:27 +08:00
joylink_cuiweidong
b2f4138699 代码调整 2020-06-03 13:31:09 +08:00
zyy
a98495f43f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 13:19:11 +08:00
zyy
a57ae39ebf 调整区段修改逻辑 2020-06-03 13:18:52 +08:00
joylink_cuiweidong
00705cd006 综合演练仿真聊天 退出群聊代码调整 2020-06-03 11:20:46 +08:00
joylink_cuiweidong
3c6b950744 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 10:44:43 +08:00
joylink_cuiweidong
c3736a02c8 北京/佛山/哈尔滨 现地 左下角 聊天信息窗口遮盖问题处理 2020-06-03 10:43:41 +08:00
zyy
d592e381ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-03 10:12:50 +08:00
zyy
631fba04bb 调整道岔佛山线路显示， 综合监控元素添加 2020-06-03 10:12:36 +08:00
joylink_cuiweidong
7549203f97 综合演练仿真会话代码调整 2020-06-02 19:26:36 +08:00
joylink_cuiweidong
34016219dd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 18:30:38 +08:00
joylink_cuiweidong
4c38334d2c 西安三号线 按计划行车/添加列车 列车列表代码调整 2020-06-02 18:30:12 +08:00
zyy
4f4be3b33a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-06-02 18:11:52 +08:00
zyy
ad3694c7f5 调整综合监控模型，调整信号机自动触发显示，综合监控数据保存 2020-06-02 18:05:35 +08:00
fan
6977e93e5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 17:51:08 +08:00
fan
c1d88ab3e9 iscs调整&列车调整 2020-06-02 17:50:56 +08:00
sunzhenyu
620839876d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 17:00:26 +08:00
sunzhenyu
9ca15d9146 修改三维cctv视角 2020-06-02 16:58:45 +08:00
sunzhenyu
f4d41eb0de 修改通号模型信息显示功能 2020-06-02 16:57:38 +08:00
zyy
a1978bd266 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/iscs/iscsDraw/iscsCommonElem/button.vue
 2020-06-02 16:17:53 +08:00
zyy
de49bba2ad 调整信号机流程 综合监控操作 2020-06-02 16:17:00 +08:00
fan
c3d4d475c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 16:12:45 +08:00
fan
e473199e24 iscs调整 2020-06-02 16:12:34 +08:00
joylink_cuiweidong
dea961be7b 实现平台 子系统产品说明调整 2020-06-02 15:31:16 +08:00
joylink_cuiweidong
979a9e78b2 仿真聊天代码调整 
竞赛 实操代码调整
 2020-06-02 15:00:48 +08:00
joylink_cuiweidong
063cb07991 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-02 13:44:06 +08:00
joylink_cuiweidong
ff9842f43b ISCS 绘图机电小系统代码调整 2020-06-02 13:43:42 +08:00
fan
013596a502 iscs调整 2020-06-02 10:21:33 +08:00
joylink_cuiweidong
7e83cc9505 代码调整 2020-06-01 18:58:38 +08:00
joylink_cuiweidong
61ca059900 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 18:53:54 +08:00
joylink_cuiweidong
2bc47186cf 竞赛实操代码调整 2020-06-01 18:52:37 +08:00
fan
e72538f66b 合并代码 2020-06-01 18:35:01 +08:00
fan
d93e40ab48 iscs调整 2020-06-01 18:33:17 +08:00
zyy
101014d9b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/iscs/constant/iscsData.js
 2020-06-01 18:23:49 +08:00
zyy
dfe10ea585 增加综合监控绘图 复制粘贴 元素功能 2020-06-01 18:21:36 +08:00
joylink_cuiweidong
8eefd599b5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 17:38:44 +08:00
joylink_cuiweidong
8dabdd150d iscs 小系统代码调整 
综合演练聊天代码调整
 2020-06-01 17:32:33 +08:00
sunzhenyu
dfa91c5234 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 15:43:48 +08:00
sunzhenyu
041528ebaa 修改三维cctv中路径 2020-06-01 15:43:40 +08:00
zyy
3e62782fc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 13:36:41 +08:00
zyy
16392a3b1f 调整仿真运行图加载高亮显示 2020-06-01 13:36:26 +08:00
sunzhenyu
6ea1c7250d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 12:30:44 +08:00
sunzhenyu
e7224548b8 修改旧数据三维通信bug，cctv三维逻辑修改 2020-06-01 12:29:30 +08:00
joylink_cuiweidong
d46a2cb784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:33:37 +08:00
joylink_cuiweidong
ee9714a705 综合演练仿真聊天代码调整 2020-06-01 11:33:22 +08:00
fan
ab9bf51298 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:32:30 +08:00
fan
0e4b16182b 调整裁判系统0分显示 2020-06-01 11:32:21 +08:00
joylink_cuiweidong
3012601bf6 综合演练仿真 聊天代码调整 2020-06-01 11:28:04 +08:00
joylink_cuiweidong
46d5e09f7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 11:22:08 +08:00
joylink_cuiweidong
799227f8c4 仿真页面刷新 时间代码调整 2020-06-01 11:21:10 +08:00
fan
119af19522 调整二次按计划行车报错 2020-06-01 10:57:19 +08:00
fan
c2c543503d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-01 10:32:13 +08:00
fan
76990e129e iscs调整 2020-06-01 10:32:02 +08:00
zyy
6705d59a26 增加竞赛平台裁判查看理论结果页面 2020-06-01 10:11:09 +08:00
zyy
64ac5beec9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:26:27 +08:00
zyy
106d217e63 调整导入运行图判断 2020-05-29 18:26:12 +08:00
fan
c395fcbcff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:25:01 +08:00
fan
fb40db0ad8 裁判搜索条件调整 2020-05-29 18:24:51 +08:00
joylink_cuiweidong
ba23dbe2b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 18:16:43 +08:00
joylink_cuiweidong
8b23874ea5 综合演练仿真聊天代码调整 2020-05-29 18:15:51 +08:00
zyy
8b3f4de3b7 调整裁判修改分数 2020-05-29 17:58:50 +08:00
fan
0d27ba3d6f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:55:33 +08:00
fan
eff6615407 西安一三号线道岔失表表示灯状态&裁判分数展示调整 2020-05-29 17:55:22 +08:00
zyy
007802267a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:50:02 +08:00
zyy
29f027077d 调整考试结果页面接口对接 2020-05-29 17:49:26 +08:00
fan
68675f7759 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 17:32:29 +08:00
joylink_cuiweidong
9477a7ddc2 综合演练仿真聊天代码调整 2020-05-29 17:28:40 +08:00
fan
a4924383fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:58:11 +08:00
fan
31dd88b426 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:57:31 +08:00
fan
95e4f4c938 西安一三号线道岔失表调整&iscs调整 2020-05-29 16:57:21 +08:00
joylink_cuiweidong
42cd8a3aec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:56:23 +08:00
joylink_cuiweidong
933db5fb50 综合演练 仿真聊天 代码调整 2020-05-29 16:56:02 +08:00
zyy
243a5763bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 16:55:53 +08:00
zyy
16ebf3e013 调整竞赛结果流程，列车放大流程 2020-05-29 16:55:25 +08:00
joylink_cuiweidong
6fe1a0c22b 新版地图绘图 高级数据交路代码调整 2020-05-29 16:23:38 +08:00
joylink_cuiweidong
2fd42c22f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 14:05:03 +08:00
joylink_cuiweidong
7449b6b2a3 综合演练 仿真聊天代码调整 2020-05-29 14:03:43 +08:00
fan
e0b5f1d249 提示调整 2020-05-29 13:02:44 +08:00
fan
2abe815c87 理论考试缓存调整 2020-05-29 11:18:44 +08:00
fan
f21751fcd3 哈尔滨title调整&理论考试缓存调整 2020-05-29 11:08:38 +08:00
joylink_cuiweidong
edcefeab07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-29 09:17:16 +08:00
joylink_cuiweidong
8c99f4a3ce 西安一/三号线的侧边栏 代码调整 2020-05-29 09:16:35 +08:00
zyy
3aeb6f85bd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:48:50 +08:00
zyy
88be776582 调整样式 2020-05-28 18:48:28 +08:00
joylink_cuiweidong
cf6dadf46b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:39:11 +08:00
joylink_cuiweidong
65569da4cd 西安一/三号线的侧边栏 代码调整 2020-05-28 18:38:49 +08:00
zyy
79e76bbfb1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:34:47 +08:00
zyy
e63a299a77 校验裁判打分最大分值 2020-05-28 18:34:34 +08:00
fan
2a1ce3543f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 18:29:03 +08:00
fan
fffd6f0be7 调整运行图加载lineCode获取 2020-05-28 18:28:46 +08:00
zyy
474dcc2d74 新增车站字段 2020-05-28 18:17:15 +08:00
zyy
f1a66f8f73 调整站台轨关联站台也会修改 2020-05-28 18:08:20 +08:00
fan
5e97623b06 逻辑区段始终点偏移量设置调整 2020-05-28 17:47:52 +08:00
zyy
84afa25fe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 17:09:51 +08:00
zyy
e569702907 增加裁判平台修改分数 2020-05-28 17:09:22 +08:00
fan
601aed6f5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 16:41:04 +08:00
fan
80d016a2b5 公共菜单调整 2020-05-28 16:40:52 +08:00
joylink_cuiweidong
8822e8b3c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/jsxt/competition/theory/quiz/index.vue
 2020-05-28 15:31:11 +08:00
joylink_cuiweidong
c502d755f9 竞赛平台代码调整 2020-05-28 15:28:18 +08:00
fan
76ba1caf8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 15:04:07 +08:00
fan
c300fe2f5f 理论考试倒计时 2020-05-28 15:03:58 +08:00
zyy
6ae66333e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 15:02:53 +08:00
zyy
55f57e2135 调整保存字段 2020-05-28 15:02:15 +08:00
zyy
6eefedb434 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 14:39:21 +08:00
zyy
df4dc3eea9 调整供电线路保存，福州皮肤配置文件调整 2020-05-28 14:39:06 +08:00
sunzhenyu
bfe172ff30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 13:39:50 +08:00
sunzhenyu
fe5bfa50e0 三维cctv修改 2020-05-28 13:39:41 +08:00
joylink_cuiweidong
0939eecf59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 13:22:20 +08:00
joylink_cuiweidong
27981666b1 仿真聊天代码调整 2020-05-28 13:21:51 +08:00
fan
e5d4a31dce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 11:28:06 +08:00
fan
d301e9d9f4 整理公共菜单 2020-05-28 11:27:53 +08:00
joylink_cuiweidong
062cdc69dd 综合演练聊天代码调整 2020-05-28 10:35:16 +08:00
joylink_cuiweidong
a302ab24c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-28 10:16:33 +08:00
joylink_cuiweidong
a471120ea0 综合演练 聊天代码调整 2020-05-28 10:16:13 +08:00
fan
bf1bbbe948 调整取消进路指令&调整导出试卷参数&公共菜单 2020-05-28 09:54:47 +08:00
joylink_cuiweidong
9fb51bd047 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 19:03:54 +08:00
joylink_cuiweidong
4afcef1ce2 综合演练 聊天 创建群聊代码调整 2020-05-27 19:02:39 +08:00
zyy
4fe1330990 调整试卷加载 2020-05-27 19:02:34 +08:00
zyy
07679a37e7 调整理论流程结果页面 2020-05-27 18:30:14 +08:00
zyy
32d94e6b38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/competitionManage/generatePaper.vue
 2020-05-27 18:10:39 +08:00
zyy
707fa4ba43 调整理论竞赛流程 2020-05-27 18:09:21 +08:00
fan
cfed64b4d5 调整合并代码错误 2020-05-27 17:37:32 +08:00
fan
cacaa155b0 合并代码 2020-05-27 17:32:20 +08:00
fan
18735986e6 修改列车识别号禁用人工车类型&生成试卷 2020-05-27 17:30:39 +08:00
zyy
7fbc759595 调整总分显示 2020-05-27 17:27:50 +08:00
fan
ff3d4329d6 调整生成试卷 2020-05-27 16:36:55 +08:00
fan
6ebfffd36b 调整table移出bug 2020-05-27 15:38:40 +08:00
fan
643c5e0b9e 添加分值初始化和校验 2020-05-27 15:31:47 +08:00
fan
6a1215621d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 14:57:34 +08:00
fan
bb009011c3 修改列车识别号调整 2020-05-27 14:57:25 +08:00
joylink_cuiweidong
47e02a0ce8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 14:45:54 +08:00
joylink_cuiweidong
53c8c13405 竞赛系统 实操题目录制代码调整 2020-05-27 14:45:32 +08:00
zyy
3a68650a89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 14:14:00 +08:00
zyy
160587e333 调整试题流程 2020-05-27 14:13:47 +08:00
fan
23c49b965d 生成试卷调整 2020-05-27 13:51:27 +08:00
fan
04bf8a9dda 生成试卷实操调整 2020-05-27 11:28:29 +08:00
fan
8cc1dd66d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:25:50 +08:00
fan
a44fe915b8 生成试卷实操调整 2020-05-27 11:25:39 +08:00
joylink_cuiweidong
eaa18f3539 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:20:33 +08:00
joylink_cuiweidong
61b0d22d53 竞赛系统 实操列表代码调整 2020-05-27 11:20:14 +08:00
fan
31f516abb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 11:07:14 +08:00
fan
eb7dd84c48 生成试卷实操调整 2020-05-27 11:07:04 +08:00
joylink_cuiweidong
60c90f24e8 竞赛代码调整 2020-05-27 10:49:53 +08:00
zyy
64256f5982 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 10:36:51 +08:00
zyy
b7d4eb7bda 调整区段绘图元素层级，调整字段显示 2020-05-27 10:36:40 +08:00
fan
accfc78a65 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 10:33:51 +08:00
fan
d492634c98 生成试题理论调整 2020-05-27 10:33:26 +08:00
joylink_cuiweidong
9051a15605 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 09:57:21 +08:00
joylink_cuiweidong
5beb834384 竞赛系统 实操试题删除修改代码调整 2020-05-27 09:56:59 +08:00
zyy
e9f35e6804 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-27 09:09:49 +08:00
zyy
0a54a5988e 调整理论列表 2020-05-27 09:09:29 +08:00
fan
1aeb7e0d33 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 18:44:24 +08:00
fan
8e2537a9d0 生成试题调整 2020-05-26 18:43:59 +08:00
zyy
ee16508b02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 18:30:43 +08:00
zyy
94dddea3bd 调整字段显示 2020-05-26 18:30:17 +08:00
joylink_cuiweidong
0ada88bafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 18:28:34 +08:00
joylink_cuiweidong
f91a46552b 实操列表添加修改代码调整 2020-05-26 18:28:18 +08:00
zyy
438ccb2404 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 18:12:57 +08:00
zyy
92b144ddeb 调整理论考试接口调整，字段 2020-05-26 18:12:42 +08:00
joylink_cuiweidong
4fb37b3c7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 17:56:17 +08:00
joylink_cuiweidong
d8cfcbd595 添加实操列表页面和实操创建页面 2020-05-26 17:55:11 +08:00
fan
eea3557635 生成试题调整 2020-05-26 17:35:55 +08:00
fan
31a82432d1 生成试题 2020-05-26 17:33:19 +08:00
zyy
6354b60a58 调整字段 2020-05-26 16:01:41 +08:00
zyy
04ed45e498 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 15:59:23 +08:00
zyy
d161492fed 添加题库管理流程 2020-05-26 15:59:11 +08:00
joylink_cuiweidong
2336fe7fbe 代码调整 2020-05-26 13:33:12 +08:00
joylink_cuiweidong
187024b5b7 代码调整 2020-05-26 13:10:29 +08:00
joylink_cuiweidong
6886ea3190 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 13:04:21 +08:00
joylink_cuiweidong
a354264097 竞赛代码调整 2020-05-26 13:03:37 +08:00
zyy
b413c2f0f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 12:12:13 +08:00
zyy
83343d54b8 调整竞赛系统逻辑 2020-05-26 12:11:59 +08:00
fan
678581f079 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 11:10:49 +08:00
fan
ae9cce3557 LCD屏控制 2020-05-26 11:10:37 +08:00
zyy
7382a0d1e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 10:30:22 +08:00
zyy
c1cead3475 调整报名系统报名提示 2020-05-26 10:30:11 +08:00
joylink_cuiweidong
630b2b16d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 10:19:13 +08:00
joylink_cuiweidong
681e67468f 竞赛代码调整 2020-05-26 10:18:54 +08:00
zyy
66ad222321 删除注释 2020-05-26 09:51:24 +08:00
zyy
fde7e609c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-26 09:43:23 +08:00
zyy
d10fccb624 调整竞赛流程 2020-05-26 09:43:09 +08:00
joylink_cuiweidong
c667b7f980 竞赛代码调整 2020-05-25 18:50:38 +08:00
joylink_cuiweidong
0967316106 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/displayNew/chatView/chatBox.vue
 2020-05-25 18:34:30 +08:00
joylink_cuiweidong
83192e2bd5 代码调整 2020-05-25 18:33:36 +08:00
joylink_cuiweidong
1db4c0e193 竞赛代码调整 2020-05-25 18:32:59 +08:00
zyy
dc33306c96 调整参赛人员路由判断 2020-05-25 18:26:05 +08:00
zyy
ef9dc7c25e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/menuTrain.vue
 2020-05-25 17:58:11 +08:00
zyy
f329e30049 调整西安一三 号线路 右键操作 2020-05-25 17:57:24 +08:00
fan
b5b228b1a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 17:08:07 +08:00
fan
fe45d9b1ac 添加扣车跳停命令提示换行符 2020-05-25 17:07:58 +08:00
joylink_cuiweidong
663f25cddc 竞赛代码调整 2020-05-25 16:56:00 +08:00
joylink_cuiweidong
9f1c594a4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 16:45:19 +08:00
joylink_cuiweidong
ab8ea51140 代码调整 2020-05-25 16:44:26 +08:00
zyy
e0c6f6a12a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 16:38:15 +08:00
zyy
f06419e963 调整裁判平台进入仿真操作 2020-05-25 16:38:03 +08:00
joylink_cuiweidong
3bd5572e58 裁判系统代码调整 2020-05-25 16:29:13 +08:00
joylink_cuiweidong
0f21696e19 裁判平台代码调整 2020-05-25 16:15:15 +08:00
joylink_cuiweidong
8a104a09f6 代码调整 2020-05-25 15:45:51 +08:00
joylink_cuiweidong
40d7d960cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 15:43:58 +08:00
joylink_cuiweidong
3d10668abf 竞赛系统代码调整 2020-05-25 15:43:36 +08:00
zyy
fb6ba36680 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 15:06:47 +08:00
zyy
1ae2793221 调整绘图界面字体皮肤配置 2020-05-25 15:06:34 +08:00
joylink_cuiweidong
b67adf1afb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 14:56:02 +08:00
joylink_cuiweidong
992892ee6b 竞赛代码调整 2020-05-25 14:55:42 +08:00
fan
76a329d9af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 14:06:26 +08:00
fan
8621198acf 调整信号机菜单显示&修改列车识别号调整 2020-05-25 14:06:16 +08:00
joylink_cuiweidong
0f863cffe1 竞赛系统代码调整 2020-05-25 13:49:44 +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
a2e0522a30 调整判断状态 2020-05-25 10:53:01 +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
6012a5ce5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 10:32:27 +08:00
fan
58118ba06a 西安一三日期显示调整 2020-05-25 10:32:14 +08:00
joylink_cuiweidong
24ed5f502d 竞赛代码调整 2020-05-25 10:31:32 +08:00
zyy
15643b0d05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 10:29:14 +08:00
zyy
f90514777a 调整竞赛系统登录流程，调整接口字段 2020-05-25 10:29:03 +08:00
joylink_cuiweidong
6cf41569c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 09:52:42 +08:00
joylink_cuiweidong
46e6dec30e 竞赛系统代码调整 2020-05-25 09:52:23 +08:00
zyy
f60d72aaf8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-25 09:40:27 +08:00
zyy
aa6d821fed 调整裁判平台人员列表字段 2020-05-25 09:40:14 +08:00
joylink_cuiweidong
b74b070367 竞赛系统代码调整 2020-05-25 09:29:34 +08:00
joylink_cuiweidong
0f1ff80f1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 20:46:36 +08:00
joylink_cuiweidong
0f3520a8e3 竞赛代码调整 2020-05-22 20:46:03 +08:00
fan
d54db9bfe2 西安三号线调整 2020-05-22 20:32:19 +08:00
fan
4d29da9228 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 18:42:55 +08:00
fan
bb37c6ebbb 西安三号线调整 2020-05-22 18:41:23 +08:00
zyy
28791ddb74 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 18:28:13 +08:00
zyy
39d055ec09 调整车站连锁关系 右键空白处显示连锁关系 2020-05-22 18:28:03 +08:00
joylink_cuiweidong
5bbb5ddd4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 17:30:48 +08:00
joylink_cuiweidong
526fefceec 竞赛代码调整 2020-05-22 17:30:17 +08:00
zyy
e221ca9b22 调整报名流程字段，调整西安线路非连锁站邮件操作 2020-05-22 17:10:07 +08:00
zyy
f3cbe93987 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:52:24 +08:00
zyy
48523b2d0a 调整首页 2020-05-22 16:52:12 +08:00
fan
18054e5001 竞赛考试结果调整 2020-05-22 16:42:42 +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
198b16d926 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 16:27:20 +08:00
joylink_cuiweidong
44f5e7a87c 裁判平台代码调整 2020-05-22 16:26:59 +08:00
sunzhenyu
ef3401fb44 Merge bra:nch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-22 15:56:45 +08:00
sunzhenyu
080d670c7d 综合演练三维通号原型 2020-05-22 15:56:40 +08:00
zyy
e535b1e5d1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/competitionManage/index.vue
 2020-05-22 15:45:16 +08:00
zyy
eaeea84c8d 调整报名流程，竞赛管理页面 2020-05-22 15:41:35 +08:00
fan
bcbb5ff512 调整竞赛报名参赛路径弹框复制 2020-05-22 15:31:30 +08:00
fan
991af46e9a 调整竞赛报名参赛路径弹框复制 2020-05-22 15:23:18 +08:00
fan
8e1d552d18 调整竞赛报名参赛路径弹框复制 2020-05-22 15:20:14 +08:00
fan
32eb7faada 西安线路调整 2020-05-22 14:47:19 +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
sunzhenyu
2e40e63e9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 16:49:16 +08:00
sunzhenyu
e0fd1ece86 修改车站贴图，修改驾驶提示 2020-05-21 16:48:59 +08:00
zyy
81973b6967 添加实操考试 结束生成分值流程 2020-05-21 15:18:00 +08:00
zyy
9918678b27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 14:59:29 +08:00
zyy
568ac44bf9 调整打包模式， 报名系统逻辑 2020-05-21 14:59:18 +08:00
joylink_cuiweidong
b382b6e0d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 10:44:22 +08:00
joylink_cuiweidong
cf021736b2 竞赛裁判系统代码调整 2020-05-21 10:43:32 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
zyy
81187912f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 18:33:08 +08:00
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
joylink_cuiweidong
4132eba1ca 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-20 18:28:59 +08:00
joylink_cuiweidong
dc6819df4d 裁判平台代码调整 2020-05-20 18:26:04 +08:00
fan
7bbe7b26d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 17:44:57 +08:00
fan
ddee6156f7 竞赛管理显示地址 2020-05-20 17:44:47 +08:00
zyy
43ee4a89ed 调整报名接口调整 2020-05-20 17:35:48 +08:00
zyy
8b8f43378e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-05-20 17:20:54 +08:00
zyy
801d420db8 调整竞赛报名api 2020-05-20 17:19:45 +08:00
fan
3e84ec6a6b 裁判加载实操 2020-05-20 16:10:45 +08:00
fan
c2cee7817a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 15:36:57 +08:00
fan
e1f932c5e3 竞赛管理 2020-05-20 15:36:49 +08:00
joylink_cuiweidong
1cc644d893 剧本编制代码调整 2020-05-20 15:29:41 +08:00
joylink_cuiweidong
df718218e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:51:35 +08:00
joylink_cuiweidong
0b37830a8d 剧本录制代码调整 2020-05-20 14:50:34 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
zyy
93b92ad36a 调整报名系统增加电话验证码 2020-05-20 14:35:55 +08:00
joylink_cuiweidong
71cd5af93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 11:14:01 +08:00
joylink_cuiweidong
74665d7b25 剧本编制代码调整 2020-05-20 11:13:32 +08:00
sunzhenyu
a58f175afc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:50:18 +08:00
sunzhenyu
01f90f6a2d 隐藏三维站台 2020-05-20 10:50:13 +08:00
joylink_cuiweidong
5ad20c5659 剧本代码调整 2020-05-20 10:46:38 +08:00
joylink_cuiweidong
c8f362a213 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:28:35 +08:00
joylink_cuiweidong
ca7e92f6a1 剧本编制代码调整 2020-05-20 10:28:16 +08:00
fan
5435ac382f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 10:02:20 +08:00
fan
ea8222504e 添加竞赛接口 2020-05-20 10:02:07 +08:00
joylink_cuiweidong
582543dd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:56:49 +08:00
joylink_cuiweidong
a51ae0aa30 西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整 2020-05-19 18:54:51 +08:00
fan
46a28d3cd5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:39:31 +08:00
fan
597af25b40 iscs&站台故障 2020-05-19 18:38:58 +08:00
sunzhenyu
4819efc14e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 18:00:47 +08:00
zyy
ce0c5c074c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 17:26:20 +08:00
zyy
7b0f662912 调整裁判平台页面样式 2020-05-19 17:26:12 +08:00
fan
bfb3c9357c 竞赛系统调整 2020-05-19 17:06:34 +08:00
joylink_cuiweidong
394b60b007 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 17:05:38 +08:00
joylink_cuiweidong
e69840c87f 综合演练代码调整 2020-05-19 17:05:23 +08:00
zyy
cfe3ccd6bf 调整竞赛系统首页样式 2020-05-19 17:01:58 +08:00
zyy
85dde7c4f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 16:56:46 +08:00
zyy
cb0fcd1a3f 增加报名页面 2020-05-19 16:56:36 +08:00
sunzhenyu
5046a886fd merge 2020-05-19 16:50:34 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
joylink_cuiweidong
3b2d431400 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 15:45:17 +08:00
joylink_cuiweidong
c1ce6f46ae 综合演练代码调整 2020-05-19 15:44:57 +08:00
fan
247bc7ef30 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 15:44:13 +08:00
fan
45422c8cd2 信号机批量设置引导信号&虚拟信号机旋转 2020-05-19 15:44:01 +08:00
joylink_cuiweidong
e3b7d513ba 综合演练行调添加 列车选择 2020-05-19 14:47:47 +08:00
joylink_cuiweidong
eed312e72f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/jointTrainingNew/index.vue
 2020-05-19 14:03:44 +08:00
joylink_cuiweidong
736c81a61d 综合演练 剧本代码调整 2020-05-19 14:01:23 +08:00
fan
df83fbb904 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 13:42:06 +08:00
fan
cc3f117a8f 宁波一综合演练现地设置显示站 2020-05-19 13:41:48 +08:00
zyy
4b683de30f 调整竞赛开始考试 2020-05-19 13:15:36 +08:00
zyy
28123b0525 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 13:10:56 +08:00
zyy
63e52f1986 调整理论竞赛流程页面 2020-05-19 13:10:45 +08:00
fan
6afafc9371 调整绘图批量设置信号机类型&竞赛考试详情 2020-05-19 11:20:09 +08:00
zyy
f2430c3625 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/router/index_Common.js
 2020-05-19 10:32:07 +08:00
zyy
3a72195e15 调整竞赛系统页面路由 2020-05-19 10:30:27 +08:00
joylink_cuiweidong
f0cb7a11cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 10:25:09 +08:00
joylink_cuiweidong
9fc821f940 综合演练代码调整（添加获取所有需要值班员的车站接口） 2020-05-19 10:24:48 +08:00
fan
462b8e972b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 10:18:10 +08:00
fan
eba0bff786 竞赛系统 2020-05-19 10:18:01 +08:00
joylink_cuiweidong
a1097088ea Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-19 09:45:31 +08:00
joylink_cuiweidong
08991c8694 剧本代码调整 2020-05-19 09:45:15 +08:00
zyy
27891b29c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/store/modules/permission.js
 2020-05-19 09:05:27 +08:00
zyy
09b3b684cf 调整竞赛系统路由 2020-05-19 09:03:38 +08:00
fan
9580d4b966 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 17:59:52 +08:00
fan
86d59db177 调整路由处理 2020-05-18 17:59:38 +08:00
zyy
3069cf2112 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 17:08:32 +08:00
zyy
b8bf51fc82 优化地图绘制 2020-05-18 17:08:21 +08:00
fan
9e03602403 草稿地图右键点击改变tree选中状态 2020-05-18 16:08:49 +08:00
fan
79f9f72c07 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:48:06 +08:00
fan
c8d7347e61 课程问题调整 2020-05-18 15:47:55 +08:00
joylink_cuiweidong
559c33bb2a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 15:19:43 +08:00
joylink_cuiweidong
cc8b700328 剧本录制代码调整 
退出剧本代码调整
 2020-05-18 15:18:57 +08:00
fan
5f9806cdb8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:49:29 +08:00
fan
135b328dd1 故障操作调整 2020-05-18 14:49:16 +08:00
joylink_cuiweidong
f0d51a2771 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 14:00:40 +08:00
joylink_cuiweidong
bdf627e812 剧本调整 2020-05-18 14:00:16 +08:00
zyy
8e57bbe91e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:35:21 +08:00
zyy
6fdf3b74aa 调整车次窗撤销操作问题 2020-05-18 13:34:46 +08:00
joylink_cuiweidong
71eca2ad9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:33:20 +08:00
joylink_cuiweidong
25b1c09141 剧本代码调整 2020-05-18 13:32:25 +08:00
zyy
bbc79b1b17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-18 13:08:56 +08:00
zyy
9591cbd268 调整竞赛系统登陆权限 2020-05-18 13:08:45 +08:00
joylink_cuiweidong
f092b27282 剧本代码调整 2020-05-18 11:04:39 +08:00
joylink_cuiweidong
be4da83dcd 剧本代码调整 2020-05-18 10:31:55 +08:00
joylink_cuiweidong
9bad1d2eb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 20:47:11 +08:00
joylink_cuiweidong
8059353f06 剧本代码调整 2020-05-15 20:45:59 +08:00
zyy
93f7210596 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 19:01:18 +08:00
zyy
674bcea387 调整综合监控 2020-05-15 19:01:07 +08:00
fan
c0d75502fa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:48:38 +08:00
fan
d47a986fcc 故障操作&贵州状态班级展示 2020-05-15 18:48:10 +08:00
zyy
191f9358be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:36:42 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
joylink_cuiweidong
b1ca16b62f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 17:11:59 +08:00
joylink_cuiweidong
bda901f4c9 剧本代码调整 2020-05-15 17:11:15 +08:00
zyy
7945dedade Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:35 +08:00