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

193 Commits (db1b32b4f9b9f2f00f57e3daace2043bccd4f42f)

Author SHA1 Message Date
13621160019@163.com 0d2da7535f updated package.json in web ui 2021-10-30 15:22:36 +08:00
Caozhenhui 74706dcc37 added new period type 'weekly' to meterenergy in WEB UI 2021-10-29 16:14:16 +08:00
13621160019@163.com 61deab4fa5 removed duplicate entry in i18n of Web UI 2021-10-25 20:07:32 +08:00
13621160019@163.com 545d16660d fixed detailed data sort issues in Web UI 2021-10-24 16:30:52 +08:00
13621160019@163.com e38126e8b0 fixed detailed data sort issues of Batch reports in Web UI 2021-10-23 20:00:17 +08:00
13621160019@163.com 45bb1790de fixed detailed data sort issue in StoreBatch report 
Merge branch 'PR74' into develop
 2021-10-23 17:51:44 +08:00
YangZhang-GitHub 5be1d5f72c The sorting method of detailed energy consumption data is changed from alphabetical to quantity-value 2021-10-22 17:52:06 +08:00
13621160019@163.com 6c69ad4f23 updated version number to v1.3.2 2021-10-22 16:53:32 +08:00
tianlinzhong f4166091b7 Added Associated Equpment Data to CombinedEquipmentEfficiency Report in web UI and API 2021-10-20 13:45:19 +08:00
13621160019@163.com 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
Caozhenhui 2d91cecec9 added maximum load data 2021-10-12 14:27:37 +08:00
13621160019@163.com db622eb0c9 updated version number to v1.3.0 2021-10-11 16:53:55 +08:00
13621160019@163.com fc18eeb32c fixed PEP8 warnings and update version number to v1.3.0 2021-10-11 16:53:55 +08:00
13621160019@163.com c65a24682c removed gsmmodem and aliyun sms api from API & Admin UI 2021-10-11 16:53:55 +08:00
13621160019@163.com d678ac4149 changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime; 2021-10-11 16:53:55 +08:00
13621160019@163.com fcd78f2b09 updated demo scripts of database 2021-10-11 16:53:55 +08:00
13621160019@163.com ff501fdf2f added expiration datetimes to User in Admin UI 2021-10-11 16:53:55 +08:00
13621160019@163.com 64cc1fa74b updated demo scripts of database 2021-10-11 16:53:55 +08:00
13621160019@163.com 3c4554feea added API error messages to translations.js and i18n.js 2021-10-11 16:53:55 +08:00
13621160019@163.com f9d2f653ab fixed typo 2021-10-11 16:53:55 +08:00
13621160019@163.com 751ad8edf1 updated demo databse for database ingestion servcie 2021-10-11 16:53:55 +08:00
13621160019@163.com 1c14c0e75d added spinners to Dashboard of Web UI 2021-10-11 16:53:54 +08:00
13621160019@163.com e30bd7048a updated i18n of Web UI 2021-10-11 16:53:54 +08:00
13621160019@163.com 0ca38136b4 updated README of Web UI 2021-10-11 16:53:54 +08:00
13621160019@163.com a38743b722 added try_files directive to avoid 404 error while refreshing pages in Web UI 2021-10-11 16:53:54 +08:00
hyh123a b6f6b4a74c fixed the 404 error 2021-10-11 16:53:54 +08:00
13621160019@163.com 53bb7e2cef updated Web UI README 2021-10-11 16:53:54 +08:00
13621160019@163.com 16630dc30e modified API error message for knowledge file cannot be removed from disk 2021-10-11 16:53:54 +08:00
13621160019@163.com 13efbfc516 upgraded version number to v1.2.3 2021-10-11 16:53:54 +08:00
13621160019@163.com 086674f62d fixed Local Storage conflicts in Admin UI and Web UI 2021-10-11 16:53:54 +08:00
13621160019@163.com f19a22813a upgraded version number to v1.2.2 2021-10-11 16:53:54 +08:00
13621160019@163.com c350ddd808 fixed code style warnings in README 2021-08-26 14:57:44 +08:00
13621160019@163.com c996658069 updated i18n in Web UI 2021-08-24 10:46:13 +08:00
13621160019@163.com bbbc93acda fixed issues of markdown in README files 2021-08-23 16:53:48 +08:00
13621160019@163.com f8e5905468 fixed issue of 'typeof' expression is compared to 'null' 2021-08-22 14:37:20 +08:00
13621160019@163.com e71bc4d671 replaced == with === in Web UI 2021-08-19 22:44:29 +08:00
13621160019@163.com ea5577c2df removed unused import from Web UI 2021-08-19 22:16:52 +08:00
13621160019@163.com ad2000c3fe upgraded version numbers to 1.2.1 2021-08-19 15:32:42 +08:00
13621160019@163.com 4712b2f5e0 Added Missing Error Messages Words of API to Web UI i18n 
Merge branch 'PR61' into develop
 2021-08-19 14:53:53 +08:00
