 chenJinxu
|
2c494cefae
|
Merge branch 'feat' into develop
|
pirms 1 gada |
|
chenJinxu
|
2c88d7f606
|
update
- c1后台设备功耗查看页面
- 优化 设备状态文字
|
pirms 1 gada |
|
chenJinxu
|
c3a3e82197
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
chenJinxu
|
9e5ad9b996
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
320a84fdce
|
feat
- c1后台设备功耗查看页面
- 增加 设备状态查看菜单
- 优化 设备离线行为查看明细，增加最近离线时间
|
pirms 1 gada |
|
chenJinxu
|
8e4fb1bab7
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
chenJinxu
|
92b6b48ee1
|
Merge branch 'update' into test
|
pirms 1 gada |
|
chenJinxu
|
95c79d46f3
|
update
- 心理监测首页
- 区分 测试和正式环境接口地址
|
pirms 1 gada |
|
chenJinxu
|
eae5d5eea4
|
Merge branch 'mer-dev' into develop
|
pirms 1 gada |
|
chenJinxu
|
bc2a9bae7f
|
Merge branch 'test' into mer-dev
|
pirms 1 gada |
|
chenJinxu
|
822d5714b6
|
Merge branch 'fix' into test
|
pirms 1 gada |
|
chenJinxu
|
f0eee12165
|
update
- 心理监测首页
- 修改 菜单顺序
|
pirms 1 gada |
|
chenJinxu
|
13cac1b3b0
|
Merge branch 'fix-dev' into develop
|
pirms 1 gada |
|
chenJinxu
|
1dea4ddf50
|
- 修复 涉水监测开关显示不正确的问题
|
pirms 1 gada |
|
chenJinxu
|
508a9079d7
|
Merge branch 'fix' into test
|
pirms 1 gada |
|
chenJinxu
|
b7191cbab8
|
fix
- c1后台设备功耗查看页面
- 修复 涉水监测开关显示不正确的问题
|
pirms 1 gada |
|
chenJinxu
|
2edd3e1edd
|
Merge branch 'fix-dev' into develop
|
pirms 1 gada |
|
chenJinxu
|
c43c92ac20
|
fix
- c1后台设备功耗查看页面
- 修复 涉水监测开关显示不正确的问题
|
pirms 1 gada |
|
chenJinxu
|
cf4c96ea1a
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
14b4a9776e
|
update
- 心理监测
- 首页
- 修改 显示时间
|
pirms 1 gada |
|
chenJinxu
|
2e12503a70
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
f2f55a92d1
|
update
- 心理监测详情
- 周报详情
- 优化 上周跟本周比例显示
|
pirms 1 gada |
|
chenJinxu
|
5d88591902
|
Merge branch 'develop-rel' into develop
|
pirms 1 gada |
|
chenJinxu
|
9d470ac9e8
|
设备功耗查看 - 修复 监护角色数据解析错误导致相关页面显示错误的问题
|
pirms 1 gada |
|
chenJinxu
|
47a4c43433
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
3cc34f40fe
|
fix
- 设备功耗查看
- 修复 监护角色数据解析错误导致相关页面显示错误的问
|
pirms 1 gada |
|
chenJinxu
|
570c19e2c7
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
chenJinxu
|
f2a89a3d0c
|
fix
- 心理监测详情
- 周报列表
- 优化 列表显示
- 周报详情
- 增加 对比比例显示
|
pirms 1 gada |
|
chenJinxu
|
3b7aed7013
|
Merge branch 'test' of http://183.238.195.77:10081/chenJinxu/TelpoH5FrontendWeb into test
|
pirms 1 gada |
|
JinxChen
|
dd6c658cfe
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
JinxChen
|
474e91f923
|
fix
- 心理监测详情
- 修复 图表连线点颜色显示不正确的问题
- 修复 选项菜单显示异常的问题
|
pirms 1 gada |
|
JinxChen
|
1b3f55cd55
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
JinxChen
|
44580a243c
|
update
- 心理监测详情
- 修改 天数选择方式
- 心理监测周报
- 增加 周报列表和周报详情接口
|
pirms 1 gada |
|
JinxChen
|
778774a8ba
|
merge develop
|
pirms 1 gada |
|
JinxChen
|
e21058ba5c
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
JinxChen
|
e78d06d3b8
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
JinxChen
|
4778322b5e
|
update
- 心理监测详情
- 修改 温馨提示语
- 新增 一个周报/月报页面
|
pirms 1 gada |
|
JinxChen
|
55d9a1fb52
|
Merge branch 'develop'
|
pirms 1 gada |
|
JinxChen
|
4bd0a049d1
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
JinxChen
|
7de5fc2713
|
Merge branch 'feat' into test
|
pirms 1 gada |
|
JinxChen
|
db8da70b72
|
fix
- 话费查询
- 修复 异步问题导致首次进入页面白屏的问题
|
pirms 1 gada |
|
JinxChen
|
3c308f86b7
|
merge develop
|
pirms 1 gada |
|
JinxChen
|
3ef54f844a
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
JinxChen
|
1438d4d19b
|
Merge branch 'fix' into test
|
pirms 1 gada |
|
JinxChen
|
7331cb3959
|
fix
- 话费查询
- 修复 token过期时导致获取openId失败的问题
|
pirms 1 gada |
|
JinxChen
|
a4c7253a65
|
Merge branch 'merge-master'
|
pirms 1 gada |
|
JinxChen
|
72226c0efa
|
merge develop
|
pirms 1 gada |
|
JinxChen
|
c46827d8da
|
Merge branch 'test' into develop
|
pirms 1 gada |
|
JinxChen
|
1c055c3a80
|
Merge branch 'fix' into test
|
pirms 1 gada |
|
JinxChen
|
77e3d55c9e
|
fix
- c1后台设备功耗查看页面
- 修复 上报周期无数据时显示不全的问题
|
pirms 1 gada |
