Commit Graph

733 Commits

Author SHA1 Message Date
f38a55f8a3 Merge pull request 'fix : 注释序列号' (#369) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/369
2024-08-20 14:48:53 +00:00
493f816e3c fix : 注释序列号 2024-08-20 22:48:08 +08:00
5f9784a374 Merge pull request 'fix : 注释序列号' (#368) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/368
2024-08-20 13:52:30 +00:00
191c7dbbb5 fix : 注释序列号 2024-08-20 21:52:11 +08:00
9aef340598 Merge pull request 'de' (#367) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/367
2024-08-20 10:07:52 +00:00
967d603ff2 Merge pull request 'de' (#366) from de into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/366
2024-08-20 10:07:33 +00:00
4378ec571c fix : 注释序列号 2024-08-20 18:07:12 +08:00
5f86661ec3 fix : 恢复socket 2024-08-20 18:02:58 +08:00
7bb25958fc fix : 新增隧道时多序列号 2024-08-20 00:22:59 +08:00
9e4cee4cae fix : 新增隧道时多序列号 2024-08-20 00:21:47 +08:00
trp-ironman
e6cd9c8836 Merge pull request '唐润平:模型实际数值显示和排版修复' (#365) from trp_dev into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/365
2024-08-19 03:37:01 +00:00
trp
3f38516090 唐润平:模型实际数值显示和排版修复 2024-08-19 11:35:55 +08:00
9217ce35da Merge pull request 'dev' (#364) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/364
2024-08-17 07:34:40 +00:00
ea01ca3f79 Merge pull request 'fix : websocket代理' (#363) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/363
2024-08-17 07:34:21 +00:00
f5f178f2a2 fix : websocket代理 2024-08-17 15:33:42 +08:00
6246c4b046 Merge pull request 'fix : 修复设备管理的序列号样式' (#362) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/362
2024-08-15 15:14:53 +00:00
aa1eacc423 fix : 修复设备管理的序列号样式 2024-08-15 23:14:38 +08:00
a41f0bbaba Merge pull request 'fix : 修复设备管理的序列号样式' (#361) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/361
2024-08-15 15:02:12 +00:00
d98eaa9368 fix : 修复设备管理的序列号样式 2024-08-15 23:01:45 +08:00
8a2a97e936 Merge pull request 'de' (#360) from de into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/360
2024-08-15 14:40:05 +00:00
b2c85e4e47 fix : 注释新增/编辑框的序列号 2024-08-15 22:39:37 +08:00
3d0e88b315 fix : 修复设备管理序列号样式 2024-08-15 22:37:45 +08:00
a16b20f62b feat : 新增/编辑隧道新增序列号1,序列号前缀输入框 2024-08-08 01:18:22 +08:00
1ff85059b1 Merge pull request 'clay' (#358) from clay into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/358
2024-08-07 11:56:00 +00:00
7120a03b1d feat : bulid 2024-08-07 19:55:34 +08:00
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