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

154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
bb94d4b2a8 Merge pull request '邓洁 : 修改细节' (#112) from dengjie into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/112
 2023-12-13 12:51:46 +00:00
邓洁
0360c8c928 邓洁 : 修改细节 2023-12-13 20:51:14 +08:00
odjbin
4043ec4704 Merge pull request 'dev' (#111) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/111
 2023-12-13 12:49:50 +00:00
odjbin
b13ba91442 Merge pull request '邓洁 : 弹窗雏形' (#110) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/110
 2023-12-13 12:49:38 +00:00
dengj
f7c9ceb631 邓洁 : 弹窗雏形 2023-12-13 17:39:31 +08:00
odjbin
1d2a5c4c42 Merge pull request 'dev' (#109) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/109
 2023-12-13 09:01:19 +00:00
odjbin
76f9c64850 Merge pull request '邓洁 : 风机接口部分数据' (#108) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/108
 2023-12-13 08:58:37 +00:00
dengj
43c5532866 邓洁 : 风机接口部分数据 2023-12-13 16:57:53 +08:00
odjbin
a174713b29 Merge pull request '邓洁 : 大屏左侧变频器阀值判断' (#107) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/107
 2023-12-13 08:05:45 +00:00
dengj
5e1eb2712f 邓洁 : 大屏左侧变频器阀值判断 2023-12-13 16:01:48 +08:00
odjbin
1605eb67a6 Merge pull request 'dev' (#106) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/106
 2023-12-13 07:34:38 +00:00
odjbin
d20e082eb6 Merge pull request '邓洁 : 大屏左侧接口对接' (#105) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/105
 2023-12-13 07:31:26 +00:00
dengj
0dadb58f16 邓洁 : 大屏左侧接口对接 2023-12-13 15:28:58 +08:00
odjbin
52809c03be Merge pull request 'dengjie' (#104) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/104
 2023-12-13 05:16:06 +00:00
dengj
0b0c5f22a1 邓洁 : 传感器接口对接 2023-12-13 13:13:33 +08:00
dengj
2d1fbb27ca 邓洁 : 传感器接口对接 2023-12-13 12:52:59 +08:00
dengj
241a031cc5 邓洁 : 首屏风压接口对接 2023-12-13 11:02:41 +08:00
odjbin
1af465a435 Merge pull request 'dev' (#103) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/103
 2023-12-13 02:39:55 +00:00
odjbin
df208e2d7a Merge pull request '邓洁 : 修改细节' (#102) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/102
 2023-12-13 02:37:55 +00:00
邓洁
f188bdf574 邓洁 : 修改细节 2023-12-13 10:37:13 +08:00
odjbin
54f9b63f48 Merge pull request 'dev' (#101) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/101
 2023-12-13 02:29:48 +00:00
odjbin
db89c75db5 Merge pull request 'dengjie' (#100) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/100
 2023-12-13 02:20:34 +00:00
邓洁
6de7384566 邓洁 : 合并代码 2023-12-13 10:20:10 +08:00
邓洁
5243d89213 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/views/tunnel/index.vue
 2023-12-13 09:58:17 +08:00
邓洁
944c727cc5 邓洁 : 风压风速接口 2023-12-13 09:43:53 +08:00
odjbin
e9dfbf149f Merge pull request 'dev' (#99) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/99
 2023-12-13 00:26:53 +00:00
liaojie
0eed48dfda Merge pull request '解决变量问题' (#98) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/98
 2023-12-12 16:38:35 +00:00
Hcat1314
a93be12f0a 解决变量问题 2023-12-13 00:35:56 +08:00
liaojie
1c421fbbd6 Merge pull request 'LJ' (#96) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/96
 2023-12-12 16:25:59 +00:00
Hcat1314
45ac8aadf2 解决冲突 2023-12-13 00:17:36 +08:00
Hcat1314
454ebd3d72 完成了下拉框 2023-12-13 00:04:20 +08:00
odjbin
d919252bc3 Merge pull request 'dev' (#93) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/93
 2023-12-12 13:34:00 +00:00
odjbin
bf36d8434d Merge pull request 'dengjie' (#92) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/92
 2023-12-12 13:33:44 +00:00
邓洁
16e68e8609 邓洁 : 修改站点管理样式 2023-12-12 21:33:06 +08:00
odjbin
66ed4aaa81 Merge pull request 'dev' (#91) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/91
 2023-12-12 09:34:20 +00:00
odjbin
7b499e901f Merge pull request '邓洁 : 修改样式' (#90) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/90
 2023-12-12 09:34:07 +00:00
dengj
c7d0f7c17e 邓洁 : 修改样式 2023-12-12 17:32:22 +08:00
odjbin
ec373a568a Merge pull request 'master' (#89) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/89
 2023-12-12 09:27:45 +00:00
odjbin
0ed985bf49 Merge pull request '邓洁 : 站点管理' (#88) from dengjie into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/88
 2023-12-12 09:27:17 +00:00
dengj
59e49eda5a 邓洁 : 站点管理 2023-12-12 17:26:49 +08:00
odjbin
a0820989fc Merge pull request 'dev' (#87) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/87
 2023-12-12 01:54:12 +00:00
odjbin
0cc53c1a61 Merge pull request 'dengjie' (#86) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/86
 2023-12-12 01:32:14 +00:00
邓洁
4e934637d2 邓洁 : 1 2023-12-12 09:31:11 +08:00
邓洁
8f7d25a59e 邓洁 : 1 2023-12-12 00:33:46 +08:00
邓洁
bbe600a3bc 邓洁 : 站点管理查/改 2023-12-12 00:32:40 +08:00
odjbin
54a4b0f6f7 Merge pull request 'dev' (#85) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/85
 2023-12-11 16:15:05 +00:00
odjbin
fb95c1b947 Merge pull request '邓洁 : 修改间距' (#81) from dj into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/81
 2023-12-11 13:13:53 +00:00
邓洁
71897b22d3 邓洁 : 修改间距 2023-12-11 21:13:09 +08:00
odjbin
39c4925e47 Merge pull request 'master' (#80) from master into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/80
 2023-12-11 13:09:56 +00:00
odjbin
8ace4799db Merge pull request 'dev' (#79) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/79
 2023-12-11 13:09:35 +00:00