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 |
|
joylink_cuiweidong
|
5580a79344
|
仿真右侧列车列表调整
福州线操作代码调整
|
2020-06-22 14:29:55 +08:00 |
|
zyy
|
e934860885
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 13:49:59 +08:00 |
|
zyy
|
58ab773ec9
|
删除多余配置
|
2020-06-22 13:49:42 +08:00 |
|
joylink_cuiweidong
|
717e04c4c5
|
宁波车站操作添加，哈尔滨右键操作代码调整
|
2020-06-22 11:00:39 +08:00 |
|
fan
|
5cfec3e09f
|
课程创建角色可以直接发布课程&&sockjs恢复版本
|
2020-06-22 10:49:41 +08:00 |
|
fan
|
ab6b0036d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-22 09:49:58 +08:00 |
|
fan
|
0f519c8a89
|
贵装备导入学生信息后刷新班级列表
|
2020-06-22 09:49:45 +08:00 |
|
sunleking
|
1b36efd859
|
修改cctv老板数据中加载bug
|
2020-06-20 19:35:54 +08:00 |
|
joylink_cuiweidong
|
9cb46f16b7
|
剧本添加动作类型Drive
|
2020-06-19 19:08:33 +08:00 |
|
joylink_cuiweidong
|
ba05a22eb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:59:13 +08:00 |
|
joylink_cuiweidong
|
32f4ead036
|
剧本代码调整
|
2020-06-19 18:58:55 +08:00 |
|
fan
|
2f996e10e8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:39:51 +08:00 |
|
fan
|
4d3a1eed73
|
项目设备管理调整
|
2020-06-19 18:39:41 +08:00 |
|
joylink_cuiweidong
|
b1439d4903
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:32:46 +08:00 |
|
joylink_cuiweidong
|
c463f8ef69
|
宁波一号线哈尔滨一号线操作代码调整
|
2020-06-19 18:32:31 +08:00 |
|
zyy
|
06bbc69389
|
删除老版本绘图
|
2020-06-19 18:19:45 +08:00 |
|
zyy
|
093058158b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:15:25 +08:00 |
|
zyy
|
c0a9674725
|
调整判断
|
2020-06-19 18:14:07 +08:00 |
|
fan
|
7bf2ce406c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 18:03:02 +08:00 |
|
fan
|
df983b2cb9
|
项目设备管理调整
|
2020-06-19 18:02:50 +08:00 |
|
joylink_cuiweidong
|
8c7a5e7796
|
右键操作代码整理
|
2020-06-19 17:03:39 +08:00 |
|
joylink_cuiweidong
|
ee12c33025
|
西安一号线右键操作代码调整
|
2020-06-19 16:13:21 +08:00 |
|
joylink_cuiweidong
|
5b5949b23d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:34:35 +08:00 |
|
joylink_cuiweidong
|
dd9959b2f4
|
右键菜单代码调整
|
2020-06-19 15:34:20 +08:00 |
|
fan
|
a1c3935ba7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 15:19:40 +08:00 |
|
fan
|
75116c32da
|
控制模式实操调整&sock降至1.0.0
|
2020-06-19 15:19:28 +08:00 |
|
joylink_cuiweidong
|
b4394a7092
|
右键菜单代码整理
|
2020-06-19 14:20:57 +08:00 |
|
zyy
|
bcc5fdf92c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:16:35 +08:00 |
|
zyy
|
5334049fcc
|
提取公共函数组件 删除线路多余配置
|
2020-06-19 14:16:21 +08:00 |
|
joylink_cuiweidong
|
f5ee525b20
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 14:09:08 +08:00 |
|
joylink_cuiweidong
|
b34a9fdf25
|
右键菜单代码整理
|
2020-06-19 14:08:52 +08:00 |
|
zyy
|
06ff692181
|
删除老板本成都4、3 北京1 线路配置
|
2020-06-19 13:56:46 +08:00 |
|
zyy
|
3a66119f81
|
删除多余配置
|
2020-06-19 13:40:56 +08:00 |
|
zyy
|
996a0d1a89
|
删除多余文件
|
2020-06-19 13:33:55 +08:00 |
|
zyy
|
5934c61b8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
|
2020-06-19 13:32:40 +08:00 |
|
zyy
|
8e409078d9
|
调整公共文件
|
2020-06-19 13:31:31 +08:00 |
|
joylink_cuiweidong
|
f53e5044b7
|
代码调整
|
2020-06-19 13:30:19 +08:00 |
|
joylink_cuiweidong
|
645e425e2c
|
宁波北京一号线操作代码调整
|
2020-06-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
zyy
|
96456b2280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 11:29:30 +08:00 |
|
zyy
|
6236e70494
|
调整限速配置
|
2020-06-19 11:29:12 +08:00 |
|
sunzhenyu
|
4a831d4aa7
|
merge baseurl
|
2020-06-19 11:26:40 +08:00 |
|
sunzhenyu
|
45c96bd76f
|
修改三维驾驶录制界面中托管按钮
|
2020-06-19 11:23:47 +08:00 |
|
fan
|
3a4641f06f
|
合并代码
|
2020-06-19 10:24:11 +08:00 |
|
fan
|
f0ae68d94a
|
登录接口调整
|
2020-06-19 10:23:13 +08:00 |
|
joylink_cuiweidong
|
090d2bdfc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 10:07:54 +08:00 |
|
joylink_cuiweidong
|
ad756eee10
|
剧本编制代码调整
|
2020-06-19 10:06:58 +08:00 |
|
sunzhenyu
|
3e21c2827c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 09:56:53 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
411c1cc13e
|
宁波线路操作代码整理
|
2020-06-19 09:44:03 +08:00 |
|
fan
|
5bf46c151c
|
合并代码
|
2020-06-19 09:18:50 +08:00 |
|
fan
|
915f1fb959
|
故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发)
|
2020-06-19 09:17:03 +08:00 |
|
joylink_cuiweidong
|
f2a3867ed8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:50:34 +08:00 |
|
joylink_cuiweidong
|
d9f6d515fd
|
剧本添加司机的指令操作
|
2020-06-18 18:49:19 +08:00 |
|
sunzhenyu
|
03716c5ed3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:40:56 +08:00 |
|
sunzhenyu
|
8b2c0cc00a
|
修改三维驾驶通信接口改post
|
2020-06-18 18:40:47 +08:00 |
|
joylink_cuiweidong
|
30cd335845
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:32:37 +08:00 |
|
joylink_cuiweidong
|
aedf2b85fd
|
宁波一号线操作代码整理（部分）
|
2020-06-18 18:32:02 +08:00 |
|
zyy
|
914eb55b03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 18:13:41 +08:00 |
|
zyy
|
0da6a64af7
|
调整临时限速配置
|
2020-06-18 18:13:28 +08:00 |
|
joylink_cuiweidong
|
aa632c457d
|
西安一号线 操作代码整理
|
2020-06-18 18:00:17 +08:00 |
|
joylink_cuiweidong
|
81f418afe5
|
西安二号线操作调整
|
2020-06-18 17:50:26 +08:00 |
|
zyy
|
003bf13395
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:31:29 +08:00 |
|
zyy
|
47e44c0a76
|
调整全局组件配置
|
2020-06-18 17:31:14 +08:00 |
|
fan
|
cf961927db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 17:30:00 +08:00 |
|
fan
|
b8dfa50306
|
调整西安三号箱操作定义
|
2020-06-18 17:29:46 +08:00 |
|
joylink_cuiweidong
|
4b7c7f3f84
|
绘图代码调整
|
2020-06-18 16:58:21 +08:00 |
|
zyy
|
a039778083
|
调整路径设置
|
2020-06-18 16:03:32 +08:00 |
|
zyy
|
67ec40549c
|
调整顺序
|
2020-06-18 15:54:59 +08:00 |
|
zyy
|
5bb54b07cd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
# src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
# src/jmapNew/theme/xian_01/menus/menuSignal.vue
|
2020-06-18 14:59:43 +08:00 |
|
zyy
|
97b0a3f9eb
|
调整公共提示路径，删除多余文件
|
2020-06-18 14:57:32 +08:00 |
|
fan
|
08a3bbaa7c
|
合并代码
|
2020-06-18 14:49:14 +08:00 |
|
fan
|
76eed898a5
|
福州操作定义调整
|
2020-06-18 14:47:00 +08:00 |
|
joylink_cuiweidong
|
04b9f6062a
|
去掉断点
|
2020-06-18 14:38:33 +08:00 |
|
joylink_cuiweidong
|
7b9fe40dbd
|
剧本代码调整
|
2020-06-18 14:36:23 +08:00 |
|
joylink_cuiweidong
|
4c99069752
|
剧本代码调整
|
2020-06-18 14:19:13 +08:00 |
|
joylink_cuiweidong
|
350043c3d2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:25:01 +08:00 |
|
joylink_cuiweidong
|
acd3b0f87e
|
信号机进路代码整理
|
2020-06-18 11:24:42 +08:00 |
|
zyy
|
e439eb6048
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 11:01:49 +08:00 |
|
zyy
|
cfa6445b02
|
调整区段组件
|
2020-06-18 11:01:33 +08:00 |
|
joylink_cuiweidong
|
f3022a6bf7
|
信号机操作代码整理
|
2020-06-18 10:22:07 +08:00 |
|
fan
|
39bc38701e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-18 10:05:20 +08:00 |
|
fan
|
f892440294
|
调整操作定义
|
2020-06-18 10:05:12 +08:00 |
|
joylink_cuiweidong
|
b0e5d7a6b6
|
信号机操作代码整理
|
2020-06-18 09:46:29 +08:00 |
|
joylink_cuiweidong
|
426aed9ef1
|
剧本代码调整
|
2020-06-18 09:20:42 +08:00 |
|
joylink_cuiweidong
|
eefbf70002
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:36:45 +08:00 |
|
joylink_cuiweidong
|
0983307bc7
|
剧本代码调整
|
2020-06-17 18:36:22 +08:00 |
|
zyy
|
ceb3602ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 18:29:47 +08:00 |
|
zyy
|
6c272d3a6c
|
调整组件
|
2020-06-17 18:29:35 +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 |
|
zyy
|
b39f278a5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 17:48:33 +08:00 |
|
zyy
|
c35ceb948c
|
道岔公共组件提取
|
2020-06-17 17:48:19 +08:00 |
|
joylink_cuiweidong
|
1886663445
|
宁波一号线，北京一号线，佛山有轨电车操作代码调整
|
2020-06-17 17:08:34 +08:00 |
|
joylink_cuiweidong
|
068fc65f3d
|
剧本代码调整
|
2020-06-17 15:33:04 +08:00 |
|
joylink_cuiweidong
|
da2e975094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:31:39 +08:00 |
|
joylink_cuiweidong
|
556d7fa109
|
仿真右侧列车显示代码调整
|
2020-06-17 15:31:15 +08:00 |
|
zyy
|
a047c9996e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 15:24:28 +08:00 |
|
zyy
|
ba8f138de3
|
提取信号机通用组件
|
2020-06-17 15:24:16 +08:00 |
|
fan
|
bc4ad0658e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 14:57:32 +08:00 |
|
fan
|
7ae4206448
|
福州一号线操作定义配置
|
2020-06-17 14:57:20 +08:00 |
|
joylink_cuiweidong
|
283206e55d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 14:19:07 +08:00 |
|
joylink_cuiweidong
|
b78f90034a
|
剧本录制代码调整
|
2020-06-17 14:18:46 +08:00 |
|
fan
|
ca539976a0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:35:34 +08:00 |
|
fan
|
89ae6e8c0f
|
列车整理
|
2020-06-17 13:35:21 +08:00 |
|
sunzhenyu
|
3ec20a75c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 13:32:29 +08:00 |
|
sunzhenyu
|
71a0faa648
|
三维cctv站台名站台标方向添加
|
2020-06-17 13:32:14 +08:00 |
|
zyy
|
52bee79e22
|
删除多余组件
|
2020-06-17 11:16:56 +08:00 |
|
zyy
|
18c4d36606
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 10:30:11 +08:00 |
|
zyy
|
b530818a7e
|
调整综合检控 cctv 流程
|
2020-06-17 10:29:56 +08:00 |
|
joylink_cuiweidong
|
9da1e3bbac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:57:13 +08:00 |
|
joylink_cuiweidong
|
584654daec
|
剧本代码调整
|
2020-06-17 09:56:51 +08:00 |
|
zyy
|
88ac5afa45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-17 09:16:16 +08:00 |
|
zyy
|
17158401de
|
调整综合监控导航栏
|
2020-06-17 09:16:03 +08:00 |
|
joylink_cuiweidong
|
4fb17151df
|
佛山有轨电车操作代码调整
|
2020-06-17 09:01:18 +08:00 |
|
fan
|
6cc44b5528
|
合并代码
|
2020-06-16 18:38:21 +08:00 |
|
fan
|
3b171130f9
|
福州列车显示调整&表单组件button增加loading
|
2020-06-16 18:36:18 +08:00 |
|
sunzhenyu
|
e7a9b8f737
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 18:18:56 +08:00 |
|
sunzhenyu
|
e415dc28c0
|
修改三维驾驶mmi车门显示和控制面板关门灯
|
2020-06-16 18:18:47 +08:00 |
|
zyy
|
73338a7eaa
|
增加宁波线路车站折返逻辑
|
2020-06-16 17:49:55 +08:00 |
|
zyy
|
6d7c75e5f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 16:39:20 +08:00 |
|
zyy
|
7f242ba443
|
调整综合监控绘图元素， 调整按图折返配置
|
2020-06-16 16:39:07 +08:00 |
|
fan
|
d0e862823a
|
控制模式转换调整
|
2020-06-16 15:33:38 +08:00 |
|
fan
|
5462b24c6a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 15:10:47 +08:00 |
|
fan
|
a6ff101a6e
|
竞业达页面调整
|
2020-06-16 15:10:39 +08:00 |
|
zyy
|
53823aea04
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 15:02:00 +08:00 |
|
zyy
|
f62de1971f
|
增加宁波线路 站后折返皮肤配置
|
2020-06-16 15:01:29 +08:00 |
|
fan
|
5ecb65a577
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:53:08 +08:00 |
|
fan
|
db98a53907
|
福州道岔&列车操作
|
2020-06-16 14:52:57 +08:00 |
|
zyy
|
10502988a4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 14:45:50 +08:00 |
|
zyy
|
dfdbddad2b
|
调整综合监控数据，调整地图绘制功能按钮显示状态逻辑判断
|
2020-06-16 14:45:34 +08:00 |
|
fan
|
2e5b07d7e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 13:56:47 +08:00 |
|
fan
|
5292afe4dd
|
宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整（未完）
|
2020-06-16 13:56:33 +08:00 |
|
sunzhenyu
|
3d95103199
|
修改三维西安隧道模型
|
2020-06-16 13:36:38 +08:00 |
|
sunzhenyu
|
33343f6447
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-16 13:17:30 +08:00 |
|
sunzhenyu
|
a2c2a963a4
|
增加三维驾驶关车门亮灯，修改三维道岔转辙机动画速度，修改三维仿真驾驶中车站模型增加图片资源
|
2020-06-16 13:17:11 +08:00 |
|
fan
|
35b6d9093a
|
地图绘制信号机添加属性noOverlap是否无延续保护
|
2020-06-16 09:50:39 +08:00 |
|
fan
|
ae0a6d6dcd
|
福州一号线：站台详情
|
2020-06-16 09:32:19 +08:00 |
|
fan
|
2f81b142f3
|
宁波一号线设置头码车放开服务号输入框
|
2020-06-16 09:03:06 +08:00 |
|
fan
|
271ef9dc11
|
添加通用配置项noParkingSM，parkingSM
|
2020-06-15 18:37:48 +08:00 |
|
fan
|
38a5aeec67
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 18:00:39 +08:00 |
|
fan
|
f60e69f8ff
|
福州车站站台操作&西安车站站台操作调整
|
2020-06-15 18:00:24 +08:00 |
|
zyy
|
28cc15fd10
|
调整综合监控数据，调整系统右键菜单样式
|
2020-06-15 17:16:26 +08:00 |
|
zyy
|
0f33f9d876
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 16:13:51 +08:00 |
|
zyy
|
428967e843
|
调整地图绘制右键菜单样式，调整道岔触发居中，绘制综合监控数据
|
2020-06-15 16:13:28 +08:00 |
|
fan
|
c4ce6ae0f9
|
线路管理添加配置项-ctcOverlapOnlyTurnBackStationLock
|
2020-06-15 14:33:38 +08:00 |
|
fan
|
3c9dd88e31
|
福州线路信号机调整
|
2020-06-15 14:26:31 +08:00 |
|
fan
|
a381bfdcd8
|
退出计划调整为初始化，并不限制点击
|
2020-06-15 13:34:24 +08:00 |
|
fan
|
3f978a2aa8
|
竞业达页面调整
|
2020-06-15 13:03:24 +08:00 |
|
fan
|
2f51f2362b
|
调整西安列车车头三角宽度
|
2020-06-15 10:41:27 +08:00 |
|
fan
|
42d9e058a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-15 10:05:38 +08:00 |
|
fan
|
a732b9c19b
|
添加竞业达登录页面
|
2020-06-15 10:05:27 +08:00 |
|
zyy
|
1132043e13
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:31:11 +08:00 |
|
zyy
|
5622cc5216
|
调整公共地图右键菜单样式
|
2020-06-12 18:30:50 +08:00 |
|
joylink_cuiweidong
|
d237d45117
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:29:33 +08:00 |
|
joylink_cuiweidong
|
3248f3badf
|
剧本代码调整
|
2020-06-12 18:29:14 +08:00 |
|
fan
|
e4008afff1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 18:28:48 +08:00 |
|
fan
|
98bdbc43ab
|
福州信号机操作调整
|
2020-06-12 18:28:32 +08:00 |
|
joylink_cuiweidong
|
3944f743c6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:44:43 +08:00 |
|
joylink_cuiweidong
|
de8bbcf2bb
|
剧本代码调整
|
2020-06-12 17:44:18 +08:00 |
|
zyy
|
a166d492f1
|
调整字段名称，删除注释
|
2020-06-12 17:16:08 +08:00 |
|
zyy
|
66260cf3ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 17:12:28 +08:00 |
|
zyy
|
5a01bbfbcf
|
调整综合监控加载数据流程
|
2020-06-12 17:12:13 +08:00 |
|
joylink_cuiweidong
|
609bdaa5f2
|
剧本代码调整
|
2020-06-12 16:37:09 +08:00 |
|
fan
|
b058651e2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:34:20 +08:00 |
|
fan
|
be0208c943
|
福州操作暂存
|
2020-06-12 16:34:11 +08:00 |
|
joylink_cuiweidong
|
29b0937253
|
剧本代码调整
|
2020-06-12 16:28:52 +08:00 |
|
fan
|
2e82a362af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:15:30 +08:00 |
|
fan
|
8fc521a780
|
操作调整
|
2020-06-12 16:15:20 +08:00 |
|
joylink_cuiweidong
|
a7ca270be0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:12:47 +08:00 |
|
joylink_cuiweidong
|
6d5ba33e1f
|
剧本代码调整
|
2020-06-12 16:12:33 +08:00 |
|
sunzhenyu
|
0f92d67596
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 16:05:05 +08:00 |
|
sunzhenyu
|
7c7b0a1f2f
|
修改三维设备读取站台贴图为空bug
|
2020-06-12 16:04:50 +08:00 |
|
zyy
|
5650ecc410
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 15:35:08 +08:00 |
|
zyy
|
64a7e0e1ab
|
调整综合监控元素点击事件， 调整右键菜单样式
|
2020-06-12 15:34:53 +08:00 |
|
fan
|
71a99f225c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 14:34:29 +08:00 |
|
fan
|
2e44c69429
|
老版本福州列车目的地码调整
|
2020-06-12 14:34:18 +08:00 |
|
zyy
|
207cd06cd9
|
删除佛山线路配置
|
2020-06-12 13:42:33 +08:00 |
|
zyy
|
656cbb3b7b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:19:39 +08:00 |
|
zyy
|
e01277ba64
|
调整车站 控制模式配置
|
2020-06-12 13:19:26 +08:00 |
|
fan
|
e5bb63e3e1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:16:31 +08:00 |
|
joylink_cuiweidong
|
22756f15ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 13:16:23 +08:00 |
|
fan
|
2c8c8117b2
|
老版本福州列车目的地码调整
|
2020-06-12 13:16:21 +08:00 |
|
joylink_cuiweidong
|
0ead3ea016
|
列车的提示框停稳状态调整
|
2020-06-12 13:16:03 +08:00 |
|
joylink_cuiweidong
|
c4b325c63d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 11:31:50 +08:00 |
|
joylink_cuiweidong
|
d942ae7916
|
剧本代码调整
|
2020-06-12 11:31:30 +08:00 |
|
fan
|
9466f7f399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 10:51:16 +08:00 |
|
fan
|
429fe6d6a7
|
跳停上下行取值调整&列车识别号显示调整
|
2020-06-12 10:51:06 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
fan
|
9294c582f8
|
domId调整
|
2020-06-12 09:41:16 +08:00 |
|
fan
|
c8b2f4cfa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:36:25 +08:00 |
|
fan
|
9de92f7106
|
宁波一号线列车设置计划车、人工车、头码车
|
2020-06-11 18:36:15 +08:00 |
|
joylink_cuiweidong
|
9126397070
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:33:49 +08:00 |
|
joylink_cuiweidong
|
b341735a8c
|
剧本代码调整
|
2020-06-11 18:32:26 +08:00 |
|
zyy
|
6402e6312b
|
调整逻辑区段 名称偏移量
|
2020-06-11 17:53:35 +08:00 |
|
zyy
|
547c7efe5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:39:46 +08:00 |
|
zyy
|
9c0d69e81e
|
删除逻辑对应车次窗
|
2020-06-11 17:39:33 +08:00 |
|
fan
|
979f116f3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:28:25 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
zyy
|
e9713fc471
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:07:14 +08:00 |
|
fan
|
0f1ae1e8a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:06:49 +08:00 |
|
fan
|
fb570eb522
|
sics调整
|
2020-06-11 17:06:37 +08:00 |
|
zyy
|
3e9835ff15
|
调整字段显示
|
2020-06-11 17:06:29 +08:00 |
|
zyy
|
ffd5fc79bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 14:48:54 +08:00 |
|
zyy
|
24acb1ba86
|
调整配置，增加综合监控数据
|
2020-06-11 14:48:40 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
285749f3eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 13:29:31 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
fan
|
d16cd89fe4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:26:48 +08:00 |
|
fan
|
7d7583a7e2
|
时间表管理&添加通用配置项
|
2020-06-11 11:26:41 +08:00 |
|
zyy
|
bee7b64e8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:12:02 +08:00 |
|
zyy
|
0a58b253e1
|
调整绘图元素皮肤，调整大屏高度
|
2020-06-11 11:11:47 +08:00 |
|
sunzhenyu
|
4cdda87372
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 10:48:15 +08:00 |
|
sunzhenyu
|
52437f157f
|
修改三维驾驶换端车门动画变化bug
|
2020-06-11 10:48:04 +08:00 |
|
joylink_cuiweidong
|
3e6da59b3b
|
代码调整
|
2020-06-11 09:44:56 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
8f2e7f974e
|
代码调整
|
2020-06-10 18:38:50 +08:00 |
|
joylink_cuiweidong
|
7a7b442a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:03:10 +08:00 |
|
joylink_cuiweidong
|
95715a9f12
|
代码调整
|
2020-06-10 18:02:46 +08:00 |
|
zyy
|
7f5d99b48f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:00:11 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
fan
|
3352b94149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 17:58:35 +08:00 |
|
fan
|
1d2619cd28
|
menu-bar显示条件调整
|
2020-06-10 17:58:20 +08:00 |
|
zyy
|
ce87a96db3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-06-10 17:04:12 +08:00 |
|
zyy
|
75e9db45fa
|
调整右键菜单
|
2020-06-10 17:02:39 +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 |
|
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
|
763e0841c0
|
注释
|
2020-06-10 16:30:48 +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 |
|
zyy
|
e4ec3dfbde
|
调整佛山线路 站台操作
|
2020-06-10 11:18:50 +08:00 |
|
zyy
|
c8bf7c80ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:41:08 +08:00 |
|
zyy
|
62ede6fec7
|
增加佛山线路现地操作，调整状态字段
|
2020-06-09 18:40:48 +08:00 |
|
fan
|
5c65653ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:33:26 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
joylink_cuiweidong
|
174c15bafc
|
佛山线路添加 设置临时限速
|
2020-06-09 18:30:00 +08:00 |
|
joylink_cuiweidong
|
56eae6302a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:54:28 +08:00 |
|
joylink_cuiweidong
|
cc3fe9353f
|
佛山有轨电车 宁波一号线 全线扣车代码调整
|
2020-06-09 17:53:54 +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 |
|
sunzhenyu
|
1657859e08
|
修改三维cctv清客触发逻辑
|
2020-06-09 16:03:18 +08:00 |
|
sunzhenyu
|
40cfdca979
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 15:55:08 +08:00 |
|
sunzhenyu
|
e83553c39a
|
替换优化后三维cctv模型，修改切换站台未清空当前列车编号bug
|
2020-06-09 15:54:57 +08:00 |
|
joylink_cuiweidong
|
3628ad2d6e
|
排列进路代码调整
|
2020-06-09 15:11:21 +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
|
3c3a355fb6
|
道岔单解操作代码调整
|
2020-06-09 14:29:36 +08:00 |
|
joylink_cuiweidong
|
f3d37dd240
|
代码调整
|
2020-06-09 14:16:06 +08:00 |
|
joylink_cuiweidong
|
5bc3bfc8dd
|
操作指令代码调整
|
2020-06-09 14:09:15 +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 |
|
joylink_cuiweidong
|
dd758a1bfb
|
操作指令代码调整
|
2020-06-09 13:16:47 +08:00 |
|
joylink_cuiweidong
|
ff86c8d07f
|
指令字典调整
|
2020-06-09 11:33:42 +08:00 |
|
joylink_cuiweidong
|
be24daabd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:42:44 +08:00 |
|
joylink_cuiweidong
|
bbb9df842c
|
代码调整
|
2020-06-08 18:42:20 +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
|
9a36ce50eb
|
增加三维cctv多画面，修改cctv初始视角
|
2020-06-08 18:23:24 +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 |
|
joylink_cuiweidong
|
63c3d785dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 10:46:23 +08:00 |
|
joylink_cuiweidong
|
eecc022ae5
|
佛山线路 菜单栏 增加显示功能
列车提示代码调整
|
2020-06-08 10:46:01 +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
|
4aec9679aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:54:12 +08:00 |
|
zyy
|
dd16694b52
|
调整格式
|
2020-06-05 14:53:45 +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 |
|
zyy
|
23119acc74
|
调整综合监控绘图元素
|
2020-06-05 14:51:54 +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
|
377473ea4c
|
新版剧本增加角色调整
|
2020-06-05 14:22:46 +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 |
|
fan
|
b47d5a0f57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:50:16 +08:00 |
|
fan
|
ec6ebe78e5
|
列车显示调整
|
2020-06-05 10:50:05 +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 |
|
fan
|
554cef84f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 16:44:12 +08:00 |
|
fan
|
90d80897c6
|
佛山控制模式转换调整
|
2020-06-04 16:44:04 +08:00 |
|
joylink_cuiweidong
|
8ea4e49e0a
|
代码调整
|
2020-06-04 16:38:28 +08:00 |
|
fan
|
a0822cf68e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-04 16:19:50 +08:00 |
|
fan
|
87c2cc1ae9
|
佛山控制模式转换
|
2020-06-04 16:19:37 +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
|
cc696b6d14
|
道岔故障报警灯闪烁
|
2020-06-04 11:32:49 +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 |
|
fan
|
dbfb442ecf
|
控制权转换问题调整
|
2020-06-03 17:03:10 +08:00 |
|
fan
|
b1a00b3378
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:46:52 +08:00 |
|
fan
|
a46db80649
|
调整逻辑数据未初始化
|
2020-06-03 16:46:37 +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
|
8fff683ace
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 16:18:55 +08:00 |
|
fan
|
046a09f8b5
|
调整实操竞赛&星期显示
|
2020-06-03 16:18:40 +08:00 |
|
zyy
|
b40011c975
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 15:44:53 +08:00 |
|
zyy
|
949b49183f
|
调整西安线路信号机操作
|
2020-06-03 15:44:37 +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 |
|
fan
|
750af027b3
|
西安一三调整控制模式转换（综合演练不适用）
|
2020-06-03 10:01:34 +08:00 |
|
fan
|
186fe3e35a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-03 09:13:45 +08:00 |
|
fan
|
f31cba56f3
|
哈尔滨虚拟信号机关闭调整
|
2020-06-03 09:13:20 +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 |
|
fan
|
a71c755da2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:01:01 +08:00 |
|
fan
|
d573d0ff58
|
三号线操作调整
|
2020-06-02 17:00:55 +08:00 |
|
sunzhenyu
|
0b94aad2a9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 17:00:44 +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
|
aa8ebeee22
|
调整道岔操作
|
2020-06-02 16:30:05 +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 |
|
fan
|
929b3c4066
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-02 09:37:20 +08:00 |
|
fan
|
c64706f247
|
iscs调整
|
2020-06-02 09:37:09 +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
|
3bf766cbe1
|
test
|
2020-06-01 12:45:22 +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
|
14e8dfe547
|
调整道岔组件
|
2020-06-01 10:27:34 +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 |
|
fan
|
303632ad20
|
西安一三号线道岔失表表示灯状态
|
2020-05-29 17:32:20 +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 |
|
fan
|
e5467af549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-29 09:20:10 +08:00 |
|
fan
|
97f2b84741
|
调整小交路颜色
|
2020-05-29 09:19:59 +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
|
a76261e018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 15:02:30 +08:00 |
|
zyy
|
55f57e2135
|
调整保存字段
|
2020-05-28 15:02:15 +08:00 |
|
joylink_cuiweidong
|
652e9aa5d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 14:51:24 +08:00 |
|
joylink_cuiweidong
|
eda29adf11
|
竞赛代码调整
|
2020-05-28 14:50:57 +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 |
|
sunzhenyu
|
1fa3e7f6d8
|
修改三维仿真通信中初始化信息修改后调用
|
2020-05-28 13:33:39 +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
|
e846a7d272
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:54:58 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
zyy
|
3f451e817c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:26:21 +08:00 |
|
zyy
|
d5519590f2
|
调整组件字段显示
|
2020-05-28 09:26:05 +08:00 |
|
fan
|
fe1fcdbcf3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-28 09:07:41 +08:00 |
|
fan
|
ce05df581a
|
列车显示调整（列车类型>大小交路回库）
|
2020-05-28 09:07:29 +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 |
|
zyy
|
2bd6986ce4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 19:02:47 +08:00 |
|
joylink_cuiweidong
|
4afcef1ce2
|
综合演练 聊天 创建群聊代码调整
|
2020-05-27 19:02:39 +08:00 |
|
zyy
|
4fe1330990
|
调整试卷加载
|
2020-05-27 19:02:34 +08:00 |
|
fan
|
50f8956728
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 18:35:17 +08:00 |
|
fan
|
56bbb9441c
|
调整信号机ats人工控显示
|
2020-05-27 18:35:05 +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
|
b7bb33bd1a
|
修改列车识别号调整
|
2020-05-27 15:07:14 +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 |
|
zyy
|
b4c6c2a5dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-27 11:15:31 +08:00 |
|
zyy
|
a585fecf3b
|
调整focus 自定义指令
|
2020-05-27 11:15:17 +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 |
|
fan
|
cb9f67eb7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 16:17:34 +08:00 |
|
fan
|
7587475f38
|
调整列车操作&调整列车在人工车和头码车下的详情显示
|
2020-05-26 16:17:16 +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 |
|
fan
|
ff5f0d61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-26 09:21:59 +08:00 |
|
fan
|
f27c766b9b
|
列车调整
|
2020-05-26 09:21:48 +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
|
8aefb3ff6c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:56:19 +08:00 |
|
joylink_cuiweidong
|
663f25cddc
|
竞赛代码调整
|
2020-05-25 16:56:00 +08:00 |
|
fan
|
d30a6fe111
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 16:53:10 +08:00 |
|
fan
|
3ec64f3794
|
列车菜单调整
|
2020-05-25 16:52:54 +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
|
bf1b2801bc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 13:41:42 +08:00 |
|
joylink_cuiweidong
|
3b0d842b97
|
竞赛代码调整
|
2020-05-25 13:40:25 +08:00 |
|
fan
|
30e92a0f35
|
西安一三号线更新运行图预览不显示方向code
|
2020-05-25 11:26:42 +08:00 |
|
fan
|
e4dec85a72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-25 11:00:24 +08:00 |
|
fan
|
c74eaaaab6
|
人工车头码车显示调整
|
2020-05-25 11:00:10 +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
|
8becf204b8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 20:32:28 +08:00 |
|
fan
|
d54db9bfe2
|
西安三号线调整
|
2020-05-22 20:32:19 +08:00 |
|
joylink_cuiweidong
|
c00e502320
|
代码调整
|
2020-05-22 20:01:30 +08:00 |
|
joylink_cuiweidong
|
38daa07275
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-22 19:40:13 +08:00 |
|
joylink_cuiweidong
|
81fe0a32d7
|
代码调整
|
2020-05-22 19:39:54 +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 |
|
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 |
|