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

262 Commits (master)

Author SHA1 Message Date
13621160019@163.com 31597a98b2 added associated parameters data to excel exporter of spacesaving in API 2021-04-14 12:11:21 +08:00
13621160019@163.com 0c8ff5f59e added associated parameters data to excel exporter of spaceoutput in API 2021-04-14 12:07:07 +08:00
13621160019@163.com c21e8c6848 added associated parameters data to excel exporter of spaceload in API 2021-04-14 11:58:54 +08:00
13621160019@163.com fa0094ce42 added associated parameters data to excel exporter of spaceincome in API 2021-04-14 11:50:48 +08:00
13621160019@163.com d7156009fb added associated parameters data to excel exporter of spaceenergyitem in API 2021-04-14 11:46:26 +08:00
13621160019@163.com 68f6f3474c added associated parameters data to excel exporter of spaceenergycategory in API 2021-04-14 11:38:57 +08:00
13621160019@163.com 60719de143 added associated parameters data to excel export of spacecost in API 2021-04-14 11:28:48 +08:00
13621160019@163.com 7b9e632f1c updated excel exporter of metertrend in API 2021-04-13 12:09:44 +08:00
13621160019@163.com c0918f98bb updated excel exporter of metersubmetersbalance in API 2021-04-13 12:03:16 +08:00
13621160019@163.com 42efb7fcd7 updated excel exporter of meterenergy in API 2021-04-13 12:00:29 +08:00
13621160019@163.com 5dfd5e1b03 updated excel exporter of metercost in API 2021-04-13 11:57:59 +08:00
13621160019@163.com de588d9397 added associated parameters data to excel exporter of metertrend in API 2021-04-12 18:08:36 +08:00
13621160019@163.com aa0df09f86 added associated parameters data to excel exporter of metersubmetersbalance in API 2021-04-12 17:44:23 +08:00
13621160019@163.com e9224ec264 added associated parameters data to excel exporter of meterenergy in API 2021-04-12 17:35:10 +08:00
13621160019@163.com 98dcc10990 added parameters data to excel exporter of metercost in API 2021-04-12 16:38:06 +08:00
13621160019@163.com ab7645a13a added associated parameters data to excel exporter of tenantstatistics in API 2021-04-10 19:51:37 +08:00
13621160019@163.com 2c51196ba8 added associated paramters data to excel exporter of tenantsaving in API 2021-04-10 19:47:37 +08:00
13621160019@163.com 1362189140 added associated parameters data to excel exporter of tenantload in API 2021-04-10 19:29:48 +08:00
13621160019@163.com bfe8c4d853 added associated paramters data to excel exporter of tenantenergyitem in API 2021-04-10 19:25:35 +08:00
13621160019@163.com 65493319d3 added associated parameters data to excel exporter of tenantenergycategory in API 2021-04-10 19:19:31 +08:00
13621160019@163.com 217d19454d added associated parameters data to excel exporter of tenantcost in API 2021-04-10 19:11:52 +08:00
13621160019@163.com 7e8b101bac added associated parameters data to excel exporter of combinedequipmentstatistics in API 2021-04-06 22:24:53 +08:00
13621160019@163.com bc27862094 added associated paramters data to combinedequipmentsaving in API 2021-04-06 17:57:00 +08:00
13621160019@163.com 77b1eb6591 added associated paramters data to excel exporter of combinedequipmentoutput in API 2021-04-06 17:29:42 +08:00
13621160019@163.com db4f887975 added associated parameters data to combinedequipmentload in API 2021-04-06 17:21:23 +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 1445756d22 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 2021-04-05 20:26:49 +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 2f8a96abf6 added associated parameters data to excel exporter of combinedequipmentcost in API 2021-04-05 20:11:19 +08:00
13621160019@163.com 152ab66064 fixed issue in excel exporter of equipmentincome in API 2021-04-05 19:51:42 +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
Caozhenhui a397de2c3f fixed a bug with associated equipment data of combinedequipmentincome 2021-04-01 23:38:13 +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 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 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
13621160019@163.com 6ca8f86f73 added excel exporter of spaceincome report 
Merge branch 'PR64' into develop
 2021-03-07 13:45:51 +08:00
