Commit 0d7c880e authored by xch666's avatar xch666

修改一些文字错误

parent b7058d04
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
</nz-breadcrumb> </nz-breadcrumb>
</div> </div>
<div nz-col nzSpan="8" class="text-right"> <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> <button (click)="ngOnInit()" nz-button nzType="primary"><i class="anticon anticon-sync"></i></button>
<smart-full-screen></smart-full-screen> <smart-full-screen></smart-full-screen>
</div> </div>
......
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {BusinessService} from '../business.service'; import {BusinessService} from '../business.service';
import {OverAllService} from '../../overAll/overAll.service'; import {OverAllService} from '../../overAll/overAll.service';
import {DatePipe} from '@angular/common'; import {DatePipe, Location} from '@angular/common';
import {color} from '../../app.constants'; import {color} from '../../app.constants';
import {NzMessageService} from 'ng-zorro-antd'; import {NzMessageService} from 'ng-zorro-antd';
import {CommonService} from '../../shared/common/common.service'; import {CommonService} from '../../shared/common/common.service';
...@@ -83,7 +83,9 @@ export class EffectAnalysisComponent implements OnInit { ...@@ -83,7 +83,9 @@ export class EffectAnalysisComponent implements OnInit {
constructor(private busineSer: BusinessService, private overAllSer: OverAllService, constructor(private busineSer: BusinessService, private overAllSer: OverAllService,
private commonSer:CommonService, private commonSer:CommonService,
private datePipe: DatePipe, private message: NzMessageService) { private datePipe: DatePipe, private message: NzMessageService,
public location:Location
) {
} }
ngOnInit() { ngOnInit() {
...@@ -515,4 +517,9 @@ export class EffectAnalysisComponent implements OnInit { ...@@ -515,4 +517,9 @@ export class EffectAnalysisComponent implements OnInit {
this.isSpinning = false; this.isSpinning = false;
} }
//返回上一页
returnBack(){
this.location.back();
}
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
<div nz-col nzSpan="6"> <div nz-col nzSpan="6">
<input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.searchStr" <input type="text" (keyup.enter)="search()" nz-input [(ngModel)]="obj.searchStr"
placeholder="计划编号、创建人、计划名称、参与人"> placeholder="计划名称、计划负责人">
</div> </div>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
<button (click)="search()" <button (click)="search()"
......
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<div nz-col [nzSpan]="12"> <div nz-col [nzSpan]="12">
<nz-form-item nzFlex> <nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="title">计划描述</nz-form-label> <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}} {{plan?.description}}
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</div> </div>
<div nz-col nzSpan="6"></div> <div nz-col nzSpan="6"></div>
<div nz-col nzSpan="5"> <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>
<div nz-col nzSpan="2"> <div nz-col nzSpan="2">
<button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索 <button (click)="search()" nz-button nzType="default"><i class="anticon anticon-search"></i>搜索
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div nz-row> <div nz-row>
<div nz-col nzSpan="4">处理情况</div> <div nz-col nzSpan="4">处理情况</div>
<div nz-col nzSpan="1"></div> <div nz-col nzSpan="1"></div>
<div nz-col nzSpan="19"> <div nz-col nzSpan="19" style="word-wrap:break-word">
{{event?.operateResult}} {{event?.operateResult}}
</div> </div>
</div> </div>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<div nz-row> <div nz-row>
<div nz-col nzSpan="4">意见建议:</div> <div nz-col nzSpan="4">意见建议:</div>
<div nz-col nzSpan="1"></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"> <ng-container *ngIf="event?.status == 1">
{{event?.confirm?.suggest}} {{event?.confirm?.suggest}}
</ng-container> </ng-container>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment