Commit Graph

594 Commits

Author SHA1 Message Date
邓洁
e5e7ed3412 邓洁: 注释log 2024-01-17 15:19:29 +08:00
邓洁
9a8e70b425 Merge remote-tracking branch 'origin/dev' into dev 2024-01-17 15:18:50 +08:00
邓洁
797cf8371e 邓洁: 设备修改接口对接 2024-01-17 15:17:59 +08:00
odjbin
30b007ff9d Merge pull request '邓洁: test' (#242) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/242
2024-01-16 13:10:14 +00:00
邓洁
84786e404b 邓洁: test 2024-01-16 21:10:01 +08:00
odjbin
1a4905db8f Merge pull request '邓洁: test' (#241) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/241
2024-01-16 13:08:00 +00:00
邓洁
45446b10d2 邓洁: test 2024-01-16 21:07:22 +08:00
odjbin
a935dd555c Merge pull request 'dengjie' (#240) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/240
2024-01-16 12:58:40 +00:00
邓洁
92e64fc81f 邓洁: 1 2024-01-16 20:58:31 +08:00
邓洁
10e7aa5299 邓洁: 1 2024-01-16 20:54:38 +08:00
odjbin
01b261be42 Merge pull request '邓洁: 1' (#239) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/239
2024-01-16 12:53:31 +00:00
邓洁
c1b2cb1874 邓洁: 1 2024-01-16 20:53:19 +08:00
liaojie
99639356fc Merge pull request '更新修改和视角' (#238) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/238
2024-01-16 09:44:25 +00:00
Hcat
6fec36965e 更新修改和视角 2024-01-16 17:43:20 +08:00
odjbin
e1d557aff8 Merge pull request '邓洁: 优化界面' (#237) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/237
2024-01-16 08:03:33 +00:00
邓洁
5a0f1997e3 邓洁: 优化界面 2024-01-16 16:03:01 +08:00
odjbin
75929dcb77 Merge pull request '邓洁: 修改细节' (#236) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/236
2024-01-14 13:53:47 +00:00
邓洁
e4a9aad91b 邓洁: 修改细节 2024-01-14 21:53:19 +08:00
odjbin
df6ebb843f Merge pull request '邓洁: 1' (#235) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/235
2024-01-14 13:24:47 +00:00
邓洁
c50d41eb7e 邓洁: 1 2024-01-14 21:24:33 +08:00
liaojie
68d76e56b3 Merge pull request '修复点击设备卡墙视角中间' (#234) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/234
2024-01-14 13:19:58 +00:00
Hcat
305c944f35 修复点击设备卡墙视角中间 2024-01-14 21:17:50 +08:00
odjbin
20c7c764ff Merge pull request '邓洁: 修改细节' (#233) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/233
2024-01-12 06:52:37 +00:00
邓洁
9b5ca77651 邓洁: 修改细节 2024-01-12 14:51:06 +08:00
liaojie
959944e819 Merge pull request '预览模式修复+模型颜色更改' (#232) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/232
2024-01-11 15:17:50 +00:00
liaojie
4e143dfe53 Merge branch 'dev' into LJ 2024-01-11 15:17:09 +00:00
Hcat
6b8dd71c9d 预览模式修复+模型颜色更改 2024-01-11 23:16:16 +08:00
liaojie
7f41fd0747 Merge pull request '修改隧道颜色+预览模式的附着点距离显示' (#231) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/231
2024-01-11 15:09:15 +00:00
Hcat
41e6c78d1e 修改隧道颜色+预览模式的附着点距离显示 2024-01-11 23:03:04 +08:00
odjbin
0c87cb520a Merge pull request '邓洁: 修改bug' (#230) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/230
2024-01-09 13:32:29 +00:00
邓洁
2926e46351 邓洁: 修改bug 2024-01-09 21:32:17 +08:00
odjbin
621a3779b4 Merge pull request '邓洁: 修改电流echarts提示框' (#229) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/229
2024-01-09 12:30:51 +00:00
邓洁
c3090fbfd7 邓洁: 修改电流echarts提示框 2024-01-09 20:30:24 +08:00
odjbin
f6f928cf20 Merge pull request 'dev' (#228) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/228
2024-01-09 08:46:29 +00:00
odjbin
e795a9c7be Merge pull request '邓洁: 修改bug' (#227) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/227
2024-01-09 08:46:10 +00:00
邓洁
f4a478fb00 邓洁: 修改bug 2024-01-09 16:45:55 +08:00
odjbin
8689015643 Merge pull request '邓洁: 修改字段' (#226) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/226
2024-01-09 08:34:13 +00:00
邓洁
597ac2cf92 邓洁: 修改字段 2024-01-09 16:34:00 +08:00
odjbin
55ab73b189 Merge pull request '邓洁: 修改socket地址' (#225) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/225
2024-01-09 07:56:23 +00:00
邓洁
2e83259025 邓洁: 修改socket地址 2024-01-09 15:56:02 +08:00
odjbin
67e6737978 Merge pull request 'dengjie' (#224) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/224
2024-01-08 04:44:39 +00:00
邓洁
4745b8b146 邓洁: 修改阈值颜色 2024-01-08 12:44:30 +08:00
邓洁
c600454b52 邓洁: 修改阈值颜色 2024-01-08 12:42:33 +08:00
odjbin
712ccb9eb1 Merge pull request '邓洁: 修改低报' (#223) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/223
2024-01-08 04:13:38 +00:00
邓洁
c9ee853953 邓洁: 修改低报 2024-01-08 12:13:25 +08:00
odjbin
c44370867a Merge pull request '邓洁: 修改细节' (#222) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/222
2024-01-08 03:31:04 +00:00
邓洁
ff7d36077b 邓洁: 修改细节 2024-01-08 11:30:44 +08:00
odjbin
e932c0e4df Merge pull request '邓洁: 修改细节' (#221) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/221
2024-01-08 02:02:54 +00:00
邓洁
de507db057 邓洁: 修改细节 2024-01-08 10:02:42 +08:00
odjbin
401f7244df Merge pull request '邓洁: 修改细节' (#220) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/220
2024-01-08 01:39:10 +00:00