tianlinzhong f73e528a9a delete unrelated code and Correct errors in Reports 2021-03-07 13:07:11 +08:00
13621160019@163.com be39176900 Merge branch 'PR5' into develop 2021-03-07 11:56:14 +08:00
13621160019@163.com 0d667e6e1d fixed PEP8 warning in spacesaving 2021-03-07 11:56:00 +08:00
Caozhenhui c50840a720 Implemented the storeload Excel Exporter 2021-03-07 11:47:11 +08:00
13621160019@163.com 75015e1417 fixed DivisionUndefined issues in combinedequipmentsaving 2021-03-07 11:16:50 +08:00
13621160019@163.com 30522bc75a added excel exporter of equipmentsaving report 
Merge branch 'PR8' into develop
 2021-03-07 11:08:58 +08:00
13621160019@163.com cd6237d57c fixed divide by zero issues in equipmentsaving 2021-03-07 11:08:36 +08:00
13621160019@163.com 57a4bf377b removed abs functions for calculating percentage in equipmentsaving 2021-03-07 10:58:30 +08:00
13621160019@163.com 0a797a96b5 removed abs function for calculating percentage in combinedequipmentsaving 2021-03-07 10:52:48 +08:00
hyh123a e6ea72ecad add the excel report of equipment load 2021-03-06 16:39:13 +08:00
YangZhang-GitHub a62735c9b6 Percentage added 2021-03-05 21:24:00 +08:00
YangZhang-GitHub b2b2905205 Percentage added 2021-03-05 21:19:54 +08:00
YangZhang-GitHub 73e1e876b9 Modify the G3 cell style 2021-03-05 17:17:10 +08:00
YangZhang-GitHub 93a87cb1b0 Implemented the EquipmentSaving Excel Exporter 2021-03-05 17:13:21 +08:00
YangZhang-GitHub aaddf6b80b Implemented the CombinedEquipmentSaving Excel Exporter 2021-03-05 16:53:46 +08:00
YangZhang-GitHub 35cef1b9e7 Change the location of the judgment code logic 2021-03-05 16:21:24 +08:00
YangZhang-GitHub 7344e7745f Change the location of the judgment code logic 2021-03-05 16:10:40 +08:00
tianlinzhong db31bb56fd Implemented the spaceIncome Excel export 2021-03-05 16:05:45 +08:00
tianlinzhong 1f9699a318 Implemented the spaceIncome Excel export 2021-03-05 15:43:59 +08:00
YangZhang-GitHub 1b4189138a Delete comment code 2021-03-05 15:32:18 +08:00
YangZhang-GitHub 498d33d278 1. Change the subspace location 2021-03-05 15:29:19 +08:00
YangZhang-GitHub 811d0cba0d 1. Change the subspace location 
2. Change the code judgment logic
 2021-03-05 15:23:42 +08:00
YangZhang-GitHub ea55e306aa 1. Change the subspace location 
2. Added a TCE ratio module
3. Added a TCO2E ratio module
 2021-03-05 15:16:11 +08:00
YangZhang-GitHub a3724999dd Inspect code 2021-03-05 15:13:15 +08:00
YangZhang-GitHub 8f8e3fdc5b Add layout logic 2021-03-05 14:59:38 +08:00
YangZhang-GitHub aa8d71dec1 1. Change the subspace location 
2. Added a cost ratio module
 2021-03-05 14:48:09 +08:00
13621160019@163.com 9c603094ac added excel exporter of combinedequipmentload report 
Merge branch 'PR2' into develop
 2021-03-05 13:44:04 +08:00
13621160019@163.com 20545e8dbf added excel exporter of spaceoutput report 
Merge branch 'PR4' into develop
 2021-03-05 13:34:52 +08:00
