Commit Graph

331 Commits (538a3c741c21e4713d0a269abd4cfe5e3da03b61)

Author SHA1 Message Date
pangdundun 2ab755ab83 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-21 16:31:37 +08:00
pangdundun 7578cf5629 ~ 2023-11-21 16:31:31 +08:00
xiaomeng 6e4c4a03f6 Merge pull request 'pc-master' (#48) from pc-master into portal
Reviewed-on: #48
2023-11-21 08:11:11 +00:00
孙萌 31a3ee0da4 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-21 16:08:35 +08:00
孙萌 7075add91b 1 2023-11-21 16:08:29 +08:00
xiaomeng 9d5bc9ab01 Merge pull request '1' (#47) from pc-master into portal
Reviewed-on: #47
2023-11-21 07:37:56 +00:00
pangdundun ac738959dc Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-21 15:36:28 +08:00
pangdundun 3f04ee521b ~ 2023-11-21 15:36:22 +08:00
孙萌 44c1c8e2fb 1 2023-11-21 14:51:31 +08:00
xiaomeng 224a904cd7 Merge pull request 'pc-master' (#46) from pc-master into portal
Reviewed-on: #46
2023-11-21 05:56:59 +00:00
孙萌 b1ba00f9c2 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-21 11:29:02 +08:00
孙萌 cb24bd0bb4 1 2023-11-21 11:28:57 +08:00
pangdundun 45aed4098e ~ 2023-11-21 10:47:40 +08:00
xiaomeng d51add73ff Merge pull request '~' (#45) from pc-master into portal
Reviewed-on: #45
2023-11-20 05:17:23 +00:00
pangdundun c2147e4e47 ~ 2023-11-20 12:03:18 +08:00
xiaomeng 582f57670d Merge pull request 'pc-master' (#44) from pc-master into portal
Reviewed-on: #44
2023-11-20 02:49:24 +00:00
pangdundun 99c21c78ce Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-20 10:46:42 +08:00
pangdundun 9db095d1e1 ~ 2023-11-20 10:46:32 +08:00
孙萌 f88a36a07d 1 2023-11-20 10:14:41 +08:00
孙萌 ba1b7594fc Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-20 09:22:35 +08:00
孙萌 2fd78c1a21 1 2023-11-20 09:22:29 +08:00
xiaomeng e32baa9d0f Merge pull request 'pc-master' (#43) from pc-master into portal
Reviewed-on: #43
2023-11-19 05:53:39 +00:00
pangdundun 0d2b98af85 ~ 2023-11-18 22:07:59 +08:00
pangdundun cc2378663b ~ 2023-11-18 18:54:40 +08:00
xiaomeng 1c1f98f467 Merge pull request 'pc-master' (#42) from pc-master into portal
Reviewed-on: #42
2023-11-18 05:26:03 +00:00
pangdundun 0b2d16e194 ~ 2023-11-17 19:26:35 +08:00
pangdundun ede0dba799 修改跳转问题 2023-11-17 18:07:04 +08:00
xiaomeng f92632a750 Merge pull request 'pc-master' (#41) from pc-master into portal
Reviewed-on: #41
2023-11-17 06:29:05 +00:00
pangdundun 98dbf114ce ~ 2023-11-17 14:27:32 +08:00
pangdundun a392c01e37 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-17 14:21:16 +08:00
pangdundun 15bf2a4bf6 ~ 2023-11-17 14:21:05 +08:00
xiaomeng 4ffd0205d8 Merge pull request 'pc-master' (#40) from pc-master into portal
Reviewed-on: #40
2023-11-17 05:30:24 +00:00
孙萌 adba9271e6 Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-17 11:50:53 +08:00
孙萌 5f671cbff8 1 2023-11-17 11:50:46 +08:00
pangdundun 01ba76bf30 ~ 2023-11-17 09:30:15 +08:00
xiaomeng 0b30f8f73c Merge pull request '~' (#39) from pc-master into portal
Reviewed-on: #39
2023-11-17 00:13:43 +00:00
pangdundun 47e0ba9c90 ~ 2023-11-16 18:39:14 +08:00
xiaomeng 5aebb33093 Merge pull request '~' (#38) from pc-master into portal
Reviewed-on: #38
2023-11-16 07:44:49 +00:00
pangdundun 3140c05744 ~ 2023-11-16 15:43:23 +08:00
xiaomeng 773ced60cd Merge pull request 'pc-master' (#37) from pc-master into portal
Reviewed-on: #37
2023-11-16 07:08:30 +00:00
pangdundun 79f70fd075 ~ 2023-11-16 15:07:31 +08:00
孙萌 7fc50fd211 风机问题修改 2023-11-16 14:50:51 +08:00
孙萌 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