diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
index db051d8..12ebec7 100644
--- a/src/app/pages/equipment-info/equipment-info.component.ts
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -1,57 +1,68 @@
-import { Component, OnInit, ViewContainerRef } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { NzModalService } from 'ng-zorro-antd/modal';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { AddequipmentComponent } from './addequipment/addequipment.component';
-import { HttpClient } from '@angular/common/http';
-import { EditequipmentComponent } from './editequipment/editequipment.component';
-import { Router, ActivatedRoute } from '@angular/router'
-import * as moment from 'moment';
+import { Component, OnInit, ViewContainerRef } from "@angular/core";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { NzModalService } from "ng-zorro-antd/modal";
+import { NzMessageService } from "ng-zorro-antd/message";
+import { AddequipmentComponent } from "./addequipment/addequipment.component";
+import { HttpClient } from "@angular/common/http";
+import { EditequipmentComponent } from "./editequipment/editequipment.component";
+import { Router, ActivatedRoute } from "@angular/router";
+import * as moment from "moment";
 @Component({
-  selector: 'app-equipment-info',
-  templateUrl: './equipment-info.component.html',
-  styleUrls: ['./equipment-info.component.scss']
+  selector: "app-equipment-info",
+  templateUrl: "./equipment-info.component.html",
+  styleUrls: ["./equipment-info.component.scss"],
 })
 export class EquipmentInfoComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(private router: Router, private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
-  arr = []
+  constructor(
+    private router: Router,
+    private fb: FormBuilder,
+    private modal: NzModalService,
+    private viewContainerRef: ViewContainerRef,
+    private message: NzMessageService,
+    private http: HttpClient
+  ) {}
+  arr = [];
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      search: [null]
+      search: [null],
     });
-    this.getEquipment()
+    this.getEquipment();
     // console.log(JSON.parse(sessionStorage.getItem('userdata')))
   }
 
   //获取装备列表
-  equipmentList: any
+  equipmentList: any;
 
   getEquipment() {
-    this.http.get('/api/services/app/FireEquipment/GetAll', {
-      params: {
-        Name: this.validateForm.value.search ? this.validateForm.value.search : '',
-        organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
-        SkipCount: String(this.SkipCount),
-        MaxResultCount: String(this.MaxResultCount)
-      }
-    }).subscribe((data: any) => {
-      console.log('装备列表', data)
-      this.equipmentList = data.result.items
-      this.equipmentNum = data.result.totalCount
-    })
+    this.http
+      .get("/api/services/app/FireEquipment/GetAll", {
+        params: {
+          Name: this.validateForm.value.search
+            ? this.validateForm.value.search
+            : "",
+          organizationUnitId: JSON.parse(sessionStorage.getItem("userdata"))
+            .organization.id,
+          SkipCount: String(this.SkipCount),
+          MaxResultCount: String(this.MaxResultCount),
+        },
+      })
+      .subscribe((data: any) => {
+        console.log("装备列表", data);
+        this.equipmentList = data.result.items;
+        this.equipmentNum = data.result.totalCount;
+      });
   }
-  SkipCount: number = 0  //0 16 32 48
-  MaxResultCount: number = 16
-  equipmentNum: string
+  SkipCount: number = 0; //0 16 32 48
+  MaxResultCount: number = 16;
+  equipmentNum: string;
   pageChange($event) {
-    this.SkipCount = ($event - 1) * this.MaxResultCount
-    this.getEquipment()
+    this.SkipCount = ($event - 1) * this.MaxResultCount;
+    this.getEquipment();
   }
 
-
   submitForm() {
-    this.getEquipment()
+    this.getEquipment();
   }
   add() {
     const modal = this.modal.create({
@@ -59,109 +70,128 @@ export class EquipmentInfoComponent implements OnInit {
       nzViewContainerRef: this.viewContainerRef,
       nzWidth: 380,
       nzBodyStyle: {
-        'border': '1px solid #91CCFF',
-        'border-radius': '0px',
-        'padding': '7px',
-        'box-shadow': '0 0 8px 0 #fff',
-        'background-image': 'linear-gradient(#003665, #000f25)'
+        border: "1px solid #91CCFF",
+        "border-radius": "0px",
+        padding: "7px",
+        "box-shadow": "0 0 8px 0 #fff",
+        "background-image": "linear-gradient(#003665, #000f25)",
       },
       nzComponentParams: {},
       nzFooter: null,
       nzClosable: false,
+      nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise(resolve => {
+          await new Promise((resolve) => {
             let body = {
               name: instance.validateForm.value.name,
               storageLocation: instance.validateForm.value.storageLocation,
-              productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
-              maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
-              validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
-              organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id
-            }
-            this.http.post('/api/services/app/FireEquipment/Create', body).subscribe(data => {
-              resolve(data)
-              this.message.create('success', '创建成功！');
-              return true
-            })
-          })
+              productionDate: moment(
+                instance.validateForm.value.productionDate
+              ).format("yyyy-MM-DD"),
+              maintenanceDate: moment(
+                instance.validateForm.value.maintenanceDate
+              ).format("yyyy-MM-DD"),
+              validityEndTime: moment(
+                instance.validateForm.value.validityEndTime
+              ).format("yyyy-MM-DD"),
+              organizationUnitId: JSON.parse(sessionStorage.getItem("userdata"))
+                .organization.id,
+            };
+            this.http
+              .post("/api/services/app/FireEquipment/Create", body)
+              .subscribe((data) => {
+                resolve(data);
+                this.message.create("success", "创建成功！");
+                return true;
+              });
+          });
         } else {
-          this.message.create('warning', '请填写完整！');
-          return false
+          this.message.create("warning", "请填写完整！");
+          return false;
         }
       },
     });
