Commit Graph

819 Commits

Author SHA1 Message Date
fan
5a6848b005 框架代码同步 2023-08-02 16:13:51 +08:00
joylink_zhaoerwei
8d78f32e72 微调 2023-08-02 14:26:48 +08:00
Yuan
988eafd521 道岔限速显示修改 2023-08-02 09:25:48 +08:00
Yuan
9d9806beac 道岔限速显示调整 2023-08-01 17:30:14 +08:00
Yuan
8e7120b5dd Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-08-01 16:35:57 +08:00
Yuan
059c905951 道岔区段限速 2023-08-01 16:35:53 +08:00
fan
c4ed2bde5d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-08-01 16:27:04 +08:00
fan
bfd937da72 运行线调整 2023-08-01 16:26:57 +08:00
joylink_zhaoerwei
870169a870 线网画布微调 2023-08-01 14:03:23 +08:00
joylink_zhaoerwei
6a5bed588f 线路图监控画布调整 2023-08-01 13:19:56 +08:00
joylink_zhaoerwei
5085de4d6d 类型报错修改 2023-08-01 10:15:57 +08:00
joylink_zhaoerwei
b130ee33d7 微调 2023-08-01 09:33:05 +08:00
Yuan
e7c755348b 框架同步 2023-07-31 17:04:18 +08:00
Yuan
d9af13bb46 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-31 16:46:00 +08:00
Yuan
b6ec60b242 道岔切除 2023-07-31 16:45:55 +08:00
joylink_zhaoerwei
dbde11026c 站台车站状态调整方式更改 2023-07-31 16:37:45 +08:00
Yuan
9490392177 区段限速 2023-07-31 16:33:06 +08:00
Yuan
53f6d882ab 区段和道岔故障锁闭显示白光带 2023-07-31 14:35:23 +08:00
Yuan
3447055aa5 橙光带对应actInvalid 2023-07-31 14:03:02 +08:00
Yuan
14bd3b7b65 道岔颜色根据正反位显示 && 道岔和区段增加overlap状态显示 2023-07-31 13:49:38 +08:00
Yuan
86cc8754fb 白屏暂时修复 2023-07-31 11:30:05 +08:00
Yuan
b189c385ae 同步代码 2023-07-31 10:05:26 +08:00
fan
6c9ae09ae8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-28 16:14:36 +08:00
fan
0bbe65b042 订阅调整 2023-07-28 16:14:30 +08:00
dong
6d780d471f 代码调整 2023-07-28 11:03:16 +08:00
fan
a34b415aca Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-27 17:49:28 +08:00
fan
d67ac6aefd 关闭后重置notify 2023-07-27 17:49:19 +08:00
Yuan
8d1f666022 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-27 16:38:01 +08:00
Yuan
71a311142c 状态优先级调整 2023-07-27 16:36:06 +08:00
joylink_zhaoerwei
cc4c6b0d65 报警跳页面 2023-07-27 15:22:39 +08:00
Yuan
791857c1ba Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-27 15:05:48 +08:00
Yuan
7a4d2fe9a0 区段状态 2023-07-27 15:05:43 +08:00
joylink_zhaoerwei
ca472d7dad 删除故障清除和用户管理代码 2023-07-27 14:20:19 +08:00
fan
26c56cbb62 删除测试内容 2023-07-27 14:07:38 +08:00
fan
50a55243dc 环境变量测试1 2023-07-27 14:02:21 +08:00
fan
f0afa94099 环境变量测试 2023-07-27 14:00:18 +08:00
fan
15dce2e5b2 删除测试 2023-07-27 13:23:01 +08:00
fan
0df54816d1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-27 13:17:37 +08:00
fan
fa29a2c741 测试环境变量 2023-07-27 13:17:15 +08:00
Yuan
cd6318d01e 道岔区段颜色 2023-07-27 10:15:21 +08:00
Yuan
9cdf1fb04b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-26 17:07:25 +08:00
Yuan
732b3fe34d 道岔单封边框 2023-07-26 17:06:28 +08:00
joylink_zhaoerwei
af01b13ec0 微调 2023-07-26 15:14:06 +08:00
joylink_zhaoerwei
3c856dc22b 决策信息枚举增加 2023-07-26 15:07:25 +08:00
joylink_zhaoerwei
5afc6b59c2 历史报警列表 2023-07-26 14:24:25 +08:00
Yuan
fd231069ad Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-26 13:08:30 +08:00
Yuan
fdadeb7237 道岔状态显示 2023-07-26 13:07:14 +08:00
fan
264a8a39fb Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-26 11:23:08 +08:00
fan
4c938d58b9 socket断连提示位置调整 2023-07-26 11:23:03 +08:00
joylink_zhaoerwei
cd9f8c6d53 微调 2023-07-25 17:47:39 +08:00
joylink_zhaoerwei
fdc69703a6 微调 2023-07-25 17:13:46 +08:00
joylink_zhaoerwei
5439e11ae8 页面操作栏 2023-07-25 16:51:43 +08:00
fan
c8fd7b96ef Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-25 16:25:06 +08:00
fan
6521def1d1 添加通信断开链接提示 2023-07-25 16:25:01 +08:00
dong
c7f5bf8871 添加登出 2023-07-25 15:50:02 +08:00
fan
9bc7f9870d 线路监听调整 2023-07-25 15:35:43 +08:00
joylink_zhaoerwei
f4c13ea051 辅助决策字段增加 2023-07-25 10:15:02 +08:00
joylink_zhaoerwei
310c1ce638 微调 2023-07-25 09:56:11 +08:00
joylink_zhaoerwei
9dbb9e38bf 报警信息调整 2023-07-24 17:46:28 +08:00
joylink_zhaoerwei
eb3f8bde0c 车的名字字段修改 2023-07-24 16:19:05 +08:00
dong
3548f75666 分隔符调整 2023-07-24 15:44:56 +08:00
joylink_zhaoerwei
a69a0ff463 决策信息tip提示,页面交互监听 2023-07-24 10:38:41 +08:00
dong
19a6e4cbdb 列车调整 2023-07-21 17:45:58 +08:00
joylink_zhaoerwei
2f2bc0fe31 手动设置故障 2023-07-21 16:45:17 +08:00
Yuan
773010b73e Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-21 11:22:05 +08:00
Yuan
ff48652c3e 线路图增加逻辑区段显示 2023-07-21 11:22:01 +08:00
fan
5f5ca7346c menu菜单问题调整 2023-07-21 11:12:46 +08:00
fan
c71e9086a1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-21 10:51:26 +08:00
fan
8fffd57b5b 菜单报错调整 2023-07-21 10:51:15 +08:00
joylink_zhaoerwei
ff8a34479c 上下行字段修改 2023-07-21 10:03:17 +08:00
joylink_zhaoerwei
31eab6eb9c 微调 2023-07-20 17:44:31 +08:00
Yuan
5b1fcbf585 message 2023-07-20 17:40:32 +08:00
Yuan
8b466bbf36 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-20 17:39:56 +08:00
Yuan
4c954758ed 拆分弹窗去掉默认数字 2023-07-20 17:39:51 +08:00
joylink_zhaoerwei
392fecf99d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-20 17:08:29 +08:00
fan
7cb9548aaa 监听页面尺寸调整 2023-07-20 17:08:00 +08:00
joylink_zhaoerwei
5f6c338930 微调 2023-07-20 17:07:53 +08:00
fan
a62470fcae 同步代码 2023-07-20 15:54:01 +08:00
fan
2284cd1290 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-20 15:51:46 +08:00
fan
31459c06b4 运行线增加虚线部位 2023-07-20 15:51:41 +08:00
joylink_zhaoerwei
00f5e408fb 车次窗最后加载 2023-07-20 15:38:08 +08:00
Yuan
e87aba7dd0 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-20 15:12:03 +08:00
Yuan
0fa1916db9 区段拆分dialog 2023-07-20 15:12:01 +08:00
joylink_zhaoerwei
3970ae4073 报警调整 2023-07-20 14:57:42 +08:00
joylink_zhaoerwei
2dc864920d 车站名字--站台上下行和关联车站 2023-07-20 11:12:08 +08:00
joylink_zhaoerwei
25b4f6d3ea 车次窗大小和位置 2023-07-19 17:27:35 +08:00
joylink_zhaoerwei
f67255243f 决策信息和报警弹框 2023-07-19 15:21:21 +08:00
joylink_zhaoerwei
9e3f4c7de5 车次窗位置 2023-07-19 10:27:03 +08:00
joylink_zhaoerwei
d4cc29921c 车次窗位置调整 2023-07-19 10:26:18 +08:00
joylink_zhaoerwei
8b817d8830 车次窗关联道岔 2023-07-19 09:14:04 +08:00
Yuan
438829ddab Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-19 09:00:56 +08:00
Yuan
bfbf3c6f00 道岔物理区段增加道岔数据 2023-07-19 09:00:52 +08:00
fan
346303f33e Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-18 17:44:45 +08:00
fan
57778a3314 线网列车显示调整 2023-07-18 17:44:39 +08:00
joylink_zhaoerwei
230b3ead6e 报警弹框 2023-07-18 17:26:42 +08:00
joylink_zhaoerwei
d4683bd04e 车次窗 2023-07-18 13:58:55 +08:00
Yuan
37be5d34d8 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-18 10:36:50 +08:00
Yuan
36a66d794b 逻辑区段编号 && 物理区段增加目的地码 2023-07-18 10:36:45 +08:00
joylink_zhaoerwei
77831b35e4 道岔物理区段的车次窗 2023-07-18 08:48:34 +08:00
joylink_zhaoerwei
596df8d218 报警信息初提交,待美化 2023-07-17 17:31:18 +08:00
joylink_zhaoerwei
03b5698c45 站台加名称编辑 2023-07-17 17:14:49 +08:00
Yuan
357a52ce2d Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-17 16:13:52 +08:00
Yuan
e1353feb43 物理区段 2023-07-17 16:13:45 +08:00
joylink_zhaoerwei
ce0d4076c4 决策信息接口修改 2023-07-17 14:35:03 +08:00
fan
477aad487b 右键菜单调整 2023-07-17 14:04:36 +08:00
fan
d6b2fc2f5d 线网列车调整 2023-07-17 13:48:13 +08:00
fan
87aa370787 同步代码 2023-07-17 09:15:35 +08:00
fan
28ffe0f52b Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-14 17:34:45 +08:00
fan
db201aeeb3 线网车站调整 2023-07-14 17:34:40 +08:00
joylink_zhaoerwei
e192cb39b8 决策信息管理 2023-07-14 17:15:20 +08:00
fan
714f650854 车站跳转菜单 2023-07-14 16:32:11 +08:00
fan
1cff9ab0f2 message同步 2023-07-14 15:25:49 +08:00
fan
e861d5c3a5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-14 15:22:03 +08:00
fan
5b9758bc36 线网列车逻辑调整 2023-07-14 15:21:51 +08:00
Yuan
9694ee1a73 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-13 17:59:57 +08:00
Yuan
3c04f8ee4a 代码同步 2023-07-13 17:59:54 +08:00
Yuan
240e75262f wip-道岔&区段 2023-07-13 17:58:56 +08:00
fan
8396b511d2 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-13 15:33:10 +08:00
fan
02bde2b842 轨迹线调整 2023-07-13 15:33:02 +08:00
dong
67fd3551d3 列车调整 2023-07-07 17:56:06 +08:00
dong
17e8fe2b0a 列车调整 2023-07-07 15:17:12 +08:00
dong
f4051c5190 代码调整 2023-07-07 09:30:22 +08:00
dong
141d351794 列车调整 2023-07-06 16:43:21 +08:00
fan
0a2d5af597 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-06 11:24:41 +08:00
fan
b0028f048f 同步代码 2023-07-06 11:24:35 +08:00
joylink_zhaoerwei
9cfe78fc00 微调 2023-07-05 18:02:48 +08:00
joylink_zhaoerwei
e6e35250ab 微调 2023-07-05 16:10:44 +08:00
fan
ceb6a230c6 信号机状态调整 2023-07-05 15:45:10 +08:00
fan
bf93f67091 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-05 11:16:45 +08:00
fan
c95ceb164a 线网跳转线路逻辑调整 2023-07-05 11:16:38 +08:00
joylink_zhaoerwei
f146d6faba 微调 2023-07-05 11:08:22 +08:00
joylink_zhaoerwei
e25403077a 站台代码优化 2023-07-05 10:19:17 +08:00
joylink_zhaoerwei
6fc88043e7 微调 2023-07-04 17:40:38 +08:00
joylink_zhaoerwei
e2f3bf7bdb 微调 2023-07-04 17:30:08 +08:00
joylink_zhaoerwei
87eece2ab4 mock代码 2023-07-04 17:04:23 +08:00
dong
3745e5486d mock调整 2023-07-04 11:24:21 +08:00
Yuan
ce017c77ed Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-04 11:13:36 +08:00
Yuan
03eacb52f5 道岔和区段编号表单改为字符串 2023-07-04 11:13:33 +08:00
dong
d53972584c mock测试 2023-07-04 11:12:12 +08:00
Yuan
e149b0764a 拆分的区段标签居中 2023-07-04 09:21:34 +08:00
Yuan
2c219da3a2 区段拆分 && 区段道岔联动拖动 2023-07-03 18:45:18 +08:00
dong
a3c079ba48 列车socket订阅 2023-07-03 18:19:26 +08:00
dong
9021a2b134 列车状态调整 2023-07-03 18:13:25 +08:00
dong
d74477bdd6 发布图添加分隔符 2023-07-03 16:26:49 +08:00
joylink_zhaoerwei
07b6ede1df 线路图车次窗和计轴数据 2023-07-03 16:05:41 +08:00
Yuan
e91c6bcb28 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-07-03 15:30:46 +08:00
Yuan
7424e9afed 区段关联问题 2023-07-03 15:30:41 +08:00
joylink_zhaoerwei
f484d17805 状态数据 2023-07-03 15:24:28 +08:00
joylink_zhaoerwei
edb93a32e9 车站和站台状态数据 2023-07-03 14:38:15 +08:00
dong
104dfdec3b 列车状态调整 2023-07-03 11:02:01 +08:00
fan
16d407b39e 线网运行调整 2023-07-03 10:28:00 +08:00
fan
d1664767a7 换乘=》 换线 2023-07-03 10:17:57 +08:00
fan
e1ab9751e5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-07-03 09:46:08 +08:00
fan
6341dfa0e5 坐标系增加 2023-07-03 09:46:00 +08:00
joylink_zhaoerwei
f1e9a8b6d5 计轴微调 2023-07-03 09:15:33 +08:00
dong
d14ed2d149 计轴调整 2023-06-30 18:34:09 +08:00
joylink_zhaoerwei
8fe80c5c10 bb有信号机连接 2023-06-30 18:15:36 +08:00
Yuan
9006e57ad3 bugfix - 关系保存错误 2023-06-30 17:10:57 +08:00
Yuan
b19d06cf8c Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-30 17:05:05 +08:00
Yuan
f3ee285bc3 bugfix - 关联关系更新 2023-06-30 17:04:57 +08:00
fan
9a706820f9 代码同步 2023-06-30 17:00:02 +08:00
fan
7aa731d9f8 运行线数据调整 2023-06-30 16:41:27 +08:00
fan
c2e2c5dd64 删除数据处理 2023-06-30 16:24:01 +08:00
fan
4b1cb517c4 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-30 16:17:08 +08:00
fan
c9dabfe457 线网调整 2023-06-30 16:17:00 +08:00
joylink_zhaoerwei
5bc728365b 微调 2023-06-30 15:36:26 +08:00
dong
db885806ec 计轴调整 2023-06-30 15:35:14 +08:00
dong
136e02efa2 分隔符调整 2023-06-30 14:54:03 +08:00
joylink_zhaoerwei
bf00193047 逻辑区段车次窗大小随区段长度变化 2023-06-30 14:33:29 +08:00
joylink_zhaoerwei
353914335d 车次窗根据逻辑区段生成 2023-06-30 13:51:10 +08:00
Yuan
08a8e332d2 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-30 13:49:04 +08:00
Yuan
9289e151f7 道岔公里标修改 2023-06-30 13:48:59 +08:00
dong
d13da1478a 分隔符调整 2023-06-30 13:40:48 +08:00
Yuan
07b5f97972 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-30 11:20:30 +08:00
Yuan
3135ba1711 wip-道岔拆分 2023-06-30 11:20:26 +08:00
dong
46ce8c3be9 分隔符调整 2023-06-30 11:15:12 +08:00
dong
2ea2ed8a8b 一键生成分隔符调整 2023-06-30 09:56:13 +08:00
fan
bc2de121ab 线路订阅调整 2023-06-30 09:35:31 +08:00
fan
1d552714a1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-30 09:34:00 +08:00
fan
1a7e5e1647 取消订阅 2023-06-30 09:33:49 +08:00
fan
1e93e6ddf8 消息订阅 2023-06-30 09:27:16 +08:00
joylink_zhaoerwei
77f32c55ab 微调 2023-06-30 09:26:21 +08:00
joylink_zhaoerwei
6f0a933e15 计轴代码优化 2023-06-30 08:54:34 +08:00
joylink_zhaoerwei
f13de18397 微调 2023-06-29 18:27:55 +08:00
Yuan
856fe39e3b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-29 18:00:57 +08:00
Yuan
e0e28524dc 道岔增加公里标 2023-06-29 17:59:58 +08:00
dong
1117ccb828 分隔符调整 2023-06-29 17:56:07 +08:00
joylink_zhaoerwei
9a0604d8c8 一键生成修改 2023-06-29 17:51:31 +08:00
dong
2b0f6acbd9 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 17:38:03 +08:00
dong
630e2c7d01 一键生成调整 2023-06-29 17:37:50 +08:00
Yuan
81dd9ed450 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-29 17:33:54 +08:00
Yuan
10a2c9de27 四道岔共点关系处理 2023-06-29 17:33:19 +08:00
fan
ddbf5936be Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 17:22:02 +08:00
fan
6726da6a39 线路线网跳转 2023-06-29 17:21:55 +08:00
joylink_zhaoerwei
2f1dafe83b 计轴名称加默认 2023-06-29 17:18:16 +08:00
dong
4121dde0d2 分隔符调整 2023-06-29 17:10:53 +08:00
joylink_zhaoerwei
04c4b8908e 公里标--车站和计轴 2023-06-29 16:51:53 +08:00
dong
3f7014066d 分隔符调整 2023-06-29 16:34:11 +08:00
dong
47005eb430 添加分隔符 2023-06-29 16:29:48 +08:00
fan
9df36d7706 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 15:39:28 +08:00
fan
5c0b0fc40f 公里标系统 2023-06-29 15:39:23 +08:00
joylink_zhaoerwei
f8d0dc8b39 计轴优化 2023-06-29 15:35:18 +08:00
joylink_zhaoerwei
3f54c6c010 计轴--增量添加 2023-06-29 14:49:54 +08:00
fan
5022d73b58 proto同步 2023-06-29 14:11:23 +08:00
fan
166825266a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-29 14:08:38 +08:00
fan
344371c3fa 信号机公里标 2023-06-29 14:08:33 +08:00
fan
331eaf042b 轨迹线公里标点生成逻辑调整 2023-06-29 11:18:01 +08:00
joylink_zhaoerwei
1ff4a3e60f 由道岔关系生成计轴 2023-06-29 11:09:25 +08:00
Yuan
8be43e6331 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-29 10:38:19 +08:00
Yuan
48d117fdab 区段和道岔关系 2023-06-29 10:38:16 +08:00
joylink_zhaoerwei
99f0987b15 由区段的关联关系生成计轴--道岔待优化 2023-06-29 10:09:00 +08:00
fan
180712d9c4 运行线生成关联车站调整again 2023-06-29 10:05:02 +08:00
fan
2f5a932c58 运行线生成关联车站限制增加 2023-06-29 09:59:16 +08:00
fan
632371b64c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 17:59:15 +08:00
fan
886e16fd03 信号机公里标 2023-06-28 17:59:10 +08:00
Yuan
798a348ac9 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-28 17:28:11 +08:00
Yuan
5ec1dcc745 道岔和区段表单更新问题 2023-06-28 17:28:08 +08:00
joylink_zhaoerwei
ea2e929822 由区段生成的计轴以及关联关系 2023-06-28 15:20:00 +08:00
fan
124eb1f758 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 13:54:32 +08:00
fan
ce48819652 轨迹线注释坐标 2023-06-28 13:54:26 +08:00
Yuan
c5d9661337 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-28 13:49:26 +08:00
Yuan
63738bae43 bugfix - 区段道岔关系数据 2023-06-28 13:49:22 +08:00
fan
8f8ce56c87 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-28 13:42:02 +08:00
fan
4e7d373031 轨迹线调整 2023-06-28 13:41:18 +08:00
joylink_zhaoerwei
36ea9427e5 计轴不删 2023-06-28 13:07:44 +08:00
joylink_zhaoerwei
4559914091 计轴 2023-06-28 11:02:17 +08:00
joylink_zhaoerwei
ad331085b4 计轴图形--待完善 2023-06-27 14:31:43 +08:00
fan
16f535514d Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-27 14:14:46 +08:00
fan
4529277fb5 暂提 2023-06-27 14:14:41 +08:00
dong
ef8f31ffe3 列车调整 2023-06-27 14:11:30 +08:00
dong
62bb6bd323 列车调整 2023-06-27 13:50:16 +08:00
fan
faa462f980 proto调整 2023-06-27 13:19:42 +08:00
fan
47753510e2 proto文件修改 2023-06-27 13:15:02 +08:00
fan
9789157b86 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-27 13:14:40 +08:00
fan
d328f89463 代码调整 2023-06-27 13:12:41 +08:00
Yuan
ae4fab38f9 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-27 09:57:14 +08:00
Yuan
c47933e4d2 wip - 区段拆分 2023-06-27 09:57:10 +08:00
fan
153b1ec567 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 17:23:18 +08:00
fan
5970b33047 运行线车站关系构建 2023-06-26 17:22:42 +08:00
joylink_zhaoerwei
95981e5153 车站状态数据 2023-06-26 17:13:31 +08:00
joylink_zhaoerwei
14a349aace 微调 2023-06-26 16:01:55 +08:00
joylink_zhaoerwei
3a51b0697c 车站--站控中控 2023-06-26 15:13:25 +08:00
Yuan
ca173798e2 道岔和区段关联关系显示对应的端口 2023-06-26 14:42:44 +08:00
fan
4efb620b42 路由导入调整 2023-06-26 13:56:06 +08:00
fan
ead291543a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 13:51:31 +08:00
fan
db881556a7 主页面调整 2023-06-26 13:51:27 +08:00
joylink_zhaoerwei
c240b81de8 站台调整 2023-06-26 13:45:18 +08:00
fan
beb4704912 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-26 13:13:58 +08:00
fan
3fe9f9e92c 添加监控 2023-06-26 13:13:52 +08:00
joylink_zhaoerwei
7863cfb71b 站台状态数据 2023-06-26 11:00:48 +08:00
joylink_zhaoerwei
db143530c1 车次窗一键生成辅助线 2023-06-26 10:05:53 +08:00
dong
e049c6cd39 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-25 17:40:32 +08:00
dong
ed825ab1ed 草稿发布调整 2023-06-25 17:40:17 +08:00
joylink_zhaoerwei
9b06b1301e 站台状态数据 2023-06-25 17:37:52 +08:00
fan
93432b76fb 信号机名称子元素拖拽 2023-06-25 15:48:32 +08:00
fan
7a51145aa3 信号机名称调整 2023-06-25 15:45:48 +08:00
fan
e45e329bb5 信号机调整 2023-06-25 15:40:20 +08:00
fan
6e728a6265 信号机调整 2023-06-25 15:38:36 +08:00
fan
add93ac439 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-25 15:06:51 +08:00
fan
58ed710688 框架代码同步 2023-06-25 15:06:47 +08:00
fan
4035943936 信号机代码调整暂提 2023-06-25 15:05:59 +08:00
Yuan
27615aec8f 区段标签移动 && 区段AB端标识修复 2023-06-25 14:30:31 +08:00
Yuan
6e365adecd bugfix - 道岔增删点 2023-06-25 14:04:00 +08:00
joylink_zhaoerwei
4e6f241b7f 公里标显示格式修改 2023-06-25 13:32:32 +08:00
Yuan
b281550e96 bugfix - 道岔增点数据保存 2023-06-25 10:44:20 +08:00
fan
5f80694d93 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-21 17:35:07 +08:00
fan
a4ae7c9c3c 状态调整 2023-06-21 17:35:01 +08:00
joylink_zhaoerwei
5a07e8dcaa 微调 2023-06-21 16:57:24 +08:00
joylink_zhaoerwei
f53dc1bec8 车次窗一键生成--改为需要选择一条区段作为基准 2023-06-21 16:30:09 +08:00
Yuan
018c8eb66f Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-21 16:23:42 +08:00
Yuan
1385cae2ed bugfix - 区段取消选中时ab端标识不消失 2023-06-21 16:23:27 +08:00
joylink_zhaoerwei
624956b7d1 车站和站台右键菜单初提交,待配置 2023-06-21 16:23:23 +08:00
Yuan
7d72c33ab2 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-21 16:11:14 +08:00
Yuan
a8fa8d24c4 道岔区段增删节点 2023-06-21 16:11:10 +08:00
fan
c84d6d92e8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-21 14:48:21 +08:00
fan
b896c3169c 信号机闪烁动画 2023-06-21 14:48:11 +08:00
dong
eb9b564adc 代码调整 2023-06-21 14:37:57 +08:00
dong
0a209a963a 列车调整 2023-06-21 10:07:16 +08:00
joylink_zhaoerwei
a3617b30a5 车次窗一键生成修改 2023-06-21 09:48:07 +08:00
Yuan
53044aeb5a 道岔辅助线增加斜45度 2023-06-21 09:39:12 +08:00
Yuan
e2d2999967 message 2023-06-21 09:33:13 +08:00
Yuan
be3e2d9511 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 17:38:30 +08:00
Yuan
f22953f3f2 区段变换数据 2023-06-20 17:38:27 +08:00
fan
e77765111b lineApp调整 2023-06-20 17:36:39 +08:00
fan
f52bc51759 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 17:32:12 +08:00
fan
5a3ccf5413 信号机状态调整 2023-06-20 17:32:05 +08:00
Yuan
13bbc1a7e6 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 17:25:41 +08:00
Yuan
51f724bab6 道岔和区段修改 2023-06-20 17:24:28 +08:00
fan
5e12d9a2e5 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 17:15:03 +08:00
fan
f77edafdfe 信号机状态调整 2023-06-20 17:14:56 +08:00
joylink_zhaoerwei
4af86c2886 车站和站台引入状态数据 2023-06-20 17:00:16 +08:00
fan
3d78dec574 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 16:22:14 +08:00
fan
b87eb4f326 信号机状态流程 2023-06-20 16:22:10 +08:00
joylink_zhaoerwei
676710cfb8 车站和站台的状态数据 2023-06-20 16:15:05 +08:00
fan
c53c2df847 状态调整 2023-06-20 14:52:19 +08:00
fan
2ffd39f70a Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 14:00:09 +08:00
fan
eb7163cf64 代码同步 2023-06-20 14:00:01 +08:00
Yuan
1bbff9661d Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-20 13:50:34 +08:00
Yuan
6a8abaa990 框架更新报错修改 2023-06-20 13:48:23 +08:00
joylink_zhaoerwei
44074dd798 代码调整 2023-06-20 13:43:43 +08:00
fan
2e849d8893 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 11:28:45 +08:00
fan
bd671ada7d 代码调整 2023-06-20 11:28:41 +08:00
joylink_zhaoerwei
4a233987e0 多边形备用 2023-06-20 11:22:03 +08:00
fan
d57b7bdbfa 同步代码 2023-06-20 11:06:00 +08:00
fan
8082948b65 link路径点菜单调整 2023-06-20 10:09:55 +08:00
fan
98c213dab1 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 10:08:33 +08:00
fan
bea612c8ba 路径编辑调整 2023-06-20 10:08:29 +08:00
joylink_zhaoerwei
5de5b79e04 去除多边形 2023-06-20 09:40:18 +08:00
fan
8f8ad4cd6a 同步代码 2023-06-20 09:20:02 +08:00
fan
924790bf64 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-20 09:17:14 +08:00
fan
45709b918d 信号机大小调整 2023-06-20 09:17:10 +08:00
joylink_zhaoerwei
3b337a7834 车次窗方向 2023-06-20 09:10:58 +08:00
Yuan
553bcb4307 bugfix 2023-06-20 08:48:49 +08:00
Yuan
357085e7fd bugfix - deviceType比较 2023-06-19 17:40:27 +08:00
Yuan
bcb0a1da98 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-19 17:37:21 +08:00
Yuan
aa584dd3bb 框架更新, 道岔和区段吸附修改 2023-06-19 17:37:16 +08:00
fan
d28b9c94d1 代码同步 2023-06-19 17:28:04 +08:00
fan
134b1dd700 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 17:27:19 +08:00
fan
1d1dbade47 线网添加设备 2023-06-19 17:27:06 +08:00
Yuan
98f768cc9f Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-19 17:18:38 +08:00
Yuan
1d317a452a 道岔和区段关联关系 2023-06-19 17:18:32 +08:00
joylink_zhaoerwei
5570e88878 车站和站台绘制辅助线 2023-06-19 16:40:39 +08:00
fan
6b735a094c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 16:19:44 +08:00
fan
2e5527d5f7 右键菜单迁移 2023-06-19 16:19:38 +08:00
joylink_zhaoerwei
76444b896a 微调 2023-06-19 16:01:22 +08:00
joylink_zhaoerwei
63052c4617 微调 2023-06-19 15:29:44 +08:00
joylink_zhaoerwei
932409e700 车次窗bug修复 2023-06-19 14:42:31 +08:00
joylink_zhaoerwei
8b46178f57 一键生成车次窗--初提交 2023-06-19 14:18:09 +08:00
fan
b3c31c2a54 预览界面调整 2023-06-19 14:09:09 +08:00
fan
415db453e4 框架代码同步 2023-06-19 11:14:54 +08:00
fan
a28dad6c03 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-19 11:14:18 +08:00
fan
ea2c874341 发布预览 2023-06-19 11:14:09 +08:00
Yuan
cf61120362 bugfix - 区段保存错误数据 2023-06-16 17:49:30 +08:00
joylink_zhaoerwei
af2ac45426 车次窗辅助线和自动生成多个车次窗 2023-06-16 17:15:04 +08:00
joylink_zhaoerwei
0064742aa1 微调 2023-06-16 15:53:09 +08:00
joylink_zhaoerwei
683dc43c8e Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 15:46:29 +08:00
joylink_zhaoerwei
18a24d898c 公里标 2023-06-16 15:45:21 +08:00
Yuan
61e9b9dcf7 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-16 15:44:49 +08:00
Yuan
2429d7a348 修改道岔和区段吸附 2023-06-16 15:44:45 +08:00
fan
3239e8862e 镜像处理逻辑调整 2023-06-16 14:49:15 +08:00
fan
a116149775 镜像复值调整 2023-06-16 14:31:05 +08:00
fan
3d8e203e9d 镜像代码调整 2023-06-16 14:08:04 +08:00
fan
59721814af Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 13:46:04 +08:00
fan
aa805d8f84 信号机添加吸附&镜像 2023-06-16 13:45:58 +08:00
joylink_zhaoerwei
3e7b9936b4 车次窗初提交--车站增加集中站属性 2023-06-16 13:15:46 +08:00
fan
f4535563be 线网图车站字体调小 2023-06-16 10:48:20 +08:00
fan
b401a1ffcd 工具方法提出 2023-06-16 10:45:58 +08:00
fan
41c562451a 代码同步 2023-06-16 10:28:39 +08:00
fan
f777be3d47 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-16 09:27:23 +08:00
fan
34df6dc145 代码调整 2023-06-16 09:27:14 +08:00