odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
332 Commits 1 Branch 0 Tags
a3bea157b45f31a3f08c56342a4dd7b59af19e9a
Commit Graph

332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
dengj
bc39fcda9e 邓洁 : 修复首屏风机细节 2023-12-29 14:19:40 +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
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
odjbin
7e5f00e0cf Merge pull request '邓洁: 用电量框样式' (#182) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/182
 2023-12-23 04:23:31 +00:00
邓洁
94db596da6 邓洁: 用电量框样式 2023-12-23 12:23:08 +08:00
odjbin
6e58ac3d65 Merge pull request '邓洁: 分流器设备管理样式' (#181) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/181
 2023-12-22 16:00:51 +00:00
邓洁
06b12297d1 邓洁: 分流器设备管理样式 2023-12-22 23:59:51 +08:00
odjbin
a2d64b6538 Merge pull request 'dengjie' (#180) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/180
 2023-12-22 15:37:03 +00:00
邓洁
5b2441d585 邓洁: 修改左侧布局 2023-12-22 23:36:02 +08:00
邓洁
e2b1ef3845 邓洁: 传感器数据监控 2023-12-22 23:33:48 +08:00
邓洁
267ef35001 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 23:11:15 +08:00
邓洁
56f954e354 邓洁: 用户管理接口 2023-12-22 23:11:01 +08:00
liaojie
6fa0de9886 Merge pull request 'LJ' (#179) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/179
 2023-12-22 10:10:02 +00:00
Hcat
73fc7557a7 初始化接口对齐了 2023-12-22 18:08:59 +08:00
Hcat
2eeba5ee7e 初始化接口绑定完全完成 2023-12-22 18:04:05 +08:00
odjbin
fb3a060010 Merge pull request 'dengjie' (#177) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/177
 2023-12-22 08:09:25 +00:00
邓洁
1cb5c6c258 邓洁: 合并代码 2023-12-22 16:08:49 +08:00
邓洁
b090604c70 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 16:08:34 +08:00
邓洁
43c4aaa21d 邓洁: 完善首页数据 2023-12-22 16:07:06 +08:00
Hcat
6e8d651b52 更新 2023-12-22 15:50:14 +08:00
liaojie
ffcaa5b715 Merge pull request 'LJ' (#176) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/176
 2023-12-22 07:00:01 +00:00