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

793 Commits (9126d1981a875fb8d06c7d8352ed2ec7ce5b484f)

Author SHA1 Message Date
13621160019@163.com 1362189140 added associated parameters data to excel exporter of tenantload in API 2021-04-10 19:29:48 +08:00
13621160019@163.com f65f66990b added associated paramters data to excel exporter of tenantenergyitem in API 
Merge branch 'develop'
 2021-04-10 19:25:53 +08:00
13621160019@163.com bfe8c4d853 added associated paramters data to excel exporter of tenantenergyitem in API 2021-04-10 19:25:35 +08:00
13621160019@163.com bf022493d8 added associated parameters data to excel exporter of tenantenergycategory in API 
Merge branch 'develop'
 2021-04-10 19:19:50 +08:00
13621160019@163.com 65493319d3 added associated parameters data to excel exporter of tenantenergycategory in API 2021-04-10 19:19:31 +08:00
13621160019@163.com a9e1caf7cb added associated parameters data to excel exporter of tenantcost in API 
Merge branch 'develop'
 2021-04-10 19:12:19 +08:00
13621160019@163.com 217d19454d added associated parameters data to excel exporter of tenantcost in API 2021-04-10 19:11:52 +08:00
Caozhenhui b7a8083380 Parameter data has been added to the Excel export 2021-04-10 17:45:16 +08:00
13621160019@163.com 451821a0c7 deleted slim-scroll from and added maxheight to panel of views in Admin UI 
Merge branch 'develop'
 2021-04-07 22:14:25 +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 a4d42bea34 updated panel width and height of costcenter in Admin UI 
Merge branch 'develop'
 2021-04-07 21:24:39 +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 b6da296e4a updated panel width and height of combinedequipment view in Admin UI 
Merge branch 'develop'
 2021-04-07 21:15:22 +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 97828ac50d updated panel width and height of equipment view in Admin UI 
Merge branch 'develop'
 2021-04-07 20:49:56 +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
13621160019@163.com 061cefb5c9 added associated parameters data to excel exporter of combinedequipmentstatistics in API 
Merge branch 'develop'
 2021-04-06 22:39:09 +08:00
13621160019@163.com 7e8b101bac added associated parameters data to excel exporter of combinedequipmentstatistics in API 2021-04-06 22:24:53 +08:00
13621160019@163.com 43bf242dda added associated paramters data to combinedequipmentsaving in API 
Merge branch 'develop'
 2021-04-06 22:05:31 +08:00
13621160019@163.com bc27862094 added associated paramters data to combinedequipmentsaving in API 2021-04-06 17:57:00 +08:00
13621160019@163.com 2fcd4bf45a added associated paramters data to excel exporter of combinedequipmentoutput in API 
Merge branch 'develop'
 2021-04-06 17:30:32 +08:00
13621160019@163.com 77b1eb6591 added associated paramters data to excel exporter of combinedequipmentoutput in API 2021-04-06 17:29:42 +08:00
13621160019@163.com 1a5efb4ede added associated parameters data to combinedequipmentload in API 
Merge branch 'develop'
 2021-04-06 17:22:36 +08:00
13621160019@163.com db4f887975 added associated parameters data to combinedequipmentload in API 2021-04-06 17:21:23 +08:00
13621160019@163.com 7cf3218207 added associated parameters data to excel exporter of combinedequipmentincome in API 
Merge branch 'develop'
 2021-04-06 08:47:26 +08:00
13621160019@163.com 3967ad5d08 added associated parameters data to excel exporter of combinedequipmentincome in API 2021-04-06 08:46:26 +08:00
13621160019@163.com 747c9430b9 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 
Merge branch 'develop'
 2021-04-05 20:28:27 +08:00
13621160019@163.com 1445756d22 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 2021-04-05 20:26:49 +08:00
13621160019@163.com 6aa5708016 added associated parameters data to excel exporter of combinedequipmentenergycategory in API 
Merge branch 'develop'
 2021-04-05 20:21:59 +08:00
13621160019@163.com f19ee1f3ae added associated parameters data to excel exporter of combinedequipmentenergycategory in API 2021-04-05 20:20:25 +08:00
13621160019@163.com 2ebff6b9f4 added associated parameters data to excel exporter of combinedequipmentcost in API 
Merge branch 'develop'
 2021-04-05 20:13:38 +08:00
13621160019@163.com 2f8a96abf6 added associated parameters data to excel exporter of combinedequipmentcost in API 2021-04-05 20:11:19 +08:00
13621160019@163.com 842f5aec8b fixed issue in excel exporter of equipmentincome in API 
Merge branch 'develop'
 2021-04-05 19:52:55 +08:00
13621160019@163.com 152ab66064 fixed issue in excel exporter of equipmentincome in API 2021-04-05 19:51:42 +08:00
guangyuzhang ec4c2f42c5 fixed error in excel exporter of equipmentincome report in API 
Merge branch 'develop'
 2021-04-05 12:31:00 +08:00
guangyuzhang bcf8cbc438 fixed error in excel exporter of equipmentincome report in API 
Merge branch 'PR28' into develop
 2021-04-05 12:29:31 +08:00
guangyuzhang cf705656e1 upated panels' width and height in shopfloor view of Admin UI 
Merge branch 'develop'
 2021-04-04 16:25:11 +08:00
guangyuzhang 7071375e8c upated panels' width and height in shopfloor view of Admin UI 2021-04-04 16:20:33 +08:00
guangyuzhang 5f530c7eda upated panels width and height of store view in Admin UI 
Merge branch 'develop'
 2021-04-04 16:05:32 +08:00
guangyuzhang b6e5cf9960 upated panels width and height of store view in Admin UI 2021-04-04 16:04:54 +08:00
guangyuzhang 1e4523c369 updated panels' widith and height of tenant view in Admin UI 
Merge branch 'develop'
 2021-04-04 15:52:53 +08:00
guangyuzhang 714edc42ad updated panels' widith and height of tenant view in Admin UI 2021-04-04 15:47:16 +08:00
tianlinzhong dc8a0eba2b Fixed the Income bug 2021-04-04 15:33:45 +08:00
tianlinzhong 5b9305ee5a Fixed the Income bug 2021-04-04 15:24:56 +08:00
guangyuzhang a1190a67a6 updated width and height of panels in space view in Admin UI 
Merge branch 'develop'
 2021-04-04 13:38:41 +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 d151e71704 updated space bind meter panel to be scrollable in Admin UI 
Merge branch 'develop'
 2021-04-04 12:23:37 +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 95f54fae70 fixed unit issue in CombinedEquipmentCost report in API 
Merge branch 'develop'
 2021-04-02 14:02:04 +08:00
13621160019@163.com 51cd31faa7 fixed unit issue in CombinedEquipmentCost report in API 2021-04-02 13:49:55 +08:00