b076f355b7b438b45e430cbd1c441ef5ff34b6fe..50098f48234b6d53edfdac541b08a95d9d8e63d6
2018-06-04 fengxiang
登录页面 不处理登录失效响应
50098f diff | tree
2018-06-04 fengxiang
名称修复
a91d9b diff | tree
4 files modified
11 ■■■■■ changed files
src/app/core/net/default.interceptor.ts 5 ●●●● patch | view | raw | blame | history
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html 2 ●●● patch | view | raw | blame | history
src/app/routes/devices/version/version-edit/version-edit.component.html 2 ●●● patch | view | raw | blame | history
src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html 2 ●●● patch | view | raw | blame | history
src/app/core/net/default.interceptor.ts
@@ -14,6 +14,7 @@
import { Subject } from 'rxjs/Subject';
import { error } from 'protractor';
import { debug } from 'util';
import {Location} from '@angular/common';
/**
 * 默认HTTP拦截器,其注册细节见 `app.module.ts`
@@ -68,7 +69,9 @@
                break;
            case 401: // 未登录状态码
            // this.goTo('/passport/login');
                this.unLoginHandle.next(<HttpErrorResponse>event);
                if (location.hash && !location.hash.endsWith('login')) {
                    this.unLoginHandle.next(<HttpErrorResponse>event);
                }
                break;
            case 403:
            case 404:
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html
@@ -1,5 +1,5 @@
<div class="modal-header">
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 组织</div>
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 监控站点</div>
</div>
<form [formGroup]="validateForm" (ngSubmit)="save($event,validateForm.value,validateForm.valid)" nz-form [nzType]="'horizontal'">
  <div nz-form-item nz-row class="mb-sm">
src/app/routes/devices/version/version-edit/version-edit.component.html
@@ -1,5 +1,5 @@
<div class="modal-header">
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 安装用户</div>
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 设备型号</div>
</div>
<form [formGroup]="validateForm"  (ngSubmit)="save($event,validateForm.value,validateForm.valid)" nz-form [nzType]="'horizontal'">
  <div nz-form-item nz-row class="mb-sm">
src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.html
@@ -1,5 +1,5 @@
<div class="modal-header">
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 组织</div>
  <div class="modal-title">{{ data.id != null ? '编辑' : '添加'}} - 传感器</div>
</div>
<form [formGroup]="validateForm" (ngSubmit)="save($event,validateForm.value,validateForm.valid)" nz-form [nzType]="'horizontal'">
  <div nz-form-item nz-row class="mb-sm">