Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

src/app/pages/down-image/down-image.component.html

@@ -25,6 +25,7 @@
       <nz-form-control>
         <nz-select
           nzAllowClear
+          nzShowSearch 
           style="background-color: #fff"
           formControlName="GasStationId"
           id="GasStationId"
@@ -62,6 +63,6 @@
 
     <button nz-button nzType="primary" (click)="onClick()">提交</button>
   </form>
-  <textarea style="width: 600px; height: 300px; margin-left: 10px;" *ngIf="result" [(ngModel)]="result" nz-input></textarea>
+  <textarea style="width: 600px; height: 300px; margin-left: 10px;" *ngIf="resultString" [(ngModel)]="resultString" nz-input></textarea>
   <!-- <div  style="width: 650px; height: 100%; background-color: #fff; margin-left: 10px;">{{result}}</div> -->
 </div>

src/app/pages/down-image/down-image.component.ts

@@ -1,76 +1,108 @@
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input } from "@angular/core";
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef } from "ng-zorro-antd/modal";
-import { HttpClient } from '@angular/common/http';
+import { HttpClient } from "@angular/common/http";
-import { TreeService } from 'src/app/service/tree.service';
+import { TreeService } from "src/app/service/tree.service";
-import * as moment from 'moment';
+import * as moment from "moment";
-
 
 @Component({
-  selector: 'app-down-image',
+  selector: "app-down-image",
-  templateUrl: './down-image.component.html',
+  templateUrl: "./down-image.component.html",
-  styleUrls: ['./down-image.component.scss']
+  styleUrls: ["./down-image.component.scss"],
 })
 export class DownImageComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private fb: FormBuilder, private http: HttpClient ,private toTree:TreeService) { }
+  constructor(
-  isVisible=false
+    private fb: FormBuilder,
+    private http: HttpClient,
+    private toTree: TreeService
+  ) {}
+  isVisible = false;
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       StartTime: [null],
-      EndTime:[null],
+      EndTime: [null],
-      NodeName:[null],
+      NodeName: [null],
-      GasStationId:[null]
+      GasStationId: [null],
     });
-    this.getAllOrganization()
+
+    this.getAllOrganization();
   }
-  result
+  result;
-  onClick(){
+  resultList=[];
+  resultString;
+  list = [
+    "车辆进场",
+    "设置卸油隔离区",
+    "卸油连接静电接地",
+    "卸油设置消防器材",
+    "连接卸油管",
+    "卸油中无人监卸",
+    "拆除卸油管",
+    "车辆离场",
+  ];
+  onClick() {
     console.log(this.validateForm.value);
-    let params={
+    this.resultList=[]
-      StartTime:moment(this.validateForm.value.StartTime).format('YYYY-MM-DD HH:mm:ss'),
+    let params = {
-      EndTime:moment(this.validateForm.value.EndTime).format('YYYY-MM-DD HH:mm:ss'),
+      StartTime: this.validateForm.value.StartTime
-      NodeName:this.validateForm.value.NodeName,
+        ? moment(this.validateForm.value.StartTime).format(
-      GasStationId:this.validateForm.value.GasStationId
+            "YYYY-MM-DD HH:mm:ss"
-    }
+          )
-    this.http.get('/api/services/app/OilUnloadingProcess/GetOilUnloadingImages', { params: params }).subscribe((data:any)=>{
+        : null,
-      console.log(data);
+      EndTime: this.validateForm.value.EndTime
-      this.result=data.result
+        ? moment(this.validateForm.value.EndTime).format("YYYY-MM-DD HH:mm:ss")
-      setTimeout(() => {
+        : null,
-        this.isVisible=true
+      NodeName: this.validateForm.value.NodeName,
-      }, 500);
+      GasStationId: this.validateForm.value.GasStationId,
-    })
+    };
+    this.http
+      .get("/api/services/app/OilUnloadingProcess/GetOilUnloadingImages", {
+        params: params,
+      })
+      .subscribe((data: any) => {
+        console.log(data);
+        this.result = data.result;
+        this.result.forEach((element:any,i) => {
+
+          element.urlList.forEach((e:any,k)=>{
+            if (e && e.indexOf("http") === -1 && e.indexOf("/api") === -1) {
+              this.result[i].urlList[k] = window.location.origin + "/" + e;
+          }else if(e && e.indexOf("http") === -1 && e.indexOf("/api") != -1){
+            this.result[i].urlList[k] = window.location.origin + e;
+          }
+          })
+          
+          console.log(element,i);
+          this.resultList.push(element.station.stationName,...element.urlList)
+        });
+        this.resultList = [...this.resultList];
+        console.log(this.resultList);
+        
+        this.resultString=this.resultList.join('\n')
+      });
   }
-  list=[
+
-    '车辆进场',
+
-    '设置卸油隔离区',
+  nodes: any = [];
-    '卸油连接静电接地',
-    '卸油设置消防器材',
-    '连接卸油管',
-    '卸油中无人监卸',
-    '拆除卸油管',
-    '车辆离场',
-  ]
-  
-  nodes: any = []
   async getAllOrganization() {
-    let OrganizationUnitId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
+    let OrganizationUnitId = JSON.parse(sessionStorage.getItem("userdata"))
+      .organization.id;
     let params = {
       OrganizationUnitId: OrganizationUnitId,
       MaxResultCount: 9999,
-      IsContainsChildren: "true"
+      IsContainsChildren: "true",
-    }
+    };
     await new Promise((resolve, reject) => {
-      this.http.get('/api/services/app/GasStation/GetAll', {
+      this.http
-        params: params
+        .get("/api/services/app/GasStation/GetAll", {
-      }).subscribe((data: any) => {
+          params: params,
-        this.nodes=data.result.items
+        })
-        
+        .subscribe((data: any) => {
-        resolve(data)
+          this.nodes = data.result.items;
-        
-      })
-    })
 
+          resolve(data);
+        });
+    });
   }
-
 }