fan
|
f6997d3bd9
|
合并代码
|
2020-06-03 14:30:14 +08:00 |
|
fan
|
8bf9f77e0b
|
西安三号线控制权调整&iscs调整
|
2020-06-03 14:27:54 +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
|
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
|
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 |
|
zyy
|
aa8ebeee22
|
调整道岔操作
|
2020-06-02 16:30:05 +08:00 |
|
zyy
|
de49bba2ad
|
调整信号机流程 综合监控操作
|
2020-06-02 16:17:00 +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 |
|
fan
|
fb40db0ad8
|
裁判搜索条件调整
|
2020-05-29 18:24:51 +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
|
303632ad20
|
西安一三号线道岔失表表示灯状态
|
2020-05-29 17:32:20 +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
|
95e4f4c938
|
西安一三号线道岔失表调整&iscs调整
|
2020-05-29 16:57:21 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
fan
|
d301e9d9f4
|
整理公共菜单
|
2020-05-28 11:27:53 +08:00 |
|
fan
|
bf1bbbe948
|
调整取消进路指令&调整导出试卷参数&公共菜单
|
2020-05-28 09:54:47 +08:00 |
|
fan
|
ce05df581a
|
列车显示调整（列车类型>大小交路回库）
|
2020-05-28 09:07:29 +08:00 |
|
fan
|
56bbb9441c
|
调整信号机ats人工控显示
|
2020-05-27 18:35:05 +08:00 |
|
fan
|
18735986e6
|
修改列车识别号禁用人工车类型&生成试卷
|
2020-05-27 17:30:39 +08:00 |
|
fan
|
b7bb33bd1a
|
修改列车识别号调整
|
2020-05-27 15:07:14 +08:00 |
|
fan
|
bb009011c3
|
修改列车识别号调整
|
2020-05-27 14:57:25 +08:00 |
|
fan
|
23c49b965d
|
生成试卷调整
|
2020-05-27 13:51:27 +08:00 |
|
zyy
|
b7d4eb7bda
|
调整区段绘图元素层级，调整字段显示
|
2020-05-27 10:36:40 +08:00 |
|
fan
|
7587475f38
|
调整列车操作&调整列车在人工车和头码车下的详情显示
|
2020-05-26 16:17:16 +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 |
|
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
|
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 |
|
zyy
|
f06419e963
|
调整裁判平台进入仿真操作
|
2020-05-25 16:38:03 +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 |
|
fan
|
8621198acf
|
调整信号机菜单显示&修改列车识别号调整
|
2020-05-25 14:06:16 +08:00 |
|
fan
|
30e92a0f35
|
西安一三号线更新运行图预览不显示方向code
|
2020-05-25 11:26:42 +08:00 |
|
fan
|
c74eaaaab6
|
人工车头码车显示调整
|
2020-05-25 11:00:10 +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
|
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
|
39d055ec09
|
调整车站连锁关系 右键空白处显示连锁关系
|
2020-05-22 18:28:03 +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 |
|
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 |
|
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
|
d7c5a1303d
|
新建列车调整
|
2020-05-22 11:09:00 +08:00 |
|
fan
|
1c9301a3d5
|
调整列车指令
|
2020-05-21 18:27:26 +08:00 |
|
fan
|
98f60b6d94
|
调整虚拟信号机侧向开放显示
|
2020-05-21 17:15:17 +08:00 |
|
fan
|
4d9edad82b
|
调整加入创建列车菜单问题
|
2020-05-21 17:03:30 +08:00 |
|
fan
|
a861e4908f
|
哈尔滨虚拟信号机调整
|
2020-05-21 16:53:39 +08:00 |
|
fan
|
e4bdd9c829
|
调整西安一ats人工控显示调整
|
2020-05-21 16:34:05 +08:00 |
|
fan
|
503c51af10
|
西安一三宁波一福州一佛山延续保护区段闪烁
|
2020-05-21 15:58:23 +08:00 |
|
fan
|
fa4c481d40
|
删除新建列车参数
|
2020-05-21 14:40:21 +08:00 |
|
fan
|
82adf8e241
|
西安三号线列车识别号修改
|
2020-05-21 14:21:04 +08:00 |
|
fan
|
96f5c31b18
|
新建列车调整
|
2020-05-21 13:16:20 +08:00 |
|
fan
|
19bd41b214
|
调整hydIcon路径
|
2020-05-21 10:02:13 +08:00 |
|
fan
|
650b0c00ee
|
调整列车早晚点显示
|
2020-05-21 09:31:16 +08:00 |
|
fan
|
9e8f4a48f4
|
调整站台扣车显示
|
2020-05-20 18:11:39 +08:00 |
|
fan
|
ddee6156f7
|
竞赛管理显示地址
|
2020-05-20 17:44:47 +08:00 |
|
fan
|
f93f432d7e
|
ARB故障状态&哈尔滨列车早晚点时间
|
2020-05-20 17:08:21 +08:00 |
|
fan
|
e3034f630e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 14:46:39 +08:00 |
|
fan
|
b137adbd69
|
哈尔滨地图问题调整&竞赛管理
|
2020-05-20 14:46:26 +08:00 |
|
joylink_cuiweidong
|
74665d7b25
|
剧本编制代码调整
|
2020-05-20 11:13:32 +08:00 |
|
joylink_cuiweidong
|
ca7e92f6a1
|
剧本编制代码调整
|
2020-05-20 10:28:16 +08:00 |
|
joylink_cuiweidong
|
582543dd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:56:49 +08:00 |
|
joylink_cuiweidong
|
a51ae0aa30
|
西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整
|
2020-05-19 18:54:51 +08:00 |
|
fan
|
597af25b40
|
iscs&站台故障
|
2020-05-19 18:38:58 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44: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 |
|
fan
|
46092a9b8e
|
西安三右键菜单
|
2020-05-19 09:09: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
|
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
|
3e64c6da02
|
西安三号线 仿真系统车次与实际车次显示不符 修改
|
2020-05-18 11:32:46 +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 |
|
fan
|
cc6227f6f4
|
故障调整
|
2020-05-15 19:24:58 +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 |
|
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
|
dff3a090a5
|
调整右键跳转车站
|
2020-05-15 15:58:08 +08:00 |
|
fan
|
c27204aeb7
|
信号机添加非空校验
|
2020-05-15 14:18:17 +08:00 |
|
fan
|
b7e8409b1a
|
西安二号线信号机内三角进路排列后显示样式调整
|
2020-05-15 13:56:19 +08:00 |
|
zyy
|
cb47cd612d
|
调整加载线路字段
|
2020-05-15 10:34:15 +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
|
e3d773dfbe
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 17:48:17 +08:00 |
|
zyy
|
b975c1746b
|
调整西安三号线与一号线列车移入提示信息
|
2020-05-14 17:48:01 +08:00 |
|
fan
|
8ffd499c51
|
信号机调整
|
2020-05-14 17:37:46 +08:00 |
|
fan
|
027fe43467
|
删除日志，信号机调整
|
2020-05-14 17:24:35 +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 |
|
fan
|
b3743326bc
|
西安二号线信号机调整逻辑点灯
|
2020-05-14 16:04:23 +08:00 |
|
fan
|
6eb6cd5340
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-14 15:37:37 +08:00 |
|
fan
|
f8a6908d8c
|
西安二号线调整
|
2020-05-14 15:37:18 +08:00 |
|
joylink_cuiweidong
|
77a8fd7c41
|
西安二号线 列车在站台停车时，站台框也显示为绿色
|
2020-05-14 15:32:51 +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
|
352becd47b
|
西安二号线 列车占用的光带显示为红光带
|
2020-05-14 10:55:20 +08:00 |
|
joylink_cuiweidong
|
8fd1014203
|
西安二号线 车次窗显示车次号颜色为黑色
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
|
2020-05-14 10:22:13 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +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 |
|