seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
793 Commits
2 Branches
32 Tags
112 MiB
Commit Graph

793 Commits (9126d1981a875fb8d06c7d8352ed2ec7ce5b484f)

Author SHA1 Message Date
13621160019@163.com 86a9289b2b added associated equipment data to excel exporter of CombinedEquipmentIncome in API 
Merge branch 'develop'
 2021-04-02 11:23:52 +08:00
13621160019@163.com af8be9d20e added associated equipment data to excel exporter of CombinedEquipmentIncome in API 
Merge branch 'PR27' into develop
 2021-04-02 11:21:47 +08:00
Caozhenhui a397de2c3f fixed a bug with associated equipment data of combinedequipmentincome 2021-04-01 23:38:13 +08:00
13621160019@163.com 36935ace07 added quickmode to HTTP request parameters of MeterTrend report in API 
Merge branch 'develop'
 2021-04-01 15:50:01 +08:00
13621160019@163.com 2965397cd9 added quickmode to HTTP request parameters of MeterTrend report in API 
Merge branch 'PR26' into develop
 2021-04-01 15:48:24 +08:00
YangZhang-GitHub 8279c4ba7a Add 'quick_mode variable is used to speed up 2021-04-01 15:23:09 +08:00
13621160019@163.com 051c8134cf added parameter data to excel exporter of Equipment reports in API 
Merge branch 'develop'
 2021-04-01 12:07:16 +08:00
13621160019@163.com 0c75dc4db8 added paramter data to excel exporter of EquipmentStatistics in API 2021-04-01 11:59:41 +08:00
13621160019@163.com 6c20da74ed added parameter data to excel exporter of EquipmentSaving in API 2021-04-01 11:56:31 +08:00
13621160019@163.com 980958f8eb added paramter data to excel exporter of EquipmentOutput in API 2021-04-01 11:36:57 +08:00
13621160019@163.com d729198278 added parameter data to excel exporter of EquipmentLoad in API 2021-04-01 11:32:48 +08:00
13621160019@163.com 5c5d23784e added paramters data to excel exporter of EquipmentEnergyItem in API 2021-04-01 10:57:54 +08:00
13621160019@163.com 4e28aac1da added parameters data to excel exporter of EquipmentEnergyCategory in API 2021-04-01 10:48:53 +08:00
13621160019@163.com afffd609c9 changed query form column width from auto to xs={6} sm={3} in Web UI 
Merge branch 'develop'
 2021-03-31 18:23:24 +08:00
13621160019@163.com 8f8772893d changed query form column width from auto to xs={6} sm={3} in Web UI 2021-03-31 18:17:36 +08:00
13621160019@163.com 9493afd4db updated CHANGELOG for v1.1.1 
Merge branch 'develop'
 2021-03-31 16:15:11 +08:00
13621160019@163.com 9e70495dde updated CHANGELOG for v1.1.1 2021-03-31 16:13:56 +08:00
13621160019@163.com 35c0111a15 upgraded version to v1.1.1 
Merge branch 'develop'
 2021-03-31 15:50:17 +08:00
13621160019@163.com e76066b62a upgraded version to v1.1.1 2021-03-31 15:49:23 +08:00
13621160019@163.com aabdb6fb02 added associated equipment data to combinedequipmentcost report in API 
Merge branch 'develop'
 2021-03-31 15:22:26 +08:00
13621160019@163.com d5261e8e01 added associated equipment data to combinedequipmentcost report in API 2021-03-31 15:20:32 +08:00
13621160019@163.com 8ae8d33618 added associated equipment data to combinedequipmentstatistics report in API 2021-03-31 15:09:33 +08:00
13621160019@163.com c79852faa8 Merge branch 'develop' 2021-03-31 14:59:32 +08:00
13621160019@163.com 4bd5b175f4 added associated equipment data to combinedequipmentsaving report in API 2021-03-31 14:58:24 +08:00
13621160019@163.com e0dea0765f added associated equipment data to combinedequipmentoutput report in API 
Merge branch 'develop'
 2021-03-31 14:43:23 +08:00
13621160019@163.com 979d5d7b8c added associated equipment data to combinedequipmentoutput report in API 2021-03-31 14:42:27 +08:00
13621160019@163.com eb276b2123 added associated equipment data to combinedequipmentload report in API 
Merge branch 'develop'
 2021-03-31 14:35:22 +08:00
13621160019@163.com 32eb0441cb added associated equipment data to combinedequipmentload report in API 2021-03-31 14:34:27 +08:00
13621160019@163.com a24a6ddd09 added associated equipment data to combinedeuqipmentincome report in API 2021-03-31 13:34:39 +08:00
13621160019@163.com 0034f856a2 added associated equipment data to combinedequipmentenergyitem report in API 
Merge branch 'develop'
 2021-03-31 13:20:24 +08:00
13621160019@163.com 3bf04cc27d added associated equipment data to combinedequipmentenergyitem report in API 2021-03-31 13:15:07 +08:00
13621160019@163.com 7800a96e64 added associated equipment data to combinedequipmentenergycategory report in API 2021-03-31 13:05:19 +08:00
13621160019@163.com 08317e31ae updated README 
Merge branch 'develop'
 2021-03-31 12:31:35 +08:00
13621160019@163.com 635fa307dd updated README 2021-03-31 12:30:34 +08:00
13621160019@163.com 57114a239c reduced font size of meterrealtime in Web UI 
Merge branch 'develop'
 2021-03-31 09:58:33 +08:00
13621160019@163.com 49013e9516 reduced font size of meterrealtime in Web UI 2021-03-31 09:58:04 +08:00
13621160019@163.com 436177b2c3 Merge branch 'develop' 2021-03-30 17:01:54 +08:00
13621160019@163.com f9ac97d792 updated sample data of tbl_rules in database 2021-03-30 16:56:30 +08:00
13621160019@163.com 6d37bb2ff0 updated sample data of tbl_rules in database 
Merge branch 'PR99' into develop
 2021-03-30 16:35:03 +08:00
13621160019@163.com bbe307b603 added quickmode paramter to combinedequipmentefficiency report in API 
Merge branch 'develop'
 2021-03-29 16:54:35 +08:00
13621160019@163.com ede74ec298 added quickmode paramter to combinedequipmentefficiency report in API 2021-03-29 16:53:35 +08:00
hyh123a eba1a124c6 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-29 13:14:52 +08:00
hyh123a 21dbbca631 add the tbl_rules data 2021-03-29 13:13:13 +08:00
13621160019@163.com b40d858f99 updated sample data of tbl_rules in database 
Merge branch 'develop'
 2021-03-29 10:40:40 +08:00
13621160019@163.com f1fa8b30c4 updated sample data of tbl_rules in database 2021-03-29 10:39:33 +08:00
13621160019@163.com 28fcfd9c63 updated sample data of tbl_rules in database 
Merge branch 'develop'
 2021-03-29 10:32:55 +08:00
13621160019@163.com 26782ad7eb updated sample data of tbl_rules in database 
Merge branch 'PR98' into develop
 2021-03-29 10:32:17 +08:00
hyh123a 37413915cb modify the diff of new line 2021-03-29 10:21:27 +08:00
hyh123a 916fa9d4b7 fixed the version 2021-03-28 19:57:07 +08:00
hyh123a 0f6a6d20c1 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-28 19:51:24 +08:00