Commit Graph

90 Commits (ca3731837d50552721ecec037cffaf4532c7b7ea)

Author SHA1 Message Date
孙萌 ca3731837d Merge branch 'pc-master' of https://git.lihe-control.com/xiaomeng/wszhyWx into pc-master 2023-11-21 16:51:51 +08:00
孙萌 0d4f6e0762 1 2023-11-21 16:51:45 +08:00
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
孙萌 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
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
孙萌 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
pangdundun c2147e4e47 ~ 2023-11-20 12:03:18 +08: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
pangdundun 0d2b98af85 ~ 2023-11-18 22:07:59 +08:00
pangdundun cc2378663b ~ 2023-11-18 18:54:40 +08:00
pangdundun 0b2d16e194 ~ 2023-11-17 19:26:35 +08:00
pangdundun ede0dba799 修改跳转问题 2023-11-17 18:07:04 +08: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
孙萌 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
pangdundun 47e0ba9c90 ~ 2023-11-16 18:39:14 +08:00
pangdundun 3140c05744 ~ 2023-11-16 15:43:23 +08: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
孙萌 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
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
孙萌 ee88ac82f3 1 2023-11-15 11:53:23 +08:00
孙萌 1f51575bb0 监控修改 2023-11-14 16:44:09 +08:00
孙萌 e9b0ccc21f 控温宽度计算修改 2023-11-14 08:49:22 +08:00
孙萌 c3f0d872e0 实时数据时间位置修改 2023-11-11 11:12:19 +08: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
孙萌 8e810024c3 1 2023-11-10 17:26:39 +08:00