孙萌
|
19513b2c9c
|
大屏左侧滚动
|
2023-11-16 14:35:46 +08:00 |
 xiaomeng
|
62481ff198
|
Merge pull request 'pc-master' (#36) from pc-master into portal
Reviewed-on: #36
|
2023-11-16 03:10:45 +00:00 |
|
孙萌
|
94c0fa90b2
|
1
|
2023-11-16 11:09:07 +08:00 |
|
孙萌
|
8490006970
|
1
|
2023-11-16 11:04:36 +08:00 |
|
孙萌
|
80a985e06e
|
实时数据status加入了3s请求
|
2023-11-16 11:03:04 +08:00 |
|
孙萌
|
09b4d0a0cb
|
大屏视频对接
|
2023-11-16 10:39:29 +08:00 |
|
xiaomeng
|
3be20bad81
|
Merge pull request 'pc-master' (#35) from pc-master into portal
Reviewed-on: #35
|
2023-11-16 02:14:37 +00:00 |
 pangdundun
|
9a56e7b039
|
Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master
|
2023-11-16 10:11:43 +08:00 |
|
pangdundun
|
5d94e95072
|
合并代码
|
2023-11-16 10:11:37 +08:00 |
|
孙萌
|
7937067a32
|
1
|
2023-11-16 09:05:28 +08:00 |
|
孙萌
|
6898791e83
|
设备运行状态
|
2023-11-15 18:30:17 +08:00 |
|
孙萌
|
b745f2bdbe
|
1
|
2023-11-15 11:55:28 +08:00 |
|
孙萌
|
3049e3fe66
|
Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master
|
2023-11-15 11:53:33 +08:00 |
|
孙萌
|
ee88ac82f3
|
1
|
2023-11-15 11:53:23 +08:00 |
|
xiaomeng
|
cc404fb531
|
Merge pull request 'pc-master' (#34) from pc-master into portal
Reviewed-on: #34
|
2023-11-15 02:34:11 +00:00 |
|
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 |