-    modal.afterClose.subscribe(result => this.getEquipment());
+    modal.afterClose.subscribe((result) => this.getEquipment());
     const instance = modal.getContentComponent();
   }
   edit(item) {
-    console.log('xxxxx', item)
+    console.log("xxxxx", item);
     const modal = this.modal.create({
       nzContent: EditequipmentComponent,
       nzViewContainerRef: this.viewContainerRef,
       nzWidth: 380,
       nzBodyStyle: {
-        'border': '1px solid #91CCFF',
-        'border-radius': '0px',
-        'padding': '7px',
-        'box-shadow': '0 0 8px 0 #fff',
-        'background-image': 'linear-gradient(#003665, #000f25)'
+        border: "1px solid #91CCFF",
+        "border-radius": "0px",
+        padding: "7px",
+        "box-shadow": "0 0 8px 0 #fff",
+        "background-image": "linear-gradient(#003665, #000f25)",
       },
       nzComponentParams: {
-        data: item
+        data: item,
       },
       nzFooter: null,
       nzClosable: false,
+      nzMaskClosable: false,
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise(resolve => {
+          await new Promise((resolve) => {
             let body = {
               id: item.id,
               name: instance.validateForm.value.name,
               storageLocation: instance.validateForm.value.storageLocation,
-              productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
-              maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
-              validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
-              organizationUnitId: item.organizationUnitId
-            }
-            this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => {
-              resolve(data)
-              this.message.create('success', '修改成功！');
-              return true
-            })
-          })
+              productionDate: moment(
+                instance.validateForm.value.productionDate
+              ).format("yyyy-MM-DD"),
+              maintenanceDate: moment(
+                instance.validateForm.value.maintenanceDate
+              ).format("yyyy-MM-DD"),
+              validityEndTime: moment(
+                instance.validateForm.value.validityEndTime
+              ).format("yyyy-MM-DD"),
+              organizationUnitId: item.organizationUnitId,
+            };
+            this.http
+              .put("/api/services/app/FireEquipment/Update", body)
+              .subscribe((data) => {
+                resolve(data);
+                this.message.create("success", "修改成功！");
+                return true;
+              });
+          });
         } else {
-          this.message.create('warning', '请填写完整！');
-          return false
+          this.message.create("warning", "请填写完整！");
+          return false;
         }
-      }
+      },
     });
     const instance = modal.getContentComponent();
-    modal.afterClose.subscribe(result => this.getEquipment());
+    modal.afterClose.subscribe((result) => this.getEquipment());
   }
   delete(item) {
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个器材吗?`,
-      nzOkText: '确定',
-      nzOkType: 'primary',
+      nzOkText: "确定",
+      nzOkType: "primary",
       nzOnOk: () => {
-        this.http.delete('/api/services/app/FireEquipment/Delete', {
-          params: {
-            Id: item.id
-          }
-        }).subscribe(data => {
-          this.message.create('success', '删除成功！');
-          this.getEquipment()
-        })
+        this.http
+          .delete("/api/services/app/FireEquipment/Delete", {
+            params: {
+              Id: item.id,
+            },
+          })
+          .subscribe((data) => {
+            this.message.create("success", "删除成功！");
+            this.getEquipment();
+          });
       },
-      nzCancelText: '取消',
-      nzOnCancel: () => {
-
-      }
+      nzCancelText: "取消",
+      nzOnCancel: () => {},
     });
   }
 
   goback() {
-    this.router.navigate(['/todaywarning/petrolStation'])
+    this.router.navigate(["/todaywarning/petrolStation"]);
   }
 }