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

327 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
4057623133 Merge pull request '邓洁 : 大屏信息接口对接' (#150) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/150
 2023-12-16 17:47:34 +00:00
邓洁
2d413876d4 邓洁 : 大屏信息接口对接 2023-12-17 01:47:13 +08:00
Hcat1314
907f4cc220 初始化功能还在做 2023-12-17 00:25:10 +08:00
odjbin
13e232d6f6 Merge pull request '邓洁 : 设备管理及修复' (#149) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/149
 2023-12-16 15:38:40 +00:00
邓洁
1a934eaf7e 邓洁 : 设备管理及修复 2023-12-16 23:38:13 +08:00
trp-ironman
fdecc480ec Merge pull request 'trp_dev' (#148) from trp_dev into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/148
 2023-12-16 09:36:23 +00:00
trp
8c0b322cf4 唐润平：增加和删除后的提示信息框-提交 2023-12-16 17:34:57 +08:00
trp
5a29a9d445 Merge branch 'dev' into trp_dev 2023-12-16 17:29:58 +08:00
trp
b2422e5899 唐润平：增加和删除后的提示信息框 2023-12-16 17:28:18 +08:00
odjbin
da34dbb986 Merge pull request 'dengjie' (#146) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/146
 2023-12-16 08:34:55 +00:00
邓洁
0c45d3df93 邓洁 : 设备管理雏形 2023-12-16 16:34:30 +08:00
邓洁
d0d907f91a Merge remote-tracking branch 'origin/dev' into dev 2023-12-16 16:34:01 +08:00
邓洁
a45afb9e6f 邓洁 : 设备管理雏形 2023-12-16 16:33:54 +08:00
trp-ironman
0e781957af Merge pull request '唐润平：风机旋转' (#145) from trp_dev into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/145
 2023-12-16 08:04:57 +00:00
trp
236ed18fd5 唐润平：风机旋转 2023-12-16 16:00:04 +08:00
odjbin
3e69f20271 Merge pull request '邓洁 : 修改下拉框样式' (#144) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/144
 2023-12-16 07:21:17 +00:00
邓洁
e8ac21d5be 邓洁 : 修改下拉框样式 2023-12-16 15:20:49 +08:00
trp-ironman
ae7d15d22b Merge pull request 'trp_dev' (#143) from trp_dev into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/143
 2023-12-15 20:32:38 +00:00
trp
9ff76d31db 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角、角度和缩放限制、细节修改 2023-12-16 04:30:44 +08:00
trp
d322949598 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角-提交 2023-12-16 04:08:02 +08:00
trp
814c28b908 Merge branch 'dev' into trp_dev 2023-12-16 04:01:43 +08:00
trp
ae6a305515 唐润平: 传感器添加删除、标签文字设置、双击进入视角、双击空白回退视角 2023-12-16 03:58:36 +08:00
odjbin
828a4fca82 Merge pull request '邓洁 : 修改细节' (#142) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/142
 2023-12-15 17:18:09 +00:00
邓洁
fc68b62555 邓洁 : 修改细节 2023-12-16 01:17:38 +08:00
odjbin
141e134dbd Merge pull request '邓洁 : 站点管理修改细节' (#141) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/141
 2023-12-15 17:12:31 +00:00
邓洁
41bfdd5194 邓洁 : 站点管理修改细节 2023-12-16 01:12:10 +08:00
liaojie
02ff5125fe Merge pull request '添加视角限制' (#140) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/140
 2023-12-15 16:39:20 +00:00
Hcat1314
b2a4ef158e 添加视角限制 2023-12-16 00:34:46 +08:00
odjbin
3db123a884 Merge pull request '邓洁 : 站点管理接口对接' (#139) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/139
 2023-12-15 13:50:28 +00:00
邓洁
f94b84fe2e 邓洁 : 站点管理接口对接 2023-12-15 21:50:04 +08:00
odjbin
0bed2e5cec Merge pull request '邓洁 : 退出登录提示' (#138) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/138
 2023-12-15 13:19:47 +00:00
邓洁
a1597159c9 邓洁 : 退出登录提示 2023-12-15 21:19:10 +08:00
odjbin
be70d9929f Merge pull request '邓洁 : 修改隧道管理间距' (#137) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/137
 2023-12-15 12:02:02 +00:00
邓洁
d42fabc37f 邓洁 : 修改隧道管理间距 2023-12-15 20:01:30 +08:00
odjbin
f633e50b9f Merge pull request 'dengjie' (#136) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/136
 2023-12-15 10:08:14 +00:00
dengj
9afee1a588 邓洁 : 解决冲突 2023-12-15 18:07:44 +08:00
dengj
bf9dc9530a Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/components/content/badGasInfo/BadGasInfo.vue
 2023-12-15 18:07:24 +08:00
dengj
1168c9eb13 邓洁 : 隧道管理界面 2023-12-15 18:00:40 +08:00
trp
dcc92b3c77 唐润平：传感器添加功能 2023-12-15 17:02:23 +08:00
dengj
37b16633cf 邓洁 : 修改弹窗样式 2023-12-15 15:04:04 +08:00
trp-ironman
ca3fbc2602 Merge pull request 'trp_dev' (#134) from trp_dev into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/134
 2023-12-15 06:25:26 +00:00
trp
c91d93b24b 唐润平：视角切换修改版-重新提交 2023-12-15 14:17:56 +08:00
odjbin
077ff6a074 Merge pull request '邓洁 : 修改首屏弹窗样式' (#133) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/133
 2023-12-15 04:58:59 +00:00
dengj
32e425a926 邓洁 : 修改首屏弹窗样式 2023-12-15 12:58:24 +08:00
odjbin
15bb5c40e1 Merge pull request '邓洁 : 用电量弹窗大小' (#131) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/131
 2023-12-15 03:19:24 +00:00
admin
dcf3b540ca 邓洁 : 用电量弹窗大小 2023-12-15 11:18:00 +08:00
odjbin
0ba608bf29 Merge pull request 'dengjie' (#130) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/130
 2023-12-15 03:11:35 +00:00
admin
f238a475e9 邓洁 : 风机接口对接及用电量弹窗大小 2023-12-15 11:10:38 +08:00
admin
c984f7be5b 邓洁 : 风机接口对接 2023-12-15 10:10:11 +08:00
trp
02d9ba3ef1 唐润平：修改视角变换 2023-12-15 02:43:19 +08:00