Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 89ed1c3a0c Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-24 10:51:55 +0800
• 4727db76b1 2023-05-24 10:09:36 优化完善温度传感器查询接口! 魔神煜修罗皇 2023-05-24 10:51:44 +0800
• e925784190 能耗统计 wj 2023-05-23 16:31:15 +0800
• c097c854c3 能耗统计 wj 2023-05-23 14:54:32 +0800
• 2ce6e92a51 Merge remote-tracking branch 'origin/master' wj 2023-05-23 10:36:24 +0800
• 3c97b9e339 能耗统计 wj 2023-05-23 10:36:17 +0800
• 41c85b94a3 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-23 10:09:35 +0800
• 9c454de070 2023-05-23 10:09:36 优化完善首页大屏运行设备查询接口! 魔神煜修罗皇 2023-05-23 10:09:26 +0800
• a6f88657d3 首页，定时控制 wj 2023-05-23 09:52:39 +0800
• 65b4b11696 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-22 17:30:16 +0800
• 1061d24193 11 林颖晨 2023-05-22 17:30:08 +0800
• 099869008d 2023-05-22 17:20:16 优化完善温度传感器查询接口! 魔神煜修罗皇 2023-05-22 17:06:24 +0800
• bd8e3dd33c 2023-05-22 16:20:46 优化完善温度传感器查询接口，补充空判断处理! 魔神煜修罗皇 2023-05-22 16:20:52 +0800
• 3d928674fd 2023-05-22 15:34:46 完成设备管理的绑定用户接口! 魔神煜修罗皇 2023-05-22 15:34:42 +0800
• 7f6ed1042f 2023-05-22 14:55:46 完成策略管理的增、删、改、查接口! 魔神煜修罗皇 2023-05-22 14:56:02 +0800
• 06193bc682 2023-05-16 14:08:35 完成策略管理的增、删、改、查接口! 魔神煜修罗皇 2023-05-16 16:16:21 +0800
• 9454997d85 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-16 15:23:57 +0800
• b8fdd12f18 2023-05-16 14:08:35 完成策略管理的增、删、改、查接口! 魔神煜修罗皇 2023-05-16 15:23:47 +0800
• 3c393e86ec Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-16 14:09:50 +0800
• 286f71a3f6 11 林颖晨 2023-05-16 14:09:42 +0800
• 4cdd1fd2c2 2023-05-16 14:08:35 完成策略管理的增、删、改、查接口! 魔神煜修罗皇 2023-05-16 14:09:19 +0800
• 740d098d26 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-16 10:54:14 +0800
• e27080f07a 2023-05-16 10:51:56 完成用户所属策略的查询接口! 魔神煜修罗皇 2023-05-16 10:54:04 +0800
• c3c905d642 11 jiminglei 2023-05-15 17:52:29 +0800
• 229b471f33 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-15 17:31:47 +0800
• 3d04e41bfc 2023-05-15 17:30:15 优化完善设备管理的增、删、改、查、导入、模板下载、导出接口! 魔神煜修罗皇 2023-05-15 17:31:38 +0800
• 72723572a8 完成环比，策略导入执行 林颖晨 2023-05-15 17:05:06 +0800
• c1c24f2c65 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-15 16:51:23 +0800
• 3b95e7bcc5 11 林颖晨 2023-05-15 16:47:28 +0800
• b1ef74bf8e Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-15 16:46:45 +0800
• 23069ec518 2023-05-15 16:46:15 优化完善首页大屏、能源监测的查询接口! 魔神煜修罗皇 2023-05-15 16:46:26 +0800
• a71bbd82e9 11 wj 2023-05-15 15:06:41 +0800
• 4132fb04e4 11 jiminglei 2023-05-15 15:04:05 +0800
• 62a19fb1db Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-15 10:29:20 +0800
• 9585dccc18 同比统计分析 林颖晨 2023-05-15 10:29:13 +0800
• a45416c4ce Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-15 10:19:43 +0800
• 138037e3cd 2023-05-15 10:18:26 优化完善首页大屏、能源监测的查询接口! 魔神煜修罗皇 2023-05-15 10:19:33 +0800
• c693aef07e 11 林颖晨 2023-05-12 18:33:06 +0800
• 6ac6ad3f64 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-12 18:31:08 +0800
• 564a5bddfb Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-12 18:30:12 +0800
• 9663ac8ba4 2023-05-12 16:02:05 完成用户所属策略下拉列表接口! 魔神煜修罗皇 2023-05-12 18:27:48 +0800
• 617d9316c1 11 林颖晨 2023-05-12 18:21:21 +0800
• d15c6d60ec Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-12 18:20:38 +0800
• 0eb66b5b9c 2023-05-12 16:02:05 完成用户所属策略下拉列表接口! 魔神煜修罗皇 2023-05-12 18:20:30 +0800
• 12442b7953 11 jiminglei 2023-05-12 18:19:39 +0800
• 9c69c17498 11 wj 2023-05-12 18:14:01 +0800
• b58b530a62 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-12 18:07:02 +0800
• 7934698795 2023-05-12 16:02:05 完成用户所属策略下拉列表接口! 魔神煜修罗皇 2023-05-12 18:05:58 +0800
• ae1843cf0d 11 wj 2023-05-12 17:26:18 +0800
• 67cd85bede 11 jiminglei 2023-05-12 17:14:18 +0800
• 957e2f72b2 2023-05-12 16:02:05 补充在设备今日无数据的情况下，增加空判断处理! 魔神煜修罗皇 2023-05-12 16:02:18 +0800
• 2295843b5c Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-12 15:46:43 +0800
• dea7be54a6 2023-05-12 15:46:23 增加空判断处理! 魔神煜修罗皇 2023-05-12 15:46:35 +0800
• 0065a44356 优化定时控制 林颖晨 2023-05-12 15:41:27 +0800
• 834a9ec5a4 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-12 15:37:29 +0800
• b16c30080f 2023-05-12 15:37:06 增加空判断处理! 魔神煜修罗皇 2023-05-12 15:37:20 +0800
• 6d475cfca5 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-12 15:33:31 +0800
• 70312027db 完成能耗统计接口，定时采集 林颖晨 2023-05-12 15:26:33 +0800
• e725765030 2023-05-12 11:23:36 完成设备管理的导出、模板下载、导入接口! 魔神煜修罗皇 2023-05-12 14:28:29 +0800
• 5daa9451f0 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-12 11:47:28 +0800
• 73fab0ad90 2023-05-12 11:23:36 完成设备管理的导出、模板下载接口! 魔神煜修罗皇 2023-05-12 11:47:18 +0800
• c43cd8cfdd 11 wj 2023-05-12 11:24:21 +0800
• c9f3889b8b 11 wj 2023-05-11 18:02:49 +0800
• 0d58b2b4a0 11 jiminglei 2023-05-11 17:58:41 +0800
• b3720b33b5 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-11 17:24:29 +0800
• 46f117ee4c 2023-05-11 17:23:36 完成设备管理的增、删、改、查接口! 魔神煜修罗皇 2023-05-11 17:24:20 +0800
• b3f86390d4 11 jiminglei 2023-05-11 16:39:40 +0800
• 655e7960bc 11 wj 2023-05-11 16:31:12 +0800
• 6131313b1e 11 林颖晨 2023-05-11 15:36:38 +0800
• 645ddb4826 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-11 15:34:44 +0800
• 703bcede57 完成定时控制 林颖晨 2023-05-11 15:34:37 +0800
• 3131b7135d 2023-05-11 10:28:06 完成能源监测总电表、电磁锅炉、蓄热锅炉、空气源热泵、发热电缆、沙盘、温度传感器的查询接口! 魔神煜修罗皇 2023-05-11 14:53:02 +0800
• 0d88bd0448 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-11 14:03:46 +0800
• 5f350b53f4 2023-05-11 14:03:26 完成用户所属设备列表查询接口，完成根据设备Id查询设备当前状态接口! 魔神煜修罗皇 2023-05-11 14:03:39 +0800
• a371b2163c 11 jiminglei 2023-05-11 11:21:08 +0800
• 78f3453d99 2023-05-11 10:28:06 完成能源监测电磁锅炉、蓄热锅炉、空气源热泵、发热电缆的查询接口! 魔神煜修罗皇 2023-05-11 10:29:18 +0800
• 1294a2cd98 Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-10 17:42:24 +0800
• 535bd66fbd 开发手动，控制，定时控制 林颖晨 2023-05-10 17:42:12 +0800
• 63dd6e5fe6 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-10 17:37:17 +0800
• d270366f1a 2023-05-10 17:36:28 完成能源监测电磁锅炉的查询接口! 魔神煜修罗皇 2023-05-10 17:37:04 +0800
• 1c22df3a43 11 wj 2023-05-10 16:10:05 +0800
• 8cb913af88 11 wj 2023-05-10 11:08:37 +0800
• 70b850dff6 11 jiminglei 2023-05-10 16:06:14 +0800
• dff3876895 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-10 15:46:07 +0800
• 1efb3f20da 2023-05-10 15:45:20 完成能源监测总电表的查询接口! 魔神煜修罗皇 2023-05-10 15:45:58 +0800
• c46aff0c4b 11 jiminglei 2023-05-10 11:12:50 +0800
• 9b51b10d6e 111 林颖晨 2023-05-10 09:16:15 +0800
• 107b29f3eb Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-10 09:07:04 +0800
• 87eaca1744 手动控制页面开发 林颖晨 2023-05-10 09:06:56 +0800
• a5ff0db251 11 wj 2023-05-09 17:53:39 +0800
• 58aa10af3b Merge remote-tracking branch 'origin/master' wj 2023-05-09 17:53:20 +0800
• 3216851ea0 2023-05-09 17:21:52 完成首页大屏的查询接口! 魔神煜修罗皇 2023-05-09 17:26:51 +0800
• c2ddcf6b33 Merge remote-tracking branch 'origin/master' 魔神煜修罗皇 2023-05-09 17:25:45 +0800
• 9059261b4d 2023-05-09 17:21:52 完成首页大屏的查询接口! 魔神煜修罗皇 2023-05-09 17:23:31 +0800
• eb37d3db7a Merge remote-tracking branch 'origin/master' wj 2023-05-09 16:45:17 +0800
• f2a352d5f5 11 wj 2023-05-09 16:45:04 +0800
• b722eac09a Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc 林颖晨 2023-05-09 16:44:58 +0800
• bacd78e36e 手动控制页面开发 林颖晨 2023-05-09 16:44:51 +0800
• 63ad00d79b 11 wj 2023-05-09 16:39:39 +0800
• 57703d9f73 11 wj 2023-05-09 16:36:38 +0800