Commit Graph

353 Commits

Author SHA1 Message Date
odjbin
182b29bb17 Merge pull request '邓洁: 修改bug' (#205) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/205
2023-12-29 13:55:59 +00:00
邓洁
7a2a586d67 邓洁: 修改bug 2023-12-29 21:54:56 +08:00
liaojie
253a6ed387 Merge pull request 'LJ_dev' (#204) from LJ_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/204
2023-12-29 13:44:05 +00:00
Hcat
3e14bf1ca5 2 2023-12-29 21:40:54 +08:00
Hcat
a540c433fd 预览模式+切换隧道 2023-12-29 21:30:47 +08:00
Hcat
92215c97ef 廖杰:预览初始化+隧道切换 2023-12-29 21:28:56 +08:00
Hcat
e49c126351 预览初始化+切换隧道 2023-12-29 21:18:48 +08:00
odjbin
ee07807e9d Merge pull request '邓洁: 修改用户bug' (#203) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/203
2023-12-29 11:01:54 +00:00
邓洁
11f9de9389 邓洁: 修改用户bug 2023-12-29 19:00:54 +08:00
odjbin
6eb8d73594 Merge pull request '邓洁 : 修复bug' (#202) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/202
2023-12-29 09:37:50 +00:00
dengj
051d0bcd6c 邓洁 : 修复bug 2023-12-29 17:36:36 +08:00
odjbin
2664d815ff Merge pull request '邓洁 : 修复bug' (#201) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/201
2023-12-29 08:59:01 +00:00
dengj
8289274d52 邓洁 : 修复bug 2023-12-29 16:57:29 +08:00
odjbin
a3bea157b4 Merge pull request '邓洁 : 修复bug' (#200) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/200
2023-12-29 08:04:00 +00:00
dengj
101f200a96 邓洁 : 修复bug 2023-12-29 16:03:02 +08:00
odjbin
e51fea9d69 Merge pull request 'dengjie' (#199) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/199
2023-12-29 07:22:23 +00:00
dengj
b185a2a651 邓洁 : 修复用户细节 2023-12-29 15:21:24 +08:00
Hcat
a02ecff84f Merge branch 'trp_dev' of http://git.feashow.cn/clay/tunnel-cloud-web 2023-12-29 14:33:33 +08:00
trp
a1f31cf3ef 唐润平:设备唯一性 2023-12-29 14:19:42 +08:00
dengj
bc39fcda9e 邓洁 : 修复首屏风机细节 2023-12-29 14:19:40 +08:00
trp
196eac3cee 唐润平:模型接口重写 2023-12-29 13:39:23 +08:00
trp
20bfc32d08 唐润平:接口重写 2023-12-29 13:09:46 +08:00
odjbin
7d3aa9ef46 Merge pull request '邓洁 : 修复bug' (#198) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/198
2023-12-29 05:07:28 +00:00
dengj
a473317022 邓洁 : 修复bug 2023-12-29 13:06:35 +08:00
odjbin
a87b58bea7 Merge pull request '邓洁: 修复bug' (#197) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/197
2023-12-29 02:33:57 +00:00
邓洁
57b22361dc 邓洁: 修复bug 2023-12-29 10:31:46 +08:00
odjbin
abdbbbda31 Merge pull request '邓洁: 修复bug' (#196) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/196
2023-12-28 15:09:59 +00:00
邓洁
6dde5ccbc8 邓洁: 修复bug 2023-12-28 23:00:52 +08:00
odjbin
50270cddd3 Merge pull request '邓洁 : 隧道接口部分对接' (#195) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/195
2023-12-28 12:53:50 +00:00
dengj
67f40cd6b1 邓洁 : 隧道接口部分对接 2023-12-28 18:06:48 +08:00
odjbin
9017465b15 Merge pull request '邓洁: 接口部分对接' (#194) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/194
2023-12-28 08:23:26 +00:00
邓洁
64b3052348 邓洁: 接口部分对接 2023-12-28 16:22:53 +08:00
odjbin
452d76f198 Merge pull request 'dengjie' (#193) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/193
2023-12-27 15:53:28 +00:00
邓洁
31428cd640 邓洁: 设备接口部分对接 2023-12-27 23:52:10 +08:00
邓洁
ac5327e5d8 邓洁: 设备接口部分对接 2023-12-27 23:45:44 +08:00
liaojie
976c2f2bad Merge pull request 'LJ' (#192) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/192
2023-12-26 15:48:39 +00:00
Hcat
8bae80ce77 解决冲突 2023-12-26 23:47:50 +08:00
Hcat
e25398db7d 隧道的间隔点动态绑定了 2023-12-26 23:31:35 +08:00
odjbin
aa7342325f Merge pull request '邓洁: 隧道接口部分对接' (#189) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/189
2023-12-26 14:38:41 +00:00
邓洁
48978b917c 邓洁: 隧道接口部分对接 2023-12-26 22:38:10 +08:00
odjbin
49baa25f8a Merge pull request '邓洁 : 隧道接口部分对接' (#188) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/188
2023-12-26 12:30:22 +00:00
dengj
2ba9e761ab 邓洁 : 隧道接口部分对接 2023-12-26 17:08:15 +08:00
odjbin
dd561f21fc Merge pull request '邓洁: 隧道接口部分对接' (#187) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/187
2023-12-26 01:43:49 +00:00
邓洁
b1fde92bbd 邓洁: 隧道接口部分对接 2023-12-26 09:41:44 +08:00
odjbin
4a31567ab0 Merge pull request 'dev' (#186) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/186
2023-12-24 10:09:36 +00:00
odjbin
9afb0f7f28 Merge pull request '邓洁: 修改用电量' (#185) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/185
2023-12-24 10:09:07 +00:00
邓洁
73a8e809d9 邓洁: 修改用电量 2023-12-24 18:08:09 +08:00
liaojie
bd25780f46 Merge pull request 'LJ' (#183) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/183
2023-12-23 07:16:20 +00:00
Hcat
c27f1a5652 廖杰:风压阀动态添加墙壁功能大致完成 2023-12-23 15:13:44 +08:00
Hcat
7684e21d33 分压阀功能大致完成 2023-12-23 14:56:04 +08:00