Commit Graph

12188 Commits

Author SHA1 Message Date
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