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

219 Commits (cf87c7b7ec212e05f89008cb1b1f08eee42a57f3)

Author SHA1 Message Date
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
YangZhang-GitHub c6f4ed9003 Completed the start and end values increase 2021-04-29 20:23:18 +08:00
YangZhang-GitHub 3e9de79589 Fix the bug of missing detailed value and the bug of web interface stuck with empty data 2021-04-28 14:12:52 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +08:00
13621160019@163.com d1d8d96243 improved theme of energyflowdiagram in Web UI 2021-04-25 11:11:50 +08:00
13621160019@163.com a367bfc140 updated changelog and set version number to 1.1.2 2021-04-23 11:28:14 +08:00
13621160019@163.com 8f8772893d changed query form column width from auto to xs={6} sm={3} in Web UI 2021-03-31 18:17:36 +08:00
13621160019@163.com e76066b62a upgraded version to v1.1.1 2021-03-31 15:49:23 +08:00
13621160019@163.com 32eb0441cb added associated equipment data to combinedequipmentload report in API 2021-03-31 14:34:27 +08:00
13621160019@163.com 49013e9516 reduced font size of meterrealtime in Web UI 2021-03-31 09:58:04 +08:00
13621160019@163.com 80391f7acd added associated equipment data to CombinedEquipmentStatistics in Web UI 2021-03-28 11:33:05 +08:00
13621160019@163.com 776340e624 added associated equipment data to CombinedEquipmentLoad in Web UI 2021-03-28 11:03:43 +08:00
13621160019@163.com d82f1eb829 added AssociatedEquipmentTable to CombinedEquipmentSaving report in web UI 2021-03-23 18:13:09 +08:00
13621160019@163.com 3efce5f620 added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI 2021-03-23 18:09:52 +08:00
13621160019@163.com 78ba4d0ed1 added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI 2021-03-23 18:06:42 +08:00
13621160019@163.com 59d195bdb2 added AssociatedEquipmentTable to CombinedEquipmentCost report in web UI 2021-03-23 18:00:38 +08:00
13621160019@163.com 64db7d9542 added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI 2021-03-23 17:56:06 +08:00
13621160019@163.com 60c55df622 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:47:16 +08:00
13621160019@163.com 6ee35da206 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:46:54 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
guangyuzhang fa58d71fe6 fixed typo in EquipmentEfficiency in web 2021-03-14 22:55:07 +08:00
guangyuzhang 218c7d2129 fixed issues in CombinedEquipmentEfficiency and EquipmentEfficiency in web 2021-03-14 22:45:31 +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 2c4271d641 added spinner and export button to combinedequipmentefficiency and equipmentefficiency in web 2021-03-13 09:01:50 +08:00
13621160019@163.com 82fb8c2e5a added cominbedequipmentefficiency report to api and web 2021-03-13 08:14:21 +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 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
13621160019@163.com c22e05af3f changed the decimals to 0 for CountUp of cardsummyItems in dashboard 2021-03-08 19:36:36 +08:00
13621160019@163.com b7b991fd62 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:23:38 +08:00
13621160019@163.com 1fcfacf366 rounded subtotals in cardsummary of dashboard to integer (no decimals) 2021-03-08 18:15:03 +08:00
13621160019@163.com e5176eb9b0 updated version number to v1.0.7 2021-03-07 16:45:29 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
hyh123a 29dc12913f revert the commit 2021-03-03 11:35:17 +08:00
hyh123a 7ca12b43cd add the de translation 2021-03-03 10:57:35 +08:00
13621160019@163.com aaf72ba41d updated badges in README 2021-03-02 12:02:23 +08:00
13621160019@163.com 4bb02b3561 fixed issue in web EquipmentTracking 2021-02-23 17:49:47 +08:00
13621160019@163.com b6184b0c61 added export button to EquipmentTracking report 2021-02-23 16:24:59 +08:00
13621160019@163.com 70659c7897 fixed energy category names and units issue in EnergyItem reports 2021-02-23 14:16:19 +08:00
13621160019@163.com 3f96056042 updated version number to 1.0.5 2021-02-23 13:04:55 +08:00
13621160019@163.com 1ae965d7f9 modified gitignore file in admin & updated READMEs 2021-02-22 15:50:00 +08:00
13621160019@163.com 375f94ed3a updated READMEs for using gzip on NGINX 2021-02-21 15:54:42 +08:00
13621160019@163.com 19959847ef updated README files 2021-02-21 13:56:12 +08:00
13621160019@163.com bb7bf14033 merged myems-web 2021-02-20 19:34:53 +08:00