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 |
|
zyy
|
dc783bd2a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:55:14 +08:00 |
|
zyy
|
7992a2e11e
|
调整格式
|
2020-05-15 16:55:00 +08:00 |
|
joylink_cuiweidong
|
f775f76aa8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:54:59 +08:00 |
|
joylink_cuiweidong
|
901ab1a8bd
|
剧本添加提示
|
2020-05-15 16:54:31 +08:00 |
|
fan
|
6aeb2d1b8d
|
删除localStore 操作
|
2020-05-15 16:33:14 +08:00 |
|
fan
|
a13567faaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:26:37 +08:00 |
|
fan
|
9db76cbf52
|
添加贵州装备教师课程删除功能
|
2020-05-15 16:26:21 +08:00 |
|
zyy
|
bc00f1660a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 16:01:28 +08:00 |
|
zyy
|
6391e8e881
|
调整竞赛系统路径，页面路由配置
|
2020-05-15 16:01:16 +08:00 |
|
fan
|
e4b14d96e5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 15:58:19 +08:00 |
|
fan
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
zyy
|
399111c682
|
调整列表字段显示
|
2020-05-15 14:59:53 +08:00 |
|
zyy
|
322ca86dec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 14:50:19 +08:00 |
|
zyy
|
ae5916b90a
|
调整竞赛系统路由配置
|
2020-05-15 14:50:05 +08:00 |
|
fan
|
4bf80d3e5b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:43:23 +08:00 |
|
fan
|
4e379324ea
|
调整贵州成绩计算小数
|
2020-05-15 13:43:02 +08:00 |
|
joylink_cuiweidong
|
f25a73c4e7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-15 13:17:33 +08:00 |
|
joylink_cuiweidong
|
d3df0afc94
|
剧本代码调整
|
2020-05-15 13:16:55 +08:00 |
|
fan
|
912816d324
|
学生管理日期限制调整
|
2020-05-15 11:29:24 +08:00 |
|
joylink_cuiweidong
|
fab4e149c8
|
代码调整
|
2020-05-14 19:42:49 +08:00 |
|
joylink_cuiweidong
|
bd730d5946
|
代码调整
|
2020-05-14 19:42:08 +08:00 |
|
joylink_cuiweidong
|
8f0129a742
|
代码调整
|
2020-05-14 19:34:22 +08:00 |
|
joylink_cuiweidong
|
8ff8356d28
|
代码调整
|
2020-05-14 19:33:48 +08:00 |
|
joylink_cuiweidong
|
ddbf334419
|
剧本代码调整
|
2020-05-14 19:13:44 +08:00 |
|
fan
|
396dd0d899
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 18:55:12 +08:00 |
|
fan
|
71682d00a5
|
区段计轴调整
|
2020-05-14 18:54:53 +08:00 |
|
zyy
|
43e6b4bca1
|
保存道岔状态
|
2020-05-14 18:49:47 +08:00 |
|
joylink_cuiweidong
|
3968331bbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:25:25 +08:00 |
|
joylink_cuiweidong
|
c226d75d6b
|
剧本代码调整
|
2020-05-14 17:24:47 +08:00 |
|
fan
|
027fe43467
|
删除日志，信号机调整
|
2020-05-14 17:24:35 +08:00 |
|
fan
|
5ef9b0aaaf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:03:45 +08:00 |
|
fan
|
4f8de9cc6a
|
信号机批量操作调整
|
2020-05-14 17:03:30 +08:00 |
|
zyy
|
81c8ad5210
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:59 +08:00 |
|
zyy
|
ccf186e98e
|
调整区段停车点偏移量
|
2020-05-14 16:54:31 +08:00 |
|
fan
|
996b71da05
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:54:09 +08:00 |
|
fan
|
126278ee01
|
状态表示道岔故障调整
|
2020-05-14 16:53:58 +08:00 |
|
fan
|
abec4b2b4c
|
西安二号线添加是否灭灯显示(CTC级)
|
2020-05-14 16:45:48 +08:00 |
|
zyy
|
0533ddfcfe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:39 +08:00 |
|
zyy
|
42402f6223
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 16:44:11 +08:00 |
|
zyy
|
b735cd5b06
|
调整区段回车问题
|
2020-05-14 16:43:55 +08:00 |
|
joylink_cuiweidong
|
4fec468885
|
剧本预览代码调整
|
2020-05-14 15:48:25 +08:00 |
|
joylink_cuiweidong
|
812a7534b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:19:59 +08:00 |
|
joylink_cuiweidong
|
bbeb6d44aa
|
剧本预览代码调整
|
2020-05-14 15:19:07 +08:00 |
|
zyy
|
7833afa1fd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:05:32 +08:00 |
|
zyy
|
04aacc3818
|
调整物理区段创建逻辑区段逻辑
|
2020-05-14 15:05:19 +08:00 |
|
fan
|
7242d7ba76
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 14:39:55 +08:00 |
|
fan
|
48b931897c
|
调整考试列表实训类型
|
2020-05-14 14:39:38 +08:00 |
|
joylink_cuiweidong
|
0684d2a93c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 14:37:17 +08:00 |
|
joylink_cuiweidong
|
70f06409df
|
综合演练 语音聊天接口调整
剧本预览 代码调整
|
2020-05-14 14:36:15 +08:00 |
|
fan
|
8ebe4df256
|
学生管理问题调整
|
2020-05-14 13:41:25 +08:00 |
|
fan
|
01456de62a
|
学生管理问题调整
|
2020-05-14 11:27:01 +08:00 |
|
fan
|
f95d5e46d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:03:33 +08:00 |
|
fan
|
8335ee1259
|
调整列车详情显示和路由课程创建角色处理
|
2020-05-14 11:03:24 +08:00 |
|
zyy
|
ba1365b951
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 11:00:27 +08:00 |
|
zyy
|
2de0a0fc5b
|
调整区段鼠标移入元素绘制
|
2020-05-14 11:00:09 +08:00 |
|
joylink_cuiweidong
|
8a284215c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 19:31:38 +08:00 |
|
joylink_cuiweidong
|
36ca6dc3d1
|
综合演练 聊天代码调整
|
2020-05-13 19:31:14 +08:00 |
|
fan
|
39edb68018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:22:05 +08:00 |
|
fan
|
e35709ac2c
|
学生管理调整
|
2020-05-13 18:21:55 +08:00 |
|
joylink_cuiweidong
|
4631590df0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:06:15 +08:00 |
|
joylink_cuiweidong
|
2b8757a074
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 18:05:48 +08:00 |
|
zyy
|
d82f381eb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:06 +08:00 |
|
fan
|
9aca6deb77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:03 +08:00 |
|
zyy
|
e238dbbd19
|
删除大屏提示
|
2020-05-13 18:00:37 +08:00 |
|
fan
|
847efa84ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:00:33 +08:00 |
|
fan
|
c30b221dc3
|
学生管理调整
|
2020-05-13 17:59:08 +08:00 |
|
zyy
|
e271702129
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:58:52 +08:00 |
|
zyy
|
85c1a89d01
|
调整大屏系统宽度
|
2020-05-13 17:58:39 +08:00 |
|
sunzhenyu
|
7288644258
|
Merget pu branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:39:33 +08:00 |
|
sunzhenyu
|
19dc753a7f
|
修改三维设备旧数据窗口关闭bug
|
2020-05-13 17:39:16 +08:00 |
|
zyy
|
98a4a7b622
|
调整大屏系统推出流程
|
2020-05-13 17:34:38 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
0f34b4293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 15:31:27 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
sunzhenyu
|
1142ad1f3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 14:34:22 +08:00 |
|
sunzhenyu
|
92eed74c94
|
修改老数据地图三维设备显示交互功能
|
2020-05-13 14:34:17 +08:00 |
|
joylink_cuiweidong
|
1cae47b8d7
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 13:14:58 +08:00 |
|
joylink_cuiweidong
|
3e2a6b511b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:22:44 +08:00 |
|
joylink_cuiweidong
|
6866b58b19
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 10:21:53 +08:00 |
|
zyy
|
0a09f6a79b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:07:34 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
fan
|
4d18c4ac2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:08:11 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
joylink_cuiweidong
|
6fe3fe6ecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:03:19 +08:00 |
|
joylink_cuiweidong
|
13a3ccf066
|
代码调整
|
2020-05-12 19:02:53 +08:00 |
|
sunzhenyu
|
364c0afcef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:34:18 +08:00 |
|
sunzhenyu
|
1d3c00502a
|
三维设备展示页面转辙机界面样式逻辑修改
|
2020-05-12 18:34:09 +08:00 |
|
zyy
|
86ecb843eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:24:09 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
joylink_cuiweidong
|
376662d96e
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 17:49:00 +08:00 |
|
joylink_cuiweidong
|
808236a6fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:47:08 +08:00 |
|
joylink_cuiweidong
|
6fe5363706
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 16:46:41 +08:00 |
|
zyy
|
dd6030d346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:45:59 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
fan
|
b3dfe242e2
|
iscs
|
2020-05-12 14:17:47 +08:00 |
|
fan
|
d11f64b7bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 13:57:48 +08:00 |
|
fan
|
a707d142be
|
逻辑区段生成调整
|
2020-05-12 13:57:33 +08:00 |
|
joylink_cuiweidong
|
c997e5d244
|
代码调整
|
2020-05-12 13:39:52 +08:00 |
|
joylink_cuiweidong
|
27a54d5842
|
代码调整
|
2020-05-12 10:51:17 +08:00 |
|
joylink_cuiweidong
|
fb17b72e5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 10:14:20 +08:00 |
|
joylink_cuiweidong
|
d0ed6ed859
|
iscs 代码调整
实训平台 缓存跳转代码调整
|
2020-05-12 10:13:27 +08:00 |
|
fan
|
d03b3c1978
|
存在仿真管理
|
2020-05-12 09:04:17 +08:00 |
|
fan
|
795503d227
|
大屏调整
|
2020-05-11 18:15:49 +08:00 |
|
fan
|
9a0465879c
|
合并代码
|
2020-05-11 17:43:33 +08:00 |
|
fan
|
68fdc7f2ec
|
问题调整
|
2020-05-11 17:40:52 +08:00 |
|
zyy
|
18fbae9114
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 17:36:39 +08:00 |
|
zyy
|
68e63ee5ef
|
调整地图绘制报错
|
2020-05-11 17:36:21 +08:00 |
|
fan
|
a04f353473
|
大屏缩放按钮影藏
|
2020-05-11 17:01:56 +08:00 |
|
fan
|
e8e63f2976
|
逻辑区段始终点偏移
|
2020-05-11 16:54:53 +08:00 |
|
joylink_cuiweidong
|
841afe35a1
|
剧本代码调整
|
2020-05-11 16:27:58 +08:00 |
|
fan
|
9991c50bb4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 15:51:49 +08:00 |
|
fan
|
a90adb9575
|
联锁关系生成过渡和结果展示调整
|
2020-05-11 15:51:33 +08:00 |
|
fan
|
6d38dd5ba3
|
增加联锁关系生成过渡和结果展示
|
2020-05-11 15:47:56 +08:00 |
|
joylink_cuiweidong
|
e83551b18d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 15:44:25 +08:00 |
|
joylink_cuiweidong
|
078252b6ac
|
剧本代码调整
|
2020-05-11 15:43:36 +08:00 |
|
fan
|
ac1d5bfdff
|
配置turefalse改为中文
|
2020-05-11 14:52:54 +08:00 |
|
fan
|
b56cbb47d0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 14:45:37 +08:00 |
|
fan
|
56ed2a4f8c
|
调整更新坐标&联锁配置项
|
2020-05-11 14:45:07 +08:00 |
|
joylink_cuiweidong
|
7b00dac9be
|
剧本代码调整
|
2020-05-11 14:38:23 +08:00 |
|
joylink_cuiweidong
|
46f40bd381
|
剧本代码调整
|
2020-05-11 14:32:40 +08:00 |
|
joylink_cuiweidong
|
7ef7aa7768
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 13:59:15 +08:00 |
|
joylink_cuiweidong
|
2bc45b075e
|
剧本代码调整
|
2020-05-11 13:58:53 +08:00 |
|
fan
|
2a220b6fb9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 13:25:19 +08:00 |
|
fan
|
115f1da928
|
批量生成区段逻辑始终端偏移量
|
2020-05-11 13:25:09 +08:00 |
|
joylink_cuiweidong
|
c8f858214c
|
剧本代码调整
|
2020-05-11 11:31:55 +08:00 |
|
joylink_cuiweidong
|
e5dca0b15b
|
新版剧本 代码调整
|
2020-05-11 10:44:00 +08:00 |
|
sunzhenyu
|
c8544909f7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-11 10:14:04 +08:00 |
|
sunzhenyu
|
275e4bab27
|
修改三维设备页面道岔转辙机
|
2020-05-11 10:13:54 +08:00 |
|
joylink_fanyuhong
|
6b9dc0433b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-10 21:52:24 +08:00 |
|
joylink_fanyuhong
|
390af69821
|
接口注释
|
2020-05-10 21:52:13 +08:00 |
|
joylink_zyy
|
4d16abe984
|
注释综合监控请求
|
2020-05-10 21:51:44 +08:00 |
|
joylink_zyy
|
c65edfc06d
|
调整区段绘图逻辑
|
2020-05-10 20:43:37 +08:00 |
|
joylink_zyy
|
fa70eb85ca
|
注释iscs事件
|
2020-05-10 15:58:08 +08:00 |
|
fan
|
ecf816d32a
|
地图数据维护中提示调整
|
2020-05-09 20:27:41 +08:00 |
|
fan
|
f57bf47c7c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:25:18 +08:00 |
|
fan
|
1601b655d1
|
地图数据维护中提示调整
|
2020-05-09 20:24:59 +08:00 |
|
joylink_cuiweidong
|
5b0d16c920
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:21:43 +08:00 |
|
joylink_cuiweidong
|
b5a3a195f7
|
代码调整
|
2020-05-09 20:21:20 +08:00 |
|
zyy
|
3212b4362b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 20:13:53 +08:00 |
|
zyy
|
fe5f6cecc9
|
调整大屏系统界面加载宽度
|
2020-05-09 20:13:32 +08:00 |
|
fan
|
c5f63c9e52
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:35:56 +08:00 |
|
fan
|
fc68903ff5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 19:24:22 +08:00 |
|
fan
|
29881aab0b
|
添加地图数据维护中提示&存在仿真管理添加类型
|
2020-05-09 19:24:12 +08:00 |
|
zyy
|
1d2e835b85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 18:48:30 +08:00 |
|
zyy
|
d90996da48
|
调整大屏系统行数放到配置
|
2020-05-09 18:48:08 +08:00 |
|
joylink_cuiweidong
|
81450fbc9e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 18:24:37 +08:00 |
|
fan
|
f16936d9c3
|
信号机接近区段
|
2020-05-09 18:24:35 +08:00 |
|
joylink_cuiweidong
|
13ae9eba9c
|
代码调整
|
2020-05-09 18:24:21 +08:00 |
|
joylink_cuiweidong
|
9796280970
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:49:40 +08:00 |
|
joylink_cuiweidong
|
de024b9a45
|
代码调整
|
2020-05-09 17:49:25 +08:00 |
|
fan
|
d761c287af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:32:29 +08:00 |
|
fan
|
e50edafb0c
|
校验调整
|
2020-05-09 17:32:13 +08:00 |
|
zyy
|
17547d31ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-09 17:27:42 +08:00 |
|
zyy
|
8e81a00847
|
调整区段绘图方式
|
2020-05-09 17:27:28 +08:00 |
|
joylink_cuiweidong
|
597f5cb990
|
代码调整
|
2020-05-09 16:39:33 +08:00 |
|