mzp
|
84a88d1062
|
手动解决冲突
|
2023-11-15 10:26:29 +08:00 |
|
孙萌
|
1f51575bb0
|
监控修改
|
2023-11-14 16:44:09 +08:00 |
 xiaomeng
|
f78510043e
|
Merge pull request 'pc-master' (#30) from pc-master into portal
Reviewed-on: #30
|
2023-11-14 04:37:25 +00:00 |
|
孙萌
|
e9b0ccc21f
|
控温宽度计算修改
|
2023-11-14 08:49:22 +08:00 |
|
孙萌
|
c3f0d872e0
|
实时数据时间位置修改
|
2023-11-11 11:12:19 +08:00 |
|
xiaomeng
|
e8b736299a
|
Merge pull request 'pc-master' (#29) from pc-master into portal
Reviewed-on: #29
|
2023-11-11 02:01:20 +00:00 |
|
孙萌
|
90cd66efe4
|
1
|
2023-11-11 08:40:51 +08:00 |
|
孙萌
|
38283f0c00
|
1
|
2023-11-10 18:31:55 +08:00 |
|
孙萌
|
4bcef06f27
|
1
|
2023-11-10 18:03:25 +08:00 |
|
xiaomeng
|
dde09a8564
|
Merge pull request 'pc-master' (#28) from pc-master into portal
Reviewed-on: #28
|
2023-11-10 09:48:07 +00:00 |
|
孙萌
|
8e810024c3
|
1
|
2023-11-10 17:26:39 +08:00 |
|
孙萌
|
5ca623bb55
|
11/10问题修改提交
|
2023-11-10 17:23:30 +08:00 |
|
xiaomeng
|
3092d08a92
|
Merge pull request '1' (#27) from pc-master into portal
Reviewed-on: #27
|
2023-11-10 07:45:36 +00:00 |
|
孙萌
|
5d1c0d32a3
|
1
|
2023-11-09 18:13:44 +08:00 |
|
xiaomeng
|
1928aeaa61
|
Merge pull request '1' (#26) from pc-master into portal
Reviewed-on: #26
|
2023-11-09 08:33:19 +00:00 |
|
孙萌
|
c7dbe2eaf7
|
1
|
2023-11-09 16:30:21 +08:00 |
|
xiaomeng
|
54ae501a7b
|
Merge pull request 'pc-master' (#25) from pc-master into portal
Reviewed-on: #25
|
2023-11-09 08:15:30 +00:00 |
|
孙萌
|
95b35bcdf7
|
1
|
2023-11-09 16:06:57 +08:00 |
|
孙萌
|
331eae5982
|
1
|
2023-11-09 16:05:04 +08:00 |
|
xiaomeng
|
b352dc1bb0
|
Merge pull request 'pc-master' (#24) from pc-master into portal
Reviewed-on: #24
|
2023-11-09 06:49:11 +00:00 |
|
孙萌
|
98600b8b57
|
1
|
2023-11-09 14:46:29 +08:00 |
 home孙
|
b6937ed840
|
1
|
2023-11-09 11:33:44 +08:00 |
|
home孙
|
0aeb0251c5
|
修改控制器数据上传
|
2023-11-09 11:29:41 +08:00 |
|
xiaomeng
|
5c01e3693d
|
Merge pull request 'pc-master' (#23) from pc-master into portal
Reviewed-on: #23
|
2023-11-09 00:23:13 +00:00 |
|
孙萌
|
53f0908869
|
1
|
2023-11-08 17:07:22 +08:00 |
|
孙萌
|
af0a38da60
|
传感器合成
|
2023-11-08 16:39:33 +08:00 |
|
xiaomeng
|
6d402ee265
|
Merge pull request 'pc-master' (#22) from pc-master into portal
Reviewed-on: #22
|
2023-11-08 05:29:14 +00:00 |
|
孙萌
|
afe6d43b3b
|
1
|
2023-11-07 17:32:13 +08:00 |
|
孙萌
|
4c06530f6a
|
新页面编写提交
|
2023-11-07 17:23:20 +08:00 |
|
xiaomeng
|
4aea05d5d2
|
Merge pull request '折线图数据修改' (#20) from pc-master into portal
Reviewed-on: #20
|
2023-10-18 07:43:22 +00:00 |
|
孙萌
|
ce72349d01
|
折线图数据修改
|
2023-10-18 15:35:30 +08:00 |
|
xiaomeng
|
e8aee0fb3e
|
Merge pull request '添加修改参数页面状态跟随' (#19) from pc-master into portal
Reviewed-on: #19
|
2023-10-18 00:10:22 +00:00 |
|
孙萌
|
e42de203fb
|
1
|
2023-10-17 18:34:03 +08:00 |
|
xiaomeng
|
0e61082d16
|
Merge pull request 'pc-master' (#18) from pc-master into portal
Reviewed-on: #18
|
2023-10-17 10:08:39 +00:00 |
|
孙萌
|
d90bf7bef1
|
1
|
2023-10-17 18:07:19 +08:00 |
|
孙萌
|
46478ffd20
|
添加active状态
|
2023-10-17 18:04:47 +08:00 |
|
xiaomeng
|
ceba1f0b47
|
Merge pull request '页面跳转逻辑修改' (#17) from pc-master into portal
Reviewed-on: #17
|
2023-10-17 09:48:34 +00:00 |
|
孙萌
|
6a78b68d8a
|
页面跳转逻辑修改
|
2023-10-17 17:47:24 +08:00 |
|
xiaomeng
|
72c593b4de
|
Merge pull request 'pc-master' (#16) from pc-master into portal
Reviewed-on: #16
|
2023-10-17 09:22:10 +00:00 |
|
孙萌
|
e92d96ef0f
|
设定值页面默认设置为状态设置
|
2023-10-17 17:21:10 +08:00 |
|
孙萌
|
28be7eec0e
|
1
|
2023-10-17 17:08:49 +08:00 |
|
xiaomeng
|
c9f9155367
|
Merge pull request 'pc-master' (#15) from pc-master into portal
Reviewed-on: #15
|
2023-10-16 08:45:18 +00:00 |
|
孙萌
|
d7131321c8
|
1
|
2023-10-16 15:58:58 +08:00 |
|
孙萌
|
9aa46b6aed
|
修改模式回显 变更为点击操作(方便手机端用户)
|
2023-10-16 14:17:41 +08:00 |
|
孙萌
|
dfc6f44105
|
修改登录页背景图空白问题
|
2023-10-13 15:44:05 +08:00 |
 clibing
|
8bedf46050
|
Merge pull request '新问题修改' (#13) from pc-master into portal
Reviewed-on: #13
|
2023-10-13 07:06:00 +00:00 |
|
孙萌
|
a73f2dc3d2
|
新问题修改
|
2023-10-13 14:49:25 +08:00 |
|
clibing
|
57d9ae8cfe
|
Merge pull request 'pc-master' (#12) from pc-master into portal
Reviewed-on: #12
|
2023-10-13 02:43:37 +00:00 |
|
孙萌
|
bfeec0854d
|
1
|
2023-10-13 09:09:36 +08:00 |
|
孙萌
|
e9c742f571
|
1
|
2023-10-12 18:31:12 +08:00 |