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

122 Commits (8ae8d33618a8cc01f17aefec92a2f7ad2c17d788)

Author SHA1 Message Date
13621160019@163.com 8ae8d33618 added associated equipment data to combinedequipmentstatistics report in API 2021-03-31 15:09:33 +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 979d5d7b8c added associated equipment data to combinedequipmentoutput report in API 2021-03-31 14:42:27 +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 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 7c19344e8f added excel exporter of equipmentcost reporter in API 
Merge branch 'PR96' into develop
 2021-03-28 17:05:44 +08:00
tianlinzhong 3b705722bf Fixed the error 2021-03-28 12:19:05 +08:00
tianlinzhong 4b40835d4b Implemented the equipmentcost Excel export 2021-03-26 21:44:52 +08:00
13621160019@163.com 9e32d75470 added associated equipment to combinedequipmentenergyitem report in API 
Merge branch 'PR23' into develop
 2021-03-26 10:31:16 +08:00
YangZhang-GitHub eb0c2df3e0 Fixed a bug 2021-03-25 16:03:51 +08:00
Caozhenhui ca4fdc0872 2021/3/23 #86 2021-03-23 17:19:03 +08:00
13621160019@163.com 6a1b986f56 fixed NoneType error in TenantLoad Report API 2021-03-23 15:54:48 +08:00
13621160019@163.com c7559e0470 fixed NoneType error in SpaceLoad report in API 2021-03-23 15:42:31 +08:00
13621160019@163.com e614888026 fixed issues of excel exporter of conbinedequipmentefficiency and equipmentefficiency reports in API 
Merge branch 'PR22' into develop
 2021-03-19 14:57:29 +08:00
YangZhang-GitHub fadbb98b1d Fixed a bug 2021-03-19 14:15:36 +08:00
13621160019@163.com a5789343e8 updated excel exporter of combinedequipmentefficiency report 
Merge branch 'PR21' into develop
 2021-03-19 10:45:06 +08:00
13621160019@163.com 0f3e5ff641 added excel exporter of equipmentefficiency report 
Merge branch 'PR20' into develop
 2021-03-18 11:29:57 +08:00
YangZhang-GitHub a425b8ff35 Added row height to resolve the problem of incomplete time display 2021-03-18 11:26:08 +08:00
YangZhang-GitHub b6d9b44765 Added row height to resolve the problem of incomplete time display 2021-03-18 11:24:48 +08:00
YangZhang-GitHub c3a5799bb9 Implemented the EquipmentEfficiency Excel Exporter 2021-03-18 10:14:10 +08:00
YangZhang-GitHub 8b25860ad7 Modify the layout 2021-03-17 14:43:44 +08:00
YangZhang-GitHub 3d5d924d56 Modify the column width 2021-03-16 15:00:26 +08:00
YangZhang-GitHub 3d143fecc3 Inspect Code 2021-03-15 19:01:36 +08:00
YangZhang-GitHub dd1fe3c2d4 Improvement of related parameter time 2021-03-15 18:59:52 +08:00
YangZhang-GitHub b531831499 Implemented the CombinedEquipmentEfficiency Excel Exporter 2021-03-15 17:20:09 +08:00
Caozhenhui e9a272a68f change line chart insertion position and delete annotation code 2021-03-11 15:47:18 +08:00
Caozhenhui 2d966aa46a Change the code variable name and add the LineChart comment 2021-03-10 19:27:30 +08:00
Caozhenhui cdfe37dd2a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 19:23:39 +08:00
13621160019@163.com 6c2d66019f updated excel exporters of combinedequipmentenergyitem, combinedequipmentoutput, equipmentenergyitem, equipmentoutput, shopfloorenergyitem, spaceoutput, storeenergyitem and tenantenergytime 
Merge branch 'PR6' into develop
 2021-03-10 19:00:36 +08:00
Caozhenhui d962457c67 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 16:06:16 +08:00
13621160019@163.com e863754cc3 updated excel exporter of spacesot, spaceenergycategory, spaceenergyitem and spaceincome 
Merge branch 'PR13' into develop
 2021-03-10 13:23:51 +08:00
13621160019@163.com c9cb56d8ee fixed issue in excel exporter of spaceincome report 2021-03-10 13:23:40 +08:00
Caozhenhui 7345f1de8a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 12:58:04 +08:00
13621160019@163.com 67be8e5b04 added excel exporter of storesaving report 
Merge branch 'PR14' into develop
 2021-03-10 11:33:13 +08:00
13621160019@163.com 1da9704abf updated excel exporter of spacesaving and tenantsaving reports 
Merge branch 'PR12' into develop
 2021-03-10 09:54:21 +08:00
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
Caozhenhui 7a322f5b4d Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 16:58:29 +08:00
Caozhenhui 4f7ccfa0cc Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 15:32:17 +08:00
YangZhang-GitHub 5f405215f6 Implemented the StoreSaving Excel Exporter 2021-03-08 15:24:47 +08:00
YangZhang-GitHub 5221016bd4 Add the data of per unit area 2021-03-08 15:22:47 +08:00
13621160019@163.com 6612269ab3 added excel exporter of equipmentincome report 
Merge branch 'PR65' into develop
 2021-03-08 15:22:20 +08:00
YangZhang-GitHub 291fabca0f Add a subspace title. Modify the subspace text display format. 2021-03-08 11:45:05 +08:00
YangZhang-GitHub ea00fc9d9f Modify the subspace location. Add a subspace diagram. Add a subspace title 2021-03-08 11:43:44 +08:00
YangZhang-GitHub d0f364b287 Increase the proportion column 2021-03-08 10:25:02 +08:00
YangZhang-GitHub b067abb46d Implemented the ShopFloorSaving Excel Exporter 2021-03-08 09:58:32 +08:00
hyh123a 029ce72b80 Merge remote-tracking branch 'origin_myems/develop' into issure31 2021-03-07 19:05:51 +08:00
tianlinzhong b52f1ef42d Implemented the equipmentincome Excel export 2021-03-07 15:47:57 +08:00
13621160019@163.com 98ff0adcae added excel exporter of storeload report 
Merge branch 'PR10' into develop
 2021-03-07 14:57:39 +08:00