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

860 Commits (d429ba09a7e44c8f828e898103a7a76160524f6c)

Author SHA1 Message Date
13621160019@163.com d429ba09a7 Merge branch 'master' into develop 2021-05-25 17:14:58 +08:00
13621160019@163.com db10874f19 updated version to v1.1.3 2021-05-25 17:05:59 +08:00
13621160019@163.com 53202e6369 updated Dashboard in web to display energy data of this year 
Merge branch 'develop'
 2021-05-25 16:29:41 +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
13621160019@163.com 3ed2c53c29 added recalculating scripts to database 
Merge branch 'develop'
 2021-05-25 16:10:35 +08:00
13621160019@163.com 86c3aa4c82 added recalculating scripts to database 2021-05-25 16:09:07 +08:00
13621160019@163.com 0c9521ff10 updated tbl_expressions in database 
Merge branch 'develop'
 2021-05-24 18:28:38 +08:00
13621160019@163.com dca4a6da26 updated tbl_expressions in database 2021-05-24 18:27:47 +08:00
13621160019@163.com 79490fa6b5 updated README 
Merge branch 'develop'
 2021-05-22 19:43:45 +08:00
13621160019@163.com 99245d88c5 updated README 2021-05-22 19:42:46 +08:00
13621160019@163.com 34ec8c8dba added Combined Equipment Batch Analysis report 
Merge branch 'develop'
 2021-05-21 11:40:49 +08:00
13621160019@163.com 44c0cf6b1c added Combined Equipment Batch Analysis report 
Merge branch 'PR45' into develop
 2021-05-21 11:38:34 +08:00
13621160019@163.com 6176107164 updated postman collection in API 2021-05-21 11:38:21 +08:00
YangZhang-GitHub 11e6a20b5b The CombinedEquipmentBatch page display function is completed 2021-05-20 15:49:54 +08:00
YangZhang-GitHub 676886a844 Implemented the combinedequipmentbatch Excel Exporter 2021-05-20 15:48:50 +08:00
YangZhang-GitHub 05547c42a8 The combinedequipmentbatch API has been completed 2021-05-20 15:48:17 +08:00
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 386fb9f19e updated README and Postman collection in API 
Merge branch 'develop'
 2021-05-20 12:20:26 +08:00
13621160019@163.com 64aa3daf95 updated README and Postman collection in API 2021-05-20 12:19:24 +08:00
13621160019@163.com e2492af569 added Shopfloor Batch Analysis report 
Merge branch 'develop'
 2021-05-20 11:23:51 +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 1ed1eb77c7 removed unnecessory validator in tenant batch analysis report in API 
Merge branch 'develop'
 2021-05-19 15:10:38 +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 50d9b5de63 added Store Batch Analysis Report 
Merge branch 'develop'
 2021-05-19 15:01:21 +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 e269861a8e Merge branch 'develop' 2021-05-18 14:38:32 +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 da63661418 added excel exporter of tenant batch 
Merge branch 'develop'
 2021-05-13 10:06:40 +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