Commit Graph

561 Commits

Author SHA1 Message Date
62a71e5806 Merge pull request 'fix : 细节优化' (#303) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/303
2024-03-04 12:29:44 +00:00
02d39e74fa fix : 细节优化 2024-03-04 20:28:59 +08:00
2488d73a54 Merge pull request 'fix : 细节优化' (#302) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/302
2024-03-04 09:57:18 +00:00
534c492562 fix : 细节优化 2024-03-04 17:56:50 +08:00
bdd4fd02f4 Merge pull request 'fix : 细节优化' (#301) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/301
2024-03-04 09:49:39 +00:00
07739421e8 fix : 细节优化 2024-03-04 17:29:06 +08:00
d0cd0a19ea Merge pull request 'fix : 细节优化' (#300) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/300
2024-03-04 09:08:14 +00:00
c64c0fc8e4 fix : 细节优化 2024-03-04 17:07:45 +08:00
da030d3f8e Merge pull request 'fix : 报警信息框loading' (#299) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/299
2024-03-04 08:31:41 +00:00
3130942037 fix : 报警信息框loading 2024-03-04 16:31:00 +08:00
11b11a32e7 Merge pull request 'fix : 样式修改' (#298) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/298
2024-03-04 07:48:24 +00:00
0bae6752ac fix : 样式修改 2024-03-04 15:47:47 +08:00
271c102314 Merge pull request 'fix : 不同浏览器匹配样式修改' (#297) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/297
2024-03-04 07:18:38 +00:00
89161ea797 fix : 不同浏览器匹配样式修改 2024-03-04 15:18:07 +08:00
bcccbcb0ad Merge pull request 'fix : 修复时间频率单位' (#296) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/296
2024-03-04 03:22:42 +00:00
4fd53e8875 fix : 修复时间频率单位 2024-03-04 11:22:05 +08:00
8d0232e02a Merge pull request 'fix : select框样式修改' (#295) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/295
2024-03-03 16:30:03 +00:00
3bbfc5f34b fix : select框样式修改 2024-03-04 00:25:59 +08:00
9dd32c349f Merge pull request 'fix : select框样式修改' (#294) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/294
2024-03-03 16:20:10 +00:00
44c7766bce fix : select框样式修改 2024-03-04 00:19:48 +08:00
0c787d04e6 Merge pull request 'fix : select框样式修改' (#293) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/293
2024-03-03 16:10:50 +00:00
272d859e28 fix : select框样式修改 2024-03-04 00:10:27 +08:00
fe93dc3abb Merge pull request 'feat : 新增报警信息功能' (#292) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/292
2024-03-03 15:34:39 +00:00
5a6f7a4535 feat : 新增报警信息功能 2024-03-03 23:34:18 +08:00
3110fa8a51 Merge pull request 'feat : 新增报警信息功能' (#291) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/291
2024-03-03 15:07:33 +00:00
b827f2ff2b feat : 新增报警信息功能 2024-03-03 23:07:03 +08:00
liaojie
554b67d61f Merge pull request '廖杰:完成风机功能+预览模式路牌修复' (#290) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/290
2024-03-02 14:45:53 +00:00
Hcat
eef5cf50d8 廖杰:完成风机功能+预览模式路牌修复 2024-03-02 22:44:11 +08:00
liaojie
6c5de35283 Merge pull request '廖杰:修复编辑模式下删除时设备不存在' (#289) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/289
2024-03-01 14:42:18 +00:00
liaojie
8a9c613733 Merge branch 'dev' into liaojie 2024-03-01 14:41:37 +00:00
Hcat
5b1c692339 廖杰:修复编辑模式下删除时设备不存在 2024-03-01 22:40:56 +08:00
liaojie
226415ff34 Merge pull request '廖杰:修复预览模式的隧道切换bug和编辑模式的添加bug' (#288) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/288
2024-03-01 13:52:07 +00:00
Hcat
fd47f10974 廖杰:修复预览模式的隧道切换bug和编辑模式的添加bug 2024-03-01 21:50:26 +08:00
934b11a274 Merge pull request 'fix : 修改风机状态bug' (#287) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/287
2024-03-01 08:26:01 +00:00
7932db5002 fix : 修改风机状态bug 2024-03-01 16:25:38 +08:00
67dab895f7 Merge pull request 'fix : 修改风机状态bug' (#286) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/286
2024-03-01 08:05:17 +00:00
8e81ca403a fix : 修改风机状态bug 2024-03-01 16:04:42 +08:00
47cfa89257 Merge pull request 'feat : 隧道管理新增/修改框添加新字段输入框' (#285) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/285
2024-02-29 15:26:55 +00:00
b2a31c28de feat : 隧道管理新增/修改框添加新字段输入框 2024-02-29 23:26:32 +08:00
liaojie
182182de1c Merge pull request '廖杰:更新了隧道简称,和昨天的编辑模式bug' (#284) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/284
2024-02-29 14:42:05 +00:00
556a865abd Merge pull request 'feat : 站点管理新增上传图纸按钮,隧道管理新增图纸导航模式' (#283) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/283
2024-02-29 13:58:54 +00:00
d11401fd12 feat : 站点管理新增上传图纸按钮,隧道管理新增图纸导航模式 2024-02-29 21:58:30 +08:00
Hcat
29672ce74a 廖杰:更新了隧道简称,和昨天的编辑模式bug 2024-02-29 21:58:06 +08:00
47d23d37d7 Merge pull request 'feat : 隧道管理新增施工长度输入框' (#282) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/282
2024-02-28 15:52:24 +00:00
76bdc87c50 feat : 隧道管理新增施工长度输入框 2024-02-28 23:52:05 +08:00
5b8b6cbf27 Merge pull request 'feat : 对接用电量/省电量数据及新增用电量echarts图表模块' (#281) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/281
2024-02-28 14:19:18 +00:00
9afde77c00 feat : 对接用电量/省电量数据及新增用电量echarts图表模块 2024-02-28 22:18:55 +08:00
liaojie
0fb3c3b827 Merge pull request 'liaojie' (#280) from liaojie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/280
2024-02-28 13:29:43 +00:00
Hcat
3d706c10ca 廖杰:预览模式当风机离线(不在online下)会显示红色 2024-02-28 21:27:36 +08:00
Hcat
70364c8e10 廖杰:预览模式当风机离线(不在online下)会显示红色 2024-02-28 21:23:57 +08:00