808 Commits

Author SHA1 Message Date
11b3c82e22 Merge pull request 'dengjie' (#357) from dengjie into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/357
2024-08-07 11:48:06 +00:00
acb729c8a3 feat : 设备管理新增序列号字段 2024-08-07 19:47:36 +08:00
trp-ironman
f4d6245ecf Merge pull request 'trp_dev' (#356) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/356
2024-08-06 15:16:24 +00:00
trp
f91560eaa9 trp: 隧道模型缩放修改完成 2024-08-06 22:42:03 +08:00
23c82eafaf Merge pull request 'dev' (#353) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/353
2024-08-06 14:06:08 +00:00
7d318d2d0c Merge pull request 'fix : 修复echart弹窗默认小屏' (#352) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/352
2024-08-03 07:12:01 +00:00
228687daf1 fix : 修复echart弹窗默认小屏 2024-08-03 15:11:39 +08:00
clay
05cf9cb794 Merge pull request '更新 .drone.yml' (#351) from clay-patch-4 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/351
2024-07-23 11:06:28 +00:00
clay
5b412a03a9 更新 .drone.yml 2024-07-23 11:06:18 +00:00
clay
e45d332495 Merge pull request '更新 .drone.yml' (#350) from clay-patch-3 into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/350
2024-07-23 11:04:28 +00:00
clay
86d0c63dd2 更新 .drone.yml 2024-07-23 11:04:21 +00:00
zhangkaihuai
c2beac4f6b Merge pull request '更新 .drone.yml' (#348) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/348
2024-07-23 10:55:17 +00:00
zhangkaihuai
57914d186e 更新 .drone.yml 2024-07-23 10:54:38 +00:00
94fe95bbf2 Merge pull request 'fix : 屏蔽文字' (#347) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/347
2024-07-23 10:38:45 +00:00
7edf599cc2 fix : 屏蔽文字 2024-07-23 18:38:22 +08:00
ef16f0c049 Merge pull request 'fix : 屏蔽文字' (#345) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/345
2024-07-23 09:23:08 +00:00
5521f7db7a Merge pull request 'fix : 屏蔽文字' (#344) from dengjie into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/344
2024-07-23 09:22:46 +00:00
a0e7b0b177 fix : 屏蔽文字 2024-07-23 17:22:23 +08:00
a399062d19 Merge pull request 'dev' (#343) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/343
2024-05-23 03:25:34 +00:00
94126fd0a3 Merge pull request 'fix : 修复页面细节' (#342) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/342
2024-05-23 03:25:22 +00:00
e09b0b2d52 fix : 修复页面细节 2024-05-23 11:24:53 +08:00
49dd6a7ed2 Merge pull request 'dev' (#341) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/341
2024-05-23 03:00:26 +00:00
d0dd2d6043 Merge pull request 'fix : 修复页面细节' (#340) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/340
2024-05-23 02:59:23 +00:00
a79a381c59 fix : 修复页面细节 2024-05-23 10:58:42 +08:00
liaojie
179be93d48 Merge pull request '廖杰:风机状态颜色修复+修复选中模式多次发送请求' (#339) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/339
2024-03-27 08:11:55 +00:00
Hcat
ea111a186f 廖杰:风机状态颜色修复+修复选中模式多次发送请求 2024-03-27 16:10:37 +08:00
3e2f453bde Merge pull request 'fix : 修复气体echarts为空时隐藏' (#338) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/338
2024-03-26 02:34:40 +00:00
a200e168bb fix : 修复气体echarts为空时隐藏 2024-03-26 10:34:11 +08:00
5318ff1236 Merge pull request 'fix : 修改防抖等待时间' (#337) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/337
2024-03-25 14:45:53 +00:00
054a731435 fix : 修改防抖等待时间 2024-03-25 22:45:27 +08:00
4c74715efd Merge pull request 'fix : 1' (#336) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/336
2024-03-25 09:58:55 +00:00
55aa67cd1f fix : 1 2024-03-25 17:58:38 +08:00
5cb1e61da4 Merge pull request 'fix : 修复确认按钮防抖' (#335) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/335
2024-03-25 08:31:50 +00:00
1cde879d78 fix : 修复确认按钮防抖 2024-03-25 16:31:37 +08:00
475503c81c Merge pull request 'fix : 修改ws切换bug' (#334) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/334
2024-03-25 07:42:45 +00:00
ef3bd6a125 fix : 修改ws切换bug 2024-03-25 15:42:01 +08:00
9cd8734db8 Merge pull request 'fix : 修改ws切换bug' (#333) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/333
2024-03-25 07:19:04 +00:00
d73d50f455 fix : 修改ws切换bug 2024-03-25 15:18:19 +08:00
9461fa0bd2 Merge pull request 'fix : 修改用电量最大值' (#332) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/332
2024-03-24 05:48:43 +00:00
297ecefe42 fix : 修改用电量最大值 2024-03-24 13:48:22 +08:00
liaojie
0e23e31457 Merge pull request '廖杰:完成预览模式下鼠标离开设备,面板自动消失,调整面板字体,设备选中的箭头优化' (#331) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/331
2024-03-18 11:27:45 +00:00
Hcat
9e3d896259 廖杰:完成预览模式下鼠标离开设备,面板自动消失,调整面板字体,设备选中的箭头优化 2024-03-18 19:26:45 +08:00
b90d5d5911 Merge pull request 'fix : 修复bug' (#330) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/330
2024-03-15 09:49:26 +00:00
bf34ea12b0 fix : 修复bug 2024-03-15 17:49:04 +08:00
3e0bfe6aaf Merge pull request 'fix : 修复风机bug' (#329) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/329
2024-03-15 08:55:47 +00:00
be09956098 fix : 修复风机bug 2024-03-15 16:55:27 +08:00
44bf1d1857 Merge pull request 'fix : 修复风机启动/停止bug' (#328) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/328
2024-03-14 15:30:03 +00:00
532dd08414 fix : 修复风机启动/停止bug 2024-03-14 23:29:25 +08:00
5c5a48e083 Merge pull request 'fix : 修复风机启动/停止bug' (#327) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/327
2024-03-14 10:09:20 +00:00
b2e0dded31 fix : 修复风机启动/停止bug 2024-03-14 18:09:00 +08:00