[完善]修改参数

src/app/pages/histories/histories.component.html

@@ -68,10 +68,10 @@
 
                 <nz-form-item class="searchParams">
                     <nz-form-control>
-                        <nz-select nzAllowClear formControlName="manufacturer" nzPlaceHolder="请选择厂商">
-                            <nz-option nzValue="null" nzLabel="交大"></nz-option>
-                            <nz-option nzValue="1" nzLabel="黄海"></nz-option>
-                            <nz-option nzValue="2" nzLabel="安信"></nz-option>
+                        <nz-select nzAllowClear formControlName="manufacturer" nzPlaceHolder="请选择产品型号">
+                            <nz-option nzValue="警棋1" nzLabel="警棋1"></nz-option>
+                            <nz-option nzValue="警棋2" nzLabel="警棋2"></nz-option>
+                            <nz-option nzValue="警棋3" nzLabel="警棋3"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
@@ -79,9 +79,9 @@
                 <nz-form-item class="searchParams">
                     <nz-form-control>
                         <nz-select nzAllowClear formControlName="operation" nzPlaceHolder="请选择操作记录">
-                            <nz-option nzValue="null" nzLabel="未处理"></nz-option>
+                            <!-- <nz-option nzValue="null" nzLabel="未处理"></nz-option> -->
                             <nz-option nzValue="HandlerNotified" nzLabel="已推送"></nz-option>
-                            <nz-option nzValue="VerifierNotified" nzLabel="误报"></nz-option>
+                            <nz-option nzValue="VerifierNotified" nzLabel="标记误报"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>

src/app/pages/histories/histories.component.ts

@@ -126,13 +126,9 @@ export class HistoriesComponent implements OnInit {
         item.id ? ViolationIds.push(item.id) : null;
       });
     }
-    let VendorId: any = -1;
+    let VendorName: any = null;
     if (this.validateForm.value.manufacturer) {
-      if (this.validateForm.value.manufacturer === "null") {
-        VendorId = null;
-      } else {
-        VendorId = this.validateForm.value.manufacturer;
-      }
+      VendorName = this.validateForm.value.manufacturer;
     }
     let NotificationState: any = "All";
     if (this.validateForm.value.operation) {
@@ -158,7 +154,7 @@ export class HistoriesComponent implements OnInit {
       SkipCount: this.SkipCount,
       MaxResultCount: this.MaxResultCount, //每页50条
       Positive: this.validateForm.value.disposalState,
-      VendorId: VendorId,
+      VendorName: VendorName,
       NotificationState: NotificationState,
     };
     this.tableSpin = true;
@@ -193,13 +189,9 @@ export class HistoriesComponent implements OnInit {
         item.id ? ViolationIds.push(item.id) : null;
       });
     }
-    let VendorId: any = -1;
+    let VendorName: any = null;
     if (this.validateForm.value.manufacturer) {
-      if (this.validateForm.value.manufacturer === "null") {
-        VendorId = null;
-      } else {
-        VendorId = this.validateForm.value.manufacturer;
-      }
+      VendorName = this.validateForm.value.manufacturer;
     }
     let NotificationState: any = "All";
     if (this.validateForm.value.operation) {
@@ -223,7 +215,7 @@ export class HistoriesComponent implements OnInit {
           ]
         : null,
       Positive: this.validateForm.value.disposalState,
-      VendorId: VendorId,
+      VendorName: VendorName,
       NotificationState: NotificationState,
     };
     this.http
@@ -251,7 +243,7 @@ export class HistoriesComponent implements OnInit {
       nzComponentParams: {
         data: data,
       },
-      nzWidth:700,
+      nzWidth: 700,
       nzOnOk: () => new Promise((resolve) => setTimeout(resolve, 1000)),
       nzFooter: null,
     });

src/app/pages/histories/img-list/img-list.component.html

@@ -1,3 +1,3 @@
 <div class="box">
-    <textarea name="" id="">{{data}}</textarea>
+    <textarea name="" id="">{{newList}}</textarea>
 </div>

src/app/pages/histories/img-list/img-list.component.ts

@@ -1,17 +1,27 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit } from "@angular/core";
 
 @Component({
-  selector: 'app-img-list',
-  templateUrl: './img-list.component.html',
-  styleUrls: ['./img-list.component.scss']
+  selector: "app-img-list",
+  templateUrl: "./img-list.component.html",
+  styleUrls: ["./img-list.component.scss"],
 })
 export class ImgListComponent implements OnInit {
+  @Input() data?: any;
 
-  @Input() data?: string;
-
-  constructor() { }
+  constructor() {}
 
+  newList;
   ngOnInit(): void {
+    let str = "";
+    let num = 0;
+    this.data.forEach((element) => {
+      num++;
+      if (element.indexOf("http") !== 0) {
+        str += location.origin + element + "\n";
+      } else {
+        str += element + "\n";
+      }
+    });
+    this.newList = str;
   }
-
 }