Merge branch 'master' of http://180.168.156.211:2903/qinghua/smart

src/main/webapp/app/business/effect-analysis/effect-analysis.component.html

@@ -13,6 +13,7 @@
     </nz-breadcrumb>
   </div>
   <div nz-col nzSpan="8" class="text-right">
+    <button nzType="primary" (click)="returnBack()" nz-button>返回上一页</button>
     <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
     <smart-full-screen></smart-full-screen>
   </div>

src/main/webapp/app/business/effect-analysis/effect-analysis.component.ts

 import {Component, OnInit} from '@angular/core';
 import {BusinessService} from '../business.service';
 import {OverAllService} from '../../overAll/overAll.service';
-import {DatePipe} from '@angular/common';
+import {DatePipe,Location} from '@angular/common';
 import {color} from '../../app.constants';
 import {NzMessageService} from 'ng-zorro-antd';
 import {CommonService} from '../../shared/common/common.service';
@@ -83,8 +83,9 @@ export class EffectAnalysisComponent implements OnInit {
     chartUser;
 
     constructor(private busineSer: BusinessService, private overAllSer: OverAllService,
-                private commonSer: CommonService,
+                private commonSer:CommonService,
                 private routerInfo: ActivatedRoute,
+                public location:Location,
                 private datePipe: DatePipe, private message: NzMessageService) {
         this.routerInfo.queryParams.subscribe(
             (res) => {
@@ -348,7 +349,7 @@ export class EffectAnalysisComponent implements OnInit {
     //时间改变
     changeType() {
         this.isSpinning = true;
-        if (this.timeType == '99') return;
+        if(this.timeType =='99') return ;
         this.obj.startTime = this.commonSer.getTimeByType(this.timeType).startTime;
         this.obj.endTime = this.commonSer.getTimeByType(this.timeType).endTime;
         this.findChart();
@@ -527,4 +528,9 @@ export class EffectAnalysisComponent implements OnInit {
 
         this.isSpinning = false;
     }
+
+    //返回上一页
+    returnBack(){
+        this.location.back();
+    }
 }

src/main/webapp/app/work/inspect-plan-config/inspect-plan-config.component.html

@@ -27,7 +27,7 @@
     </div>
     <div nz-col nzSpan="6">
         <input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.searchStr"
-               placeholder="计划编号、创建人、计划名称、参与人">
+               placeholder="计划名称、计划负责人">
     </div>
     <div nz-col nzSpan="2">
         <button (click)="search()"

src/main/webapp/app/work/modal/look-plan/look-plan.component.html

@@ -104,7 +104,7 @@
         <div nz-col [nzSpan]="12">
           <nz-form-item nzFlex>
             <nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="title">计划描述</nz-form-label>
-            <nz-form-control [nzSpan]="14">
+            <nz-form-control style="word-wrap:break-word" [nzSpan]="14">
               {{plan?.description}}
             </nz-form-control>
           </nz-form-item>

src/main/webapp/app/work/spare-parts-management/spare-parts-management.component.html

@@ -32,7 +32,7 @@
     </div>
     <div nz-col nzSpan="6"></div>
     <div nz-col nzSpan="5">
-        <input type="text" nz-input [(ngModel)]="obj.keyword" placeholder="资产编号、名称">
+        <input type="text" nz-input [(ngModel)]="obj.keyword" placeholder="备件编号、备件名称">
     </div>
     <div nz-col nzSpan="2">
         <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索

src/main/webapp/app/work/work-handle/handle-detail/handle-detail.component.html

@@ -118,7 +118,7 @@
         <div nz-row>
             <div nz-col nzSpan="4">处理情况</div>
             <div nz-col nzSpan="1"></div>
-            <div nz-col nzSpan="19">
+            <div nz-col nzSpan="19" style="word-wrap:break-word">
                 {{event?.operateResult}}
             </div>
         </div>
@@ -171,7 +171,7 @@
         <div nz-row>
             <div nz-col nzSpan="4">意见建议:</div>
             <div nz-col nzSpan="1"></div>
-            <div nz-col nzSpan="19">
+            <div nz-col nzSpan="19" style="word-wrap:break-word">
                 <ng-container *ngIf="event?.status == 1">
                     {{event?.confirm?.suggest}}
                 </ng-container>