13621160019@163.com 4189003ba0 updated README of Web UI 2021-08-16 18:13:17 +08:00
13621160019@163.com 9db895d191 added express-rate-limit middleware to Web UI 2021-08-16 16:41:07 +08:00
13621160019@163.com 72d045e277 added version tags to images in Dockerfile 2021-08-11 13:17:30 +08:00
tianlinzhong 0410f80dd5 Sort alphabetically 2021-08-10 20:20:00 +08:00
tianlinzhong dfb4eed111 Modify some errors 2021-08-10 13:46:23 +08:00
tianlinzhong 606ff8265f Update Web UI i18n , Added Missing Error Messages Words of API 2021-08-09 21:24:34 +08:00
tianlinzhong d5baf08056 Merge remote-tracking branch 'origin/develop' into develop 2021-08-09 15:18:40 +08:00
tianlinzhong d607f219b0 1 2021-08-09 15:18:31 +08:00
13621160019@163.com 95e77bcb18 upgraded version number to v1.2.0 2021-08-06 19:26:41 +08:00
13621160019@163.com 14cec6a333 updated README for Docker 2021-08-06 18:45:51 +08:00
hyh123a 3828f1f73b modify the docker files and README.md 2021-08-06 16:08:51 +08:00
hyh123a 35d9ea4a02 modify the Dockerfile 2021-08-05 10:35:15 +08:00
13621160019@163.com ff15db356c upgraded to v1.1.6 2021-08-02 17:30:56 +08:00
13621160019@163.com 3e813c666b updated customized menus in Web UI 2021-08-02 16:36:18 +08:00
YangZhang-GitHub 0a512af51a The function that the menu can be configured in the Web UI has been implemented 2021-08-02 14:28:02 +08:00
YangZhang-GitHub b25e8e8b47 The function that the menu can be configured in the Web UI has been implemented 2021-08-02 14:04:47 +08:00
YangZhang-GitHub cfd8b68257 The function that the menu can be configured in the Web UI has been implemented 2021-08-02 13:07:04 +08:00
13621160019@163.com 302fdf2ce8 updated Dockerfile 2021-07-30 19:05:54 +08:00
hyh123a 24204896df modify the Dockerfile 2021-07-30 18:40:24 +08:00
hyh123a d72b12363a Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-07-29 15:34:37 +08:00
hyh123a 356a1a645b add the build dic for web 2021-07-29 15:32:11 +08:00
13621160019@163.com 14af3b6969 Added Apache2 Server installation guides for Admin UI and Web UI 
Merge branch 'PR55' into develop
 2021-07-29 13:27:02 +08:00
13621160019@163.com fcc2c3e30b updated REAEME files in Admin UI and Web UI 2021-07-29 13:26:50 +08:00
hyh123a 9f7eefce10 Merge branch 'docker' into develop 2021-07-29 13:17:14 +08:00
hyh123a 020a4a85a5 add the docker installation 2021-07-29 13:14:06 +08:00
Caozhenhui ca0fe37a9d Added how to install Apache 2021-07-29 11:33:14 +08:00
13621160019@163.com e76dd988b3 added Child Space Share Pies for SpaceCost in Web UI 
Merge branch 'PR52' into develop
 2021-07-28 12:35:26 +08:00
