bug update

src/main/webapp/app/early-warning/business-warning/business-warning.component.html

@@ -21,18 +21,18 @@
     <div nz-col nzSpan="6">
         预警级别:
         <nz-radio-group [(ngModel)]="obj.ruleLevel">
-            <label *ngFor="let item of warning_leavel" (click)="search()" nz-radio-button
+            <label *ngFor="let item of warning_leavel" (click)="searchValue()" nz-radio-button
                    [nzValue]="item.value">{{item.label}}</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="10">
         预警时间:
         <nz-radio-group [(ngModel)]="time.timeType" (ngModelChange)="changeTimeType($event)">
             <label *ngFor="let item of warning_time"  nz-radio-button
                    [nzValue]="item.value">{{item.label}}</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="6">
+    <div nz-col nzSpan="8">
         <ng-container *ngIf="time.timeType == '99'">
             <nz-date-picker
                     nzFormat="yyyy-MM-dd"
@@ -47,11 +47,11 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="10">
-        <input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.keyword"
+        <input type="text" (keyup.enter)="searchValue()" nz-input [(ngModel)]="obj.keyword"
                placeholder="预警内容、触发规则、批注人、批注内容">
     </div>
     <div nz-col nzSpan="2">
-        <button (click)="search()"
+        <button (click)="searchValue()"
                 nz-button nzType="default"><i class="anticon anticon-search"></i>搜索
         </button>
     </div>

src/main/webapp/app/early-warning/business-warning/business-warning.component.ts

@@ -75,11 +75,6 @@ export class BusinessWarningComponent implements OnInit {
         }
     }
 
-    //搜索
-    search() {
-        this.page.pageNum = 1;
-        this.getList();
-    }
 
     //时间改变
     changeTimeType(e) {
@@ -93,10 +88,9 @@ export class BusinessWarningComponent implements OnInit {
     //查询
     searchValue() {
         if (this.time.timeType == '99') {
-            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd HH:mm:ss');
-            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd HH:mm:ss');
+            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd') + ' 00:00:00';
+            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd') + ' 23:59:59';
         }
-        this.getList();
         this.page.pageNum = 1;
         this.getList();
     }

src/main/webapp/app/early-warning/resource-warning/resource-warning.component.html

@@ -25,14 +25,14 @@
              [nzValue]="item.value">{{item.label}}</label>
     </nz-radio-group>
   </div>
-  <div nz-col nzSpan="12">
+  <div nz-col nzSpan="10">
     预警时间:
     <nz-radio-group [(ngModel)]="time.timeType" (ngModelChange)="changeTimeType($event)">
       <label *ngFor="let item of warning_time" nz-radio-button
              [nzValue]="item.value">{{item.label}}</label>
     </nz-radio-group>
   </div>
-  <div nz-col nzSpan="6">
+  <div nz-col nzSpan="8">
     <ng-container *ngIf="time.timeType == '99'">
       <nz-date-picker
               nzFormat="yyyy-MM-dd"
@@ -51,7 +51,7 @@
            placeholder="预警内容、触发规则、批注人、批注内容">
   </div>
   <div nz-col nzSpan="2">
-    <button (click)="search()"
+    <button (click)="searchValue()"
             nz-button nzType="default"><i class="anticon anticon-search"></i>搜索
     </button>
   </div>

src/main/webapp/app/early-warning/resource-warning/resource-warning.component.ts

@@ -95,9 +95,10 @@ export class ResourceWarningComponent implements OnInit {
     //查询
     searchValue() {
         if (this.time.timeType == '99') {
-            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd HH:mm:ss');
-            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd HH:mm:ss');
+            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd') + ' 00:00:00';
+            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd') + ' 23:59:59';
         }
+        this.page.pageNum = 1;
         this.getList();
     }
 

src/main/webapp/app/early-warning/work-warning/work-warning.component.html

@@ -21,18 +21,18 @@
     <div nz-col nzSpan="6">
         预警级别:
         <nz-radio-group [(ngModel)]="obj.ruleLevel">
-            <label *ngFor="let item of warning_leavel" (click)="search()" nz-radio-button
+            <label *ngFor="let item of warning_leavel" (click)="searchValue()" nz-radio-button
                    [nzValue]="item.value">{{item.label}}</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="12">
+    <div nz-col nzSpan="10">
         预警时间:
         <nz-radio-group [(ngModel)]="time.timeType" (ngModelChange)="changeTimeType($event)">
             <label *ngFor="let item of warning_time"  nz-radio-button
                    [nzValue]="item.value">{{item.label}}</label>
         </nz-radio-group>
     </div>
-    <div nz-col nzSpan="6">
+    <div nz-col nzSpan="8">
         <ng-container *ngIf="time.timeType == '99'">
             <nz-date-picker
                     nzFormat="yyyy-MM-dd"
@@ -47,11 +47,11 @@
 </div>
 <div nz-row [nzGutter]="4" class="search-form">
     <div nz-col nzSpan="10">
-        <input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.keyword"
+        <input type="text" (keyup.enter)="searchValue()" nz-input [(ngModel)]="obj.keyword"
                placeholder="预警内容、触发规则、批注人、批注内容">
     </div>
     <div nz-col nzSpan="2">
-        <button (click)="search()"
+        <button (click)="searchValue()"
                 nz-button nzType="default"><i class="anticon anticon-search"></i>搜索
         </button>
     </div>

src/main/webapp/app/early-warning/work-warning/work-warning.component.ts

@@ -97,9 +97,10 @@ export class WorkWarningComponent implements OnInit {
     //查询
     searchValue() {
         if (this.time.timeType == '99') {
-            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd HH:mm:ss');
-            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd HH:mm:ss');
+            this.obj.startDate = this.datePipe.transform(this.time.startTime, 'yyyy-MM-dd') + ' 00:00:00';
+            this.obj.endDate = this.datePipe.transform(this.time.endTime, 'yyyy-MM-dd') + ' 23:59:59';
         }
+        this.page.pageNum = 1;
         this.getList();
     }
 

tsconfig.json

@@ -10,7 +10,7 @@
         "noImplicitAny": false,
         "skipLibCheck": true,
         "suppressImplicitAnyIndexErrors": true,
-        "outDir": "build/master/app",
+        "outDir": "build/www/app",
         "lib": ["es7", "dom"],
         "typeRoots": [
             "node_modules/@types"