joylink_cuiweidong
|
af511e12a2
|
代码调整
|
2022-08-26 18:05:40 +08:00 |
|
joylink_cuiweidong
|
ca677c232e
|
代码调整
|
2022-08-26 17:37:42 +08:00 |
|
joylink_cuiweidong
|
fd87d9b27f
|
代码调整
|
2022-08-26 17:32:59 +08:00 |
|
Yuan
|
5f4be2eb18
|
Merge branch 'yly' into test
|
2022-08-25 18:24:56 +08:00 |
|
Yuan
|
fed6ac91d6
|
区域批量操作
|
2022-08-25 18:22:07 +08:00 |
|
joylink_cuiweidong
|
e671165355
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-25 15:19:09 +08:00 |
|
joylink_cuiweidong
|
86ae692f61
|
大铁项目 车务管理终端 增加/修改列车固定径路 代码调整
|
2022-08-25 15:18:32 +08:00 |
|
fan
|
c411d7237b
|
大屏显示调整
|
2022-08-25 15:16:08 +08:00 |
|
dong
|
3971a33039
|
代码调整
|
2022-08-25 14:34:27 +08:00 |
|
joylink_cuiweidong
|
8223c252fc
|
大铁项目 车务终端 固定列车经路更新加载到计划 代码调整
|
2022-08-25 14:04:25 +08:00 |
|
joylink_cuiweidong
|
2f87a19864
|
大铁项目 车务终端 固定列车经路从生效区更新、更新后的列表 代码调整
|
2022-08-25 11:29:02 +08:00 |
|
fan
|
832d26709f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-24 17:52:42 +08:00 |
|
fan
|
2f4816442f
|
新实训代码调整
|
2022-08-24 17:52:33 +08:00 |
|
dong
|
a61c51d5c5
|
代码调整
|
2022-08-24 16:09:16 +08:00 |
|
dong
|
7b94333a16
|
代码调整
|
2022-08-24 14:54:46 +08:00 |
|
fan
|
0452a4fee7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-24 11:14:12 +08:00 |
|
fan
|
602b0a75a3
|
增加武汉项目
|
2022-08-24 11:13:56 +08:00 |
|
fan
|
7df2e4a404
|
代码调整
|
2022-08-24 11:02:17 +08:00 |
|
dong
|
d96678e7c4
|
代码调整
|
2022-08-23 18:16:12 +08:00 |
|
fan
|
a2e0f543bb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-23 18:07:39 +08:00 |
|
fan
|
b66d899285
|
代码调整
|
2022-08-23 18:07:28 +08:00 |
|
joylink_cuiweidong
|
d0c3ca304d
|
大铁项目 车务管理终端 批量增加列车固定径路 代码调整
|
2022-08-23 17:59:04 +08:00 |
|
dong
|
5443e46708
|
实训代码调整
|
2022-08-23 17:42:44 +08:00 |
|
joylink_cuiweidong
|
86c0b72802
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-23 16:24:22 +08:00 |
|
joylink_cuiweidong
|
624a3a11f9
|
大铁项目 车务管理终端 列车固定径路增加/修改 代码调整
|
2022-08-23 16:24:11 +08:00 |
|
dong
|
1d128f92eb
|
代码调整
|
2022-08-23 15:42:24 +08:00 |
|
dong
|
806f20dc9f
|
代码调整
|
2022-08-23 15:29:13 +08:00 |
|
dong
|
546029e4ad
|
实训编制功能
|
2022-08-23 15:17:21 +08:00 |
|
joylink_cuiweidong
|
831cb965d9
|
大铁项目 车务管理终端 修改出入口 代码调整
|
2022-08-23 14:08:51 +08:00 |
|
joylink_cuiweidong
|
6d8f209cbb
|
大铁项目 车务管理终端 获取出入口列表 代码调整
|
2022-08-23 10:25:04 +08:00 |
|
fan
|
5939dc773f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-23 09:24:57 +08:00 |
|
fan
|
0664688a5c
|
代码调整
|
2022-08-23 09:24:36 +08:00 |
|
joylink_cuiweidong
|
2e7a2cab70
|
大铁项目 车务管理终端 出入口发布生效区 代码调整
|
2022-08-22 17:24:56 +08:00 |
|
Yuan
|
0aeb991e86
|
封锁设备操作
|
2022-08-22 16:29:33 +08:00 |
|
Yuan
|
201f80d794
|
电力臂状态操作
|
2022-08-22 16:01:05 +08:00 |
|
joylink_cuiweidong
|
b69e2b77c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 15:53:50 +08:00 |
|
joylink_cuiweidong
|
b3244ce77e
|
大铁线路 出入口增加 属性ioDirection(出入口类型)
|
2022-08-22 15:53:28 +08:00 |
|
Yuan
|
bf1cf2af65
|
Merge branch 'yly' into test
|
2022-08-22 14:46:38 +08:00 |
|
Yuan
|
e138bbf57b
|
股道视图显示设置
|
2022-08-22 14:46:19 +08:00 |
|
joylink_cuiweidong
|
ac620e5607
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 14:44:27 +08:00 |
|
joylink_cuiweidong
|
2cca3e1bd4
|
代码调整
|
2022-08-22 14:44:09 +08:00 |
|
dong
|
a128496ef6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 13:44:08 +08:00 |
|
dong
|
ba81b37ca0
|
实训功能
|
2022-08-22 13:43:40 +08:00 |
|
joylink_cuiweidong
|
c88319f4c0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 13:40:43 +08:00 |
|
joylink_cuiweidong
|
9d850f9653
|
大铁项目 车务管理终端 修改股道 代码调整
|
2022-08-22 13:40:29 +08:00 |
|
fan
|
dd43337d50
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-22 10:44:42 +08:00 |
|
fan
|
1bf1776be7
|
卡斯柯显示调整
|
2022-08-22 10:44:26 +08:00 |
|
joylink_cuiweidong
|
109b46b41b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-22 10:33:04 +08:00 |
|
joylink_cuiweidong
|
718953a8f7
|
大铁项目 车务管理终端 获取股道列表 代码调整
|
2022-08-22 10:32:49 +08:00 |
|
fan
|
0d5efd0941
|
实训预览暂提
|
2022-08-22 09:24:56 +08:00 |
|
dong
|
f1ffae48ef
|
实训管理
|
2022-08-19 18:03:30 +08:00 |
|
joylink_cuiweidong
|
3ca13fcd27
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-19 17:12:36 +08:00 |
|
joylink_cuiweidong
|
434d028668
|
添加列车固定径路页面调整 列车固定径路发布生效区接口调整
|
2022-08-19 17:12:20 +08:00 |
|
Yuan
|
34618901a3
|
Merge branch 'yly' into test
|
2022-08-19 16:58:46 +08:00 |
|
Yuan
|
e8af1d813f
|
占线板视图设置
|
2022-08-19 16:58:27 +08:00 |
|
joylink_cuiweidong
|
b7b5f0150c
|
大铁项目 车务管理终端 (删除/清空)固定列车径路
|
2022-08-19 15:52:00 +08:00 |
|
joylink_cuiweidong
|
22d2dd16f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-19 13:47:04 +08:00 |
|
joylink_cuiweidong
|
b07d8303a4
|
大铁项目 车务管理终端 获取固定列车径路列表
|
2022-08-19 13:46:49 +08:00 |
|
Yuan
|
515f51e578
|
Merge branch 'yly' into test
|
2022-08-18 18:09:11 +08:00 |
|
Yuan
|
03115a3d2b
|
staging 大铁菜单条
|
2022-08-18 18:08:46 +08:00 |
|
Yuan
|
5e5c63908d
|
staging 大铁菜单条
|
2022-08-18 18:08:27 +08:00 |
|
fan
|
a2b5b7bdda
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-18 18:02:05 +08:00 |
|
fan
|
8c4a0e3266
|
发布实训管理
|
2022-08-18 18:01:53 +08:00 |
|
joylink_cuiweidong
|
3efdd6b316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-18 16:10:55 +08:00 |
|
joylink_cuiweidong
|
3c7768c970
|
大铁项目 车务管理终端 获取股道列表 指令 代码调整
|
2022-08-18 16:10:22 +08:00 |
|
dong
|
b3652b84b0
|
实训设计列表功能
|
2022-08-18 15:35:10 +08:00 |
|
joylink_cuiweidong
|
fda477c08b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-18 11:05:13 +08:00 |
|
joylink_cuiweidong
|
7d473aba6c
|
大铁项目 车务管理终端 代码调整
|
2022-08-18 11:04:57 +08:00 |
|
fan
|
eba6f3c1e0
|
信号按钮层次调整
|
2022-08-18 09:49:35 +08:00 |
|
fan
|
b1638adeec
|
调整画面管理
|
2022-08-18 09:36:45 +08:00 |
|
fan
|
da5f1a3fcf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-17 15:47:10 +08:00 |
|
fan
|
0c553124dc
|
代码调整
|
2022-08-17 15:46:55 +08:00 |
|
joylink_cuiweidong
|
d76532bd2c
|
大铁线路代码调整
|
2022-08-17 15:24:35 +08:00 |
|
fan
|
46ec23934e
|
大铁卡斯柯线路调整
|
2022-08-17 13:57:33 +08:00 |
|
joylink_cuiweidong
|
b3da3ca56a
|
大铁线路 添加 车务终端管理界面
|
2022-08-17 13:47:23 +08:00 |
|
joylink_cuiweidong
|
e7926d28cf
|
代码调整
|
2022-08-17 13:20:41 +08:00 |
|
joylink_cuiweidong
|
0719a2031e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-17 11:29:34 +08:00 |
|
joylink_cuiweidong
|
c34ecffd04
|
大铁线路 区段添加停车点偏移坐标
|
2022-08-17 11:29:13 +08:00 |
|
fan
|
4822e0fa00
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-17 09:53:57 +08:00 |
|
fan
|
a5e441df47
|
缩放调整
|
2022-08-17 09:53:42 +08:00 |
|
fan
|
954f388c3a
|
卡斯柯线路调整
|
2022-08-16 17:31:21 +08:00 |
|
dong
|
4ffda4f614
|
添加实训设计和语音
|
2022-08-16 17:17:27 +08:00 |
|
joylink_cuiweidong
|
bdbd709824
|
代码调整
|
2022-08-16 16:43:23 +08:00 |
|
joylink_cuiweidong
|
49a5aec65b
|
代码调整
|
2022-08-16 15:13:49 +08:00 |
|
joylink_cuiweidong
|
e3e2493b55
|
大铁项目 按钮按下 弹起代码调整
|
2022-08-16 11:26:54 +08:00 |
|
joylink_cuiweidong
|
a55b94e4ab
|
代码调整
|
2022-08-15 17:27:31 +08:00 |
|
joylink_cuiweidong
|
bfe2401f0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-15 16:49:24 +08:00 |
|
joylink_cuiweidong
|
b35107c1eb
|
大铁项目 添加 预警信息
|
2022-08-15 16:48:55 +08:00 |
|
fan
|
6b4b63fc40
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-15 15:09:52 +08:00 |
|
fan
|
66230e8cbf
|
画面管理问题调整
|
2022-08-15 15:09:40 +08:00 |
|
fan
|
0228f45131
|
卡斯柯显示调整
|
2022-08-15 15:08:57 +08:00 |
|
joylink_cuiweidong
|
7d67fb18dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/shape/graph/SignalButton/index.js
|
2022-08-15 14:27:46 +08:00 |
|
joylink_cuiweidong
|
4b0b2fa156
|
大铁线路 信号机按钮添加边框
|
2022-08-15 14:25:36 +08:00 |
|
fan
|
fa53ac9a8b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-15 13:24:49 +08:00 |
|
fan
|
5ea947776d
|
画面显示位置调整
|
2022-08-15 13:24:30 +08:00 |
|
fan
|
61cb3a9957
|
卡斯柯大铁线路调整
|
2022-08-15 13:23:48 +08:00 |
|
joylink_cuiweidong
|
75fd967879
|
代码调整
|
2022-08-12 17:51:32 +08:00 |
|
joylink_cuiweidong
|
71a045bd14
|
大铁线路 密码输入框风格 代码调整
|
2022-08-12 17:17:00 +08:00 |
|
joylink_cuiweidong
|
e30c306e89
|
大铁线路 功能按钮代码调整
|
2022-08-12 15:29:51 +08:00 |
|
joylink_cuiweidong
|
2d4c5f8cf8
|
大铁线路:1.调车进路的总人解 问题修改 2.信号机和信号机按钮宽度调整
3.鼠标光标问题修改
|
2022-08-12 13:23:38 +08:00 |
|
joylink_cuiweidong
|
94504d03aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-11 16:30:30 +08:00 |
|
joylink_cuiweidong
|
75eca3b417
|
大铁项目 股道停稳代码调整
|
2022-08-11 16:29:57 +08:00 |
|
fan
|
9d64437c03
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
Conflicts:
src/jmapNew/shape/graph/SignalButton/index.js
|
2022-08-11 11:29:16 +08:00 |
|
fan
|
1a80ae7558
|
卡斯柯显示调整
|
2022-08-11 11:18:38 +08:00 |
|
fan
|
319cd60d6c
|
列车驾驶至操作调整
|
2022-08-11 11:18:01 +08:00 |
|
fan
|
61e517e317
|
综合演练页面行值刷新显示错误调整
|
2022-08-11 11:17:14 +08:00 |
|
joylink_cuiweidong
|
86d1268744
|
代码调整
|
2022-08-11 10:18:07 +08:00 |
|
joylink_cuiweidong
|
dd82df1b4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-10 17:47:46 +08:00 |
|
joylink_cuiweidong
|
b085829a91
|
标准线线路 配置文件 代码调整
|
2022-08-10 17:47:33 +08:00 |
|
dong
|
6ea8aca49a
|
区段占用与信号
|
2022-08-10 15:16:06 +08:00 |
|
fan
|
7096511b46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-10 11:22:41 +08:00 |
|
fan
|
ac33c683a5
|
指令=》 操作调整
|
2022-08-10 11:22:24 +08:00 |
|
fan
|
91a0c7b92c
|
卡斯柯线路暂提
|
2022-08-10 10:22:40 +08:00 |
|
fan
|
8b573304e6
|
bug:初始化按钮不显示调整
|
2022-08-10 09:30:10 +08:00 |
|
fan
|
6a79626a34
|
指令转操作
|
2022-08-09 13:59:23 +08:00 |
|
joylink_cuiweidong
|
9bbe93590c
|
代码调整
|
2022-08-09 11:03:00 +08:00 |
|
joylink_cuiweidong
|
3af5629595
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-09 10:03:08 +08:00 |
|
joylink_cuiweidong
|
874cc248eb
|
剧本提示 代码调整
|
2022-08-09 10:02:52 +08:00 |
|
dong
|
77dab6087e
|
点击调度命令出弹窗
|
2022-08-09 09:59:42 +08:00 |
|
joylink_cuiweidong
|
52a9aa7b61
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-08 11:13:36 +08:00 |
|
joylink_cuiweidong
|
ac77a2fd36
|
代码调整
|
2022-08-08 11:12:11 +08:00 |
|
fan
|
ffc8275e54
|
站间透明问题修复
|
2022-08-05 10:56:57 +08:00 |
|
fan
|
91175f2d57
|
鉴权接口走正式
|
2022-08-05 10:25:16 +08:00 |
|
fan
|
808ae31174
|
走画面管理没有设置集中站调整
|
2022-08-05 10:16:14 +08:00 |
|
fan
|
97966d1bec
|
簿册取消指令校验
|
2022-08-05 09:58:29 +08:00 |
|
fan
|
082e296e38
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 17:26:50 +08:00 |
|
fan
|
55d4ff6e69
|
画面新建 bug调整
|
2022-08-04 17:26:38 +08:00 |
|
joylink_cuiweidong
|
9341b3f807
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-04 17:25:54 +08:00 |
|
joylink_cuiweidong
|
9480cd310b
|
代码调整
|
2022-08-04 17:25:34 +08:00 |
|
fan
|
0e858fb921
|
多选设备筛选逻辑调整
|
2022-08-04 16:17:46 +08:00 |
|
fan
|
5344ea5788
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 16:05:10 +08:00 |
|
fan
|
78aeeddee0
|
簿册 施工 交接班注释
|
2022-08-04 16:04:58 +08:00 |
|
fan
|
22c0b57624
|
簿册剧本编制显示调整
|
2022-08-04 16:03:09 +08:00 |
|
joylink_cuiweidong
|
425a350d07
|
去掉断点
|
2022-08-04 15:50:39 +08:00 |
|
joylink_cuiweidong
|
3d0782952c
|
剧本提示代码调整
|
2022-08-04 15:39:58 +08:00 |
|
joylink_cuiweidong
|
e6ffe9d087
|
代码调整
|
2022-08-04 15:14:08 +08:00 |
|
joylink_cuiweidong
|
85f7844788
|
代码调整
|
2022-08-04 14:50:32 +08:00 |
|
joylink_cuiweidong
|
130703e0c5
|
代码调整
|
2022-08-04 14:32:00 +08:00 |
|
fan
|
e20e212536
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-04 11:05:04 +08:00 |
|
fan
|
8c7cd5d495
|
簿册暂提
|
2022-08-04 11:04:47 +08:00 |
|
fan
|
8262b24698
|
车次窗批量生成时可调整距离
|
2022-08-04 10:34:42 +08:00 |
|
joylink_cuiweidong
|
2fb83cd34e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2022-08-03 15:41:07 +08:00 |
|
joylink_cuiweidong
|
6cb94046c8
|
代码调整
|
2022-08-03 15:40:51 +08:00 |
|
fan
|
d7c7b3ac9e
|
黄绿灯显示调整
|
2022-08-03 15:40:33 +08:00 |
|
dong
|
ae5d53e9e0
|
代码调整
|
2022-08-03 15:33:03 +08:00 |
|
fan
|
d115c4975d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 14:38:12 +08:00 |
|
fan
|
5c63dafaa4
|
簿册显示调整
|
2022-08-03 14:37:59 +08:00 |
|
dong
|
5a072c7236
|
修改进路
|
2022-08-03 14:13:14 +08:00 |
|
dong
|
71480564f7
|
修改进路
|
2022-08-03 13:31:07 +08:00 |
|
fan
|
f3a1e22e65
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls
|
2022-08-03 11:22:04 +08:00 |
|