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

246 Commits (cf87c7b7ec212e05f89008cb1b1f08eee42a57f3)

Author SHA1 Message Date
13621160019@163.com 8697c66c67 replaced stateChangeStart with transitions.onStart in Admin UI 2021-08-17 18:52:25 +08:00
13621160019@163.com fd37fd53aa removed unused logs 2021-08-17 15:24:43 +08:00
13621160019@163.com e898822272 removed diff-match-patch library from Admin UI 2021-08-17 10:22:28 +08:00
13621160019@163.com c755082856 removed jeditable library from Admin UI 2021-08-17 10:01:06 +08:00
13621160019@163.com 659b0cf50e added filters for jstree action types of menu and space in Admin UI 2021-08-16 22:10:21 +08:00
13621160019@163.com bb13f923f8 fixed self assignment error in Web UI 2021-08-16 19:24:22 +08:00
13621160019@163.com 98f09259db replaced href with ng-href in Admin UI 2021-08-16 16:28:35 +08:00
13621160019@163.com 21d84ccabd removed js plugins codemirror and summernote from Admin UI 2021-08-15 16:21:09 +08:00
13621160019@163.com edbd8bff42 upgraded Highcharts JS to v9.1.2 2021-08-15 11:26:32 +08:00
13621160019@163.com 3b18672f90 upgraded jquery-ui to v1.12.1 2021-08-14 20:43:03 +08:00
13621160019@163.com 17b8af550a replaced == with === to avoid casting in Admin UI 2021-08-14 17:44:41 +08:00
13621160019@163.com 1412d2e6b2 upgraded AngularJS to v1.8.2 2021-08-14 17:26:51 +08:00
13621160019@163.com 611e0aa036 removed unnecessary library nggrid from Admin UI 2021-08-11 17:09:55 +08:00
13621160019@163.com 72d045e277 added version tags to images in Dockerfile 2021-08-11 13:17:30 +08:00
13621160019@163.com d27de89239 deleted duplicated words from translations of Admin UI 2021-08-11 12:13:35 +08:00
13621160019@163.com 1ccb6bdfef removed unnecessary libraries d3, and3, nvd3 and c3 from Admin UI 2021-08-11 11:19:44 +08:00
13621160019@163.com d049269d58 removed unnecessary library mathjax from Admin UI 2021-08-11 10:23:40 +08:00
13621160019@163.com 4a4c31bb70 upgraded ocLazyLoad to v1.0.10 in Admin UI 2021-08-10 18:57:46 +08:00
13621160019@163.com a34acc11a7 deleted keys which are used more than once in translations of Admin UI 2021-08-10 17:16:07 +08:00
13621160019@163.com c0e363c87d updated Admin UI translations for Error Messages of API 2021-08-10 16:41:01 +08:00
Caozhenhui 0638f18b16 Added Missing Error Messages Words of API 2021-08-10 14:43:42 +08:00
Caozhenhui 708b836999 sorted and removed unnecessary error messages 2021-08-09 14:42:12 +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 1656d9b131 Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-08-06 16:12:00 +08:00
hyh123a 3828f1f73b modify the docker files and README.md 2021-08-06 16:08:51 +08:00
13621160019@163.com 9c4c65ad14 deleted unnecessary words in translantions of Admin UI 2021-08-05 19:26:47 +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 b5e05ad629 updated Menu Setting in Admin UI 2021-08-02 12:16:46 +08:00
13621160019@163.com 2c0de0f673 updated Menu Setting in Admin UI 2021-08-02 10:52:13 +08:00
13621160019@163.com efd239be06 added Menu Setting to Admin UI 2021-08-01 20:43:24 +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
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 4822e1472b upgraded jquery to v2.2.4 in Admin UI 2021-07-27 14:39:09 +08:00
13621160019@163.com 62ccf58599 deleted uncessary controllers from Admin UI 2021-07-23 15:58:46 +08:00
13621160019@163.com 56ec24c94b deleted unnecessary words in translations of Admin UI 2021-07-21 12:27:19 +08:00
13621160019@163.com fd990f94b9 upgraded to v1.1.5 2021-07-20 18:57:27 +08:00
13621160019@163.com 4015e101e6 fixed issue of gitignore in Admin UI 2021-07-20 18:29:35 +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
13621160019@163.com 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com afc3ea98b4 added new category to FDD rule in API & Admin UI 2021-06-17 16:06:18 +08:00
13621160019@163.com 7271ae38f8 added data sort to FDD messages in Admin UI 2021-06-14 15:52:14 +08:00
13621160019@163.com c6a5ad2a7b fixed issues of deleting text message and wechat message in Admin UI 2021-06-09 19:12:17 +08:00
13621160019@163.com 384e73f38a fixed issue of deleting email message in Admin UI 2021-06-09 18:56:22 +08:00
13621160019@163.com ac1b94abae fixed typo for deleting email messages in Admin UI 2021-06-09 18:18:19 +08:00
13621160019@163.com fd8245420d updated version to v1.1.3 2021-05-25 17:55:47 +08:00
13621160019@163.com db10874f19 updated version to v1.1.3 2021-05-25 17:05:59 +08:00
13621160019@163.com bb875521ef added is_virtual to point in myems-admin 2021-05-07 09:01:19 +08:00
13621160019@163.com 1619849c16 added last seen datetime to data source setting in Admin UI 2021-04-28 15:55:10 +08:00
13621160019@163.com e4b9cffd18 added last seen datetime to Gateway Setting in Admin UI 2021-04-28 15:02:56 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +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 bfb2fcd2e5 deleted slim-scroll from and added maxheight to panel of views in Admin UI 2021-04-07 22:10:37 +08:00
13621160019@163.com b092caff50 updated panel width and height of costcenter in Admin UI 2021-04-07 21:23:25 +08:00
13621160019@163.com 75ad399750 updated panel width and height of combinedequipment view in Admin UI 2021-04-07 21:01:34 +08:00
13621160019@163.com da45ba0f68 updated panel width and height of equipment view in Admin UI 2021-04-07 20:48:44 +08:00
guangyuzhang 7071375e8c upated panels' width and height in shopfloor view of Admin UI 2021-04-04 16:20:33 +08:00
guangyuzhang b6e5cf9960 upated panels width and height of store view in Admin UI 2021-04-04 16:04:54 +08:00
guangyuzhang 714edc42ad updated panels' widith and height of tenant view in Admin UI 2021-04-04 15:47:16 +08:00
guangyuzhang ad611f096a updated width and height of panels in space view in Admin UI 2021-04-04 13:38:10 +08:00
guangyuzhang c8819ba9ba updated space bind meter panel to be scrollable in Admin UI 2021-04-04 12:22:07 +08:00
13621160019@163.com e76066b62a upgraded version to v1.1.1 2021-03-31 15:49:23 +08:00
13621160019@163.com cee412557a moved category before fdd_code of rule in admin UI and API 2021-03-23 10:51:34 +08:00
13621160019@163.com c9aa2a1f23 added last_run_datetime and next_run_datetime to rule in admin UI 2021-03-22 18:13:16 +08:00
guangyuzhang 9e6362df25 added Deutsch (German) login language list in admin UI 2021-03-21 09:09:29 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
13621160019@163.com 373c2a1fb1 added 'optional' tips to meter,virtual meter and offline meter setting in admin UI 2021-03-17 17:24:34 +08:00
13621160019@163.com 409617ff75 fixed headers issue of cost file in admin UI 2021-03-17 11:34:16 +08:00
13621160019@163.com b99d251e4c fixed headers issues of offline meter file and knowledge file in admin UI 2021-03-17 11:32:20 +08:00
13621160019@163.com 65a18aff97 updated cost file controller in admin UI 2021-03-16 18:39:35 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com faecb1f670 fixed issue of add space in web UI 2021-03-15 14:56:22 +08:00
13621160019@163.com 57b6dd3266 changed to set contact of space is optional in web UI and API 2021-03-15 13:46:16 +08:00
13621160019@163.com 8fca486742 added Optional key to translation in admin UI 2021-03-15 13:20:11 +08:00
13621160019@163.com d61583c560 added Optional key to translation in admin UI 2021-03-15 13:14:06 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
13621160019@163.com fd41af641b added translation for German 2021-03-10 19:36:04 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
13621160019@163.com 6797790785 fixed wrong headers issues in admin 2021-03-02 14:57:56 +08:00
13621160019@163.com 3e2eae7a77 Merge branch 'develop' of https://github.com/myems/myems into develop 2021-03-02 12:02:44 +08:00
13621160019@163.com aaf72ba41d updated badges in README 2021-03-02 12:02:23 +08:00
guangyuzhang ce7553afcb fixed null contact issue in space controller in admin 2021-03-01 22:38:20 +08:00
guangyuzhang 215e90aa4b deleted require property for space contact in admin 2021-03-01 22:17:50 +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 143dd46aa2 fixed typo in combinedequipment controller in admin 2021-02-26 18:04:50 +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 06eb9ae4c2 modified gitignore file in admin 2021-02-22 15:49:08 +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 6514e753d0 updated gitignore files 2021-02-20 20:04:48 +08:00
13621160019@163.com 070c7a0d56 merged myems-admin 2021-02-19 14:43:12 +08:00