12843792f1
Merge branch 'PR' into develop
2022-02-12 14:47:23 +08:00
e0f720b8e4
Bump node-sass from 6.0.1 to 7.0.0 in Web
2022-02-11 20:07:16 +08:00
42ed405afa
Merge branch 'PR' into develop
2022-02-11 16:45:51 +08:00
32f0f85482
Bump node-sass from 6.0.1 to 7.0.0 in /web
...
Bumps [node-sass](https://github.com/sass/node-sass ) from 6.0.1 to 7.0.0.
- [Release notes](https://github.com/sass/node-sass/releases )
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/node-sass/compare/v6.0.1...v7.0.0 )
---
updated-dependencies:
- dependency-name: node-sass
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-02-11 04:04:12 +00:00
3dcd03218e
fixed issue 192
2022-02-11 01:33:23 +08:00
154a2a859e
fixed issue 192
2022-02-10 20:37:40 +08:00
3690d0e02b
fixed issue 192
2022-02-10 20:36:01 +08:00
af332baa3c
fixed Web UI Notification Error
2022-02-09 16:08:56 +08:00
79c76e3419
fixed issue of Notification in Web UI
2022-02-09 10:44:33 +08:00
85ceeb8648
fixed Web UI Notification 404 Error
2022-02-08 19:51:24 +08:00
6e40b42403
fixed energyflowdiagram web error
2022-02-08 14:42:53 +08:00
225dd53330
udpated version number to v1.7.0
2022-01-28 19:14:19 +08:00
1c724816bb
added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant
2022-01-21 19:09:35 +08:00
7f26b63aac
upgraded version number to 1.6.1
2022-01-18 22:55:31 +08:00
ecbebd4ea0
updated year in LICENSE
2022-01-12 12:38:31 +08:00
1a97d02fcd
updated README
2022-01-07 21:55:16 +08:00
00e30108cb
updated echarts version to 5.2.2 in web ui
2022-01-05 22:44:20 +08:00
827d42e898
fixed issue 183
2022-01-04 11:53:31 +08:00
4d5e58f9cf
fixed issue 183
2022-01-04 11:32:28 +08:00
617c7825b4
fixed issue 183
2022-01-04 11:25:46 +08:00
23412c2817
added docker image immigration to readme
2022-01-03 22:56:45 +08:00
f26d96d1b6
updated Dockerfiles
2022-01-02 19:30:01 +08:00
169b09a386
updated readme
2022-01-01 18:36:14 +08:00
35d2d7306a
updated version number to v1.6.0
2021-12-31 12:47:17 +08:00
60c37b7a2f
Added Energy Input & Output Values to Detailed Data of CombinedEquipment Efficiency Report
2021-12-30 22:02:49 +08:00
0e01185730
added energy output and input to equipment efficiency report
2021-12-30 16:14:02 +08:00
81d911306c
Merge branch 'PR' into develop
2021-12-30 15:23:38 +08:00
685a3f1dd5
Deleted console.log for the test
2021-12-29 19:03:33 +08:00
8803fc4559
Added Energy Input & Output Values to Detailed Data of Equipment Efficiency Repor
2021-12-29 18:54:00 +08:00
b4a401a1ec
updated dependencies in web ui
2021-12-29 18:35:51 +08:00
1f823647eb
updated dependencies in web ui
2021-12-29 17:58:51 +08:00
79a7227e82
updated react-countup to v6.1.0 in web ui
2021-12-29 12:24:21 +08:00
d6a7b7ad78
updated Meter RealtimeChart in web ui
2021-12-29 11:41:22 +08:00
16bf7df2f8
fixed issue 159
2021-12-29 10:18:45 +08:00
84c01910e0
fixed issue 159
2021-12-28 21:24:09 +08:00
a435fb50a6
fixed issue 159
2021-12-28 20:41:57 +08:00
a248df9006
updated web for latest Node.js version
2021-12-28 17:17:31 +08:00
1158bc841f
solved I4ENPR
2021-12-27 17:04:40 +08:00
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
56c4c6b188
upgraded version number to v1.5.0
2021-12-12 17:40:07 +08:00
37a44353a8
added access control to shopfloor, store and tenant in api and admin
2021-12-08 23:28:58 +08:00
9c9e316efc
added access control to point in api and admin
2021-12-07 19:50:37 +08:00
15cc27ac18
added access control to equipment in api and admin
2021-12-06 23:02:27 +08:00
5d1e469894
updated nofification(web message) in web and api
2021-12-05 22:37:59 +08:00
cd94e31a98
added user varification to webmessage in admin and api
2021-12-05 18:06:50 +08:00
dfec9a8fc0
added access_control to menu in api and admin
2021-11-29 17:46:14 +08:00
ccf7b9d435
updated requirements of myems-api
2021-11-28 20:46:46 +08:00
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
e2234902a2
updated version number to v1.3.4
2021-11-06 15:44:05 +08:00
4329569bb1
added notification drop down list and notification page
...
Merge branch 'PR78' into develop
2021-11-06 14:16:37 +08:00
405fa656f4
added installation on docker to readme of web ui
2021-11-05 20:01:00 +08:00
4d91e63dcb
solve the bug
2021-11-05 10:06:19 +08:00
df57994c7a
fixed NoneType errors in detailed data formatters of Web UI
2021-11-04 22:13:22 +08:00
cfe749e44d
added weekly to i18n of Web UI
2021-11-04 21:18:50 +08:00
62ad53d430
Merge remote-tracking branch 'upstream/develop' into develop
2021-11-02 17:03:08 +08:00
2671cd7f8e
updated dockerfiles
2021-11-02 16:50:54 +08:00
2bade8434f
Energy management system notification function WEB UI
2021-11-02 16:02:42 +08:00
c2004ca4c4
Energy management system notification function WEB UI
2021-11-02 15:35:54 +08:00
8d421975c5
updated Dockerfiles
2021-11-01 14:52:33 +08:00
01bce323b9
Merge remote-tracking branch 'upstream/develop' into develop
2021-11-01 09:24:34 +08:00
70151b020f
updated version number to v1.3.3
2021-10-30 16:11:12 +08:00
0d2da7535f
updated package.json in web ui
2021-10-30 15:22:36 +08:00
74706dcc37
added new period type 'weekly' to meterenergy in WEB UI
2021-10-29 16:14:16 +08:00
61deab4fa5
removed duplicate entry in i18n of Web UI
2021-10-25 20:07:32 +08:00
545d16660d
fixed detailed data sort issues in Web UI
2021-10-24 16:30:52 +08:00
e38126e8b0
fixed detailed data sort issues of Batch reports in Web UI
2021-10-23 20:00:17 +08:00
45bb1790de
fixed detailed data sort issue in StoreBatch report
...
Merge branch 'PR74' into develop
2021-10-23 17:51:44 +08:00
5be1d5f72c
The sorting method of detailed energy consumption data is changed from alphabetical to quantity-value
2021-10-22 17:52:06 +08:00
6c69ad4f23
updated version number to v1.3.2
2021-10-22 16:53:32 +08:00
f4166091b7
Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API
2021-10-20 13:45:19 +08:00
3936b7c2e7
updated version number to v1.3.1
2021-10-15 16:31:00 +08:00
d78db4c23e
update web/README.md.
2021-10-13 05:44:40 +00:00
2d91cecec9
added maximum load data
2021-10-12 14:27:37 +08:00
db622eb0c9
updated version number to v1.3.0
2021-10-11 16:53:55 +08:00
fc18eeb32c
fixed PEP8 warnings and update version number to v1.3.0
2021-10-11 16:53:55 +08:00
c65a24682c
removed gsmmodem and aliyun sms api from API & Admin UI
2021-10-11 16:53:55 +08:00
d678ac4149
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
2021-10-11 16:53:55 +08:00
fcd78f2b09
updated demo scripts of database
2021-10-11 16:53:55 +08:00
ff501fdf2f
added expiration datetimes to User in Admin UI
2021-10-11 16:53:55 +08:00
64cc1fa74b
updated demo scripts of database
2021-10-11 16:53:55 +08:00
3c4554feea
added API error messages to translations.js and i18n.js
2021-10-11 16:53:55 +08:00
f9d2f653ab
fixed typo
2021-10-11 16:53:55 +08:00
751ad8edf1
updated demo databse for database ingestion servcie
2021-10-11 16:53:55 +08:00
1c14c0e75d
added spinners to Dashboard of Web UI
2021-10-11 16:53:54 +08:00
e30bd7048a
updated i18n of Web UI
2021-10-11 16:53:54 +08:00
0ca38136b4
updated README of Web UI
2021-10-11 16:53:54 +08:00
a38743b722
added try_files directive to avoid 404 error while refreshing pages in Web UI
2021-10-11 16:53:54 +08:00
b6f6b4a74c
fixed the 404 error
2021-10-11 16:53:54 +08:00
53bb7e2cef
updated Web UI README
2021-10-11 16:53:54 +08:00
16630dc30e
modified API error message for knowledge file cannot be removed from disk
2021-10-11 16:53:54 +08:00
13efbfc516
upgraded version number to v1.2.3
2021-10-11 16:53:54 +08:00
086674f62d
fixed Local Storage conflicts in Admin UI and Web UI
2021-10-11 16:53:54 +08:00
f19a22813a
upgraded version number to v1.2.2
2021-10-11 16:53:54 +08:00
c350ddd808
fixed code style warnings in README
2021-08-26 14:57:44 +08:00
c996658069
updated i18n in Web UI
2021-08-24 10:46:13 +08:00
bbbc93acda
fixed issues of markdown in README files
2021-08-23 16:53:48 +08:00
f8e5905468
fixed issue of 'typeof' expression is compared to 'null'
2021-08-22 14:37:20 +08:00
e71bc4d671
replaced == with === in Web UI
2021-08-19 22:44:29 +08:00
ea5577c2df
removed unused import from Web UI
2021-08-19 22:16:52 +08:00
ad2000c3fe
upgraded version numbers to 1.2.1
2021-08-19 15:32:42 +08:00
13621160019@163.com