编译精简完成

fengxiang

2018-01-29 3bbe9a88d9ab747ee2e4f01128547efd1fc20038

编译精简完成

 .angular-cli.json

@@ -23,7 +23,7 @@
        "scripts": [
            "../node_modules/@antv/g2/dist/g2.min.js",
            "../node_modules/@antv/data-set/dist/data-set.min.js",
            "../node_modules/@antv/g2-plugin-slider/dist/g-2.0.0.min.js"
            "../node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js"
        ],
        "environmentSource": "environments/environment.ts",
        "environments": {

 _mock/README.md

File was deleted

 _mock/_api.ts

File was deleted

 _mock/_chart.ts

File was deleted

 _mock/_profile.ts

File was deleted

 _mock/_rule.ts

File was deleted

 _mock/index.ts

File was deleted

 package.json

@@ -44,7 +44,6 @@
    "@delon/acl": "0.6.1",
    "@delon/auth": "0.6.1",
    "@delon/theme": "0.6.1",
    "@delon/mock": "0.6.1",
    "@delon/cache": "0.6.1",
    "@ngx-translate/core": "^9.0.0",
    "@ngx-translate/http-loader": "^2.0.0",

 src/app/delon.module.ts

@@ -172,12 +172,8 @@
import { AlainAuthModule } from '@delon/auth';
import { AlainACLModule } from '@delon/acl';
import { DelonCacheModule } from '@delon/cache';
// mock
import { DelonMockModule } from '@delon/mock';
import * as MOCKDATA from '../../_mock';
import { environment } from '@env/environment';
const MOCKMODULE = !environment.production || environment.chore === true ?
                    [ DelonMockModule.forRoot({ data: MOCKDATA }) ] : [];


@NgModule({
    imports: [
@@ -196,9 +192,7 @@
        // acl
        AlainACLModule.forRoot(),
        // cache
        DelonCacheModule.forRoot(),
        // mock
        ...MOCKMODULE
        DelonCacheModule.forRoot()
    ]
})
export class DelonModule {

 src/app/routes/devices/basic-info/basic-info.component.html

@@ -6,7 +6,7 @@
</div>
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="selectedRows.length > 0"> &nbsp;

 src/app/routes/devices/basic-info/device-edit/device-edit.component.ts

@@ -16,10 +16,10 @@
  styles: []
})
export class DeviceEditComponent implements OnInit {
  private monitorPoints:any [] = [];
  private deviceVersions:any [] = [];
  private operateUsers:any [] = [];
  private isSaving = false;
  public monitorPoints:any [] = [];
  public deviceVersions:any [] = [];
  public operateUsers:any [] = [];
  public isSaving = false;
  constructor(
    private subject: NzModalSubject,
    private formBuilder: FormBuilder,

 src/app/routes/devices/monitor-point/monitor-point.component.html

@@ -1,7 +1,7 @@
<pro-header [title]="grid.title"></pro-header>
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="grid.selectedIndexs.length > 0"> &nbsp;

 src/app/routes/devices/version/version-sensor-config/version-sensor-config.component.html

@@ -31,7 +31,7 @@
</nz-table>
<div class="modal-footer">
  <button nz-button type="button" (click)="close()">关闭</button>
  <button nz-button [nzType]="'primary'" (click)="save($event)" [nzLoading]="isSaving">               
  <button nz-button [nzType]="'primary'" (click)="save($event,null,null)" [nzLoading]="isSaving">               
         <span >
            保存<span *ngIf="isSaving" >中</span>
         </span>

 src/app/routes/devices/version/version.component.html

@@ -1,7 +1,7 @@
<pro-header [title]="grid.title"></pro-header>
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="grid.selectedIndexs.length > 0"> &nbsp;

 src/app/routes/map/coordinates-picker/coordinates-picker.component.html

@@ -10,7 +10,7 @@
                        </nz-input>
                    </div>
                    <div nz-col [nzSpan]="1">
                        <button nz-button [nzType]="'primary'" [disabled]="disabled"  (click)="mapSearch($event)" class="mr-sm">
                        <button nz-button [nzType]="'primary'"  (click)="mapSearch($event)" class="mr-sm">
                            <i class="anticon anticon-search"></i><span>搜索</span>
                        </button>
                    </div>

 src/app/routes/map/coordinates-picker/coordinates-picker.component.ts

@@ -16,6 +16,7 @@
export class CoordinatesPickerComponent{
    Default_LNG = 121;
    Default_LAT = 31.4;
    isSaving = false;
    markerOption:{
      point:Point,
      options:MarkerOptions
@@ -114,6 +115,7 @@
      this.subject.destroy();
  }
  save() {
      this.isSaving = true;
      this.subject.next();
      this.subject.destroy();
  }

 src/app/routes/sensors/basic-info/basic-info.component.html

@@ -1,11 +1,11 @@
<pro-header [title]="grid.title"></pro-header>
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="grid.selectedIndexs.length > 0"> &nbsp;
                <button nz-button [nzSize]="'large'" (click)="deleteSelected()">批量删除</button>
                <button nz-button [nzSize]="'large'" (click)="deleteSelected($event)">批量删除</button>
                </ng-container>
                <nz-input [ngStyle]="{'width': '280px','float':'right'}" [(ngModel)]="queryMap.value" name=""  [nzPlaceHolder]="queryMap.text"
                (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>

 src/app/routes/systems/account/account-edit/account-edit.component.html

@@ -52,6 +52,6 @@
    </div>
    <div class="modal-footer">
        <button nz-button type="button" (click)="close()">关闭</button>
        <button nz-button [nzLoading]="http.loading" [nzType]="'primary'" [disabled]="!validateForm.valid">保存</button>
        <button nz-button  [nzType]="'primary'" [disabled]="!validateForm.valid">保存</button>
    </div>
</form>

 src/app/routes/systems/account/account.component.ts

@@ -13,7 +13,7 @@

export class AccountComponent implements OnInit {

  private isDeleteOptions = [
  public isDeleteOptions = [
    {value: '1', label: '是'},
    {value: '0', label: '否'}
  ];

 src/app/routes/systems/organization/organization-config/organization-config.component.ts

@@ -23,7 +23,7 @@
  ngOnDestroy(): void {
    this.backToList();
  }
  private organization: Organization;
  public organization: Organization;
  grid: Grid<object> = new Grid<object>(null);
  validateForm: FormGroup;
  constructor(
@@ -274,8 +274,8 @@
           }
         }
   }
   private hasDegression = false;
   refreshHasDegression(value){
   public hasDegression = false;
   public refreshHasDegression(value){
       if(value){
         this.hasDegression = true;
       }else{

 src/app/routes/systems/organization/organization-list/organization-list.component.html

@@ -1,10 +1,10 @@
<nz-card [nzBordered]="false">
        <div class="mb-md">
                <button nz-button (click)="addOrModify()" [nzType]="'primary'" [nzSize]="'large'">
                <button nz-button (click)="addOrModify($event)" [nzType]="'primary'" [nzSize]="'large'">
                    <i class="anticon anticon-plus"></i><span>新建</span>
                </button>
                <ng-container *ngIf="grid.selectedIndexs.length > 0"> &nbsp;
                <button nz-button [nzSize]="'large'" (click)="deleteSelected()">批量删除</button>
                <button nz-button [nzSize]="'large'" (click)="deleteSelected($event)">批量删除</button>
                </ng-container>
                <nz-input [ngStyle]="{'width': '280px','float':'right'}" [(ngModel)]="queryMap.value" name=""  [nzPlaceHolder]="queryMap.text"
                (keyup)="queryTextChanged($event)" (change)="queryTextChanged($event)" ></nz-input>

 src/app/routes/systems/organization/organization.component.ts

@@ -12,6 +12,6 @@
  ngOnInit(): void {
  }
  constructor(
    private organizationService: OrganizationService
    public organizationService: OrganizationService
  ) {}
}

 src/app/routes/users/alarm-user/alarm-user-edit/alarm-user-edit.component.html

@@ -51,6 +51,6 @@
    </div>
    <div class="modal-footer">
        <button nz-button type="button" (click)="close()">关闭</button>
        <button nz-button [nzLoading]="http.loading" [nzType]="'primary'">保存</button>
        <button nz-button  [nzType]="'primary'">保存</button>
    </div>
</form>

 src/app/routes/users/alarm-user/alarm-user.component.html

@@ -81,7 +81,7 @@
                <th nz-th><span>创建日期</span></th>
                <th nz-th>
                    <span>过期日期</span>
                    <nz-table-sort [(nzValue)]="sortMap.updatedAt" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
                    <nz-table-sort [(nzValue)]="sortMap" (nzValueChange)="sort('expire_time', $event)"></nz-table-sort>
                </th>
                <th nz-th><span>操作</span></th>
            </tr>

 src/app/routes/users/installer/edit/edit.component.html

@@ -36,6 +36,6 @@
  </div>
  <div class="modal-footer">
    <button nz-button type="button" (click)="close()">关闭</button>
    <button nz-button [nzLoading]="http.loading" [nzType]="'primary'">保存</button>
    <button nz-button  [nzType]="'primary'">保存</button>
  </div>
</form>

 src/app/routes/users/installer/edit/edit.component.ts

@@ -14,7 +14,7 @@
export class UserInstallerEditComponent implements OnInit {

  user: any;
  private validateForm: FormGroup;
  public validateForm: FormGroup;

  constructor(
    private modalHelper: ModalHelper,

 src/environments/environment.prod.ts

@@ -4,5 +4,5 @@
    production: true,
    hmr: false,
    useHash: true,
    SERVER_BASH_URL: `http://47.96.15.25:8001/`
    SERVER_BASH_URL:`http://47.96.171.62:8080/screen_api_v2/`
};

 yarn.lock

@@ -235,10 +235,6 @@
  version "0.6.1"
  resolved "http://registry.npm.taobao.org/@delon/cache/download/@delon/cache-0.6.1.tgz#13b412897743dc2ad612c4c4fca280c3dc044825"

"@delon/mock@0.6.1":
  version "0.6.1"
  resolved "http://registry.npm.taobao.org/@delon/mock/download/@delon/mock-0.6.1.tgz#e52bbdd708ff83680c985d0aa4ace282168de873"

"@delon/theme@0.6.1":
  version "0.6.1"
  resolved "http://registry.npm.taobao.org/@delon/theme/download/@delon/theme-0.6.1.tgz#4e98b1dc565c2f0684717c44ed73509cd866f120"
@@ -2176,6 +2172,12 @@
  resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
  dependencies:
    jsbn "~0.1.0"

echarts@^3.8.5:
  version "3.8.5"
  resolved "https://registry.yarnpkg.com/echarts/-/echarts-3.8.5.tgz#58e4a51d2743c6fb75257b0dc0a9cf9f5378ac0e"
  dependencies:
    zrender "3.7.4"

ee-first@1.1.1:
  version "1.1.1"
@@ -8253,3 +8255,7 @@
zone.js@^0.8.14, zone.js@^0.8.18:
  version "0.8.19"
  resolved "http://registry.npm.taobao.org/zone.js/download/zone.js-0.8.19.tgz#a4b522cd9e8b7b616a638c297d720d4c7f292f71"

zrender@3.7.4:
  version "3.7.4"
  resolved "https://registry.yarnpkg.com/zrender/-/zrender-3.7.4.tgz#f847d53948481ef6d42906d1ea9aeec7acbefdf2"