Commit Graph

228 Commits (f26d96d1b635dc81e80f5f41284763069306134b)

Author SHA1 Message Date
13621160019@163.com f26d96d1b6 updated Dockerfiles 2022-01-02 19:30:01 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +08:00
Caozhenhui afd29bf8bc object_types is disabled when editing point 2021-12-30 17:00:33 +08:00
Caozhenhui 19597adc41 added for point.object_type 2021-12-30 15:48:38 +08:00
Caozhenhui 4777e1f275 added Is_Virtual check box is valid only for ANALOG VALUE 2021-12-30 13:17:40 +08:00
Caozhenhui 76d1a083f6 added Is_Virtual check box is valid only for ANALOG VALUE 2021-12-30 13:15:10 +08:00
13621160019@163.com abadf16516 added bind-mount upload file folder to containers of myems-api and admin 2021-12-25 21:28:29 +08:00
13621160019@163.com 907a582c48 updated get messages by date range in admin and api 2021-12-20 21:15:26 +08:00
13621160019@163.com 3045e8d4f0 Merge branch 'PR' into develop 2021-12-20 20:25:40 +08:00
13621160019@163.com 75ea44dd84 added locl/unlock user who faied login some times to admin and api 2021-12-20 20:00:48 +08:00
Caozhenhui 545ea96fee use config.maximum failed login count instead of 3 2021-12-20 19:25:02 +08:00
Caozhenhui 3d26c687fd Solved two problems of the last PR 2021-12-20 14:21:32 +08:00
tianlinzhong c45e4a84e3 Modified the TextMessages webmessage wechatmessage interface 2021-12-20 11:55:16 +08:00
13621160019@163.com 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
13621160019@163.com b41f785f6e updated date time picker of fdd message views in admin 2021-12-18 10:35:09 +08:00
13621160019@163.com 1d1775a7aa Merge branch 'PR' into develop 2021-12-17 22:34:37 +08:00
13621160019@163.com 6e4fd34651 updated date-range-picker of emailmessage view in admin 2021-12-17 22:34:24 +08:00
Caozhenhui 1b1afa7de1 The step of judging the number of 'failed login count' moves to myems-api 2021-12-17 10:19:06 +08:00
tianlinzhong 9086a2c767 Modified the EmailMessages interface 5 2021-12-15 15:13:52 +08:00
Caozhenhui 8375885468 If the login is successful, failed login count is cleared 2021-12-15 14:40:13 +08:00
Caozhenhui 747daab4cb 2021/12/15 11:49 2021-12-15 11:49:46 +08:00
tianlinzhong 952e9dd278 Modified the EmailMessages interface3 2021-12-15 09:49:38 +08:00
Caozhenhui d387684a78 lock user 2021-12-13 20:15:41 +08:00
tianlinzhong 45e9bd9e7e Modified the EmailMessages interface 2021-12-13 17:13:11 +08:00
tianlinzhong 905cd6f870 EmailMessages interface is modified 2021-12-13 17:07:52 +08:00
13621160019@163.com 56c4c6b188 upgraded version number to v1.5.0 2021-12-12 17:40:07 +08:00
13621160019@163.com af7157fff9 added access control to space, offline meter and virtual meter in api and admin 2021-12-10 19:24:49 +08:00
13621160019@163.com 849934afa3 Merge branch 'PR' into develop 2021-12-10 18:22:39 +08:00
13621160019@163.com d3519bf39c added access control to rule in api and admin 2021-12-10 17:58:42 +08:00
13621160019@163.com bf6a8ba8ee added access control to costcenter and tariff in api and admin 2021-12-09 12:08:00 +08:00
Caozhenhui 3e78a06a1d added access control to space virtualmeter and offlinemeter 2021-12-09 12:04:30 +08:00
13621160019@163.com 4d9b60af3d Merge branch 'PR' into develop 2021-12-09 11:20:33 +08:00
13621160019@163.com 37a44353a8 added access control to shopfloor, store and tenant in api and admin 2021-12-08 23:28:58 +08:00
tianlinzhong 31b70d4057 added access_control to costcenter and tariff 2021-12-08 10:22:16 +08:00
13621160019@163.com 95c8dd95d5 Merge branch 'PR' into develop 2021-12-07 20:14:55 +08:00
13621160019@163.com 9c9e316efc added access control to point in api and admin 2021-12-07 19:50:37 +08:00
Caozhenhui 8ea1d4a812 added access control to shopfloor tenant and store 2021-12-07 15:04:26 +08:00
13621160019@163.com 15cc27ac18 added access control to equipment in api and admin 2021-12-06 23:02:27 +08:00
13621160019@163.com 9b417d0648 Merge branch 'PR' into develop 2021-12-06 22:17:44 +08:00
13621160019@163.com 57671aa2b6 added access control to combinedequipment in api and admin 2021-12-06 19:31:51 +08:00
tianlinzhong 0bf0c829d0 equipment of access_control 2021-12-06 15:26:27 +08:00
Caozhenhui fb31837efa added access_control to combinedequipment 2021-12-06 14:52:15 +08:00
13621160019@163.com cd94e31a98 added user varification to webmessage in admin and api 2021-12-05 18:06:50 +08:00
13621160019@163.com 996f7066e1 added access control to wechat message in api and admin 2021-12-05 12:37:42 +08:00
13621160019@163.com 65565a5351 added access control to text message in api and admin 2021-12-04 20:48:56 +08:00
13621160019@163.com 3e536d503e added access control to email message in api and admin 2021-12-04 19:52:12 +08:00
13621160019@163.com 3ec50fab0d added access control to sersor in api and admin 2021-12-03 19:53:12 +08:00
13621160019@163.com b10cc91a3a Merge branch 'PR89' into develop 2021-12-03 19:21:08 +08:00
13621160019@163.com 4e0961e5fb added access control to distribution system in api and admin 2021-12-03 19:09:39 +08:00
13621160019@163.com 05b5631408 Merge branch 'PR88' into develop 2021-12-03 17:01:21 +08:00