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

1219 Commits (f499279fc4e016d14d16e76df51a8c45b413b71c)

Author SHA1 Message Date
13621160019@163.com 7cf3218207 added associated parameters data to excel exporter of combinedequipmentincome in API 
Merge branch 'develop'
 2021-04-06 08:47:26 +08:00
13621160019@163.com 3967ad5d08 added associated parameters data to excel exporter of combinedequipmentincome in API 2021-04-06 08:46:26 +08:00
13621160019@163.com 747c9430b9 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 
Merge branch 'develop'
 2021-04-05 20:28:27 +08:00
13621160019@163.com 1445756d22 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 2021-04-05 20:26:49 +08:00
13621160019@163.com 6aa5708016 added associated parameters data to excel exporter of combinedequipmentenergycategory in API 
Merge branch 'develop'
 2021-04-05 20:21:59 +08:00
13621160019@163.com f19ee1f3ae added associated parameters data to excel exporter of combinedequipmentenergycategory in API 2021-04-05 20:20:25 +08:00
13621160019@163.com 2ebff6b9f4 added associated parameters data to excel exporter of combinedequipmentcost in API 
Merge branch 'develop'
 2021-04-05 20:13:38 +08:00
13621160019@163.com 2f8a96abf6 added associated parameters data to excel exporter of combinedequipmentcost in API 2021-04-05 20:11:19 +08:00
13621160019@163.com 842f5aec8b fixed issue in excel exporter of equipmentincome in API 
Merge branch 'develop'
 2021-04-05 19:52:55 +08:00
13621160019@163.com 152ab66064 fixed issue in excel exporter of equipmentincome in API 2021-04-05 19:51:42 +08:00
guangyuzhang ec4c2f42c5 fixed error in excel exporter of equipmentincome report in API 
Merge branch 'develop'
 2021-04-05 12:31:00 +08:00
guangyuzhang bcf8cbc438 fixed error in excel exporter of equipmentincome report in API 
Merge branch 'PR28' into develop
 2021-04-05 12:29:31 +08:00
guangyuzhang cf705656e1 upated panels' width and height in shopfloor view of Admin UI 
Merge branch 'develop'
 2021-04-04 16:25:11 +08:00
guangyuzhang 7071375e8c upated panels' width and height in shopfloor view of Admin UI 2021-04-04 16:20:33 +08:00
guangyuzhang 5f530c7eda upated panels width and height of store view in Admin UI 
Merge branch 'develop'
 2021-04-04 16:05:32 +08:00
guangyuzhang b6e5cf9960 upated panels width and height of store view in Admin UI 2021-04-04 16:04:54 +08:00
guangyuzhang 1e4523c369 updated panels' widith and height of tenant view in Admin UI 
Merge branch 'develop'
 2021-04-04 15:52:53 +08:00
guangyuzhang 714edc42ad updated panels' widith and height of tenant view in Admin UI 2021-04-04 15:47:16 +08:00
tianlinzhong dc8a0eba2b Fixed the Income bug 2021-04-04 15:33:45 +08:00
tianlinzhong 5b9305ee5a Fixed the Income bug 2021-04-04 15:24:56 +08:00
guangyuzhang a1190a67a6 updated width and height of panels in space view in Admin UI 
Merge branch 'develop'
 2021-04-04 13:38:41 +08:00
guangyuzhang ad611f096a updated width and height of panels in space view in Admin UI 2021-04-04 13:38:10 +08:00
guangyuzhang d151e71704 updated space bind meter panel to be scrollable in Admin UI 
Merge branch 'develop'
 2021-04-04 12:23:37 +08:00
guangyuzhang c8819ba9ba updated space bind meter panel to be scrollable in Admin UI 2021-04-04 12:22:07 +08:00
13621160019@163.com 95f54fae70 fixed unit issue in CombinedEquipmentCost report in API 
Merge branch 'develop'
 2021-04-02 14:02:04 +08:00
13621160019@163.com 51cd31faa7 fixed unit issue in CombinedEquipmentCost report in API 2021-04-02 13:49:55 +08:00
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