odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99 Commits 1 Branch 0 Tags
a5dbf736e998307a8e0510ffafbd2e043c76b841
Commit Graph

99 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
a5dbf736e9 Merge pull request '唐润平：添加右下角面板阈值刻度线' (#77) from trp_dev_v2.0 into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/77
 2023-12-11 13:08:06 +00:00
trp
779448b465 唐润平：添加右下角面板阈值刻度线 2023-12-11 14:07:03 +08:00
odjbin
68cc874e91 Merge pull request 'dev' (#74) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/74
 2023-12-11 06:05:03 +00:00
odjbin
cbab0fd43f Merge pull request '邓洁 : 右侧鼠标经过效果' (#73) from dj into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/73
 2023-12-11 03:00:15 +00:00
dengj
407898dcc4 邓洁 : 右侧鼠标经过效果 2023-12-11 10:59:44 +08:00
odjbin
cd0a458c3a Merge pull request '邓洁 : 修改细节' (#72) from dj into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/72
 2023-12-11 02:06:25 +00:00
dengj
07704501be 邓洁 : 修改细节 2023-12-11 10:04:59 +08:00
odjbin
15a582dbd0 Merge pull request '邓洁 : 修改细节' (#71) from dj into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/71
 2023-12-11 01:55:34 +00:00
邓洁
51dd0fbd5e 邓洁 : 修改细节 2023-12-11 09:50:11 +08:00
odjbin
04f3ef893f Merge pull request '邓洁 : 绑定首页实时数据' (#69) from dj into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/69
 2023-12-10 16:26:08 +00:00
邓洁
86709fb13d 邓洁 : 绑定首页实时数据 2023-12-11 00:25:13 +08:00
odjbin
ab87b17567 Merge pull request 'master' (#68) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/68
 2023-12-09 10:23:16 +00:00
odjbin
813b854316 Merge pull request '邓洁 : 修改细节' (#66) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/66
 2023-12-09 10:22:36 +00:00
邓洁
10268ab2ba 邓洁 : 修改细节 2023-12-09 18:22:10 +08:00
odjbin
b327839389 Merge pull request 'master' (#65) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/65
 2023-12-09 10:09:23 +00:00
odjbin
ba66780ff3 Merge pull request '邓洁 : 完善首页' (#64) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/64
 2023-12-09 10:08:52 +00:00
邓洁
b66d3ce40f 邓洁 : 完善首页 2023-12-09 18:07:52 +08:00
odjbin
db4cf4fd91 Merge pull request 'master' (#63) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/63
 2023-12-09 06:23:07 +00:00
odjbin
61f5381c93 Merge pull request '邓洁 : 完善首页' (#62) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/62
 2023-12-09 06:22:46 +00:00
邓洁
cb289963bc 邓洁 : 完善首页 2023-12-09 14:22:25 +08:00
odjbin
07614c00af Merge pull request 'LJ' (#61) from LJ into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/61
 2023-12-09 05:32:36 +00:00
Hcat1314
42916453e0 背景图调整+模型 2023-12-09 13:29:16 +08:00
odjbin
66a1246746 Merge pull request 'trp_dev_v2.0' (#60) from trp_dev_v2.0 into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/60
 2023-12-09 05:06:20 +00:00
Hcat1314
f0b46b1c24 换模型+背景 2023-12-09 13:05:10 +08:00
trp
600febc98a 唐润平：名称小修改 2023-12-09 03:24:38 +08:00
trp
305a5f9824 唐润平:显示面板雏形全部完成并优化了第一个风机面板样式 2023-12-09 03:09:53 +08:00
odjbin
2f06c69384 Merge pull request '邓洁 : 1' (#59) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/59
 2023-12-08 17:07:02 +00:00
邓洁
799107c3cc 邓洁 : 1 2023-12-09 01:05:26 +08:00
odjbin
40124d5813 Merge pull request '邓洁 : 隧道切换效果' (#58) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/58
 2023-12-08 17:04:47 +00:00
邓洁
5663c9338f 邓洁 : 隧道切换效果 2023-12-09 01:04:10 +08:00
odjbin
d568440879 Merge pull request 'master' (#57) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/57
 2023-12-08 14:47:15 +00:00
odjbin
d494a1e1fe Merge pull request '邓洁 : socket' (#56) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/56
 2023-12-08 14:47:03 +00:00
邓洁
e7405fcf00 邓洁 : socket 2023-12-08 22:46:41 +08:00
odjbin
9031e39ff1 Merge pull request 'master' (#55) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/55
 2023-12-08 14:38:22 +00:00
odjbin
64d44f03d2 Merge pull request '邓洁 : socket' (#54) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/54
 2023-12-08 14:37:58 +00:00
邓洁
4afc8552df 邓洁 : socket 2023-12-08 22:36:52 +08:00
odjbin
2a4ef8bed5 Merge pull request 'master' (#53) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/53
 2023-12-08 14:13:27 +00:00
odjbin
c3396dddf1 Merge pull request '邓洁 : 修改大屏样式' (#52) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/52
 2023-12-08 14:13:14 +00:00
邓洁
a0b12dcbdc 邓洁 : 修改大屏样式 2023-12-08 22:12:37 +08:00
odjbin
28ff50193c Merge pull request '邓洁 : 两侧收缩展开' (#51) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/51
 2023-12-08 10:00:00 +00:00
dengj
b2cc03bbd8 邓洁 : 两侧收缩展开 2023-12-08 17:58:25 +08:00
odjbin
0bee4d9e16 Merge pull request '邓洁 : 首页上下方和两侧合并' (#50) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/50
 2023-12-08 08:59:30 +00:00
dengj
ce95bd2fe5 邓洁 : 首页上下方和两侧合并 2023-12-08 16:59:04 +08:00
odjbin
a59035383e Merge pull request '邓洁 : 首页上下方样式' (#49) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/49
 2023-12-08 08:36:12 +00:00
dengj
390eaa1116 邓洁 : 首页上下方样式 2023-12-08 16:35:17 +08:00
odjbin
1c46679a64 Merge pull request '唐润平：UI显示面板开发起步版' (#48) from trp_dev_v2.0 into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/48
 2023-12-08 08:16:53 +00:00
trp
e20b7c1002 唐润平：UI显示面板开发起步版 2023-12-08 16:12:55 +08:00
odjbin
818cd0a9bc Merge pull request 'master' (#45) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/45
 2023-12-08 01:27:07 +00:00
odjbin
3040ba062e Merge pull request '邓洁 : 修改细节' (#44) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/44
 2023-12-08 01:26:51 +00:00
邓洁
650d617f30 邓洁 : 修改细节 2023-12-08 09:26:25 +08:00