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

687 Commits (2e9e151bfd8d4dacafbb1d56fc8e1eb64109f70c)

Author SHA1 Message Date
13621160019@163.com 0f0507d92c updated version to v1.0.8 
Merge branch 'develop'
 2021-03-11 16:10:27 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
13621160019@163.com d2dbb9ad38 updated excel exporter of storestatistics report 
Merge branch 'develop'
 2021-03-11 15:57:33 +08:00
13621160019@163.com 4282df55af updated excel exporter of storestatistics report 
Merge branch 'PR16' into develop
 2021-03-11 15:55:41 +08:00
Caozhenhui 34b7735161 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-11 15:47:38 +08:00
Caozhenhui e9a272a68f change line chart insertion position and delete annotation code 2021-03-11 15:47:18 +08:00
13621160019@163.com f99b28eb25 added excel exporter of combinedequipmentstatistics report 
Merge branch 'develop'
 2021-03-11 15:27:19 +08:00
13621160019@163.com f3b62c91a7 added excel exporter of combinedequipmentstatistics report 2021-03-11 15:26:18 +08:00
13621160019@163.com 20cd609702 added translation for German 
Merge branch 'develop'
 2021-03-10 19:36:52 +08:00
13621160019@163.com fd41af641b added translation for German 2021-03-10 19:36:04 +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 bc27fcd7b9 updated excel exporters of combinedequipmentenergyitem, combinedequipmentoutput, equipmentenergyitem, equipmentoutput, shopfloorenergyitem, spaceoutput, storeenergyitem $ 
Merge branch 'develop'
 2021-03-10 19:03:37 +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 c740540bea updated excel exporter of spacesot, spaceenergycategory, spaceenergyitem and spaceincome 
Merge branch 'develop'
 2021-03-10 13:26:24 +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 54401e97b3 added excel exporter of storesaving report 
Merge branch 'develop'
 2021-03-10 11:34:27 +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 026882de16 updated excel exporter of spacesaving and tenantsaving reports 
Merge branch 'develop'
 2021-03-10 09:56:08 +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
13621160019@163.com 1b32c51f48 added excel exporter of combinedequipmentincome report 
Merge branch 'develop'
 2021-03-09 18:30:19 +08:00
13621160019@163.com 54de71ed7b added excel exporter of combinedequipmentincome report 
Merge branch 'PR68' into develop
 2021-03-09 18:28:28 +08:00
13621160019@163.com df5a823070 added excel exporter combinedequipmentincome report 2021-03-09 18:28:15 +08:00
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
tianlinzhong d2bae2cc8c Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 21:58:18 +08:00
tianlinzhong 958bc74dbf add 2021-03-08 21:58:08 +08:00
13621160019@163.com 36a53048f8 Changed decimals of CountUp to 0 for CardSummaryItems of Dashboard 
Merge branch 'develop'
 2021-03-08 19:37:28 +08:00
13621160019@163.com c22e05af3f changed the decimals to 0 for CountUp of cardsummyItems in dashboard 2021-03-08 19:36:36 +08:00
13621160019@163.com 7ba4ec46fa rounded subtotals in cardsummary of dashboard to integer (no decimals) 
Merge branch 'develop'
 2021-03-08 18:24:57 +08:00
13621160019@163.com b7b991fd62 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:23:38 +08:00
13621160019@163.com 1fcfacf366 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:15:03 +08:00
Caozhenhui 7a322f5b4d Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 16:58:29 +08:00
Caozhenhui bc371f9a44 Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 16:56:32 +08:00
13621160019@163.com 7b83a30fa5 Updated README and CHANGELOG 
Merge branch 'develop'
 2021-03-08 16:35:34 +08:00
13621160019@163.com 753fa733e5 updated README and CHANGELOG 2021-03-08 16:34:37 +08:00
Caozhenhui d3859bca4c Merge remote-tracking branch 'upstream/develop' into issue22 2021-03-08 15:32:47 +08:00
Caozhenhui 4f7ccfa0cc Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 15:32:17 +08:00
YangZhang-GitHub 2b852e2634 Added 'excelexporters.storesaving.export()' method 2021-03-08 15:26:01 +08:00
YangZhang-GitHub 5f405215f6 Implemented the StoreSaving Excel Exporter 2021-03-08 15:24:47 +08:00
13621160019@163.com 70850f40ed added excel exporter of equipmentincome report 
Merge branch 'develop'
 2021-03-08 15:24:00 +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
13621160019@163.com 93d0552f0e added excel exporter of shopfloorsaving report 
Merge branch 'develop'
 2021-03-08 14:24:51 +08:00
13621160019@163.com a0be801275 added excel exporter of shopfloorsaving report 
Merge branch 'PR11' into develop
 2021-03-08 14:21:40 +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