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

196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
odjbin
549b0f30c8 Merge pull request '邓洁 : 首屏修改' (#128) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/128
 2023-12-14 15:33:08 +00:00
邓洁
8c655e1d23 邓洁 : 首屏修改 2023-12-14 23:32:56 +08:00
trp
1884ad3db6 唐润平：下拉框优化，编辑视角调整 2023-12-14 23:08:38 +08:00
odjbin
d39dbce992 Merge pull request '邓洁 : 风压监控弹窗' (#127) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/127
 2023-12-14 09:58:16 +00:00
admin
3efec39f4e 邓洁 : 风压监控弹窗 2023-12-14 17:57:44 +08:00
odjbin
aab82210d4 Merge pull request '邓洁 : 打开弹窗时背景更改' (#126) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/126
 2023-12-14 08:42:52 +00:00
admin
c70dd888fd 邓洁 : 打开弹窗时背景更改 2023-12-14 16:41:51 +08:00
odjbin
4cb9954b15 Merge pull request '邓洁 : 用电量弹窗及样式修改' (#124) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/124
 2023-12-14 08:09:49 +00:00
admin
d6661dc5fd 邓洁 : 用电量弹窗及样式修改 2023-12-14 16:08:15 +08:00
odjbin
5987c8cfe5 Merge pull request '邓洁 : 首页修改' (#123) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/123
 2023-12-14 06:05:20 +00:00
admin
38c3a34a9c 邓洁 : 首页修改 2023-12-14 14:04:03 +08:00
odjbin
aae8ac8438 Merge pull request 'dengjie' (#122) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/122
 2023-12-14 03:45:23 +00:00
dengj
8b3f36f5c9 邓洁 : 折线图渲染 2023-12-14 11:44:07 +08:00
odjbin
aa64923d81 Merge pull request 'dev' (#121) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/121
 2023-12-14 02:44:04 +00:00
odjbin
8ab097f31d Merge pull request '唐润平：上线版,功能为待完善' (#120) from trp_dev_v2.0 into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/120
 2023-12-14 02:40:23 +00:00
odjbin
2805974591 Merge pull request 'dev' (#118) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/118
 2023-12-14 02:30:31 +00:00
odjbin
dc1871fd80 Merge pull request 'dengjie' (#117) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/117
 2023-12-14 02:30:17 +00:00
dengj
ed05635852 邓洁 : 更换隧道icon 2023-12-14 10:29:04 +08:00
trp
fb9dfb37a2 唐润平：上线版,功能为待完善 2023-12-14 10:26:29 +08:00
odjbin
e95c24befe Merge pull request 'dev' (#115) from dev into master 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/115
 2023-12-13 15:04:27 +00:00
odjbin
6912132e36 Merge pull request '邓洁 : 首屏修改' (#114) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/114
 2023-12-13 15:02:29 +00:00
邓洁
ecead4aa09 邓洁 : 首屏修改 2023-12-13 23:02:01 +08:00
odjbin
5823484bde Merge pull request 'dengjie' (#113) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/113
 2023-12-13 12:52:20 +00:00
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