Commit Graph

731 Commits

Author SHA1 Message Date
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
4235e5f472 fix :drone.yml 2024-09-03 18:50:01 +08:00
2f4b2bca15 Merge pull request 'fix :drone.yml' (#385) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/385
2024-09-03 10:48:51 +00:00
0aa521a2c8 Merge remote-tracking branch 'origin/dev' into dev 2024-09-03 18:48:11 +08:00
7081dbb18c fix :drone.yml 2024-09-03 18:47:59 +08:00
trp-ironman
a859b01252 Merge pull request 'trp:从场景保存的设备模型数据中获取设备名称' (#384) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/384
2024-09-03 06:42:55 +00:00
trp
92e419d40f trp:从场景保存的设备模型数据中获取设备名称 2024-09-03 14:41:59 +08:00
trp-ironman
cae6fc6ed1 Merge pull request 'trp:覆盖远程仓库之前代码' (#383) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/383
2024-09-03 06:27:07 +00:00
trp
fd7e1fe015 trp:覆盖远程仓库之前代码 2024-09-03 14:23:09 +08:00
trp-ironman
d7bcd3d4d6 Merge pull request 'trp_dev' (#382) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/382
2024-09-02 15:59:52 +00:00
trp
aadef41fff trp:上一次代码提交冲突解决 2024-09-02 23:58:12 +08:00
trp
dcd43ff5da trp:上一次冲突后提交 2024-09-02 23:30:21 +08:00
trp
ae1cc159a4 trp:设备hover回显面板数据绑定和模拟模式3d场景添加 2024-09-02 18:43:41 +08:00
6bed6482a2 Merge pull request 'fix : 修复隧道模拟首页,结束模拟之后切换状态' (#380) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/380
2024-09-02 09:54:30 +00:00
20440c1cc1 fix : 修复隧道模拟首页,结束模拟之后切换状态 2024-09-02 17:53:59 +08:00
b7b4d92f40 Merge pull request 'fix : 修复预览隧道时切换报错bug' (#379) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/379
2024-09-02 07:45:36 +00:00
00a04d0d79 fix : 修复预览隧道时切换报错bug 2024-09-02 15:45:01 +08:00
bd2a57ab69 Merge pull request 'feat : 隧道模拟' (#378) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/378
2024-09-02 05:14:52 +00:00
02194afce4 feat : 隧道模拟 2024-09-02 13:13:51 +08:00
832115e958 Merge pull request 'dev' (#377) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/377
2024-08-26 15:37:56 +00:00
a4e7bb4460 Merge pull request 'fix : 修复设备管理序列号展示' (#376) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/376
2024-08-26 15:37:42 +00:00
f66f9f4fbb fix : 修复设备管理序列号展示 2024-08-26 23:36:59 +08:00
7c7e9e9607 Merge pull request 'dev' (#374) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/374
2024-08-26 15:22:50 +00:00
c2a5d47506 Merge pull request 'fix : 修复设备管理序列号展示' (#373) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/373
2024-08-26 15:22:36 +00:00
e4f8d48838 fix : 修复设备管理序列号展示 2024-08-26 23:22:21 +08:00
535b214c40 Merge pull request 'fix : 修复气体展示' (#372) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/372
2024-08-26 15:13:49 +00:00
b2fd0bba85 fix : 修复气体展示 2024-08-26 23:12:53 +08:00
f1425ae60b Merge pull request 'fix : 多序列号功能' (#371) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/371
2024-08-25 16:05:13 +00:00
d7378bf0af fix : 多序列号功能 2024-08-25 23:00:39 +08:00
4fd4cf4f4c Merge pull request 'fix : 注释序列号' (#370) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/370
2024-08-20 16:21:53 +00:00
4813161c08 fix : 注释序列号 2024-08-21 00:21:32 +08:00
f38a55f8a3 Merge pull request 'fix : 注释序列号' (#369) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/369
2024-08-20 14:48:53 +00:00
493f816e3c fix : 注释序列号 2024-08-20 22:48:08 +08:00