Commit Graph

68 Commits (2eaa8df6c6cc22eb727c26d3e221b700d726d7f3)

Author SHA1 Message Date
Caozhenhui 2eaa8df6c6 added access control to sensor 2021-12-03 16:36:48 +08:00
13621160019@163.com fb8284ca52 added access control to privilege in api and admin 2021-12-03 14:16:51 +08:00
13621160019@163.com 624e4f7e3b Merge branch 'PR87' into develop 2021-12-03 14:00:48 +08:00
13621160019@163.com 8f2db8952f added access control to energyflowdiagram in api and admin 2021-12-03 13:51:32 +08:00
Caozhenhui 8dd998ed0c added access_control to privilege 2021-12-02 10:43:32 +08:00
tianlinzhong 62312e8c54 energyflowdiagram of access_control2 2021-12-02 09:56:13 +08:00
tianlinzhong f685728985 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 09:09:38 +08:00
13621160019@163.com 213f669924 added access control to energyitem in api and admin 2021-12-01 22:16:11 +08:00
tianlinzhong c7fe4dea79 energyflowdiagram of access_control 2021-12-01 14:21:38 +08:00
13621160019@163.com 637f8ce481 added accecc_control to contact in api and admin 2021-11-30 22:57:51 +08:00
Caozhenhui 6e53449439 added access control to EnergyItem 2021-11-30 10:07:12 +08:00
Caozhenhui 16c7e858fb added access control to EnergyItem 2021-11-30 10:00:38 +08:00
tianlinzhong 9304225419 contact of access_control 2021-11-29 18:48:29 +08:00
13621160019@163.com dfec9a8fc0 added access_control to menu in api and admin 2021-11-29 17:46:14 +08:00
tianlinzhong 7a2d2a3f1d menu of access_control 2021-11-29 16:07:31 +08:00
13621160019@163.com 3b0d4a13f5 added access control to meter in api and admin 2021-11-27 21:15:43 +08:00
13621160019@163.com d937acd1bb fixed issue of EnergyCategory in admin and updated README of admin 2021-11-26 20:05:01 +08:00
guangyuzhang 8e0bb54616 Merge branch 'PR81' into develop 2021-11-23 23:16:24 +08:00
tianlinzhong a8fec3a7dd added access control to energycategory 2021-11-23 11:19:38 +08:00
Caozhenhui 365a0a903c added access control to meter 2021-11-23 11:08:29 +08:00
13621160019@163.com 566b57843a added access control to gateway, datasource and point 2021-11-20 21:51:38 +08:00
13621160019@163.com d5155c04b8 added access control to offline meter file 2021-11-19 22:49:54 +08:00
13621160019@163.com d15fef3b52 added access control to knowledge file 2021-11-19 22:10:59 +08:00
13621160019@163.com 2245dee31e added access control to cost file 2021-11-18 22:51:01 +08:00
13621160019@163.com 9937d0d051 added access control to email server 2021-11-17 22:58:24 +08:00
13621160019@163.com dd279ba548 added access control to actions of user in api 2021-11-10 18:04:15 +08:00
13621160019@163.com 72484ea920 added access control to GET all users in API 2021-11-10 16:19:46 +08:00
13621160019@163.com 32256396ac added validation for area of shopfloor, space, store and tenant in API 2021-10-19 18:45:17 +08:00
13621160019@163.com b29d8d1e9b removed gsmmodem and aliyun sms api from API & Admin UI 2021-09-22 22:42:37 +08:00
13621160019@163.com 02caabc640 changed start&end datetime formater for tariff from timestamp to strftime 2021-09-22 18:09:13 +08:00
13621160019@163.com efda021649 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:07:38 +08:00
13621160019@163.com 0ac76ccd96 added expiration datetimes to User in Admin UI 2021-09-22 11:28:33 +08:00
13621160019@163.com 3b236fe454 fixed typo in contact controller of Admin UI 2021-09-17 14:14:20 +08:00
13621160019@163.com 44d7933323 updated Admin UI to make error messages more specific 2021-09-09 16:13:40 +08:00
13621160019@163.com 31b55cdd75 fixed Local Storage conflicts in Admin UI and Web UI 2021-09-03 20:34:08 +08:00
13621160019@163.com 754a688d26 rename language cn to zh-ch in Admin UI 2021-09-03 19:33:22 +08:00
13621160019@163.com 1b07a2147d fixed typo caused error in Admin UI 2021-08-25 17:33:59 +08:00
13621160019@163.com 3ef7ce386b fixed undefined variable error in Admin UI 2021-08-25 16:35:44 +08:00
13621160019@163.com e016b1df9b fixed toaster issues for uploading file in Admin UI 2021-08-22 17:49:41 +08:00
13621160019@163.com 79c7725061 fixed debugging code issues in Admin UI 2021-08-17 22:29:08 +08:00
13621160019@163.com cac434cc5d fixed unused code issues in Admin UI 2021-08-17 22:11:30 +08:00
13621160019@163.com 8697c66c67 replaced stateChangeStart with transitions.onStart in Admin UI 2021-08-17 18:52:25 +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 edbd8bff42 upgraded Highcharts JS to v9.1.2 2021-08-15 11:26:32 +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 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