沈斌
2018-03-08 f320f1970e5d80a423f377fb3253628bd1e7f5bf
refs
author 沈斌 <bluelazysb@hotmail.com>
Thursday, March 8, 2018 15:10 +0800
committer 沈斌 <bluelazysb@hotmail.com>
Thursday, March 8, 2018 15:10 +0800
commitf320f1970e5d80a423f377fb3253628bd1e7f5bf
tree ff165af121991a5d609fabed24e362bad723753c tree | zip | gz
parent 09074f01208062343f3c456bafe2a5f1115f2b2a view | diff
43f2601b8a5706a029f333204f7f52f153d61dfe view | diff
Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
48 files modified
1234 ■■■■■ changed files
src/app/app.component.ts 20 ●●●● diff | view | raw | blame | history
src/app/business/entity/data.ts 46 ●●●● diff | view | raw | blame | history
src/app/business/entity/grid.ts 4 ●●●● diff | view | raw | blame | history
src/app/business/entity/token.ts 8 ●●●● diff | view | raw | blame | history
src/app/business/enum/patterns.enum.ts 2 ●●● diff | view | raw | blame | history
src/app/business/enum/types.enum.ts 15 ●●●●● diff | view | raw | blame | history
src/app/business/services/http/alarm-config.service.ts 24 ●●●● diff | view | raw | blame | history
src/app/business/services/http/device-adjust-value.service.ts 8 ●●●● diff | view | raw | blame | history
src/app/business/services/http/device.service.ts 6 ●●●● diff | view | raw | blame | history
src/app/business/services/http/login.service.ts 20 ●●●● diff | view | raw | blame | history
src/app/business/services/http/monitor-point.service.ts 33 ●●●● diff | view | raw | blame | history
src/app/business/services/http/organization.service.ts 2 ●●● diff | view | raw | blame | history
src/app/business/services/http/sensors.service.ts 12 ●●●● diff | view | raw | blame | history
src/app/business/services/http/version.service.ts 2 ●●● diff | view | raw | blame | history
src/app/business/services/util/example.service.ts 10 ●●●● diff | view | raw | blame | history
src/app/business/services/util/tools.service.ts 20 ●●●● diff | view | raw | blame | history
src/app/core/i18n/i18n.service.ts 2 ●●● diff | view | raw | blame | history
src/app/core/net/default.interceptor.ts 11 ●●●● diff | view | raw | blame | history
src/app/routes/analysis/analysis.module.ts 4 ●●● diff | view | raw | blame | history
src/app/routes/analysis/query/query.component.html 154 ●●●● diff | view | raw | blame | history
src/app/routes/analysis/query/query.component.ts 339 ●●●● diff | view | raw | blame | history
src/app/routes/dashboard/v1/v1.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/devices/basic-info/adjust-config/adjust-config.component.ts 41 ●●●● diff | view | raw | blame | history
src/app/routes/devices/basic-info/basic-info.component.html 2 ●●● diff | view | raw | blame | history
src/app/routes/devices/basic-info/basic-info.component.ts 40 ●●●● diff | view | raw | blame | history
src/app/routes/devices/basic-info/device-edit/device-edit.component.ts 54 ●●●● diff | view | raw | blame | history
src/app/routes/devices/devices.module.ts 8 ●●●● diff | view | raw | blame | history
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/devices/monitor-point/monitor-point.component.ts 6 ●●●● diff | view | raw | blame | history
src/app/routes/devices/version/version-edit/version-edit.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/map/coordinates-picker/coordinates-picker.component.ts 72 ●●●● diff | view | raw | blame | history
src/app/routes/map/coordinates-picker/coordinates-picker.service.ts 12 ●●●● diff | view | raw | blame | history
src/app/routes/map/map.module.ts 4 ●●●● diff | view | raw | blame | history
src/app/routes/passport/login/login.component.ts 44 ●●●● diff | view | raw | blame | history
src/app/routes/routes-routing.module.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/systems/account/account.component.ts 10 ●●●● diff | view | raw | blame | history
src/app/routes/systems/organization/organization-config/organization-config.component.html 2 ●●● diff | view | raw | blame | history
src/app/routes/systems/organization/organization-config/organization-config.component.ts 139 ●●●● diff | view | raw | blame | history
src/app/routes/systems/organization/organization-edit/organization-edit.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/systems/organization/organization-list/organization-list.component.ts 8 ●●●● diff | view | raw | blame | history
src/app/routes/systems/systems.module.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.ts 2 ●●● diff | view | raw | blame | history
src/app/routes/users/alarm-user/alarm-user.component.ts 8 ●●●● diff | view | raw | blame | history
src/app/routes/users/installer/edit/edit.component.ts 16 ●●●● diff | view | raw | blame | history
src/app/routes/users/installer/installer.component.ts 6 ●●●● diff | view | raw | blame | history
src/app/routes/users/users.module.ts 2 ●●● diff | view | raw | blame | history
tslint.json 2 ●●● diff | view | raw | blame | history