xzb
|
b9e687d26a
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation into HEAD
# Conflicts:
# repository/model/proto/model.pb.go
|
2023-10-13 15:01:36 +08:00 |
|
xzb
|
d3dd59d720
|
信号机
|
2023-10-13 14:59:08 +08:00 |
|
weizhihong
|
0abe2ca44d
|
【生成proto文件】提交
|
2023-10-13 14:13:24 +08:00 |
|
weizhihong
|
f6ff5bdf69
|
【修改冲突】
|
2023-10-13 14:07:17 +08:00 |
|
weizhihong
|
fc3defbae3
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
# proto/src/model.proto
|
2023-10-13 14:05:38 +08:00 |
|
weizhihong
|
008dcbc665
|
【增加设备类型】
|
2023-10-13 14:03:48 +08:00 |
|
xzb
|
24c455cc6f
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-13 09:32:05 +08:00 |
|
xzb
|
4dbe6e6042
|
sgianl jdxh 驱采
|
2023-10-13 09:31:49 +08:00 |
|
|
|
f9d845a0cf
|
消除报错
|
2023-10-13 09:29:43 +08:00 |
|
|
|
a3f6982dab
|
Merge remote-tracking branch 'origin/master'
|
2023-10-13 09:13:02 +08:00 |
|
|
|
fe3ce44bdc
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# jl-ecs-go
# proto/src/model.proto
# repository/model/proto/model.pb.go
|
2023-10-13 09:09:07 +08:00 |
|
xzb
|
4f05a50503
|
sgianl jdxh 驱采
|
2023-10-12 18:06:17 +08:00 |
|
xzb
|
7f5eb71ff5
|
sgianl jdxh 驱采
|
2023-10-12 17:58:01 +08:00 |
|
|
|
18ed7f9214
|
增加草稿数据列表查询接口；增加屏蔽门ecs相关内容
|
2023-10-12 17:55:40 +08:00 |
|
xzb
|
51e0f5a4bd
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 17:53:56 +08:00 |
|
xzb
|
4e84c2d0ba
|
fmt
|
2023-10-12 17:53:30 +08:00 |
|
weizhihong
|
bfec6804ce
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 17:47:21 +08:00 |
|
weizhihong
|
abeeb595dc
|
【初始化IBP盘实例】
|
2023-10-12 17:46:43 +08:00 |
|
xzb
|
7864f04cba
|
signal jckxh 驱采
|
2023-10-12 17:33:20 +08:00 |
|
xzb
|
d2e31012db
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 16:59:25 +08:00 |
|
xzb
|
9a21c4bfd2
|
signal dcxh 驱采
|
2023-10-12 16:59:08 +08:00 |
|
|
|
2d64e2b3bb
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 16:29:49 +08:00 |
|
|
|
949c4a883a
|
添加道岔故障组件、定义、接口、实现逻辑
|
2023-10-12 16:29:00 +08:00 |
|
xzb
|
a1beb531a6
|
signal 3xh4 驱采
|
2023-10-12 16:21:55 +08:00 |
|
xzb
|
e5238067a9
|
signal 3xh4 驱采
|
2023-10-12 16:13:56 +08:00 |
|
xzb
|
1180549f1d
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
# jl-ecs-go
|
2023-10-12 15:13:49 +08:00 |
|
xzb
|
6a9b48b4d3
|
signal 3xh3 驱采
|
2023-10-12 15:13:13 +08:00 |
|
weizhihong
|
dbb5eaa417
|
【IBP操作】
|
2023-10-12 15:03:11 +08:00 |
|
xzb
|
ae3495ce62
|
signal 3xh2 驱采
|
2023-10-12 14:30:25 +08:00 |
|
xzb
|
9bdb1a5fdc
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
# Conflicts:
# jl-ecs-go
|
2023-10-12 14:20:07 +08:00 |
|
xzb
|
691a4efdc9
|
signal 3xh2 驱采
|
2023-10-12 14:19:00 +08:00 |
|
|
|
8fa5d10a87
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 14:05:13 +08:00 |
|
|
|
758d396ad1
|
调整道岔功能接口使用ecs请求接口实现
|
2023-10-12 14:05:09 +08:00 |
|
xzb
|
da8485c036
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 13:55:13 +08:00 |
|
xzb
|
c23e141691
|
signal 3xh1 驱采
|
2023-10-12 13:54:53 +08:00 |
|
weizhihong
|
dae56425d4
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 13:53:38 +08:00 |
|
weizhihong
|
a4fcdd1706
|
【增加实体初始化】
|
2023-10-12 13:47:57 +08:00 |
|
|
|
c5cef5eb4e
|
双机转辙机添加驱动采集电路相关组件和逻辑
|
2023-10-12 13:04:38 +08:00 |
|
xzb
|
90e373d3fd
|
signal 2xh1 驱采
|
2023-10-12 11:06:20 +08:00 |
|
xzb
|
3e8fe93701
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-12 11:01:12 +08:00 |
|
xzb
|
406cfe6c0a
|
signal 2xh1 驱采
|
2023-10-12 11:00:56 +08:00 |
|
weizhihong
|
8f59554b2e
|
【spk、emp采集电路】
|
2023-10-12 10:25:01 +08:00 |
|
xzb
|
b6bdcc8748
|
signal 2xh1 驱采
|
2023-10-12 10:07:40 +08:00 |
|
xzb
|
b5cfb5b8b7
|
signal 3xh3
|
2023-10-11 17:44:44 +08:00 |
|
xzb
|
ff32f14e12
|
signal 3xh2
|
2023-10-11 17:25:25 +08:00 |
|
xzb
|
412de346bc
|
signal 3xh1
|
2023-10-11 17:11:13 +08:00 |
|
xzb
|
1d3d8e0150
|
Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation
|
2023-10-11 16:58:43 +08:00 |
|
xzb
|
819f157f23
|
signal 3xh1
|
2023-10-11 16:57:48 +08:00 |
|
weizhihong
|
d81a36634a
|
【修改人员防护、紧急关闭逻辑】
|
2023-10-11 15:43:48 +08:00 |
|
xzb
|
1a809f1af4
|
signal 2xh1
|
2023-10-11 14:12:51 +08:00 |
|
