Commit Graph

250 Commits

Author SHA1 Message Date
邓洁
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
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