13621160019@163.com
|
669ab85549
|
added exporters of storeenergycategory and shopfloorenergycategory
|
2021-03-01 13:06:27 +08:00 |
|
13621160019@163.com
|
645b8f6228
|
added exporters of storeenergycategory and shopfloorenergycategory
Merge branch 'PR49' into develop
|
2021-03-01 13:04:18 +08:00 |
|
hyh123a
|
73a7760575
|
Merge remote-tracking branch 'origin_myems/develop' into develop
|
2021-02-28 22:16:07 +08:00 |
|
hyh123a
|
1fe0b5ba1b
|
add the excel of shopfloor energy category
|
2021-02-28 22:15:48 +08:00 |
|
tianlinzhong
|
20ad139415
|
Merge pull request #3 from MyEMS/develop
Develop
|
2021-02-28 21:57:47 +08:00 |
|
hyh123a
|
9f98d12973
|
fixed the bug of storeenergycategory
|
2021-02-28 21:46:05 +08:00 |
|
13621160019@163.com
|
ff491d269f
|
fixed typo in energyflowdiagram report
|
2021-02-28 17:22:43 +08:00 |
|
13621160019@163.com
|
6ab2ac36cf
|
fixed typo in energyflowdiagram report
|
2021-02-28 17:21:33 +08:00 |
|
hyh123a
|
bbd67b7f0e
|
add the reference of the storeenergycategory
|
2021-02-28 14:46:39 +08:00 |
|
hyh123a
|
b0273e733a
|
Merge remote-tracking branch 'origin_myems/develop' into develop
|
2021-02-28 14:14:14 +08:00 |
|
13621160019@163.com
|
3e60c662f8
|
Merge branch 'develop'
|
2021-02-28 12:12:06 +08:00 |
|
13621160019@163.com
|
9754b0b8cb
|
Merge branch 'develop' of https://github.com/myems/myems into develop
|
2021-02-28 12:11:01 +08:00 |
|
13621160019@163.com
|
5736a6eac0
|
discard change of tbl_energy_flow_diagrams_links
|
2021-02-28 12:10:36 +08:00 |
|
hyh123a
|
84b6fee32a
|
Merge remote-tracking branch 'origin_myems/develop' into develop
|
2021-02-27 23:09:09 +08:00 |
|
hyh123a
|
d158a06873
|
add the excel report of storeenergycategory
|
2021-02-27 23:08:35 +08:00 |
|
guangyuzhang
|
a6461dc917
|
Merge branch 'develop'
|
2021-02-27 22:04:22 +08:00 |
|
guangyuzhang
|
50c2a6d70d
|
fixed issue in excel exporter for spaceenergyitem report
|
2021-02-27 21:58:50 +08:00 |
|
YangZhang-GitHub
|
14d858d52c
|
Merge branch 'develop' of https://github.com/YangZhang-GitHub/myems
|
2021-02-27 20:11:59 +08:00 |
|
YangZhang-GitHub
|
78c02dd6a5
|
Improved the SpaceEnergyItem Execl Exporter
|
2021-02-27 20:06:18 +08:00 |
|
YangZhang-GitHub
|
3d46116678
|
Improved the SpaceEnergyCategory Execl Exporter
|
2021-02-27 20:05:49 +08:00 |
|
YangZhang-GitHub
|
26ff9762b9
|
Improved the SpaceCost Execl Exporter
|
2021-02-27 20:05:25 +08:00 |
|
YangZhang-GitHub
|
a94fd8f023
|
Improved the SpaceSaving Execl Exporter
|
2021-02-27 20:05:07 +08:00 |
|
YangZhang-GitHub
|
6a82e1c002
|
Merge pull request #6 from MyEMS/develop
Develop
|
2021-02-27 19:48:48 +08:00 |
|
YangZhang-GitHub
|
e8660f2772
|
Merge pull request #5 from MyEMS/master
develop
|
2021-02-27 19:46:21 +08:00 |
|
13621160019@163.com
|
9c0adcaad3
|
updated changelog
|
2021-02-27 18:48:44 +08:00 |
|
13621160019@163.com
|
8d73aa551c
|
modified database table tbl_energy_flow_diagrams_links
|
2021-02-27 18:47:26 +08:00 |
|
13621160019@163.com
|
21fdaf8fd3
|
Merge branch 'develop'
|
2021-02-27 12:53:27 +08:00 |
|
13621160019@163.com
|
f9eb2e39ba
|
fixed energy item undefined issue when edit virtual meter and offline meter
|
2021-02-27 12:52:27 +08:00 |
|
13621160019@163.com
|
ee5eca4976
|
Merge branch 'develop'
|
2021-02-26 18:06:02 +08:00 |
|
13621160019@163.com
|
143dd46aa2
|
fixed typo in combinedequipment controller in admin
|
2021-02-26 18:04:50 +08:00 |
|
13621160019@163.com
|
00f1339c40
|
Merge branch 'develop'
|
2021-02-26 17:57:31 +08:00 |
|
13621160019@163.com
|
1399fbc3c8
|
removed required property from equipment model in admin
|
2021-02-26 17:57:06 +08:00 |
|
13621160019@163.com
|
4847a8d179
|
Merge branch 'develop'
|
2021-02-26 16:15:21 +08:00 |
|
13621160019@163.com
|
74b1374597
|
updated CHANGELOG
|
2021-02-26 16:14:26 +08:00 |
|
13621160019@163.com
|
86438837a4
|
Merge branch 'develop'
|
2021-02-26 16:11:11 +08:00 |
|
13621160019@163.com
|
c184c6a330
|
updated Changelog
|
2021-02-26 16:05:48 +08:00 |
|
13621160019@163.com
|
c1550d2fd7
|
Merge branch 'develop'
|
2021-02-26 15:34:22 +08:00 |
|
13621160019@163.com
|
406b54e14c
|
updated CHANGLOG
|
2021-02-26 15:33:07 +08:00 |
|
13621160019@163.com
|
349e42bebb
|
Merge branch 'develop'
|
2021-02-26 15:09:29 +08:00 |
|
13621160019@163.com
|
e940d827a1
|
merged myems-api
|
2021-02-26 15:07:38 +08:00 |
|
13621160019@163.com
|
a1a4e15c52
|
Merge branch 'develop'
|
2021-02-24 14:52:54 +08:00 |
|
13621160019@163.com
|
163f580064
|
updated README and CHANGELOG
|
2021-02-24 14:52:27 +08:00 |
|
13621160019@163.com
|
d55883a8cf
|
Merge branch 'develop'
|
2021-02-23 17:50:08 +08:00 |
|
13621160019@163.com
|
4bb02b3561
|
fixed issue in web EquipmentTracking
|
2021-02-23 17:49:47 +08:00 |
|
tianlinzhong
|
14fa94056b
|
Merge pull request #2 from MyEMS/develop
Develop
|
2021-02-23 16:42:09 +08:00 |
|
13621160019@163.com
|
4808bbad27
|
Merge branch 'develop'
|
2021-02-23 16:26:45 +08:00 |
|
13621160019@163.com
|
b6184b0c61
|
added export button to EquipmentTracking report
|
2021-02-23 16:24:59 +08:00 |
|
13621160019@163.com
|
8cf32e64bf
|
Merge branch 'develop'
|
2021-02-23 14:41:11 +08:00 |
|
13621160019@163.com
|
e860269955
|
updated CHANGELOG.md
|
2021-02-23 14:36:56 +08:00 |
|
13621160019@163.com
|
c716290547
|
Merge branch 'develop'
|
2021-02-23 14:18:43 +08:00 |