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

269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hcat1314
0e16b255dd 冲突修复 2023-12-20 12:55:35 +08: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
Hcat1314
d769d353be 加了路由，简单预览模式实现 2023-12-17 21:55:54 +08:00
odjbin
1c3243bf7b Merge pull request 'dengjie' (#153) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/153
 2023-12-17 13:27:58 +00:00
邓洁
0d53e11ceb 邓洁 : 页面调整 2023-12-17 21:25:17 +08:00
邓洁
a472bfe1d4 Merge remote-tracking branch 'origin/dev' into dev 2023-12-17 21:18:49 +08:00
liaojie
b81aeedf4c Merge pull request 'LJ' (#152) from LJ into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/152
 2023-12-17 10:36:22 +00:00
Hcat1314
ca51f5d789 合并dev 2023-12-17 18:32:13 +08:00
Hcat1314
946fe551a1 初始化功能大致完成 2023-12-17 18:20:07 +08:00
odjbin
fe61dd717e Merge pull request '邓洁 : 修改监控数据弹窗' (#151) from dengjie into dev 
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/151
 2023-12-16 18:48:07 +00:00
邓洁
8834134664 Merge remote-tracking branch 'origin/dev' into dev 2023-12-17 02:47:48 +08:00
邓洁
c25aaa9ec8 邓洁 : 修改监控数据弹窗 2023-12-17 02:47:11 +08:00
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