Commit efa063cb authored by wangqinghua's avatar wangqinghua

update

parent f1758442
......@@ -234,6 +234,16 @@ export class AlarmModalComponent implements OnInit {
this.alarmSer.getAction(id).subscribe(
(res)=>{
this.validateForm = res.data;
if(res.data.event){
this.isEvent = "1";
this.operatorList = res.data.event.map(e=>{
const d = {
username: e.username,
userId: e.userId
};
return d;
})
}
}
)
}
......
......@@ -64,7 +64,7 @@
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td nzShowCheckbox [(nzChecked)]="data.checked" (nzCheckedChange)="selectItem(data,$event)"></td>
<td nzShowCheckbox [(nzChecked)]="data.checked"></td>
<td>{{data.name}}</td>
<td>{{data.phoneNumber}}</td>
<td>
......
......@@ -53,19 +53,6 @@ export class GroupComponent implements OnInit {
this.dataSet = $event;
}
selectItem(item, e) {
if (e) {
this.selectList.push(item);
} else {
this.selectList.forEach((value, index) => {
if (value.id == item.id) {
this.selectList.splice(index, 1);
}
});
}
this.refreshStatus();
}
refreshStatus(): void {
const allChecked = this.dataSet.every(value => value.checked === true);
const allUnChecked = this.dataSet.every(value => !value.checked);
......
......@@ -116,8 +116,10 @@
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzFor="title">附件</nz-form-label>
<nz-form-control [nzSpan]="14">
<ng-container *ngIf="plan?.fileName">
<a (click)="downLoad()">下载</a>
<a class="main-color cursor">{{plan?.fileNmae}}</a>
<a class="main-color cursor">{{plan?.fileName}}</a>
</ng-container>
</nz-form-control>
</nz-form-item>
</div>
......
......@@ -35,6 +35,7 @@ export class PlanModalComponent implements OnInit {
}
initForm() {
this.fileList = [];
this.participantsList = [];
this.principalsList = [];
this.validateForm = this.fb.group({
......@@ -89,11 +90,13 @@ export class PlanModalComponent implements OnInit {
res.data.number += "";
this.participantsList = res.data.participants;
this.principalsList = res.data.principals;
if(res.data.fileName){
this.fileList = [
{
name: res.data.file,
name: res.data.fileName,
}
]
}
this.validateForm.patchValue(res.data);
}
)
......
......@@ -54,8 +54,11 @@
<div nz-row>
<div nz-col nzSpan="4">附件</div>
<div nz-col nzSpan="1"></div>
<div nz-col nzSpan="7">{{event?.fileName}}
<span (click)="downLoad()" class="main-color cursor">下载</span>
<div nz-col nzSpan="7">
<ng-container *ngIf="event?.fileName">
{{event?.fileName}}<span (click)="downLoad()" class="main-color cursor">下载</span>
</ng-container>
</div>
</div>
......
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