 JinxChen
|
e6e74e5af6
|
Merge branch 'bugfix-dialog' into develop
|
2 anos atrás |
|
JinxChen
|
b237684ece
|
- 修改 用户例外转通用弹窗大小
|
2 anos atrás |
|
JinxChen
|
f0c233de1c
|
Merge branch 'bugfix-logout-err' into develop
|
2 anos atrás |
|
JinxChen
|
c0f1ae75d8
|
- 修复 登录过期错误提示两次的问题
|
2 anos atrás |
|
JinxChen
|
1f16bfa9da
|
Merge branch 'bugfix-logout-err' into develop
|
2 anos atrás |
|
JinxChen
|
6021c8153b
|
FIX
- 修复 登录过期没有跳转到登录界面的问题
|
2 anos atrás |
|
JinxChen
|
5e2500b224
|
Merge branch 'bugfix-logout-err' into develop
|
2 anos atrás |
|
JinxChen
|
b3cca318b5
|
- 修复 登录过期错误提示显示两次的问题
|
2 anos atrás |
|
2183691628
|
5a07e0cea5
|
Merge branch 'bugfix-logout-error' into develop
|
2 anos atrás |
|
2183691628
|
48e8aec6f0
|
FIX
- 修改 登录过期错误提示
|
2 anos atrás |
|
2183691628
|
05d474d030
|
Merge branch 'bugfix-user-exception' into develop
|
2 anos atrás |
|
2183691628
|
aef9ad7eee
|
FIX
- 修改 登录过期提示
- 增加 ie10,11兼容 //todo 需后端修改下nginx配置
- 取消 通用例外显示方式
- 取消 用户例外转通用类别的显示
|
2 anos atrás |
|
2183691628
|
1d85228efb
|
Merge branch 'bugfix-error' into develop
|
2 anos atrás |
|
2183691628
|
5b8662b441
|
- 修改 登录过期提示一
|
2 anos atrás |
|
2183691628
|
1111fa3e35
|
Merge branch 'bugfix-error' into develop
|
2 anos atrás |
|
2183691628
|
e7e54a07b5
|
FIX
- 修改 登录过期提示
|
2 anos atrás |
|
2183691628
|
7bcb9defd7
|
Merge branch 'bugfix-off-limits-type' into develop
|
2 anos atrás |
|
2183691628
|
d41d2a3085
|
FIX
- 修改 增加禁入类别存在缓存的问题
- 删除 修改禁入类别重置功能
|
2 anos atrás |
|
2183691628
|
773a18e139
|
Merge branch 'bugfix-off-limits-type' into develop
|
2 anos atrás |
|
2183691628
|
f2d4c90009
|
FIX
- 修复 禁入类别分页错误的问题
|
2 anos atrás |
|
2183691628
|
731a430f2f
|
Merge branch 'bugfix-user-exeception' into develop
|
2 anos atrás |
|
2183691628
|
ed9e558c0e
|
- 修改 增加/修改用户例外接口
|
2 anos atrás |
|
2183691628
|
858d1c96f6
|
Merge branch 'bugfix-common-exception' into develop
|
2 anos atrás |
|
2183691628
|
fb26951d79
|
FEA
- 修改 增加/修改通用例外接口
|
2 anos atrás |
|
2183691628
|
b4b5327bb1
|
Merge branch 'bugfxi-off-limits-type' into develop
|
2 anos atrás |
|
2183691628
|
8818107529
|
FEA
- 增加 告警类别删除功能
FIX
- 修复 告警类别修改失败的问题
|
2 anos atrás |
|
2183691628
|
6d8ae9eb30
|
Merge branch 'bugfix-user-delete' into develop
|
2 anos atrás |
|
2183691628
|
636bd57a8d
|
- 修复 删除用户例外时同一个imei的例外会全部删除的问题
- 增加 告警类别删除功能（todo 待接口调整发布可开放）
- 增加 警告查询 内容中文查询功能
|
2 anos atrás |
|
2183691628
|
ef8c4c0a3a
|
Merge branch 'bugfix-status' into develop
|
2 anos atrás |
|
2183691628
|
01de916bf2
|
修改 用户和通用例外状态
|
2 anos atrás |
|
2183691628
|
bfc640bdde
|
Merge branch 'bugfix-status' into develop
|
2 anos atrás |
|
2183691628
|
80b772d102
|
- 修改 用户和通用例外状态选择显示
|
2 anos atrás |
|
2183691628
|
653f752dc3
|
Merge branch 'bugfxi-common' into develop
|
2 anos atrás |
|
2183691628
|
90361e1788
|
- 修复 用户例外弹窗标题显示错误的问题
|
2 anos atrás |
|
2183691628
|
d2c92d331f
|
Merge branch 'bugfix-alarm-query' into develop
|
2 anos atrás |
|
2183691628
|
c0e5e60bef
|
IMPROVEMENT
- 优化 用户例外和告警查询的搜索条件
|
2 anos atrás |
|
2183691628
|
8515aa51f6
|
Merge branch 'bugfix-ecception' into develop
|
2 anos atrás |
|
2183691628
|
fb5269b591
|
- 优化 通用和用户例外 状态显示方式
|
2 anos atrás |
|
2183691628
|
9f8c67f70b
|
Merge branch 'bugfix-user' into develop
|
2 anos atrás |
|
2183691628
|
79f7303064
|
- 修复 新增/修改用户例外报错的问题
|
2 anos atrás |
|
2183691628
|
1575b22d18
|
Merge branch 'feature-page' into develop
|
2 anos atrás |
|
2183691628
|
de1f4a14eb
|
IMPROVEMENT
- 优化 首页样式
- 统一 输入框长度
- 统一 状态判断
|
2 anos atrás |
|
2183691628
|
bcbea65ad3
|
Merge branch 'feature-alarm-query' into develop
|
2 anos atrás |
|
2183691628
|
8155559d18
|
- 修改 告警分页查询页面功能
|
2 anos atrás |
|
2183691628
|
859c62ec39
|
Merge branch 'bugfix-user-search' into develop
|
2 anos atrás |
|
2183691628
|
dc051f7259
|
- 修改 用户例外搜索功能，可根据imei搜索
|
2 anos atrás |
|
2183691628
|
5139a848fc
|
Merge branch 'feature-status' into develop
|
2 anos atrás |
|
2183691628
|
20390b286c
|
- 修改 通用例外和用户例外状态选择方式
|
2 anos atrás |
|
2183691628
|
9d5e4117d3
|
Merge branch 'bugfix-no-token' into develop
|
2 anos atrás |
|
2183691628
|
e6298ca68c
|
- 取消 登录过期弹窗退出登录确认弹窗
- 增加 登录成功提示
|
2 anos atrás |
