|
|
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 |
|
Hcat
|
5e24845abb
|
解决冲突
|
2024-02-28 19:35:33 +08:00 |
|
|
|
197914da01
|
Merge pull request 'fix : 修改bug' (#279) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/279
|
2024-02-28 10:22:26 +00:00 |
|
|
|
a8b5e2c26f
|
fix : 修改bug
|
2024-02-28 18:22:07 +08:00 |
|
|
|
17a95a9294
|
Merge pull request 'feat : 新增echarts中指定日期展示及细节优化' (#277) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/277
|
2024-02-28 10:09:14 +00:00 |
|
|
|
ea4f72780f
|
feat : 新增echarts中指定日期展示及细节优化
|
2024-02-28 18:08:44 +08:00 |
|
Hcat
|
1ed195b4b5
|
完成一半
|
2024-02-28 00:35:54 +08:00 |
|
|
|
e8b097a4ab
|
Merge pull request 'fix : 切换站点当无隧道时提示' (#275) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/275
|
2024-02-27 09:08:05 +00:00 |
|
|
|
59aa2a92d1
|
fix : 切换站点当无隧道时提示
|
2024-02-27 17:07:47 +08:00 |
|
|
|
53264551cd
|
Merge pull request 'feat : 新增echarts(折线图)下方滚动条型缩放组件' (#273) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/273
|
2024-02-27 08:59:43 +00:00 |
|
|
|
2a8cb0d389
|
feat : 新增echarts(折线图)下方滚动条型缩放组件
|
2024-02-27 16:59:15 +08:00 |
|
|
|
f1ae3537ba
|
Merge pull request 'fix : 风机区域细节优化' (#272) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/272
|
2024-02-27 08:09:34 +00:00 |
|
|
|
bc3e7ddaea
|
fix : 风机区域细节优化
|
2024-02-27 16:09:03 +08:00 |
|
|
|
e2afbbc011
|
Merge pull request 'fix : 风机区域细节优化' (#270) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/270
|
2024-02-26 09:47:35 +00:00 |
|
|
|
0301aa79bc
|
fix : 风机区域细节优化
|
2024-02-26 17:47:15 +08:00 |
|
|
|
ae15ba62b5
|
Merge pull request 'fix : 细节优化' (#269) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/269
|
2024-02-22 13:34:21 +00:00 |
|
|
|
97787def33
|
fix : 细节优化
|
2024-02-22 21:33:35 +08:00 |
|
|
|
87c4238e84
|
Merge pull request 'feat : 风机启停' (#268) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/268
|
2024-02-22 12:08:56 +00:00 |
|
|
|
02af5f6508
|
feat : 风机启停
|
2024-02-22 20:08:35 +08:00 |
|
|
|
f648711e0d
|
Merge pull request 'feat : 风压echarts按日月年监控数据' (#267) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/267
|
2024-02-22 09:31:40 +00:00 |
|
|
|
5a711436b8
|
feat : 风压echarts按日月年监控数据
|
2024-02-22 17:31:16 +08:00 |
|
|
|
4a4683c7a4
|
Merge pull request 'master' (#266) from master into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/266
|
2024-02-22 09:11:00 +00:00 |
|
|
|
8952952519
|
Merge pull request 'feat : 电流、有毒气体和传感器echarts按日月年监控数据' (#265) from dengjie into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/265
|
2024-02-22 09:10:48 +00:00 |
|
|
|
3a23b467ec
|
feat : 电流、有毒气体和传感器echarts按日月年监控数据
|
2024-02-22 17:10:06 +08:00 |
|
clay
|
99d384a847
|
Merge pull request 'master' (#264) from master into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/264
|
2024-02-22 01:04:38 +00:00 |
|
clay
|
6a13b324bd
|
Merge pull request '更新 .drone.yml' (#263) from clay-patch-2 into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/263
|
2024-02-22 01:04:16 +00:00 |
|
clay
|
e3070840b5
|
更新 .drone.yml
|
2024-02-22 01:04:03 +00:00 |
|
clay
|
9034f2c37b
|
Merge pull request 'master' (#262) from master into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/262
|
2024-02-21 14:56:50 +00:00 |
|
clay
|
3f4e6939ac
|
Merge pull request '更新 .drone.yml' (#261) from clay-patch-1 into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/261
|
2024-02-21 14:56:37 +00:00 |
|
clay
|
647dd53c4e
|
更新 .drone.yml
|
2024-02-21 14:56:29 +00:00 |
|
|
|
18e6b20414
|
Merge pull request 'master' (#259) from master into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/259
|
2024-02-21 13:45:38 +00:00 |
|
|
|
7f28038261
|
Merge pull request 'fix: 修改风向bug' (#258) from dengjie into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/258
|
2024-02-21 13:45:19 +00:00 |
|
|
|
98799e8bcc
|
fix: 修改风向bug
|
2024-02-21 21:44:59 +08:00 |
|
odjbin
|
0747a6e177
|
Merge pull request 'dev' (#257) from dev into master
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/257
|
2024-02-18 08:01:24 +00:00 |
|
odjbin
|
0443e72a38
|
Merge pull request '邓洁: 修改用电量阈值' (#256) from dengjie into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/256
|
2024-02-18 08:01:00 +00:00 |
|
邓洁
|
85dfecff84
|
邓洁: 修改用电量阈值
|
2024-02-18 16:00:13 +08:00 |
|
liaojie
|
20788c6b65
|
Merge pull request '小的细节优化' (#255) from LJ into dev
Reviewed-on: http://git.feashow.cn/clay/tunnel-cloud-web/pulls/255
|
2024-01-26 16:18:06 +00:00 |
|
Hcat
|
c29b14d968
|
小的细节优化
|
2024-01-27 00:16:55 +08:00 |
|
