Commit Graph

419 Commits

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