joylink_fanyuhong
|
e23f1ee474
|
Merge remote-tracking branch 'origin/develop' into local-test
CI / Docker-Build (push) Successful in 2m40s
|
2024-07-11 16:30:12 +08:00 |
|
joylink_fanyuhong
|
9112a3c73a
|
应答器添加LEU索引数据
|
2024-07-11 16:29:10 +08:00 |
|
joylink_fanyuhong
|
2136bd3c0f
|
message同步
|
2024-07-11 16:12:47 +08:00 |
|
joylink_fanyuhong
|
363ff066ed
|
merage
CI / Docker-Build (push) Successful in 2m45s
|
2024-07-04 17:59:39 +08:00 |
|
joylink_zhaoerwei
|
516e1d33d5
|
灯的状态信息处理
|
2024-07-04 17:37:10 +08:00 |
|
joylink_zhaoerwei
|
6754420431
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m49s
commit c2338efaf9
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jul 4 16:30:15 2024 +0800
驾驶台高度微调
commit 7a1925cfbe
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jul 4 15:29:41 2024 +0800
列车驾驶台按钮+灯备用
commit 6d54d2e5d5
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jul 4 09:17:51 2024 +0800
更改前端pixi绘图版本
|
2024-07-04 16:31:19 +08:00 |
|
joylink_zhaoerwei
|
c2338efaf9
|
驾驶台高度微调
|
2024-07-04 16:30:15 +08:00 |
|
joylink_zhaoerwei
|
0c5321e9de
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 3m0s
commit 7a1925cfbe
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jul 4 15:29:41 2024 +0800
列车驾驶台按钮+灯备用
commit 6d54d2e5d5
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jul 4 09:17:51 2024 +0800
更改前端pixi绘图版本
|
2024-07-04 15:31:09 +08:00 |
|
joylink_zhaoerwei
|
7a1925cfbe
|
列车驾驶台按钮+灯备用
|
2024-07-04 15:29:41 +08:00 |
|
joylink_zhaoerwei
|
6d54d2e5d5
|
更改前端pixi绘图版本
|
2024-07-04 09:17:51 +08:00 |
|
joylink_fanyuhong
|
14d348be07
|
merage
CI / Docker-Build (push) Successful in 2m45s
|
2024-07-01 14:07:22 +08:00 |
|
joylink_zhaoerwei
|
9de360e84e
|
驱采表显示固定表头
|
2024-07-01 13:48:42 +08:00 |
|
joylink_zhaoerwei
|
6eb015d2c1
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m39s
commit 6f013e709e
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Fri Jun 28 17:21:33 2024 +0800
不覆盖驱采时增加校验:如果驱采的继电器id改变,变为新的id;如果驱采的继电器没有生成,删除针对该继电器的驱采数据
commit 7cb3586ad5
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 18:06:32 2024 +0800
拖拽组件添加可变宽高配置(鼠标放置左边和上方移动改变弹框大小)
commit 530a6cf1a3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 16:40:19 2024 +0800
驱采绘制点击变背景色
commit d4c5e5a4a8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 15:41:42 2024 +0800
继电器增加批量操作
|
2024-06-28 17:22:51 +08:00 |
|
joylink_zhaoerwei
|
6f013e709e
|
不覆盖驱采时增加校验:如果驱采的继电器id改变,变为新的id;如果驱采的继电器没有生成,删除针对该继电器的驱采数据
|
2024-06-28 17:21:33 +08:00 |
|
joylink_zhaoerwei
|
67c84731b4
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m3s
commit 7cb3586ad5
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 18:06:32 2024 +0800
拖拽组件添加可变宽高配置(鼠标放置左边和上方移动改变弹框大小)
commit 530a6cf1a3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 16:40:19 2024 +0800
驱采绘制点击变背景色
commit d4c5e5a4a8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 15:41:42 2024 +0800
继电器增加批量操作
|
2024-06-27 18:09:03 +08:00 |
|
joylink_zhaoerwei
|
7cb3586ad5
|
拖拽组件添加可变宽高配置(鼠标放置左边和上方移动改变弹框大小)
|
2024-06-27 18:06:32 +08:00 |
|
joylink_zhaoerwei
|
ba60c0b313
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m58s
commit 530a6cf1a3
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 16:40:19 2024 +0800
驱采绘制点击变背景色
commit d4c5e5a4a8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 15:41:42 2024 +0800
继电器增加批量操作
|
2024-06-27 16:41:21 +08:00 |
|
joylink_zhaoerwei
|
530a6cf1a3
|
驱采绘制点击变背景色
|
2024-06-27 16:40:19 +08:00 |
|
joylink_zhaoerwei
|
f0cdd8c3b4
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 1m59s
commit d4c5e5a4a8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 27 15:41:42 2024 +0800
继电器增加批量操作
|
2024-06-27 15:43:33 +08:00 |
|
joylink_zhaoerwei
|
d4c5e5a4a8
|
继电器增加批量操作
|
2024-06-27 15:41:42 +08:00 |
|
joylink_fanyuhong
|
d17144cd7e
|
Merge remote-tracking branch 'origin/develop' into local-test
CI / Docker-Build (push) Successful in 2m29s
# Conflicts:
# src/drawApp/relayCabinetGraphics/RelayInteraction.ts
# src/graphics/relay/Relay.ts
# src/layouts/RelayCabinetLayout/GeneraterDevice.ts
# src/protos/relayCabinetLayoutGraphics.ts
|
2024-06-27 14:49:48 +08:00 |
|
joylink_zhaoerwei
|
71f0346bf0
|
增加空的枚举,生成的时候是空
|
2024-06-27 14:40:05 +08:00 |
|
joylink_zhaoerwei
|
9bbbe7b3e2
|
默认初始位置
|
2024-06-27 13:53:58 +08:00 |
|
joylink_zhaoerwei
|
d647c24ef7
|
合并
CI / Docker-Build (push) Successful in 1m53s
|
2024-06-26 15:42:39 +08:00 |
|
joylink_zhaoerwei
|
4373cb7dc2
|
增加空格跳到下一个位置
|
2024-06-26 15:25:44 +08:00 |
|
joylink_zhaoerwei
|
23c3abf91b
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 1m51s
commit 7e62e88ac0
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 26 14:44:19 2024 +0800
继电器图增加Ctrl和alt快捷键
|
2024-06-26 14:50:45 +08:00 |
|
joylink_zhaoerwei
|
7e62e88ac0
|
继电器图增加Ctrl和alt快捷键
|
2024-06-26 14:44:19 +08:00 |
|
joylink_zhaoerwei
|
dd46053ced
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 1m51s
commit 0e7de4afa8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 19:02:34 2024 +0800
增加数据位置调整功能
commit 35eab5ac87
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 15:48:06 2024 +0800
驱采数据加清空
|
2024-06-25 19:06:29 +08:00 |
|
joylink_zhaoerwei
|
0e7de4afa8
|
增加数据位置调整功能
|
2024-06-25 19:02:34 +08:00 |
|
joylink_zhaoerwei
|
35eab5ac87
|
驱采数据加清空
|
2024-06-25 15:48:06 +08:00 |
|
joylink_zhaoerwei
|
ec8056e1b7
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m52s
commit 54ee649581
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 11:25:09 2024 +0800
微调
commit 94060bd5e8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 11:21:30 2024 +0800
修改继电器布局
commit 8e62b39f34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 09:16:17 2024 +0800
继电器状态图显示调整+spks生成调整
commit 059a333370
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 21:08:58 2024 +0800
生成继电器增加展示编号配置
commit ad7a1a8451
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 18:35:14 2024 +0800
增加IBP盘扣车继电器(IKCJ)、增加GDJ(计轴电源故障继电器)和ZFWJ
commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 08:41:16 2024 +0800
道岔物理区段也生成GJ继电器
commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 20 17:41:27 2024 +0800
集中区分割线代码优化(风格线位于边界处一侧未关联区段)
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 10:56:19 2024 +0800
一键关联集中站加道岔物理区段也关联
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
# Conflicts:
# src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue
|
2024-06-25 11:28:40 +08:00 |
|
joylink_zhaoerwei
|
54ee649581
|
微调
|
2024-06-25 11:25:09 +08:00 |
|
joylink_zhaoerwei
|
94060bd5e8
|
修改继电器布局
|
2024-06-25 11:21:30 +08:00 |
|
joylink_zhaoerwei
|
4cc5330ec9
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m54s
commit 8e62b39f34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue Jun 25 09:16:17 2024 +0800
继电器状态图显示调整+spks生成调整
|
2024-06-25 09:45:26 +08:00 |
|
joylink_zhaoerwei
|
8e62b39f34
|
继电器状态图显示调整+spks生成调整
|
2024-06-25 09:16:17 +08:00 |
|
joylink_zhaoerwei
|
99a7cdfae0
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 3m9s
commit 059a333370
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 21:08:58 2024 +0800
生成继电器增加展示编号配置
commit ad7a1a8451
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 18:35:14 2024 +0800
增加IBP盘扣车继电器(IKCJ)、增加GDJ(计轴电源故障继电器)和ZFWJ
commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 08:41:16 2024 +0800
道岔物理区段也生成GJ继电器
commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 20 17:41:27 2024 +0800
集中区分割线代码优化(风格线位于边界处一侧未关联区段)
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 10:56:19 2024 +0800
一键关联集中站加道岔物理区段也关联
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-24 21:14:02 +08:00 |
|
joylink_zhaoerwei
|
059a333370
|
生成继电器增加展示编号配置
|
2024-06-24 21:08:58 +08:00 |
|
joylink_zhaoerwei
|
ad7a1a8451
|
增加IBP盘扣车继电器(IKCJ)、增加GDJ(计轴电源故障继电器)和ZFWJ
|
2024-06-24 18:35:14 +08:00 |
|
joylink_zhaoerwei
|
36e7a532d6
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m33s
commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon Jun 24 08:41:16 2024 +0800
道岔物理区段也生成GJ继电器
commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 20 17:41:27 2024 +0800
集中区分割线代码优化(风格线位于边界处一侧未关联区段)
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 10:56:19 2024 +0800
一键关联集中站加道岔物理区段也关联
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-24 08:44:44 +08:00 |
|
joylink_zhaoerwei
|
b7a3200560
|
道岔物理区段也生成GJ继电器
|
2024-06-24 08:41:16 +08:00 |
|
joylink_zhaoerwei
|
23ff38bbc7
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m32s
commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu Jun 20 17:41:27 2024 +0800
集中区分割线代码优化(风格线位于边界处一侧未关联区段)
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 10:56:19 2024 +0800
一键关联集中站加道岔物理区段也关联
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-20 17:42:21 +08:00 |
|
joylink_zhaoerwei
|
3a372610cf
|
集中区分割线代码优化(风格线位于边界处一侧未关联区段)
|
2024-06-20 17:41:27 +08:00 |
|
joylink_zhaoerwei
|
371755d2b5
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m34s
commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 10:56:19 2024 +0800
一键关联集中站加道岔物理区段也关联
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-19 10:57:21 +08:00 |
|
joylink_zhaoerwei
|
d784e2f0e6
|
一键关联集中站加道岔物理区段也关联
|
2024-06-19 10:56:19 +08:00 |
|
joylink_zhaoerwei
|
4fc4fa6c4f
|
Squashed commit of the following:
CI / Docker-Build (push) Successful in 2m49s
commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed Jun 19 09:56:52 2024 +0800
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-19 10:09:53 +08:00 |
|
joylink_zhaoerwei
|
00d413d494
|
1.生成计轴时删除区段有问题的计轴(区段延伸处)2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验
|
2024-06-19 09:56:52 +08:00 |
|
joylink_fanyuhong
|
77166baf11
|
Merge branch 'develop' into local-test
CI / Docker-Build (push) Successful in 2m7s
|
2024-06-12 17:38:12 +08:00 |
|
fan
|
e83a0211ed
|
Merge branch 'develop' of https://gitea.joylink.club/joylink/rts-sim-testing-client into develop
|
2024-06-12 17:36:51 +08:00 |
|
fan
|
542745ef84
|
连锁映射数据调整
|
2024-06-12 17:36:47 +08:00 |
|
joylink_fanyuhong
|
7781551d18
|
Merge branch 'develop' into local-test
CI / Docker-Build (push) Successful in 2m47s
|
2024-06-06 17:53:49 +08:00 |
|