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

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

@@ -0,0 +1,67 @@
+<div class="modelbox">
+    
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-label nzSpan="7" nzFor="NodeName"
+        ><span style="color: #fff">节点名称</span>
+      </nz-form-label>
+      <nz-form-control>
+        <nz-select
+          nzAllowClear
+          style="background-color: #fff"
+          formControlName="NodeName"
+          id="NodeName"
+          nzPlaceHolder="请选择节点名称"
+        >
+          <nz-option *ngFor="let item of list" [nzValue]="item" [nzLabel]="item"></nz-option>
+          
+        </nz-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label nzSpan="7" nzFor="GasStationId"
+        ><span style="color: #fff">加油站</span>
+      </nz-form-label>
+      <nz-form-control>
+        <nz-select
+          nzAllowClear
+          style="background-color: #fff"
+          formControlName="GasStationId"
+          id="GasStationId"
+          nzPlaceHolder="请选择加油站"
+        >
+          <nz-option *ngFor="let item of nodes" [nzValue]="item.id" [nzLabel]="item.stationName"></nz-option>
+          
+        </nz-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label nzSpan="7" nzFor="StartTime"
+        ><span style="color: #fff">开始时间</span>
+      </nz-form-label>
+      <nz-form-control>
+        <nz-date-picker
+          nzShowTime
+          nzFormat="yyyy-MM-dd HH:mm:ss"
+          formControlName="StartTime"
+        ></nz-date-picker>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-label nzSpan="7" nzFor="EndTime"
+        ><span style="color: #fff">结束时间</span>
+      </nz-form-label>
+      <nz-form-control>
+        <nz-date-picker
+          nzShowTime
+          nzFormat="yyyy-MM-dd HH:mm:ss"
+          formControlName="EndTime"
+        ></nz-date-picker>
+      </nz-form-control>
+    </nz-form-item>
+
+    <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>
+  <!-- <div  style="width: 650px; height: 100%; background-color: #fff; margin-left: 10px;">{{result}}</div> -->
+</div>

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

@@ -0,0 +1,10 @@
+.modelbox{
+    margin-top: 100px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    // flex-direction: column;
+}
+.ant-form-item-label > label{
+    color: #fff !important;
+}

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

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

src/app/pages/pages-routing.module.ts

@@ -17,6 +17,7 @@ import { NavBarComponent } from './license/nav-bar/nav-bar.component';
 import { AuditNavComponent } from './audit/audit-nav/audit-nav.component';
 import { WarningStatisticsListComponent } from './records/warning-statistics-list/warning-statistics-list.component';
 import { RecordsNavComponent } from './records/records-nav/records-nav.component';
+import { DownImageComponent } from './down-image/down-image.component'
 
 const routes: Routes = [
     { path: 'homepage', component: HomePageComponent },
@@ -41,7 +42,8 @@ const routes: Routes = [
     { path: 'equipmentInfo', component: EquipmentInfoComponent },
     { path: 'oliStationInfo', component: OilStationInfoComponent },
     { path: 'license/petrolStation', component: NavBarComponent },
-    { path: 'audit', component: AuditNavComponent }
+    { path: 'audit', component: AuditNavComponent },
+    { path: 'downImage', component: DownImageComponent }
 
 ];
 

src/app/pages/pages.module.ts

@@ -91,10 +91,11 @@ import { AppealDetailsComponent } from './audit/audit-ing/appeal-details/appeal-
 import { SystemModelComponent } from './home/system-model/system-model.component';
 import { ForgetComponent } from './login/forget/forget.component';
 import { HomePageNologinComponent } from './home-page-nologin/home-page-nologin.component';
+import { DownImageComponent } from './down-image/down-image.component';
 @NgModule({
   declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
     TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
-    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent, ForgetComponent, HomePageNologinComponent],
+    AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent, ForgetComponent, HomePageNologinComponent, DownImageComponent],
 
 
   imports: [