guangyuzhang
|
385361eadc
|
fixed typo in combined equipment energy input item report in api
Merge branch 'develop'
|
2021-03-14 20:07:32 +08:00 |
|
guangyuzhang
|
6130609d28
|
fixed typo in combined equipment energy input item report in api
|
2021-03-14 20:06:24 +08:00 |
|
13621160019@163.com
|
91cb71fdfa
|
fixed Cursor is not connected issues in combined equipment procedures in aggregation
Merge branch 'develop'
|
2021-03-14 17:51:54 +08:00 |
|
13621160019@163.com
|
0122ece16f
|
fixed Cursor is not connected issues in combined equipment procedures in aggregation
|
2021-03-14 17:50:45 +08:00 |
|
13621160019@163.com
|
8fbb547efd
|
fixed typos in combindedequipmentefficiency and equipmentefficiency report api
Merge branch 'develop'
|
2021-03-14 16:42:27 +08:00 |
|
13621160019@163.com
|
d242e7226a
|
fixed typos in combindedequipmentefficiency and equipmentefficiency report api
|
2021-03-14 16:40:57 +08:00 |
|
13621160019@163.com
|
4fbcf9f218
|
fixed forEach of undefined issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web
Merge branch 'develop'
|
2021-03-13 19:17:24 +08:00 |
|
13621160019@163.com
|
0ed2ca8fc2
|
fixed forEach of undefined issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web
|
2021-03-13 19:16:58 +08:00 |
|
13621160019@163.com
|
dc3f7d6b8d
|
fixed issues of historcial database close and disconnect in api
Merge branch 'develop'
|
2021-03-13 09:19:52 +08:00 |
|
13621160019@163.com
|
f870e8b483
|
fixed issues of historcial database close and disconnect in api
|
2021-03-13 09:19:33 +08:00 |
|
13621160019@163.com
|
cbb76de00f
|
added spinner and export button to combinedequipmentefficiency and equipmentefficiency in web
Merge branch 'develop'
|
2021-03-13 09:02:20 +08:00 |
|
13621160019@163.com
|
2c4271d641
|
added spinner and export button to combinedequipmentefficiency and equipmentefficiency in web
|
2021-03-13 09:01:50 +08:00 |
|
13621160019@163.com
|
da434992a4
|
added cominbedequipmentefficiency report to api and web
Merge branch 'develop'
|
2021-03-13 08:22:46 +08:00 |
|
13621160019@163.com
|
82fb8c2e5a
|
added cominbedequipmentefficiency report to api and web
|
2021-03-13 08:14:21 +08:00 |
|
13621160019@163.com
|
8569752dee
|
fixed issue in eqipmentefficiency report
Merge branch 'develop'
|
2021-03-12 22:29:07 +08:00 |
|
13621160019@163.com
|
9f6f688cce
|
fixed issue in eqipmentefficiency report
|
2021-03-12 22:28:05 +08:00 |
|
13621160019@163.com
|
94e9d8b7b8
|
added equipmentefficiency report api
Merge branch 'develop'
|
2021-03-12 20:00:25 +08:00 |
|
13621160019@163.com
|
db6f0a4662
|
added equipmentefficiency report api
|
2021-03-12 19:59:28 +08:00 |
|
13621160019@163.com
|
1a7f38bd6b
|
added historical database close and disconnect at the end of reports
Merge branch 'develop'
|
2021-03-12 14:46:29 +08:00 |
|
13621160019@163.com
|
319b5738d9
|
added historical database close and disconnect at the end of reports
|
2021-03-12 14:44:15 +08:00 |
|
13621160019@163.com
|
b94b5054d3
|
Changed default reporting range in EnergyFlowDiagram
Merge branch 'develop'
|
2021-03-12 12:14:13 +08:00 |
|
13621160019@163.com
|
7d4362f586
|
Changed default reporting range in EnergyFlowDiagram
Merge branch 'PR17' into develop
|
2021-03-12 12:12:24 +08:00 |
|
YangZhang-GitHub
|
cd38309ce0
|
The start time is changed to the beginning of last month and the end time is changed to the end of last month
|
2021-03-12 11:56:23 +08:00 |
|
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 |