Commit Graph

419 Commits

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