Commit Graph

763 Commits

Author SHA1 Message Date
3a5bfb94f6 Merge pull request 'fix : 隧道模拟功能初步完成' (#409) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/409
2025-01-08 02:45:44 +00:00
dj
d3466fbb8d fix : 隧道模拟功能初步完成 2025-01-08 10:45:21 +08:00
zhangkaihuai
37e32189d6 Merge pull request '更新 nginx.conf' (#408) from zhangkaihuai-patch-2 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/408
2025-01-03 16:28:44 +00:00
zhangkaihuai
62c8da2ea2 更新 nginx.conf 2025-01-03 16:28:17 +00:00
zhangkaihuai
88448a88f9 Merge pull request '更新 nginx.conf' (#407) from zhangkaihuai-patch-2 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/407
2025-01-03 16:21:11 +00:00
zhangkaihuai
e0a92b51f3 更新 nginx.conf 2025-01-03 16:21:02 +00:00
a68c362490 Merge pull request 'fix : 隧道模拟功能初步完成' (#406) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/406
2025-01-03 13:41:32 +00:00
dj
2dd7bcffca fix : 隧道模拟功能初步完成 2025-01-03 21:22:08 +08:00
de8820bf11 Merge pull request 'dengjie' (#404) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/404
2025-01-03 13:16:50 +00:00
dj
56bdf6ee1e fix : 隧道模拟功能初步完成 2025-01-03 21:14:54 +08:00
dj
472bc3cb83 fix : 隧道模拟功能初步完成 2025-01-03 20:39:42 +08:00
16df648f2b Merge pull request 'trp_dev' (#403) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/403
2025-01-03 06:15:27 +00:00
trp
661b28c879 trp:修复仿真设备重新渲染数量不一致问题、标签异常回显问题 2025-01-03 14:13:43 +08:00
trp
30825ce06a Merge branch 'dengjie' of http://git.feashow.cn/clay/tunnel-cloud-web into trp_dev 2025-01-03 11:15:45 +08:00
trp
4293418c35 trp:合并分支 2025-01-03 11:15:23 +08:00
dj
8460c52d76 fix : 隧道ws数据 2025-01-02 23:33:37 +08:00
trp
3a2bd596a9 trp:本地提交测试 2025-01-02 21:45:33 +08:00
dj
1f83ddfa8e fix : 优化隧道模拟 2025-01-02 21:35:33 +08:00
dj
923ee4a81b fix : 优化隧道模拟 2025-01-02 21:31:46 +08:00
5cb6960dfd Merge pull request 'trp:修复重新渲染设备时设备数量不一致问题' (#402) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/402
2025-01-02 13:09:15 +00:00
trp
2c42edc16f trp:修复重新渲染设备时设备数量不一致问题 2025-01-02 13:00:28 +08:00
f5c3cbbbb6 Merge pull request 'trp:隧道场景仿真修改完成,待接口调试' (#401) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/401
2025-01-01 15:29:46 +00:00
trp
41cc1b4edd trp:隧道场景仿真修改完成,待接口调试 2025-01-01 23:24:59 +08:00
dj
8af7a35c69 fix : 优化隧道模拟首页 2024-12-30 22:31:37 +08:00
890c8028ab Merge pull request 'trp:隧道仿真页面,去除标签回显和隐藏附着点' (#400) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/400
2024-12-29 11:28:42 +00:00
dj
bfbf1b5116 fix : 优化隧道模拟首页的隧道预览模式 2024-12-29 19:28:12 +08:00
trp
b64d943a5e trp:隧道仿真页面,去除标签回显和隐藏附着点 2024-12-29 19:12:05 +08:00
dj
824ab5e65c fix : 优化隧道模拟首页的隧道预览模式 2024-12-29 18:50:22 +08:00
58206a89c8 Merge pull request 'trp_dev' (#398) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/398
2024-12-29 06:53:03 +00:00
trp
aefdd23925 解决隧道仿真数据在隧道中没有渲染问题 2024-12-29 14:50:59 +08:00
trp
833318dceb 本地提交,远程忽略 2024-12-29 10:34:38 +08:00
dj
e111b10806 feat : 隧道模拟 2024-12-29 00:48:25 +08:00
dj
f57023a509 feat : 隧道模拟 2024-12-07 23:04:42 +08:00
dj
375d6719d8 备份 2024-12-07 22:35:22 +08:00
zhangkaihuai
c3109bbdad Merge pull request '更新 .drone.yml' (#396) from zhangkaihuai-patch-1 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/396
2024-10-26 08:57:05 +00:00
zhangkaihuai
1c762b052a 更新 .drone.yml 2024-10-26 08:56:55 +00:00
53777c71a6 Merge pull request 'fix : 修改设备管理-序列号选择框箭头' (#395) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/395
2024-09-19 08:30:59 +00:00
dbe77b134c fix : 修改设备管理-序列号选择框箭头 2024-09-19 16:30:38 +08:00
0722b29bca Merge pull request 'fix : 修改设备管理-序列号宽度' (#393) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/393
2024-09-19 08:23:24 +00:00
91b3fc90c2 fix : 修改设备管理-序列号宽度 2024-09-19 16:19:23 +08:00
40b0562908 Merge pull request 'fix : 修复隧道编辑bug,注释log' (#392) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/392
2024-09-18 11:52:52 +00:00
6dcbd23ef4 fix : 修复隧道编辑bug,注释log 2024-09-18 19:52:38 +08:00
f2780fe7cd Merge pull request 'fix : 修复首页切换bug' (#391) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/391
2024-09-18 11:14:13 +00:00
2dc7844688 fix : 修复首页切换bug 2024-09-18 19:13:44 +08:00
clay
b12938c99f Merge pull request 'master' (#390) from master into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/390
2024-09-18 10:20:35 +00:00
clay
eb5f2eabd7 Merge pull request '更新 .drone.yml' (#389) from clay-patch-4 into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/389
2024-09-18 10:19:37 +00:00
clay
a44e237e7e 更新 .drone.yml 2024-09-18 10:19:12 +00:00
e5ed49cb21 Merge pull request 'fix : 修复变量使用错误' (#387) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/387
2024-09-18 04:00:00 +00:00
1ac4b4d82d fix : 修复变量使用错误 2024-09-18 11:59:33 +08:00
a041a9d99d Merge pull request 'dengjie' (#386) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/386
2024-09-03 10:50:27 +00:00