Commit Graph

192 Commits (5db7e8d4e577d0b9292b8f1dabcdba40c2d0f070)

Author SHA1 Message Date
13621160019@163.com 1c724816bb added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant 2022-01-21 19:09:35 +08:00
13621160019@163.com 7f26b63aac upgraded version number to 1.6.1 2022-01-18 22:55:31 +08:00
13621160019@163.com ecbebd4ea0 updated year in LICENSE 2022-01-12 12:38:31 +08:00
13621160019@163.com 1a97d02fcd updated README 2022-01-07 21:55:16 +08:00
guangyuzhang 00e30108cb updated echarts version to 5.2.2 in web ui 2022-01-05 22:44:20 +08:00
Caozhenhui 827d42e898 fixed issue 183 2022-01-04 11:53:31 +08:00
Caozhenhui 4d5e58f9cf fixed issue 183 2022-01-04 11:32:28 +08:00
Caozhenhui 617c7825b4 fixed issue 183 2022-01-04 11:25:46 +08:00
13621160019@163.com 23412c2817 added docker image immigration to readme 2022-01-03 22:56:45 +08:00
13621160019@163.com f26d96d1b6 updated Dockerfiles 2022-01-02 19:30:01 +08:00
13621160019@163.com 169b09a386 updated readme 2022-01-01 18:36:14 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +08:00
tianlinzhong 60c37b7a2f Added Energy Input & Output Values to Detailed Data of CombinedEquipment Efficiency Report 2021-12-30 22:02:49 +08:00
13621160019@163.com 0e01185730 added energy output and input to equipment efficiency report 2021-12-30 16:14:02 +08:00
13621160019@163.com 81d911306c Merge branch 'PR' into develop 2021-12-30 15:23:38 +08:00
tianlinzhong 685a3f1dd5 Deleted console.log for the test 2021-12-29 19:03:33 +08:00
tianlinzhong 8803fc4559 Added Energy Input & Output Values to Detailed Data of Equipment Efficiency Repor 2021-12-29 18:54:00 +08:00
13621160019@163.com b4a401a1ec updated dependencies in web ui 2021-12-29 18:35:51 +08:00
13621160019@163.com 1f823647eb updated dependencies in web ui 2021-12-29 17:58:51 +08:00
13621160019@163.com 79a7227e82 updated react-countup to v6.1.0 in web ui 2021-12-29 12:24:21 +08:00
13621160019@163.com d6a7b7ad78 updated Meter RealtimeChart in web ui 2021-12-29 11:41:22 +08:00
Caozhenhui 16bf7df2f8 fixed issue 159 2021-12-29 10:18:45 +08:00
Caozhenhui 84c01910e0 fixed issue 159 2021-12-28 21:24:09 +08:00
Caozhenhui a435fb50a6 fixed issue 159 2021-12-28 20:41:57 +08:00
13621160019@163.com a248df9006 updated web for latest Node.js version 2021-12-28 17:17:31 +08:00
Caozhenhui 1158bc841f solved I4ENPR 2021-12-27 17:04:40 +08:00
13621160019@163.com cdaa3fd186 changed all datatype JSON columns to datatype LONGTEXT in database
upgrade version number to v1.5.1
2021-12-18 17:11:11 +08:00
13621160019@163.com 56c4c6b188 upgraded version number to v1.5.0 2021-12-12 17:40:07 +08:00
13621160019@163.com 37a44353a8 added access control to shopfloor, store and tenant in api and admin 2021-12-08 23:28:58 +08:00
13621160019@163.com 9c9e316efc added access control to point in api and admin 2021-12-07 19:50:37 +08:00
13621160019@163.com 15cc27ac18 added access control to equipment in api and admin 2021-12-06 23:02:27 +08:00
13621160019@163.com 5d1e469894 updated nofification(web message) in web and api 2021-12-05 22:37:59 +08:00
13621160019@163.com cd94e31a98 added user varification to webmessage in admin and api 2021-12-05 18:06:50 +08:00
13621160019@163.com dfec9a8fc0 added access_control to menu in api and admin 2021-11-29 17:46:14 +08:00
13621160019@163.com ccf7b9d435 updated requirements of myems-api 2021-11-28 20:46:46 +08:00
13621160019@163.com ef7c602508 upgraded version number to v1.4.0
Upgrade procedure for this change:
    1. Stop the myems-normalization service or container.
    2. Backup your database.
    3. Upgrade myems/admin, myems/myems-api, and myems/myems-normalization source code,
       and keep previous .env files unchanged.
    4. Run database/upgrade/upgrade1.4.0.sql to merge expression into virtual meter
    5. Check the virtual meters in Admin UI.
    6. Start the myems-normalization service or container.
2021-11-14 17:15:17 +08:00
13621160019@163.com e2234902a2 updated version number to v1.3.4 2021-11-06 15:44:05 +08:00
13621160019@163.com 4329569bb1 added notification drop down list and notification page
Merge branch 'PR78' into develop
2021-11-06 14:16:37 +08:00
13621160019@163.com 405fa656f4 added installation on docker to readme of web ui 2021-11-05 20:01:00 +08:00
tianlinzhong 4d91e63dcb solve the bug 2021-11-05 10:06:19 +08:00
13621160019@163.com df57994c7a fixed NoneType errors in detailed data formatters of Web UI 2021-11-04 22:13:22 +08:00
13621160019@163.com cfe749e44d added weekly to i18n of Web UI 2021-11-04 21:18:50 +08:00
Caozhenhui 62ad53d430 Merge remote-tracking branch 'upstream/develop' into develop 2021-11-02 17:03:08 +08:00
guangyuzhang 2671cd7f8e updated dockerfiles 2021-11-02 16:50:54 +08:00
tianlinzhong 2bade8434f Energy management system notification function WEB UI 2021-11-02 16:02:42 +08:00
tianlinzhong c2004ca4c4 Energy management system notification function WEB UI 2021-11-02 15:35:54 +08:00
guangyuzhang 8d421975c5 updated Dockerfiles 2021-11-01 14:52:33 +08:00
Caozhenhui 01bce323b9 Merge remote-tracking branch 'upstream/develop' into develop 2021-11-01 09:24:34 +08:00
13621160019@163.com 70151b020f updated version number to v1.3.3 2021-10-30 16:11:12 +08:00
13621160019@163.com 0d2da7535f updated package.json in web ui 2021-10-30 15:22:36 +08:00