Commit Graph

378 Commits

Author SHA1 Message Date
邓洁
2d1d42f83a 邓洁: echarts的loading 2024-01-03 14:50:59 +08:00
邓洁
073ec5c570 邓洁: 优化界面 2024-01-02 22:41:31 +08:00
liaojie
c730283e78 Merge pull request 'LJ' (#214) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/214
2024-01-01 10:04:47 +00:00
Hcat
6f60b6c098 编辑模式分压阀完成 2024-01-01 18:02:13 +08:00
Hcat
589496ea96 分压阀添加墙壁完成 2024-01-01 17:49:59 +08:00
odjbin
891f97a6dd Merge pull request '邓洁: 修改bug' (#213) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/213
2023-12-30 13:42:46 +00:00
邓洁
043a22cabb 邓洁: 修改bug 2023-12-30 21:42:08 +08:00
odjbin
b240206e52 Merge pull request '邓洁: 修改bug' (#212) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/212
2023-12-30 12:39:51 +00:00
邓洁
a5602f03cd 邓洁: 修改bug 2023-12-30 20:38:27 +08:00
odjbin
c66ef0a601 Merge pull request '邓洁: 修改bug' (#211) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/211
2023-12-30 12:19:08 +00:00
邓洁
3150343a40 邓洁: 修改bug 2023-12-30 20:11:32 +08:00
liaojie
1dd856e2ca Merge pull request 'LJ' (#210) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/210
2023-12-30 08:47:58 +00:00
Hcat
c6489313a7 Merge branch 'dev' of http://git.feashow.cn/clay/tunnel-cloud-web into LJ 2023-12-30 16:42:31 +08:00
Hcat
0e949a65b8 预览模式完成绑定 2023-12-30 16:39:48 +08:00
liaojie
957c6274cb Merge pull request '修复提交' (#208) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/208
2023-12-30 06:46:31 +00:00
Hcat
d0c2648a2e 修复提交 2023-12-30 14:37:58 +08:00
trp-ironman
a1e6973193 Merge pull request 'trp_dev' (#207) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/207
2023-12-30 05:39:29 +00:00
trp
1d73f0f8b8 唐润平:解决了编辑模式bug(合并后) 2023-12-30 13:37:27 +08:00
trp
697773bae4 Merge branch 'dev' into trp_dev 2023-12-30 13:25:03 +08:00
trp
7588c4eda2 Merge branch 'dev' of http://git.feashow.cn/clay/tunnel-cloud-web into dev 2023-12-30 13:24:04 +08:00
trp
5ac68dca37 唐润平:解决了编辑模式bug 2023-12-30 13:23:30 +08:00
odjbin
785d9b8289 Merge pull request 'fix : 菜单显示问题' (#206) from clay into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/206
2023-12-29 15:43:54 +00:00
邓洁
4430b9c651 fix : 菜单显示问题 2023-12-29 23:42:53 +08:00
trp
4433e5c8f4 唐润平:新版本拉取 2023-12-29 22:22:33 +08:00
trp
3ce5582ea3 唐润平:test 2023-12-29 22:06:58 +08:00
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