 james
|
c0178bcc07
Merge branch 'usky-zyj' into server-165
|
14 órája |
|
james
|
db5a081802
优化设备信息表-新增和设备信息表-修改两个接口，增加地址码字段值的录入；优化设备信息表-分页和设备信息表-分页-白名单两个接口，增加所属网关的刷选条件；优化网关配置信息-导出接口，调整导出文件格式和导出方式；
|
14 órája |
 fuyuchuan
|
a5a296b7a4
Merge branch 'fyc-ems' of uskycloud/usky-modules into server-165
|
1 napja |
|
fuyuchuan
|
8633fb644b
能耗分析接口代码提交
|
1 napja |
|
james
|
a1cb34bec4
Merge branch 'usky-ems' into server-165
|
6 napja |
|
james
|
4bdf0a3903
优化能耗类型列表接口，增加能耗类型绑定产品id集合字段取值；优化能耗分项列表接口，增加能耗分项绑定设备uuid集合字段取值；
|
6 napja |
|
james
|
b34ddc716e
解决冲突
|
6 napja |
|
james
|
2b9f5deaa2
开发能耗类型列表、能耗分项列表、产品关联的能源类型和设备关联的能源分项四个接口
|
6 napja |
 hanzhengyi
|
60e4456b63
Merge branch 'modules-zjy' of uskycloud/usky-modules into master
|
1 hete |
 zhaojinyu
|
424c64ddad
Merge branch 'han' of uskycloud/usky-modules into modules-zjy
|
1 hete |
 zhaojinyu
|
0c661fce48
优化电子地图配置添加文字配置失效问题
|
1 hete |
|
zhaojinyu
|
a0ca9dccad
Merge branch 'han' of uskycloud/usky-modules into modules-zjy
|
1 hete |
|
zhaojinyu
|
c6e4c80380
电子地图配置去除设备类型过滤
|
1 hete |
|
zhaojinyu
|
76d590bfbc
解决地图配置中添加设备选择背景色未存库问题
|
1 hete |
|
fuyuchuan
|
23e5b25539
Merge branch 'fyc-ems' of uskycloud/usky-modules into server-165
|
1 hete |
|
fuyuchuan
|
b040096f34
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into fyc-ems
|
1 hete |
|
fuyuchuan
|
65b94f36d8
Merge branch 'usky-ems' of http://47.111.81.118:3000/uskycloud/usky-modules into fyc-ems
|
1 hete |
|
fuyuchuan
|
ce253da0c7
能耗报表接口
|
1 hete |
|
fuyuchuan
|
441e718cda
能耗接口代码提交
|
1 hete |
|
fuyuchuan
|
260358b651
能耗报表代码提交口
|
1 hete |
|
zhaojinyu
|
baae54f311
新增巡检异常记录导出接口
|
1 hete |
|
zhaojinyu
|
b235a606e7
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into modules-zjy
|
1 hete |
|
hanzhengyi
|
88266319e9
Merge branch 'usky-ems' of uskycloud/usky-modules into master
|
1 hete |
|
james
|
903b603613
Merge branch 'master' into usky-ems
|
1 hete |
|
hanzhengyi
|
c9ac62b6ec
Merge branch 'fyc-cdi' of uskycloud/usky-modules into master
|
1 hete |
|
fuyuchuan
|
f6ff0de8df
能耗报表分析三个接口代码提交
|
1 hete |
|
fuyuchuan
|
1a9094dc0f
Merge branch 'usky-ems' of http://47.111.81.118:3000/uskycloud/usky-modules into fyc-ems
|
1 hete |
|
fuyuchuan
|
89a1cb5e97
二氧化碳数据精确到小数点后三位
|
1 hete |
|
fuyuchuan
|
4867fee05e
二氧化碳数据除以10000并保留两位小数
|
2 hete |
|
fuyuchuan
|
6310ee0a7d
二氧化碳数据除以10000并保留两位小数
|
2 hete |
