Commit Graph

482 Commits

Author SHA1 Message Date
clay
647dd53c4e 更新 .drone.yml 2024-02-21 14:56:29 +00:00
7f28038261 Merge pull request 'fix: 修改风向bug' (#258) from dengjie into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/258
2024-02-21 13:45:19 +00:00
98799e8bcc fix: 修改风向bug 2024-02-21 21:44:59 +08:00
odjbin
0747a6e177 Merge pull request 'dev' (#257) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/257
2024-02-18 08:01:24 +00:00
odjbin
0443e72a38 Merge pull request '邓洁: 修改用电量阈值' (#256) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/256
2024-02-18 08:01:00 +00:00
邓洁
85dfecff84 邓洁: 修改用电量阈值 2024-02-18 16:00:13 +08:00
liaojie
20788c6b65 Merge pull request '小的细节优化' (#255) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/255
2024-01-26 16:18:06 +00:00
Hcat
c29b14d968 小的细节优化 2024-01-27 00:16:55 +08:00
odjbin
3e9c18f648 Merge pull request '邓洁: 测试select样式' (#254) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/254
2024-01-25 15:23:29 +00:00
邓洁
b7695d11d4 邓洁: 测试select样式 2024-01-25 23:23:11 +08:00
odjbin
b8a13612b4 Merge pull request '邓洁: 测试select样式' (#253) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/253
2024-01-25 15:14:58 +00:00
邓洁
00257537a2 邓洁: 测试select样式 2024-01-25 23:14:34 +08:00
odjbin
8292f250a5 Merge pull request '邓洁: 测试select样式' (#252) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/252
2024-01-25 14:59:20 +00:00
邓洁
56d25805e1 邓洁: 测试select样式 2024-01-25 22:58:46 +08:00
odjbin
27da5fa649 Merge pull request '邓洁: 屏蔽风机模式接口操作' (#251) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/251
2024-01-23 13:24:06 +00:00
邓洁
b663fc9ea2 邓洁: 屏蔽风机模式接口操作 2024-01-23 21:23:38 +08:00
odjbin
c6d95b5927 Merge pull request '邓洁: 设备信息修改' (#250) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/250
2024-01-23 13:17:40 +00:00
邓洁
6f254aabfe 邓洁: 设备信息修改 2024-01-23 21:15:56 +08:00
odjbin
bb111af19f Merge pull request '邓洁: 接口及细节优化' (#249) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/249
2024-01-21 15:14:03 +00:00
邓洁
99d89d6a2b 邓洁: 接口及细节优化 2024-01-21 23:13:51 +08:00
liaojie
58ef00be98 Merge pull request 'LJ' (#248) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/248
2024-01-21 13:50:09 +00:00
liaojie
7521824078 Merge branch 'dev' into LJ 2024-01-21 13:49:17 +00:00
Hcat
18bc20666f Merge branch 'LJ' of http://git.feashow.cn/clay/tunnel-cloud-web into LJ 2024-01-21 21:47:31 +08:00
Hcat
98b28eccbd 更新路牌 2024-01-21 21:46:58 +08:00
Hcat
afcc63aa17 路牌更新 2024-01-21 21:30:06 +08:00
Hcat
25828f823f 路牌更新 2024-01-21 21:28:46 +08:00
Hcat
18d2d52b5e 廖杰:路牌更新 2024-01-21 21:14:20 +08:00
Hcat
853ddfba3f 廖杰:路牌更新 2024-01-21 21:10:21 +08:00
liaojie
70f4332546 Merge pull request '廖杰:路牌更新' (#247) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/247
2024-01-21 13:05:46 +00:00
liaojie
f1ea5bb17a Merge branch 'dev' into LJ 2024-01-21 13:05:33 +00:00
Hcat
feb0b3821f 廖杰:路牌更新 2024-01-21 21:04:50 +08:00
liaojie
f0517c3206 Merge pull request '更新路牌显示' (#246) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/246
2024-01-21 12:57:51 +00:00
Hcat
d68795a4e3 更新路牌显示 2024-01-21 20:56:22 +08:00
odjbin
3e58763c33 Merge pull request '邓洁: 1' (#245) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/245
2024-01-17 08:09:43 +00:00
邓洁
872395fce1 邓洁: 1 2024-01-17 16:09:31 +08:00
odjbin
294fafae83 Merge pull request '邓洁: 分流阀值样式及设备接口对接' (#244) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/244
2024-01-17 08:08:20 +00:00
邓洁
2fce431c43 邓洁: 分流阀值样式及设备接口对接 2024-01-17 16:08:06 +08:00
odjbin
be85ce6ecb Merge pull request 'dengjie' (#243) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/243
2024-01-17 07:20:02 +00:00
邓洁
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