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

837 Commits (c7ed16ec00631da79f29a66c0d5127dd942886bc)

Author SHA1 Message Date
YangZhang-GitHub c7ed16ec00 Added combinedequipmentbatch API 2021-05-20 15:47:36 +08:00
YangZhang-GitHub b94b4c49d3 Add Combined Equipment API information to the MyEMS.postman_collection.json 2021-05-20 15:45:06 +08:00
YangZhang-GitHub f912c27299 Add Combined Equipment API information to the README 2021-05-20 15:39:46 +08:00
13621160019@163.com 64aa3daf95 updated README and Postman collection in API 2021-05-20 12:19:24 +08:00
13621160019@163.com 7ca61c4871 added Shopfloor Batch Analysis report 
Merge branch 'PR44' into develop
 2021-05-20 11:17:16 +08:00
YangZhang-GitHub ce569d7860 The ShopfloorBatch page display function is completed 2021-05-19 16:19:50 +08:00
YangZhang-GitHub ca6ab5af3d Implemented the shopfloorbatch Excel Exporter 2021-05-19 15:59:46 +08:00
YangZhang-GitHub eda0cd7fd0 The shopfloorbatch API has been completed 2021-05-19 15:58:36 +08:00
YangZhang-GitHub fb8285c8df Added shopfloorbatch API 2021-05-19 15:57:13 +08:00
13621160019@163.com 1a9b73f092 removed unnecessory validator in tenant batch analysis report in API 2021-05-19 15:08:04 +08:00
13621160019@163.com 465f60768b added Store Batch Analysis Report 
Merge branch 'PR43' into develop
 2021-05-19 14:59:51 +08:00
13621160019@163.com b8f3d1f431 replaced fetchone with fetchall to avoid error in case there are duplicate rows in API 2021-05-18 14:36:53 +08:00
YangZhang-GitHub 2494c73bd0 Modify variable name 2021-05-18 10:56:40 +08:00
YangZhang-GitHub a8a89c77b8 The StoreBatch page display function is completed 2021-05-17 18:10:38 +08:00
YangZhang-GitHub 9ca3752945 Implemented the storebatch Excel Exporter 2021-05-17 17:25:29 +08:00
YangZhang-GitHub 1a8148845d The storebatch API has been completed 2021-05-17 16:59:42 +08:00
YangZhang-GitHub a3b82aafc3 Added storebatch API 2021-05-17 16:58:27 +08:00
13621160019@163.com e868491db8 added excel exporter of tenant batch analysis report 2021-05-13 10:04:25 +08:00
13621160019@163.com 0963035078 added excel exporter of tenant batch report 
Merge branch 'master' into develop
 2021-05-13 09:55:50 +08:00
13621160019@163.com 12e2864e0f added excel exporter of tenant batch report 2021-05-13 09:54:53 +08:00
13621160019@163.com a1f49c12b9 added tenant batch report 
Merge branch 'develop'
 2021-05-13 08:34:16 +08:00
13621160019@163.com 13249842e6 added Tenant Batch Analysis Report 2021-05-13 08:19:05 +08:00
13621160019@163.com 97c75fe001 removed unsupported sql statement from database upgrade script 
Merge branch 'develop'
 2021-05-08 14:00:22 +08:00
13621160019@163.com 900470e016 removed unsupported sql statement from database upgrade script 2021-05-08 14:00:04 +08:00
13621160019@163.com 00eff6582c implemented virtual point calculating in myems-normalization service 
Merge branch 'develop'
 2021-05-08 13:38:41 +08:00
13621160019@163.com 95983aaf4e implemented virtual point calculating in myems-normalization service 2021-05-08 13:37:17 +08:00
13621160019@163.com 964aa4c3b7 updated README 
Merge branch 'develop'
 2021-05-07 10:20:16 +08:00
13621160019@163.com aee2ca5b53 updated README 2021-05-07 10:20:03 +08:00
13621160019@163.com 1a2f274f1f added is_virtual to point 
Merge branch 'develop'
 2021-05-07 09:02:53 +08:00
13621160019@163.com 2cefdcb705 added is_virtual to point in myems-bacnet and myems-modbus-tcp 2021-05-07 09:01:56 +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 f9b72c6997 added is_virtual to point in myems-api 2021-05-07 09:00:13 +08:00
13621160019@163.com 357d1b3802 added is_virtual to tbl_points in database 
Merge branch 'develop'
 2021-05-05 07:47:14 +08:00
13621160019@163.com e45de9c394 added is_virtual to tbl_points in database 2021-05-05 07:43:39 +08:00
13621160019@163.com 5f31c92de8 updated metertracking report by adding point type condition to meter point query string 
Merge branch 'develop'
 2021-05-03 18:34:58 +08:00
13621160019@163.com cefeef57db updated metertracking report by adding point type condition to meter point query string 2021-05-03 18:33:08 +08:00
13621160019@163.com 748a94aacd added start value and end value to metertracking report 
Merge branch 'develop'
 2021-05-03 12:42:16 +08:00
13621160019@163.com 2ae9fca00f added start value and end value to metertracking report 
Merge branch 'PR40' into develop
 2021-05-03 12:41:34 +08:00
13621160019@163.com 77c5a4fb2d updated metertracking report to reduce duplicated meters 2021-05-03 12:41:21 +08:00
13621160019@163.com 981d05c4dc updated comments and log messages in myems-modbust-tcp service 
Merge branch 'develop'
 2021-05-01 20:10:38 +08:00
13621160019@163.com 9126d1981a updated comments and log messages in myems-modbust-tcp service 2021-05-01 20:10:23 +08:00
13621160019@163.com 5d7dae3e31 added gateway procedure to myems-modbus-tcp service 
Merge branch 'develop'
 2021-04-30 14:20:56 +08:00
13621160019@163.com 041171c28d added gateway procedure to myems-modbus-tcp service 2021-04-30 14:19:50 +08:00
13621160019@163.com 0a9ccedb32 added gateway process to myems-modbus-tcp service 
Merge branch 'develop'
 2021-04-30 14:08:43 +08:00
13621160019@163.com afe05816b5 added gateway process to myems-modbus-tcp service 2021-04-30 14:07:46 +08:00
13621160019@163.com bbc44bba05 added multiprocessing to main of myems-bacnet service 2021-04-30 12:41:48 +08:00
13621160019@163.com b87d41af87 added multiprocessing to main of myems-bacnet service 2021-04-30 12:40:50 +08:00
13621160019@163.com 3eebbbc533 Merge branch 'master' into develop 2021-04-30 12:32:40 +08:00
13621160019@163.com 6f92e88ece removed schedule library from gateway process in myems-bacnet service 2021-04-30 12:27:38 +08:00
13621160019@163.com 050304256f added gateway process to myems-bacnet service 
Merge branch 'develop'
 2021-04-30 11:28:11 +08:00