Commit Graph

819 Commits

Author SHA1 Message Date
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
Yuan
b68eb3e4e5 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-15 17:18:11 +08:00
Yuan
cbd43ac95a 道岔编辑吸附方式调整 2023-06-15 17:18:06 +08:00
fan
df4effd118 代码调整 2023-06-15 15:23:01 +08:00
fan
55cdf9ccbf 同步代码 2023-06-15 14:21:11 +08:00
fan
59fed6579c 代码暂提 2023-06-15 14:20:33 +08:00
fan
ce32589aac 线路信号机名称放开缩放 2023-06-15 13:18:29 +08:00
fan
3d8eea5a85 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-15 13:12:47 +08:00
fan
d0034e0acf 代码调整 2023-06-15 13:12:37 +08:00
joylink_zhaoerwei
e3551c39ee 调整换乘图标的线宽和颜色 2023-06-15 10:39:34 +08:00
joylink_zhaoerwei
5a8d709bea 车站名自动换行 2023-06-15 09:08:08 +08:00
fan
e04b7d355b 线网车站颜色调整 2023-06-14 16:04:38 +08:00
fan
fb854feb79 车站名称大小调整 2023-06-14 15:45:29 +08:00
fan
01ef575be3 轨迹线颜色调整 2023-06-14 15:39:19 +08:00
fan
5bd0a14073 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-14 15:38:49 +08:00
fan
25c65424d5 轨迹线生成逻辑调整 2023-06-14 15:38:45 +08:00
joylink_zhaoerwei
84fa32f3c8 线网车站增加吸附运行线 2023-06-14 15:30:11 +08:00
fan
e62b93d785 运行线拖动添加吸附逻辑 2023-06-14 13:50:50 +08:00
fan
b40eb6f5e8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-14 13:11:13 +08:00
fan
a5a530b66f 生成轨迹线后移动鼠标报错调整 2023-06-14 13:11:04 +08:00
joylink_zhaoerwei
10727abc6a 线网车变小 2023-06-14 13:05:01 +08:00
fan
15b028e494 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-14 10:10:28 +08:00
fan
fec2c8aa54 防止脏数据产生 2023-06-14 10:10:22 +08:00
joylink_zhaoerwei
00f52e25cc 车站控制微调 2023-06-14 09:49:47 +08:00
joylink_zhaoerwei
6e5cdce10b 车站加控制 2023-06-13 17:49:35 +08:00
fan
9ff2a4c3df Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-13 17:39:50 +08:00
fan
c30ef3456a 运行线放开坐标 2023-06-13 17:39:43 +08:00
Yuan
19166ae146 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-13 16:21:01 +08:00
Yuan
9ed2d2231e 道岔及区段关系 2023-06-13 16:20:56 +08:00
fan
ca8be20d4f input框调整 2023-06-13 16:14:03 +08:00
fan
5e72c1080c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-13 16:10:49 +08:00
fan
00c666b876 删除运行线同步移除轨迹线调整 2023-06-13 16:10:21 +08:00
joylink_zhaoerwei
c78a8c8798 线网车站svg 2023-06-13 15:49:33 +08:00
fan
f621cbefd2 轨迹线生成 2023-06-13 15:30:49 +08:00
fan
3f965fde13 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-13 13:39:23 +08:00
fan
adf0197b68 问题调整 2023-06-13 13:39:19 +08:00
joylink_zhaoerwei
f5fba2b187 多边形绘制初提交 2023-06-13 13:20:25 +08:00
fan
81340970ae 绘制完毕选中图形状态消失 2023-06-13 11:16:32 +08:00
fan
70264b3a51 测试svg 2023-06-13 10:26:57 +08:00
fan
fc5b532801 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-13 10:25:56 +08:00
fan
68bfbb3912 新增轨迹线 2023-06-13 10:24:27 +08:00
Yuan
3cb834cb62 区段绘制 2023-06-13 10:21:31 +08:00
joylink_zhaoerwei
925ce62a9c 车站固定元素更换,圆点固定 2023-06-13 09:24:02 +08:00
joylink_zhaoerwei
e855b7f85f 线网列车 2023-06-12 17:53:39 +08:00
fan
5996d47656 运行线代码调整 2023-06-12 17:41:54 +08:00
fan
8be7941e5f Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-12 17:37:54 +08:00
fan
ace323100d 运行线代码提交 2023-06-12 17:34:11 +08:00
joylink_zhaoerwei
a10fdad765 圆角矩形 2023-06-12 15:56:19 +08:00
Yuan
d9d8e11eea Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-12 14:39:47 +08:00
Yuan
916d89abf7 bugfix - token过期导致的登录异常 2023-06-12 14:39:42 +08:00
Yuan
fe8fc9cf33 区段与道岔吸附 2023-06-12 14:39:13 +08:00
joylink_zhaoerwei
7be8b773d9 线网加矩形 2023-06-12 13:54:43 +08:00
joylink_zhaoerwei
de866d9250 线网车站 2023-06-12 13:25:48 +08:00
Yuan
9a0e93d705 message 更新 2023-06-12 11:05:01 +08:00
Yuan
a3e37d0ff8 道岔和区段吸附 2023-06-12 11:04:14 +08:00
Yuan
2db09eb637 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 18:39:43 +08:00
Yuan
ec4eb4b25c 区段绘制 && message更新 2023-06-09 18:36:09 +08:00
fan
9ca21665cf Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-09 18:07:41 +08:00
fan
5231cc6764 svg显示问题调整 2023-06-09 18:07:36 +08:00
dong
d6515cf693 草稿另存为接口 2023-06-09 17:56:19 +08:00
joylink_zhaoerwei
b21af0985a 根据草稿图类型加载绘图工具 2023-06-09 17:48:35 +08:00
fan
6b3bc45677 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-09 17:45:21 +08:00
fan
afb51855fc 同步框架代码 2023-06-09 17:45:16 +08:00
dong
7686c1d50c 代码调整 2023-06-09 17:05:08 +08:00
Yuan
410e129a8b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:53:56 +08:00
fan
b79535cb83 信号机更好 2023-06-09 16:53:06 +08:00
Yuan
4db35b0fb5 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:52:03 +08:00
fan
653d312a61 信号机更改 2023-06-09 16:51:37 +08:00
Yuan
736ac691fe Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:49:37 +08:00
fan
d147568881 信号机调整 2023-06-09 16:48:21 +08:00
Yuan
6d2d5af34a Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:46:27 +08:00
fan
8a5d060377 信号机更改 2023-06-09 16:46:18 +08:00
Yuan
51f3fe129b Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:37:52 +08:00
dong
89bbac94d7 线路信息调整 2023-06-09 16:36:49 +08:00
Yuan
75811bc883 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 16:35:50 +08:00
Yuan
2baa70ae27 message更新 2023-06-09 16:35:40 +08:00
fan
825cb1b7a8 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-09 16:34:49 +08:00
fan
580f46b44b 信号机更改 2023-06-09 16:34:41 +08:00
Yuan
0a7c7056ee 道岔增加ABC端显示 2023-06-09 16:34:05 +08:00
Yuan
72ef395221 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 15:28:52 +08:00
Yuan
47dbfc9c30 道岔AB拖动 2023-06-09 15:28:48 +08:00
dong
498ed96105 代码调整 2023-06-09 15:17:55 +08:00
joylink_zhaoerwei
0943d9b103 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-09 15:15:35 +08:00
dong
06d0fbc797 代码调整 2023-06-09 15:15:27 +08:00
joylink_zhaoerwei
4740a09155 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-09 15:14:39 +08:00
joylink_zhaoerwei
f283b89078 车站 2023-06-09 15:14:09 +08:00
dong
3941fae435 草稿发布调整 2023-06-09 14:44:11 +08:00
dong
7e3173b076 线路信息管理调整 2023-06-09 14:33:09 +08:00
joylink_zhaoerwei
9a4a1d947c 草稿图发布 2023-06-09 14:25:43 +08:00
joylink_zhaoerwei
e2efa1acc6 微调 2023-06-09 14:04:13 +08:00
joylink_zhaoerwei
360829d661 发布图api和页面 2023-06-09 14:01:16 +08:00
Yuan
b76a7f1092 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 13:58:41 +08:00
Yuan
bcfc3fac7a bugfix - 道岔AB端拖动问题 2023-06-09 13:58:37 +08:00
dong
99ead17306 草稿发布修改 2023-06-09 13:55:06 +08:00
dong
0dd5e9775a 添加发布管理和线路信息管理 2023-06-09 13:31:25 +08:00
Yuan
4efcdc473b state messages 2023-06-09 13:16:52 +08:00
joylink_zhaoerwei
190b9a9ac4 车站去圆圈 2023-06-09 13:04:41 +08:00
Yuan
8c0ed787f5 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-09 09:36:19 +08:00
Yuan
95ef43ba8c 道岔 2023-06-09 09:36:13 +08:00
dong
391e086f9f 创建草稿修改 2023-06-08 18:20:18 +08:00
joylink_zhaoerwei
ae1efa309e 车站圆圈微调 2023-06-08 17:47:30 +08:00
joylink_zhaoerwei
ecb3b39be1 车站圆圈--线网备用 2023-06-08 17:08:10 +08:00
fan
141504c31c 信号机绘制调整 2023-06-08 16:51:57 +08:00
fan
e29c4a3372 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 16:30:17 +08:00
fan
648414d80c 信号机存储childtransform 2023-06-08 16:30:11 +08:00
dong
fe96e51c5a 修改列车 2023-06-08 16:18:02 +08:00
Yuan
ceaaf29610 wip - 道岔 2023-06-08 15:38:29 +08:00
fan
4eb6298e7c Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 15:37:43 +08:00
fan
373710676b 同步代码 2023-06-08 15:37:38 +08:00
joylink_zhaoerwei
33307c6821 车站和站台微调 2023-06-08 15:25:15 +08:00
fan
ecd7c5e8dc 信号机调整 2023-06-08 15:18:54 +08:00
fan
40d3b2e863 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 15:06:59 +08:00
fan
c0f348f970 信号机编号可拖拽旋转 2023-06-08 15:06:55 +08:00
Yuan
f6ccf5482a Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-08 14:55:51 +08:00
Yuan
49bd440f2f 道岔修改 2023-06-08 14:55:48 +08:00
fan
2806c4c1f2 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 14:20:20 +08:00
fan
0b0e5475df 信号机图标调整 2023-06-08 14:20:13 +08:00
joylink_zhaoerwei
50453f4502 车站和站台微调 2023-06-08 14:05:00 +08:00
joylink_zhaoerwei
3cb9513b41 车站和站台微调 2023-06-08 13:26:48 +08:00
joylink_zhaoerwei
dec41e623b 微调 2023-06-08 11:28:31 +08:00
dong
6d9f59e6be 创建草稿时选择类型 2023-06-08 11:27:25 +08:00
joylink_zhaoerwei
3179a41e4f 车站和站台 2023-06-08 11:12:40 +08:00
fan
1cc56d6aff Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 11:10:27 +08:00
fan
6baacddeb6 多余引用删除 2023-06-08 11:10:21 +08:00
Yuan
24ba22faea Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-08 10:32:58 +08:00
Yuan
6653764e8d 道岔属性面板 2023-06-08 10:32:53 +08:00
fan
ae4b02ab38 信号机调整 2023-06-08 10:27:32 +08:00
fan
2d9a400266 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-08 10:22:18 +08:00
fan
282a1d2b34 信号机调整 2023-06-08 10:16:15 +08:00
Yuan
855b8a3eb8 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-08 09:44:18 +08:00
Yuan
84e6771c9d merge 2023-06-08 09:40:12 +08:00
Yuan
9dd01ac10e wip-道岔 2023-06-08 09:38:14 +08:00
dong
265ff0a939 草稿编辑添加返回按钮 2023-06-07 17:21:25 +08:00
dong
d3ea5832c0 修改退出草稿绘图报错问题 2023-06-07 16:05:41 +08:00
dong
77d5a07672 table高度自适应 2023-06-07 16:04:40 +08:00
joylink_zhaoerwei
067afc4ddd 微调 2023-06-07 15:44:30 +08:00
joylink_zhaoerwei
3fff97ae87 微调 2023-06-07 15:39:25 +08:00
joylink_zhaoerwei
108516e059 功能菜单 2023-06-07 15:20:34 +08:00
fan
7c33be246f Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-07 14:56:06 +08:00
fan
3d3d2aefeb 信号机编号 2023-06-07 14:55:55 +08:00
joylink_zhaoerwei
f8be73ffde 画图按钮 2023-06-07 14:33:46 +08:00
joylink_zhaoerwei
1e3fbf06c7 画图图标 2023-06-07 14:25:14 +08:00
joylink_zhaoerwei
963256bebc 画图工具栏 2023-06-07 13:33:30 +08:00
dong
540ab83d74 草稿数据的保存和获取 2023-06-07 10:08:10 +08:00
fan
f6e0bdfe72 Merge branch 'master' of https://git.code.tencent.com/xian-ncc-da/xian-ncc-da-client 2023-06-06 17:07:43 +08:00
fan
bf4847e1ab 信号机调整 2023-06-06 17:07:39 +08:00
joylink_zhaoerwei
c0d5708967 矩形移动bug调整 2023-06-06 16:58:34 +08:00
fan
909b981f8e 信号机同步 2023-06-06 16:46:01 +08:00
joylink_zhaoerwei
34c449bb60 bug调整--删除右键保存 2023-06-06 16:05:18 +08:00
Yuan
2424b8120c Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-06 15:13:23 +08:00
Yuan
dfb21bedbb 更新框架代码和messages 2023-06-06 15:13:19 +08:00
joylink_zhaoerwei
9ba034922d 车站--圆圈位置显影 2023-06-06 15:11:32 +08:00
joylink_zhaoerwei
64604f7b92 微调 2023-06-06 14:40:51 +08:00
Yuan
0a068f7523 Merge branch 'master' of git.code.tencent.com:xian-ncc-da/xian-ncc-da-client 2023-06-06 14:33:30 +08:00
Yuan
6848ea4b2e 代码迁移 2023-06-06 14:33:25 +08:00
dong
422cc79deb 代码调整 2023-06-06 13:24:45 +08:00
dong
17c2c02e10 草稿接口调整 2023-06-06 13:14:42 +08:00
dong
2512c6a8ce 代码调整 2023-06-06 11:16:51 +08:00
dong
7400b2f1f6 登录和注册手机格式校验 2023-06-06 11:12:06 +08:00
dong
5f6b52228b 代码调整 2023-06-05 17:27:38 +08:00
joylink_zhaoerwei
481a2b12c1 用户管理 2023-06-05 17:08:15 +08:00
dong
313f4c1f8c 代码调整 2023-06-05 16:43:24 +08:00
dong
3a5b59b30c 代码调整 2023-06-05 16:30:07 +08:00
dong
2305d3452a 草稿图管理 2023-06-05 16:13:27 +08:00
205a8a63f7 菜单调整,无用代码删除 2023-06-05 13:11:16 +08:00
063435a584 注册登录功能开发 2023-06-05 10:40:04 +08:00
300aaf32da 登录逻辑简单处理 2023-06-02 18:26:45 +08:00
dd1137ba60 基础框架搭建 2023-06-02 18:03:39 +08:00
0fe6b2c393 添加pixijs等相关依赖
同步图形框架代码(后面可以使用npm run sync来同步graphic-pixi图形框架库代码到项目jl-graphic目录中)
2023-05-30 17:04:50 +08:00
ce2be2a18a 初始化 2023-05-30 13:19:30 +08:00