邓洁
|
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 |
|
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 |
|
Hcat
|
65510ce59d
|
合并
|
2023-12-22 14:55:05 +08:00 |
|
Hcat
|
68d121091f
|
修改初始化
|
2023-12-22 13:56:41 +08:00 |
|
Hcat
|
efa6d5b8c1
|
更新一点点
|
2023-12-22 13:40:46 +08:00 |
|
odjbin
|
3907f39b7f
|
Merge pull request '邓洁: 修改首页风机样式' (#175) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/175
|
2023-12-21 12:13:37 +00:00 |
|
邓洁
|
f178bc80cd
|
邓洁: 修改首页风机样式
|
2023-12-21 20:13:11 +08:00 |
|
odjbin
|
9d90ad9dd1
|
Merge pull request '邓洁: 站点接口及修改细节' (#174) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/174
|
2023-12-20 13:25:14 +00:00 |
|
邓洁
|
30384547af
|
邓洁: 站点接口及修改细节
|
2023-12-20 21:24:52 +08:00 |
|
odjbin
|
a404f99385
|
Merge pull request '邓洁 : 修改隧道管理鼠标悬浮背景及跳转' (#173) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/173
|
2023-12-20 09:54:36 +00:00 |
|
dengj
|
fdf4f79445
|
邓洁 : 修改隧道管理鼠标悬浮背景及跳转
|
2023-12-20 17:49:55 +08:00 |
|
liaojie
|
45387294d1
|
Merge pull request '解决alert' (#172) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/172
|
2023-12-20 09:26:26 +00:00 |
|
Hcat1314
|
12a76a5af0
|
解决alert
|
2023-12-20 17:25:33 +08:00 |
|
liaojie
|
c1cae50edc
|
Merge pull request '冲突修复' (#171) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/171
|
2023-12-20 04:56:22 +00:00 |
|
Hcat1314
|
0e16b255dd
|
冲突修复
|
2023-12-20 12:55:35 +08:00 |
|
liaojie
|
b1033ba03b
|
Merge pull request 'LJ' (#170) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/170
|
2023-12-20 04:45:06 +00:00 |
|
Hcat1314
|
a850d9af78
|
预览模式和编辑模式大致完成
|
2023-12-20 12:21:42 +08:00 |
|
Hcat1314
|
0341e93686
|
优化promise+第一次进入模型不加载
|
2023-12-19 10:12:07 +08:00 |
|