Commit Graph

782 Commits

Author SHA1 Message Date
zhangkaihuai
4d82dd04f9 Merge pull request '添加 default.conf' (#419) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/419
2025-03-20 14:26:29 +00:00
zhangkaihuai
8092661991 添加 default.conf 2025-03-20 14:23:05 +00:00
zhangkaihuai
3968156194 Merge pull request '更新 .drone.yml' (#418) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/418
2025-03-20 14:13:59 +00:00
zhangkaihuai
1c29fa9557 更新 .drone.yml 2025-03-20 14:13:42 +00:00
zhangkaihuai
00683f1d71 Merge pull request '更新 .drone.yml' (#417) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/417
2025-03-01 09:19:50 +00:00
zhangkaihuai
5bb5e2ef6d 更新 .drone.yml 2025-03-01 09:17:37 +00:00
zhangkaihuai
dac763d8b5 Merge pull request '更新 .drone.yml' (#416) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/416
2025-03-01 09:14:57 +00:00
zhangkaihuai
16f0fea099 更新 .drone.yml 2025-03-01 09:14:44 +00:00
zhangkaihuai
36ac10f0a3 Merge pull request '更新 .drone.yml' (#415) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/415
2025-03-01 08:30:37 +00:00
zhangkaihuai
8738d493d6 更新 .drone.yml 2025-03-01 08:30:21 +00:00
zhangkaihuai
65b2e47fb7 Merge pull request '更新 .drone.yml' (#414) from zhangkaihuai-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/414
2025-03-01 08:28:51 +00:00
zhangkaihuai
af7b4f8231 更新 .drone.yml 2025-03-01 08:28:42 +00:00
a3d469308e Merge pull request 'dengjie' (#413) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/413
2025-02-25 13:22:11 +00:00
ad1aaea302 Merge pull request 'trp_dev' (#412) from trp_dev into dengjie
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/412
2025-02-25 13:10:24 +00:00
trp
3b538ee6d2 trp:修复隧道编辑模式下不能hover和设备编辑情况 2025-02-25 20:55:24 +08:00
c9ed05b975 Merge pull request 'fix : 修复bug' (#411) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/411
2025-02-24 15:08:50 +00:00
dj
d6c898dea5 fix : 修复bug 2025-02-24 23:07:57 +08:00
d07b6e42d1 Merge pull request 'fix : 修复用电量弹窗' (#410) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/410
2025-02-24 14:17:47 +00:00
dj
6e8adb7757 fix : 修复用电量弹窗 2025-02-24 22:16:54 +08:00
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