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

287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
fb3a060010 Merge pull request 'dengjie' (#177) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/177
 2023-12-22 08:09:25 +00:00
邓洁
1cb5c6c258 邓洁: 合并代码 2023-12-22 16:08:49 +08:00
邓洁
b090604c70 Merge remote-tracking branch 'origin/dev' into dev 2023-12-22 16:08:34 +08:00
邓洁
43c4aaa21d 邓洁: 完善首页数据 2023-12-22 16:07:06 +08:00
liaojie
ffcaa5b715 Merge pull request 'LJ' (#176) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/176
 2023-12-22 07:00:01 +00:00
Hcat
65510ce59d 合并 2023-12-22 14:55:05 +08:00
Hcat
68d121091f 修改初始化 2023-12-22 13:56:41 +08:00
Hcat
efa6d5b8c1 更新一点点 2023-12-22 13:40:46 +08:00
odjbin
3907f39b7f Merge pull request '邓洁: 修改首页风机样式' (#175) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/175
 2023-12-21 12:13:37 +00:00
邓洁
f178bc80cd 邓洁: 修改首页风机样式 2023-12-21 20:13:11 +08:00
odjbin
9d90ad9dd1 Merge pull request '邓洁: 站点接口及修改细节' (#174) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/174
 2023-12-20 13:25:14 +00:00
邓洁
30384547af 邓洁: 站点接口及修改细节 2023-12-20 21:24:52 +08:00
odjbin
a404f99385 Merge pull request '邓洁 : 修改隧道管理鼠标悬浮背景及跳转' (#173) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/173
 2023-12-20 09:54:36 +00:00
dengj
fdf4f79445 邓洁 : 修改隧道管理鼠标悬浮背景及跳转 2023-12-20 17:49:55 +08:00
liaojie
45387294d1 Merge pull request '解决alert' (#172) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/172
 2023-12-20 09:26:26 +00:00
Hcat1314
12a76a5af0 解决alert 2023-12-20 17:25:33 +08:00
liaojie
c1cae50edc Merge pull request '冲突修复' (#171) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/171
 2023-12-20 04:56:22 +00:00
Hcat1314
0e16b255dd 冲突修复 2023-12-20 12:55:35 +08:00
liaojie
b1033ba03b Merge pull request 'LJ' (#170) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/170
 2023-12-20 04:45:06 +00:00
Hcat1314
a850d9af78 预览模式和编辑模式大致完成 2023-12-20 12:21:42 +08:00
Hcat1314
0341e93686 优化promise+第一次进入模型不加载 2023-12-19 10:12:07 +08:00
odjbin
3558d6830f Merge pull request '邓洁: 用户管理修改细节' (#168) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/168
 2023-12-18 15:23:55 +00:00
邓洁
e828ded44f 邓洁: 用户管理修改细节 2023-12-18 23:23:27 +08:00
odjbin
eef2986d1c Merge pull request '邓洁: 用户管理及全选功能字体更改' (#167) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/167
 2023-12-18 15:05:57 +00:00
邓洁
e4fada8d75 邓洁: 用户管理及全选功能字体更改 2023-12-18 23:04:20 +08:00
odjbin
75a24b31d1 Merge pull request 'dengjie' (#166) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/166
 2023-12-18 10:03:03 +00:00
dengj
ccdf5cc8e9 邓洁 : 用户管理雏形及checkbox样式更改 2023-12-18 18:02:17 +08:00
dengj
1c9c3c3e4f 邓洁 : 切换站点样式更改 2023-12-18 16:17:45 +08:00
odjbin
c018e50062 Merge pull request '邓洁 : 修复有害气体弹窗问题' (#165) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/165
 2023-12-18 07:11:54 +00:00
dengj
3457084db9 邓洁 : 修复有害气体弹窗问题 2023-12-18 15:10:28 +08:00
odjbin
aa56be825e Merge pull request '邓洁 : 有害气体echarts数据,切换站点与隧道数据渲染' (#164) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/164
 2023-12-18 06:39:22 +00:00
dengj
24c54caca7 邓洁 : 有害气体echarts数据,切换站点与隧道数据渲染 2023-12-18 14:38:40 +08:00
odjbin
61261eeee1 Merge pull request '邓洁: 切换隧道,数据渲染' (#163) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/163
 2023-12-18 05:33:25 +00:00
邓洁
d883e56771 邓洁: 切换隧道,数据渲染 2023-12-18 13:32:11 +08:00
odjbin
39e33b1de3 Merge pull request '邓洁: 切换隧道,数据渲染' (#162) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/162
 2023-12-18 04:07:59 +00:00
邓洁
8304eaa726 邓洁: 切换隧道,数据渲染 2023-12-18 12:07:36 +08:00
odjbin
02bfcc068b Merge pull request '邓洁: 登录框大小' (#161) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/161
 2023-12-18 03:09:57 +00:00
邓洁
c9c0c88b3e 邓洁: 登录框大小 2023-12-18 11:09:24 +08:00
odjbin
692acee3a7 Merge pull request '邓洁 : 弹窗提示框样式' (#160) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/160
 2023-12-18 02:47:58 +00:00
dengj
48d2004472 邓洁 : 弹窗提示框样式 2023-12-18 10:46:55 +08:00
odjbin
806c0b1db5 Merge pull request '邓洁 : 修改弹窗缩放' (#159) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/159
 2023-12-17 16:33:37 +00:00
邓洁
e8cd871447 邓洁 : 修改弹窗缩放 2023-12-18 00:33:07 +08:00
odjbin
ecfca1e0a0 Merge pull request '邓洁 : 修改弹窗x大小' (#158) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/158
 2023-12-17 15:28:47 +00:00
邓洁
f996b35a64 邓洁 : 修改弹窗x大小 2023-12-17 23:28:25 +08:00
odjbin
144c2175e2 Merge pull request '邓洁 : 修改细节' (#157) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/157
 2023-12-17 15:21:45 +00:00
邓洁
a5e2df0deb 邓洁 : 修改细节 2023-12-17 23:21:21 +08:00
liaojie
c0c9248e78 Merge pull request 'LJ' (#156) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/156
 2023-12-17 14:02:56 +00:00
liaojie
8b7dae11af Merge branch 'dev' into LJ 2023-12-17 13:58:12 +00:00
odjbin
bfccd7a0a9 Merge pull request '邓洁 : 站点静态数据' (#154) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/154
 2023-12-17 13:56:57 +00:00
邓洁
f4d2eaeaa0 邓洁 : 站点静态数据 2023-12-17 21:56:29 +08:00