13621160019@163.com dbb2398498 added excel exporter of combinedequipmentoutput 
Merge branch 'PR3' into develop
 2021-03-05 13:26:56 +08:00
Caozhenhui b782ea91a9 fixd the detail table column order 2021-03-05 12:44:44 +08:00
Caozhenhui fee9c5cf0f Merge remote-tracking branch 'upstream/develop' into issue25 2021-03-05 12:22:22 +08:00
YangZhang-GitHub ceaa72a883 Change the subspace location 2021-03-05 11:51:53 +08:00
YangZhang-GitHub 739ab78949 Delete comment code 2021-03-05 11:36:38 +08:00
Caozhenhui bf9e256d39 fixd pep8 2021-03-04 20:46:50 +08:00
tianlinzhong 80601589eb Implemented the combinedequipmentcost Excel export 2021-03-04 20:44:38 +08:00
YangZhang-GitHub 7796eeed5f Implemented the SpaceOutput Excel Exporter 2021-03-04 20:31:13 +08:00
Caozhenhui 9048dac16c Implemented the combinedequipmentload Excel Exporter 2021-03-04 20:25:32 +08:00
YangZhang-GitHub 1d2923e915 Change the cell name 'consume' to 'output' 2021-03-04 20:18:38 +08:00
YangZhang-GitHub 413077a6ee Implemented the CombinedEquipmentOutput Excel Exporter 2021-03-04 19:57:00 +08:00
13621160019@163.com 76b83136a2 added excel exporter of equipmentoutput report 
Merge branch 'PR60' into develop
 2021-03-04 18:58:53 +08:00
13621160019@163.com 187f1d33a0 added excel exporter of shopfloorcost report 2021-03-04 18:34:52 +08:00
13621160019@163.com 59db05182b added excel exporter of shopfloorcost report 
Merge branch 'PR52' into develop
 2021-03-04 18:33:07 +08:00
tianlinzhong 14bfb16cda Fix some errors and add data ratio 2021-03-04 15:55:01 +08:00
YangZhang-GitHub c9fad53977 Implemented the EquipmentOutput Excel Exporter 2021-03-04 14:54:38 +08:00
Caozhenhui 9134e88153 Remove the load factor per unit area[B 2021-03-04 14:35:27 +08:00
tianlinzhong 78f02914dc 更改完成 2021-03-04 12:03:10 +08:00
tianlinzhong 8bebedf6f1 added shopfloorcost master 2021-03-03 16:38:12 +08:00
Caozhenhui 25a96729ae 2021/3/3 2021-03-03 16:04:49 +08:00
Caozhenhui d719e95ab0 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-03 15:47:45 +08:00
13621160019@163.com e717b23bde added excel exporter of combinedequipmentenergycategory report 
Merge branch 'PR58' into develop
 2021-03-03 14:08:50 +08:00
13621160019@163.com 76139d6645 added excel exporter of combinedequipmentitem report 
Merge branch 'PR57' into develop
 2021-03-03 13:23:36 +08:00
hyh123a 83e8c27d36 add the excel report of combined equipment energy category 2021-03-03 11:52:12 +08:00
YangZhang-GitHub f0589cbb97 Implemented the CombinedEquipmentEnergyItem Excel Exporter 2021-03-03 11:48:07 +08:00
Caozhenhui c493c797ad 2021/3/2 2021-03-02 20:25:48 +08:00
13621160019@163.com 6375d7893a added excel exporter of equipmentenergyitem report 
Merge branch 'PR54' into develop
 2021-03-02 17:52:58 +08:00
YangZhang-GitHub 16d38614b2 Implemented the EquipmentEnergyItem Excel Exporter 2021-03-02 17:30:05 +08:00
hyh123a 736bd111ff Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-02 16:56:04 +08:00
hyh123a 12eab9741f modify the data format 2021-03-02 16:55:37 +08:00
tianlinzhong 28ae913f03 added shopfloorcost exporper 2021-03-02 13:55:21 +08:00