13621160019@163.com 852bb68ed8 added translation of Child Space Total Proportion for SpaceCost in Web UI 2021-07-28 12:35:17 +08:00
tianlinzhong 4e866dbc58 Fixed some bugs 2021-07-27 18:40:25 +08:00
tianlinzhong c6eef934dd Added a total cost ratio chart 2021-07-26 20:45:50 +08:00
13621160019@163.com dfc1dbecd7 added Meter Batch Analysis Report to Web UI and API 2021-07-26 15:56:38 +08:00
13621160019@163.com fd990f94b9 upgraded to v1.1.5 2021-07-20 18:57:27 +08:00
13621160019@163.com abb45dadbc added Cost File to API and Admin UI and upgraded to v1.1.4 2021-07-19 19:48:00 +08:00
tianlinzhong 2cd13bc7d5 Add Child Spaces Share Pie to Space Cost Report Web UI 2021-07-19 17:59:56 +08:00
13621160019@163.com 36e31d9942 added EquipmentBatch to Web UI 2021-07-19 15:09:57 +08:00
13621160019@163.com e20cdbe756 Internationalization of Vertical Navigation Bar in Web UI 
Merge branch 'PR46' into develop
 2021-07-07 15:58:43 +08:00
13621160019@163.com 2fdfb45bbc added pagination to MeterRealtime in Web UI 2021-07-07 15:40:20 +08:00
YangZhang-GitHub abb7c6ba7f The vertical navigation bar has been internationalized 2021-07-05 17:09:34 +08:00
hyh123a f53e464f6e add the pagination for meterrealtime page 2021-07-05 16:25:21 +08:00
YangZhang-GitHub a375b5d9f6 The vertical navigation bar has been internationalized 2021-07-05 15:51:02 +08:00
YangZhang-GitHub d2afb867bd The vertical navigation bar has been internationalized 2021-07-05 15:31:31 +08:00
13621160019@163.com a648594243 updated README of Web UI 2021-07-05 14:15:15 +08:00
13621160019@163.com 8df28f4655 fixed selected meter issues in onSearchMeter of Web UI 2021-07-05 13:54:21 +08:00
13621160019@163.com cbc447b7e2 added ChildSpaceProportion SharePies to Space Energy Category report of Web UI 2021-06-27 10:19:31 +08:00
13621160019@163.com 5f603548d7 added last year data to dashboard 2021-06-26 21:21:49 +08:00
13621160019@163.com e71e0c1f22 deleted parameters data from Dashboard 2021-06-26 20:13:27 +08:00
13621160019@163.com 31509e4009 added Search Input for meters in Web UI 2021-06-26 08:06:23 +08:00
13621160019@163.com 73447386a2 upgraded Web UI library to 2.10.2 2021-06-25 09:14:11 +08:00
13621160019@163.com 0fdcec2162 upgraded Web UI library to 2.10.0 2021-06-25 08:58:12 +08:00
13621160019@163.com c2edc9a805 upgraded Web UI template to 2.9.0 2021-06-25 08:16:14 +08:00
13621160019@163.com b2c18260a9 upgraded Web UI template to 2.8.0 2021-06-24 21:54:48 +08:00
13621160019@163.com b69460007b updated i18n in Web UI 2021-06-23 21:42:14 +08:00
13621160019@163.com db10874f19 updated version to v1.1.3 2021-05-25 17:05:59 +08:00
13621160019@163.com 50eefdb9d7 updated Dashboard in web to display energy data of this year 2021-05-25 16:26:32 +08:00
13621160019@163.com 5af58ea034 updated Dashboard in web to display energy data of this year 2021-05-25 16:26:00 +08:00
YangZhang-GitHub 11e6a20b5b The CombinedEquipmentBatch page display function is completed 2021-05-20 15:49:54 +08:00
YangZhang-GitHub ce569d7860 The ShopfloorBatch page display function is completed 2021-05-19 16:19:50 +08:00
YangZhang-GitHub a8a89c77b8 The StoreBatch page display function is completed 2021-05-17 18:10:38 +08:00
13621160019@163.com 13249842e6 added Tenant Batch Analysis Report 2021-05-13 08:19:05 +08:00
13621160019@163.com 77c5a4fb2d updated metertracking report to reduce duplicated meters 2021-05-03 12:41:21 +08:00