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 |
|
|
|
5f9784a374
|
Merge pull request 'fix : 注释序列号' (#368) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/368
|
2024-08-20 13:52:30 +00:00 |
|
|
|
191c7dbbb5
|
fix : 注释序列号
|
2024-08-20 21:52:11 +08:00 |
|
|
|
9aef340598
|
Merge pull request 'de' (#367) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/367
|
2024-08-20 10:07:52 +00:00 |
|
|
|
967d603ff2
|
Merge pull request 'de' (#366) from de into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/366
|
2024-08-20 10:07:33 +00:00 |
|
|
|
4378ec571c
|
fix : 注释序列号
|
2024-08-20 18:07:12 +08:00 |
|
|
|
5f86661ec3
|
fix : 恢复socket
|
2024-08-20 18:02:58 +08:00 |
|
|
|
7bb25958fc
|
fix : 新增隧道时多序列号
|
2024-08-20 00:22:59 +08:00 |
|
|
|
9e4cee4cae
|
fix : 新增隧道时多序列号
|
2024-08-20 00:21:47 +08:00 |
|
trp-ironman
|
e6cd9c8836
|
Merge pull request '唐润平:模型实际数值显示和排版修复' (#365) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/365
|
2024-08-19 03:37:01 +00:00 |
|
trp
|
3f38516090
|
唐润平:模型实际数值显示和排版修复
|
2024-08-19 11:35:55 +08:00 |
|
|
|
9217ce35da
|
Merge pull request 'dev' (#364) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/364
|
2024-08-17 07:34:40 +00:00 |
|
|
|
ea01ca3f79
|
Merge pull request 'fix : websocket代理' (#363) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/363
|
2024-08-17 07:34:21 +00:00 |
|
|
|
f5f178f2a2
|
fix : websocket代理
|
2024-08-17 15:33:42 +08:00 |
|
|
|
6246c4b046
|
Merge pull request 'fix : 修复设备管理的序列号样式' (#362) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/362
|
2024-08-15 15:14:53 +00:00 |
|
|
|
aa1eacc423
|
fix : 修复设备管理的序列号样式
|
2024-08-15 23:14:38 +08:00 |
|
|
|
a41f0bbaba
|
Merge pull request 'fix : 修复设备管理的序列号样式' (#361) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/361
|
2024-08-15 15:02:12 +00:00 |
|
|
|
d98eaa9368
|
fix : 修复设备管理的序列号样式
|
2024-08-15 23:01:45 +08:00 |
|
|
|
8a2a97e936
|
Merge pull request 'de' (#360) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/360
|
2024-08-15 14:40:05 +00:00 |
|
|
|
b2c85e4e47
|
fix : 注释新增/编辑框的序列号
|
2024-08-15 22:39:37 +08:00 |
|
|
|
3d0e88b315
|
fix : 修复设备管理序列号样式
|
2024-08-15 22:37:45 +08:00 |
|
|
|
a16b20f62b
|
feat : 新增/编辑隧道新增序列号1,序列号前缀输入框
|
2024-08-08 01:18:22 +08:00 |
|
|
|
1ff85059b1
|
Merge pull request 'clay' (#358) from clay into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/358
|
2024-08-07 11:56:00 +00:00 |
|