fan
|
bb37c6ebbb
|
西安三号线调整
|
2020-05-22 18:41:23 +08:00 |
|
joylink_cuiweidong
|
830b8bf94a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 18:29:13 +08:00 |
|
joylink_cuiweidong
|
867de81209
|
代码调整
|
2020-05-22 18:28:55 +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 |
|
fan
|
acfab51e85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 13:05:36 +08:00 |
|
fan
|
f875cd69c3
|
大小交路回库颜色
|
2020-05-22 13:05:08 +08:00 |
|
zyy
|
87ddea085b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 11:31:10 +08:00 |
|
zyy
|
03bfdd76f2
|
调整西安线路错误提示信息
|
2020-05-22 11:30:56 +08:00 |
|
fan
|
efbdea79e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 11:09:07 +08:00 |
|
fan
|
d7c5a1303d
|
新建列车调整
|
2020-05-22 11:09:00 +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
|
464363a6e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:33:08 +08:00 |
|
joylink_cuiweidong
|
480df83efa
|
竞赛裁判系统代码调整
|
2020-05-22 09:32:48 +08:00 |
|
sunzhenyu
|
1257c252f5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:32:30 +08:00 |
|
sunzhenyu
|
87c52581f2
|
修改三维设备贴图配置bug
|
2020-05-22 09:32:09 +08:00 |
|
joylink_cuiweidong
|
b371d02866
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 09:08:36 +08:00 |
|
joylink_cuiweidong
|
16513c64d5
|
剧本编制代码调整
|
2020-05-22 09:07:39 +08:00 |
|
fan
|
1c9301a3d5
|
调整列车指令
|
2020-05-21 18:27:26 +08:00 |
|
fan
|
98f60b6d94
|
调整虚拟信号机侧向开放显示
|
2020-05-21 17:15:17 +08:00 |
|
fan
|
103ba6c139
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 17:03:43 +08:00 |
|
fan
|
4d9edad82b
|
调整加入创建列车菜单问题
|
2020-05-21 17:03:30 +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 |
|
fan
|
aed5802b7f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 16:53:59 +08:00 |
|
fan
|
a861e4908f
|
哈尔滨虚拟信号机调整
|
2020-05-21 16:53:39 +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 |
|
fan
|
e4bdd9c829
|
调整西安一ats人工控显示调整
|
2020-05-21 16:34:05 +08:00 |
|
fan
|
311f81f601
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 15:58:50 +08:00 |
|
fan
|
503c51af10
|
西安一三宁波一福州一佛山延续保护区段闪烁
|
2020-05-21 15:58:23 +08:00 |
|
zyy
|
0dc5804886
|
调整打包相关
|
2020-05-21 15:51:56 +08:00 |
|
zyy
|
81973b6967
|
添加实操考试 结束生成分值流程
|
2020-05-21 15:18:00 +08:00 |
|
zyy
|
9827e8aae8
|
调整盈达 文件配置
|
2020-05-21 15:03:42 +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 |
|
fan
|
fa4c481d40
|
删除新建列车参数
|
2020-05-21 14:40:21 +08:00 |
|
fan
|
82adf8e241
|
西安三号线列车识别号修改
|
2020-05-21 14:21:04 +08:00 |
|
fan
|
34fba46cc3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 13:16:36 +08:00 |
|
fan
|
96f5c31b18
|
新建列车调整
|
2020-05-21 13:16:20 +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 |
|
fan
|
6fc8d7edf6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-21 09:31:29 +08:00 |
|
fan
|
650b0c00ee
|
调整列车早晚点显示
|
2020-05-21 09:31:16 +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
|
9e8f4a48f4
|
调整站台扣车显示
|
2020-05-20 18:11:39 +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
|
f93f432d7e
|
ARB故障状态&哈尔滨列车早晚点时间
|
2020-05-20 17:08:21 +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 |
|
zyy
|
31bcad0449
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 13:25:44 +08:00 |
|
zyy
|
61c3650621
|
路由权限生成调整逻辑
|
2020-05-20 13:25:31 +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 |
|