[完善]预案显示审核状态不显示维护状态

proxy.config.json

@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://10.81.73.39:8000/",
+    "target": "http://121.36.37.70:8201/",
     "生产": "http://10.81.73.39:8000/",
     "测试": "http://121.36.37.70:8201/",
     "生产2": "http://183.194.244.232:8088/",

src/app/interface.ts

@@ -7,20 +7,20 @@
  * @LastEditTime: 2021-04-09 17:12:59
  */
 export interface Data {
-    token:string,
-    refreshToken:string,
-    expires: number,
-    realName:string,
-    level:any,
-    isDefaultPassword:string
+  token: string;
+  refreshToken: string;
+  expires: number;
+  realName: string;
+  level: any;
+  isDefaultPassword: string;
 }
 
 export interface windows {
-    token:string
+  token: string;
 }
 export enum isno {
   "是",
-    "否"
+  "否",
 }
 
 export enum PlanTypeEnum {
@@ -40,7 +40,7 @@ export enum PlanTypeEnum {
   "shisan",
   "shisi",
   "shiwu",
-    "文本预案"
+  "文本预案",
 }
 
 export enum AuditStatusEnum {
@@ -88,6 +88,15 @@ export enum PlanLevelEnum {
   "编制级别5",
   "编制级别6",
   "编制级别7",
-    "中队"
+  "中队",
 }
 
+export enum PlanAuditStatusEnum {
+  "非审核状态" = 0,
+  "未提交审核" = 8,
+  "待审核" = 1,
+  "初审通过" = 16,
+  "初审退回" = 32,
+  "终审通过" = 2,
+  "终审退回" = 4,
+}

src/app/pipes/boolean.pipe.ts

@@ -1,83 +1,95 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { isno, PlanTypeEnum, AuditStatusEnum, PlanLevelEnum } from '../interface'
-@Pipe({ name: 'isno' })
+import { Pipe, PipeTransform } from "@angular/core";
+import {
+  isno,
+  PlanTypeEnum,
+  AuditStatusEnum,
+  PlanLevelEnum,
+  PlanAuditStatusEnum,
+} from "../interface";
+@Pipe({ name: "isno" })
 export class IsnoPipe implements PipeTransform {
   transform(value: boolean): string {
     if (value) {
-            var x = 0
+      var x = 0;
     } else {
-            x = 1
+      x = 1;
     }
-        return isno[x]
+    return isno[x];
   }
 }
-@Pipe({ name: 'plantype' })
+@Pipe({ name: "plantype" })
 export class PlanType implements PipeTransform {
   transform(value: number): string {
-        return PlanTypeEnum[value]
+    return PlanTypeEnum[value];
   }
 }
 
-@Pipe({ name: 'auditsatus' })
+@Pipe({ name: "auditsatus" })
 export class AuditSatus implements PipeTransform {
   transform(value: number): string {
-        return AuditStatusEnum[value]
+    return AuditStatusEnum[value];
   }
 }
-@Pipe({ name: 'planlevel' })
+@Pipe({ name: "planlevel" })
 export class PlanLevel implements PipeTransform {
   transform(value: number): string {
-        return PlanLevelEnum[value]
+    return PlanLevelEnum[value];
   }
 }
 
-@Pipe({ name: 'state' })
+@Pipe({ name: "state" })
 export class state implements PipeTransform {
   transform(value: number): string {
     if (value == 3) {
-            return '维护中'
+      return "维护中";
     } else if (value == 4) {
-            return '维护通过审核'
+      return "维护通过审核";
     } else if (value == 5) {
-            return '维护驳回审核'
+      return "维护驳回审核";
     } else {
-            return '未维护'
+      return "未维护";
     }
   }
 }
 
-@Pipe({ name: 'differentContentTitle' })
+@Pipe({ name: "auditState" })
+export class auditState implements PipeTransform {
+  transform(value: number): string {
+    return PlanAuditStatusEnum[value];
+  }
+}
+
+@Pipe({ name: "differentContentTitle" })
 export class differentContentTitle implements PipeTransform {
   transform(value: string): string {
-        if (typeof (value) == 'boolean' && value) {
-            return '是'
-        } else if (typeof (value) == 'boolean' && !value) {
-            return '否'
+    if (typeof value == "boolean" && value) {
+      return "是";
+    } else if (typeof value == "boolean" && !value) {
+      return "否";
     } else if (JSON.stringify(value) == "{}") {
-            return '空'
+      return "空";
     } else if (!value) {
-            return '空'
+      return "空";
     } else {
-            return value
+      return value;
     }
-
   }
 }
-@Pipe({ name: 'yuan' })
+@Pipe({ name: "yuan" })
 export class yuan implements PipeTransform {
   transform(value: string): string {
-        if (value == 'LevelOne') {
-            return '一级预案'
-        } else if (value == 'LevelTwo') {
-            return '二级预案'
-        } else if (value == 'LevelThree') {
-            return '三级预案'
-        }else if (value == 'LevelFour') {
-            return '四级预案'
-        }else if (value == 'LevelFive') {
-            return '五级预案'
-        }else if (value == 'PlanText') {
-            return '文本预案'
+    if (value == "LevelOne") {
+      return "一级预案";
+    } else if (value == "LevelTwo") {
+      return "二级预案";
+    } else if (value == "LevelThree") {
+      return "三级预案";
+    } else if (value == "LevelFour") {
+      return "四级预案";
+    } else if (value == "LevelFive") {
+      return "五级预案";
+    } else if (value == "PlanText") {
+      return "文本预案";
     }
   }
 }

src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@@ -88,15 +88,9 @@
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="auditstate">
-                    <th mat-header-cell *matHeaderCellDef>新增审核</th>
+                    <th mat-header-cell *matHeaderCellDef>审核状态</th>
                     <td mat-cell *matCellDef="let element">
-                        {{element.newVerifyState==null?'':element.newVerifyState}}
-                    </td>
-                </ng-container>
-                <ng-container matColumnDef="weihustate">
-                    <th mat-header-cell *matHeaderCellDef>维护审核</th>
-                    <td mat-cell *matCellDef="let element">
-                        {{element.maintenanceVerifyState==null?'':element.maintenanceVerifyState}}
+                        {{element.auditStatus | auditState}}
                     </td>
                 </ng-container>
                 <ng-container matColumnDef="isopen">

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -79,7 +79,6 @@ export class EntryPlanLookComponent implements OnInit {
     "planCategory",
     "plantype",
     "auditstate",
-    "weihustate",
     "isopen",
     "preparethelevel",
     "operation",
@@ -105,7 +104,7 @@ export class EntryPlanLookComponent implements OnInit {
       CompanyName: CompanyName || "",
     };
     this.http.get("/api/Plans", { params: header }).subscribe((data: any) => {
-      console.log('data.items',data.items)
+      console.log("data.items", data.items);
       data.items.forEach((element) => {
         if (element.companyId === this.route.snapshot.queryParams.unitId) {
           this.compantData = element.company;
@@ -1903,7 +1902,7 @@ export class AuditResult {
   auditResult: any = this.data.element.auditStatus;
   auditOpinion: any = this.data.element.auditOpinion;
   ngOnInit(): void {
-    console.log( this.data.element)
+    console.log(this.data.element);
   }
   onNoClick(): void {
     this.dialogRef.close();

src/app/plan-management/meet-plan/meet-plan.component.html

@@ -169,9 +169,11 @@
           <td mat-cell *matCellDef="let element">
             {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
         </ng-container>
-        <ng-container matColumnDef="weihustate">
-          <th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
-          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef style="width: 8%;">审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.auditStatus | auditState}}
+          </td>
         </ng-container>
         <ng-container matColumnDef="operation">
           <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>

src/app/plan-management/meet-plan/meet-plan.component.ts

@@ -84,7 +84,7 @@ export class MeetPlanComponent implements OnInit {
   preparelevels: any
   plcheck: boolean //编制级别勾选框
   IsNewData = '' //维护更新活新增
-  displayedColumns: string[] = ['state', 'unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel', 'passstate', 'weihustate', 'operation'];
+  displayedColumns: string[] = ['state', 'unitname', 'level', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel', 'passstate', 'auditstate', 'operation'];
   tabledataSource
   typePlan//新预案类型
   unitname//预案名称

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html

@@ -144,12 +144,8 @@
           <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
         </ng-container>
         <ng-container matColumnDef="passstate">
-          <th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th>
-          <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
-        </ng-container>
-        <ng-container matColumnDef="weihustate">
-          <th mat-header-cell *matHeaderCellDef style="width: 8%;">维护审核</th>
-          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+          <th mat-header-cell *matHeaderCellDef style="width: 8%;">审核状态</th>
+          <td mat-cell *matCellDef="let element"> {{element.auditStatus | auditState}}</td>
         </ng-container>
         <ng-container matColumnDef="isopen">
           <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>

src/app/plan-management/open-plan/open-plan.component.html

@@ -122,15 +122,14 @@
               margin: 3px 0 0 3px;" src="../../../assets/images/custom.png" alt="">
           </td>
         </ng-container>
-        <ng-container matColumnDef="auditStatus">
-          <th mat-header-cell *matHeaderCellDef>新增审核</th>
-          <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
-        </ng-container>
-        <ng-container matColumnDef="weihuStatus">
-          <th mat-header-cell *matHeaderCellDef>维护审核</th>
-          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
-        </ng-container>
 
+
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef>审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.auditStatus | auditState}}
+          </td>
+        </ng-container>
         <ng-container matColumnDef="openRange">
           <th mat-header-cell *matHeaderCellDef>是否公开</th>
           <td mat-cell *matCellDef="let element">{{element.openRange}}</td>

src/app/plan-management/open-plan/open-plan.component.ts

@@ -1,38 +1,63 @@
-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
-import { HttpClient } from '@angular/common/http'
-import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
-import { MatPaginator } from '@angular/material/paginator';
-import { FlatTreeControl } from '@angular/cdk/tree';
-import { FormControl } from '@angular/forms';
-import { Router, ActivatedRoute } from '@angular/router'
-import { PageEvent } from '@angular/material/paginator';
-import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
-import { TreeService } from '../../http-interceptors/tree.service'
-import { Viewer } from 'photo-sphere-viewer';
-import { ImgDetails, PsViewer } from '../entry-plan-look/entry-plan-look.component';
-declare var CryptoJS
+import { Component, OnInit, ViewChild, Inject } from "@angular/core";
+import { HttpClient } from "@angular/common/http";
+import {
+  MatTreeFlatDataSource,
+  MatTreeFlattener,
+} from "@angular/material/tree";
+import { MatPaginator } from "@angular/material/paginator";
+import { FlatTreeControl } from "@angular/cdk/tree";
+import { FormControl } from "@angular/forms";
+import { Router, ActivatedRoute } from "@angular/router";
+import { PageEvent } from "@angular/material/paginator";
+import {
+  MatDialogRef,
+  MatDialog,
+  MAT_DIALOG_DATA,
+} from "@angular/material/dialog";
+import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar";
+import { TreeService } from "../../http-interceptors/tree.service";
+import { Viewer } from "photo-sphere-viewer";
+import {
+  ImgDetails,
+  PsViewer,
+} from "../entry-plan-look/entry-plan-look.component";
+declare var CryptoJS;
 @Component({
-  selector: 'app-open-plan',
-  templateUrl: './open-plan.component.html',
-  styleUrls: ['./open-plan.component.scss']
+  selector: "app-open-plan",
+  templateUrl: "./open-plan.component.html",
+  styleUrls: ["./open-plan.component.scss"],
 })
 export class OpenPlanComponent implements OnInit {
+  constructor(
+    private http: HttpClient,
+    private router: Router,
+    private route: ActivatedRoute,
+    private tree: TreeService,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar
+  ) {}
 
-  constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { }
-
-  private _transformer = (node, level: number) => {   //初始化tree
+  private _transformer = (node, level: number) => {
+    //初始化tree
     return {
       expandable: !!node.children && node.children.length > 0,
       name: node.name,
       level: level,
       id: node.id,
       parentId: node.parentId,
-      children: node.children
+      children: node.children,
     };
-  }
-  treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
-  treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
+  };
+  treeControl = new FlatTreeControl<any>(
+    (node) => node.level,
+    (node) => node.expandable
+  );
+  treeFlattener = new MatTreeFlattener(
+    this._transformer,
+    (node) => node.level,
+    (node) => node.expandable,
+    (node) => node.children
+  );
   dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
   myControl = new FormControl();
   hasChild = (_: number, node: any) => node.expandable;
@@ -42,306 +67,342 @@ export class OpenPlanComponent implements OnInit {
   paginator: MatPaginator;
   length: any; //共多少条数据
   pageSize: any; //每页条数
-  pageSizeOptions: number[] = [10] //设置每页条数
+  pageSizeOptions: number[] = [10]; //设置每页条数
   PageNumber: any; //第几页
-  IsNewData = '' //维护更新活新增
+  IsNewData = ""; //维护更新活新增
 
-  displayedColumns: string[] = ['state', 'unitname', 'planname', 'addpeople', 'addtime', 'plantype', 'auditStatus', 'weihuStatus', 'openRange', 'projectlevel', 'operation'];
+  displayedColumns: string[] = [
+    "state",
+    "unitname",
+    "planname",
+    "addpeople",
+    "addtime",
+    "plantype",
+    "auditstate",
+    "openRange",
+    "projectlevel",
+    "operation",
+  ];
 
-  allorganizations: any //所有组织机构
-  allunittype: any //所有单位类型
-  tabledataSource: any //表格数据
-  preparelevels: any //编制级别
+  allorganizations: any; //所有组织机构
+  allunittype: any; //所有单位类型
+  tabledataSource: any; //表格数据
+  preparelevels: any; //编制级别
   ngOnInit(): void {
     if (window.matchMedia("(max-width: 1400px)").matches) {
-      this.pcMore = false
-      this.padMore = true
-      this.pcfind = false
-      this.padjt = true
+      this.pcMore = false;
+      this.padMore = true;
+      this.pcfind = false;
+      this.padjt = true;
     } else {
-      this.pcfind = true
-      this.pcMore = true
-      this.padMore = false
-      this.padjt = false
+      this.pcfind = true;
+      this.pcMore = true;
+      this.padMore = false;
+      this.padjt = false;
     }
     this.getunitdata();
     this.getOrganizations();
     this.getUnittype();
     this.getAllPlanInfo(); //得到所有单位
     let level = sessionStorage.getItem("level");
-    if (level == "0") {//如果是总队
+    if (level == "0") {
+      //如果是总队
       this.preparelevels = [
         { name: "总队", value: "1" },
         { name: "支队", value: "2" },
         { name: "大队", value: "4" },
-        { name: "中队", value: "8" }
-      ]
+        { name: "中队", value: "8" },
+      ];
     }
-    if (level == "1") {//如果是支队
+    if (level == "1") {
+      //如果是支队
       this.preparelevels = [
         { name: "支队", value: "2" },
         { name: "大队", value: "4" },
-        { name: "中队", value: "8" }
-      ]
+        { name: "中队", value: "8" },
+      ];
     }
-    if (level == "2") {//如果是大队
+    if (level == "2") {
+      //如果是大队
       this.preparelevels = [
         { name: "大队", value: "4" },
-        { name: "中队", value: "8" }
-      ]
+        { name: "中队", value: "8" },
+      ];
     }
-    if (level == "3") {//如果是中队
-      this.preparelevels = [
-        { name: "中队", value: "8" }
-      ]
+    if (level == "3") {
+      //如果是中队
+      this.preparelevels = [{ name: "中队", value: "8" }];
     }
   }
 
-  pcMore//pc更多
-  pcput = false//pc收起
-  pcfind//pc查询
-  padjt = false
-  padMore = true//pad收缩控制
-  padput = false//pad收起按钮
-  imgsrcopen = "../../../assets/images/routdown2.png"
-  imgsrcdown = "../../../assets/images/routup2.png"
+  pcMore; //pc更多
+  pcput = false; //pc收起
+  pcfind; //pc查询
+  padjt = false;
+  padMore = true; //pad收缩控制
+  padput = false; //pad收起按钮
+  imgsrcopen = "../../../assets/images/routdown2.png";
+  imgsrcdown = "../../../assets/images/routup2.png";
   pcInfo() {
-    this.pcMore = !this.pcMore
-    this.pcput = !this.pcput
+    this.pcMore = !this.pcMore;
+    this.pcput = !this.pcput;
   }
   padInfo() {
-    this.padMore = !this.padMore
-    this.padput = !this.padput
+    this.padMore = !this.padMore;
+    this.padput = !this.padput;
   }
 
-  allPlanInfo: any //存储所有预案信息
+  allPlanInfo: any; //存储所有预案信息
   //获得所有预案信息
-  IsNewCompanyData = ''
-  templatePlan: boolean = false//模板录入预案checkbox
-  customPlan: boolean = false//自定义预案
+  IsNewCompanyData = "";
+  templatePlan: boolean = false; //模板录入预案checkbox
+  customPlan: boolean = false; //自定义预案
   getAllPlanInfo() {
-    let planmode = []
-    this.templatePlan ? planmode.push(2) : null
-    this.customPlan ? planmode.push(4) : null
+    let planmode = [];
+    this.templatePlan ? planmode.push(2) : null;
+    this.customPlan ? planmode.push(4) : null;
     let paramsdata: any = {
-      CompanyName: this.companyName || '',
-      OrganizationId: '',
-      HasChildrenOrganization: '',
-      BuildingTypeId: this.unittype || '',
-      PlanType: this.reservePlanType || '',
-      AuditStatus: '', //审核状态
-      PlanLevel: this.preparelevel || '',
-      HasChildrenPlanLevel: this.plcheck || '',
-      PageNumber: this.PageNumber || '1',
+      CompanyName: this.companyName || "",
+      OrganizationId: "",
+      HasChildrenOrganization: "",
+      BuildingTypeId: this.unittype || "",
+      PlanType: this.reservePlanType || "",
+      AuditStatus: "", //审核状态
+      PlanLevel: this.preparelevel || "",
+      HasChildrenPlanLevel: this.plcheck || "",
+      PageNumber: this.PageNumber || "1",
       PageSize: this.pageSizeOptions[0],
-      Sort: '',
+      Sort: "",
       IsNewData: this.IsNewData,
       IsNewCompanyData: this.IsNewCompanyData,
-      PlanModes: planmode
-    }
-    this.http.get("/api/PublicPlans", { params: paramsdata }).subscribe((data: any) => {
+      PlanModes: planmode,
+    };
+    this.http
+      .get("/api/PublicPlans", { params: paramsdata })
+      .subscribe((data: any) => {
         // console.log(111,data)
-      this.length = data.totalCount
-      this.allPlanInfo = data
-      this.tabledataSource = data.items
-    })
+        this.length = data.totalCount;
+        this.allPlanInfo = data;
+        this.tabledataSource = data.items;
+      });
   }
   //得到当前单位信息
   getunitdata() {
-    this.http.get("/api/Account/Profiles").subscribe(
-      (data: any) => {
-        this.organizationName = data.organizationName
-      }
-    )
+    this.http.get("/api/Account/Profiles").subscribe((data: any) => {
+      this.organizationName = data.organizationName;
+    });
   }
-  organizationName: any //当前单位组织机构名称
-  treedata: any //组织机构树型数据
-  newArr: any = []
-  newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段
+  organizationName: any; //当前单位组织机构名称
+  treedata: any; //组织机构树型数据
+  newArr: any = [];
+  newallorganizations: any; //用于存储在原始数据基础上的每个机构增加children字段
   //得到当前单位所在组织机构的tree型数据
   getpresentOrganization() {
-    this.newallorganizations = this.allorganizations
-    this.newallorganizations.forEach(item => {
-      item.children = []
-      this.newallorganizations.forEach(element => {
+    this.newallorganizations = this.allorganizations;
+    this.newallorganizations.forEach((item) => {
+      item.children = [];
+      this.newallorganizations.forEach((element) => {
         if (element.parentId == item.id) {
-          item.children.push(element)
+          item.children.push(element);
         }
       });
     });
     // console.log(666,this.organizationName)
     if (this.organizationName) {
-      this.newallorganizations.forEach(item => {
+      this.newallorganizations.forEach((item) => {
         if (item.name == this.organizationName) {
-          this.dataSource.data = [item]
+          this.dataSource.data = [item];
         }
       });
     } else {
       this.dataSource.data = this.tree.toTree(this.treedata);
     }
-
   }
   //获得所有组织机构
   getOrganizations() {
-    this.http.get('/api/Organizations').subscribe(
-      (data: any) => {
-        this.allorganizations = data
+    this.http.get("/api/Organizations").subscribe((data: any) => {
+      this.allorganizations = data;
       this.treedata = this.tree.toTree(data);
       this.getpresentOrganization();
-      }
-    )
+    });
   }
 
   //获得所有单位类型
   getUnittype() {
-    this.http.get('/api/BuildingTypes/Simple').subscribe(
-      data => {
-        this.allunittype = data
-      }
-    )
+    this.http.get("/api/BuildingTypes/Simple").subscribe((data) => {
+      this.allunittype = data;
+    });
   }
   //跳转查看预案页面 公开预案
   routerTo(e) {
-    console.log(e)
+    console.log(e);
     if (e.planType == 16 || e.planType == 4 || e.planType == 8) {
       if (e.planType == 16 && e.attachmentUrls == null) {
-        window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${e.companyId}&planName=${e.name}&unitName=${e.company.name}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${e.company.buildingTypes[0].id}&orName=${e.company.organizationName}&orId=${e.company.organizationId}&pattern=false`)
+        window.open(
+          `/planManagement/createplanonlinefive?navIsOpen=false&companyId=${e.companyId}&planName=${e.name}&unitName=${e.company.name}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${e.company.buildingTypes[0].id}&orName=${e.company.organizationName}&orId=${e.company.organizationId}&pattern=false`
+        );
       } else {
-        var index = e.attachmentUrls[0].indexOf("\/")
-        if (e.attachmentUrls[0].substr(0, index) == 'psw') {
+        var index = e.attachmentUrls[0].indexOf("/");
+        if (e.attachmentUrls[0].substr(0, index) == "psw") {
           const dialogRef = this.dialog.open(PsViewer, {
-            width: '1500px',
-            height: '800px',
-            data: e.attachmentUrls[0]
+            width: "1500px",
+            height: "800px",
+            data: e.attachmentUrls[0],
           });
-        } else if (e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'JPG' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'png' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'jpeg' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'jpg') {
-          let data = e
-          const dialogRef = this.dialog.open(ImgDetails, {//调用open方法打开对话框并且携带参数过去
+        } else if (
+          e.attachmentUrls[0].substr(
+            e.attachmentUrls[0].length - 3,
+            e.attachmentUrls[0].length
+          ) == "JPG" ||
+          e.attachmentUrls[0].substr(
+            e.attachmentUrls[0].length - 3,
+            e.attachmentUrls[0].length
+          ) == "png" ||
+          e.attachmentUrls[0].substr(
+            e.attachmentUrls[0].length - 3,
+            e.attachmentUrls[0].length
+          ) == "jpeg" ||
+          e.attachmentUrls[0].substr(
+            e.attachmentUrls[0].length - 3,
+            e.attachmentUrls[0].length
+          ) == "jpg"
+        ) {
+          let data = e;
+          const dialogRef = this.dialog.open(ImgDetails, {
+            //调用open方法打开对话框并且携带参数过去
             data: data.attachmentUrls,
           });
           dialogRef.afterClosed().subscribe();
         } else {
-          let fetchUrl = e.attachmentUrls[0]
+          let fetchUrl = e.attachmentUrls[0];
           if (fetchUrl) {
-            let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
-            if (suffix == 'docx' || suffix == 'doc') {
-              let arr = fetchUrl.split('.')
-              arr[arr.length - 1] = 'pdf'
-              window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
-            } else if (suffix == 'pdf') {
-              window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
+            let suffix = fetchUrl
+              .split(".")
+              [fetchUrl.split(".").length - 1].toLowerCase();
+            if (suffix == "docx" || suffix == "doc") {
+              let arr = fetchUrl.split(".");
+              arr[arr.length - 1] = "pdf";
+              window.open(`/api/Objects/PlanPlatform/` + arr.join("."));
+            } else if (suffix == "pdf") {
+              window.open(`/api/Objects/PlanPlatform/` + fetchUrl);
             } else {
               let config = new MatSnackBarConfig();
-              config.verticalPosition = 'top';
-              config.duration = 3000
-              this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
+              config.verticalPosition = "top";
+              config.duration = 3000;
+              this.snackBar.open("该文件类型暂不支持在线查看", "确定", config);
             }
           }
         }
       }
     }
 
-    if (e.planMode == 2 && e.planType == 1) {  //如果是在线编辑
-      let id = e.id
-      sessionStorage.setItem("planId", id)
-      sessionStorage.setItem("companyId", e.companyId)
+    if (e.planMode == 2 && e.planType == 1) {
+      //如果是在线编辑
+      let id = e.id;
+      sessionStorage.setItem("planId", id);
+      sessionStorage.setItem("companyId", e.companyId);
       //sessionStorage.setItem("buildingTypeId",this.unittypeId)
-      sessionStorage.setItem("editable", "0")
-      sessionStorage.setItem("planName", e.name)
-      let companyId = sessionStorage.getItem("companyId")
+      sessionStorage.setItem("editable", "0");
+      sessionStorage.setItem("planName", e.name);
+      let companyId = sessionStorage.getItem("companyId");
       window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`);
     }
-    if (e.planMode == 3) {  //如果是跳转网页
-      sessionStorage.setItem("url", e.url)
-      window.open(`/planManagement/webLook`)
+    if (e.planMode == 3) {
+      //如果是跳转网页
+      sessionStorage.setItem("url", e.url);
+      window.open(`/planManagement/webLook`);
     }
   }
 
-
   templatePlanChange($event, type) {
     if (type == 1) {
-      this.templatePlan = $event
+      this.templatePlan = $event;
     } else if (type == 2) {
-      this.customPlan = $event
+      this.customPlan = $event;
     }
     if (this.templatePlan || this.customPlan) {
-      this.reservePlanType = ['16']
+      this.reservePlanType = ["16"];
     } else {
-      this.reservePlanType = []
+      this.reservePlanType = [];
     }
   }
   //分页事件
   chagePage(e) {
-    this.PageNumber = e.pageIndex + 1
+    this.PageNumber = e.pageIndex + 1;
     this.getAllPlanInfo();
   }
   //辖区中队div是否显示
-  isorganizationbox: boolean = false
+  isorganizationbox: boolean = false;
   //点击辖区中队树，将选择的辖区中队添加到变量
   add(node) {
-    this.isorganizationbox = false
-    this.js = node.name
-    this.jsId = node.id
+    this.isorganizationbox = false;
+    this.js = node.name;
+    this.jsId = node.id;
   }
   //关闭辖区中队隐藏框
   closeorganizationbox() {
-    this.isorganizationbox = false
+    this.isorganizationbox = false;
   }
   //打开辖区中队隐藏框
   openorganizationbox() {
-    this.isorganizationbox = true
+    this.isorganizationbox = true;
   }
   //关闭出现的组织机构div
   closediv() {
-    this.isorganizationbox = false
+    this.isorganizationbox = false;
   }
   //查询
   onSubmit(e) {
-    this.getAllPlanInfo()
+    this.getAllPlanInfo();
   }
-  companyName: any //单位名称
-  js: any //所选组织机构
-  jsId: any //所选组织机构的id
+  companyName: any; //单位名称
+  js: any; //所选组织机构
+  jsId: any; //所选组织机构的id
   // jscheck:boolean //所选组织机构勾选框
-  unittype: any //单位类型
-  reservePlanType: any //预案类型
-  preparelevel: any //编制级别
-  plcheck: boolean //编制级别勾选框
+  unittype: any; //单位类型
+  reservePlanType: any; //预案类型
+  preparelevel: any; //编制级别
+  plcheck: boolean; //编制级别勾选框
   //重置
   reset() {
-    this.companyName = ''
+    this.companyName = "";
     // this.js = ''
     // this.jsId = ''
     // this.jscheck = false
-    this.unittype = ''
-    this.reservePlanType = ''
-    this.preparelevel = ''
-    this.plcheck = false
+    this.unittype = "";
+    this.reservePlanType = "";
+    this.preparelevel = "";
+    this.plcheck = false;
     //重新获取初始化列表
-    this.pageEvent.pageIndex = 0
-    this.PageNumber = 1
-    this.templatePlan = false
-    this.customPlan = false
+    this.pageEvent.pageIndex = 0;
+    this.PageNumber = 1;
+    this.templatePlan = false;
+    this.customPlan = false;
     this.getAllPlanInfo();
-    this.IsNewCompanyData = ''
-    this.IsNewData = ''
-
+    this.IsNewCompanyData = "";
+    this.IsNewData = "";
   }
 }
 
 @Component({
-  selector: 'PsViewer',
-  templateUrl: './PsvShow.html',
-  styleUrls: ['./open-plan.component.scss']
+  selector: "PsViewer",
+  templateUrl: "./PsvShow.html",
+  styleUrls: ["./open-plan.component.scss"],
 })
 export class GkhtmlPsViewer {
-  constructor(private router: Router, private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef<GkhtmlPsViewer>, @Inject(MAT_DIALOG_DATA) public data: any) { }
+  constructor(
+    private router: Router,
+    private http: HttpClient,
+    public dialog: MatDialog,
+    public snackBar: MatSnackBar,
+    public dialogRef: MatDialogRef<GkhtmlPsViewer>,
+    @Inject(MAT_DIALOG_DATA) public data: any
+  ) {}
   ngOnInit(): void {
     // console.log(this.data)
     const viewer = new Viewer({
-      container: document.querySelector('#viewer'),
-      panorama: '/api/Objects/PlanPlatform/' + this.data,
-
+      container: document.querySelector("#viewer"),
+      panorama: "/api/Objects/PlanPlatform/" + this.data,
     });
   }
 }

src/app/plan-management/pass-plan/pass-plan.component.html

@@ -187,15 +187,13 @@
               margin: 3px 0 0 3px;" src="../../../assets/images/custom.png" alt="">
           </td>
         </ng-container>
-        <ng-container matColumnDef="auditStatus">
-          <th mat-header-cell *matHeaderCellDef>新增审核</th>
-          <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
-        </ng-container>
-        <ng-container matColumnDef="weihuState">
-          <th mat-header-cell *matHeaderCellDef>维护审核</th>
-          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
-        </ng-container>
 
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef>审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.auditStatus | auditState}}
+          </td>
+        </ng-container>
         <ng-container matColumnDef="openRange">
           <th mat-header-cell *matHeaderCellDef>是否公开</th>
           <td mat-cell *matCellDef="let element">{{element.openRange}}</td>

src/app/plan-management/pass-plan/pass-plan.component.ts

@@ -78,8 +78,7 @@ export class PassPlanComponent implements OnInit {
     "level",
     "addtime",
     "plantype",
-    "auditStatus",
-    "weihuState",
+    "auditstate",
     "openRange",
     "projectlevel",
     "operation",

src/app/plan-management/plan-management.module.ts

@@ -55,7 +55,13 @@ import {
   ChangeName,
   ImgDetails,
 } from "./entry-plan-look/entry-plan-look.component";
-import { PlanType, AuditSatus, PlanLevel, state } from "../pipes/boolean.pipe";
+import {
+  PlanType,
+  AuditSatus,
+  PlanLevel,
+  state,
+  auditState,
+} from "../pipes/boolean.pipe";
 import { WebLookComponent } from "./web-look/web-look.component";
 import { OnetwoEntryPlanComponent } from "./onetwo-entry-plan/onetwo-entry-plan.component";
 import { newunitComponent } from "./onetwo-entry-plan/onetwo-entry-plan.component";
@@ -150,6 +156,7 @@ import { NzTreeModule } from "ng-zorro-antd/tree";
     PlanDeductionComponent,
     AddPlanComponent,
     OpenOrComponent,
+    auditState,
   ],
   imports: [
     CommonModule,
@@ -215,6 +222,7 @@ import { NzTreeModule } from "ng-zorro-antd/tree";
     PlanLevel,
     state,
     CreatePlanOnlineFiveComponent,
+    auditState,
   ],
 })
 export class PlanManagementModule {}

src/app/plan-management/reinforce-plan/reinforce-plan.component.html

@@ -13,11 +13,14 @@
         <div class="queryField ordiv">
           <label style="margin-right: 10px;">消防救援站:</label>
           <mat-form-field class="example-full-width">
-            <input readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
+            <input readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"
+              (focus)="openorganizationbox()">
           </mat-form-field>
           <mat-checkbox style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
-          <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
-          <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
+          <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img
+              [src]='imgsrcopen'> </span>
+          <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'>
+          </span>
           <div class="organizationbox" *ngIf="isorganizationbox">
             <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
             <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@@ -25,12 +28,9 @@
                 <button type="button" mat-icon-button disabled></button>
                 <li>{{node.name}}</li>
               </mat-tree-node>
-                  <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding  (click)='add(node)'  class="organizationlist">
-                      <button 
-                          type="button" 
-                          mat-icon-button 
-                          matTreeNodeToggle
-                          [attr.aria-label]="'toggle ' + node.name">
+              <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)'
+                class="organizationlist">
+                <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
                   <mat-icon class="mat-icon-rtl-mirror">
                     {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
                   </mat-icon>
@@ -132,7 +132,8 @@
         <ng-container matColumnDef="level">
           <th mat-header-cell *matHeaderCellDef>预案级别</th>
           <td mat-cell *matCellDef="let element">{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案':
-                element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}</td>
+            element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}
+          </td>
         </ng-container>
         <ng-container matColumnDef="addtime">
           <th mat-header-cell *matHeaderCellDef>添加时间</th>
@@ -142,13 +143,11 @@
           <th mat-header-cell *matHeaderCellDef>预案类型</th>
           <td mat-cell *matCellDef="let element">二维预案</td>
         </ng-container>
-          <ng-container matColumnDef="auditStatus">
-            <th mat-header-cell *matHeaderCellDef>新增审核</th>
-            <td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td>
-          </ng-container>
-          <ng-container matColumnDef="weihuStatus">
-            <th mat-header-cell *matHeaderCellDef>维护审核</th>
-            <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef>审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.auditStatus | auditState}}
+          </td>
         </ng-container>
         <ng-container matColumnDef="openRange">
           <th mat-header-cell *matHeaderCellDef>是否公开</th>
@@ -167,10 +166,7 @@
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
       </table>
-        <mat-paginator 
-            [length]="length"
-            [pageSize]="pageSize"
-            [pageSizeOptions]="pageSizeOptions"
+      <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
         (page)="chagePage($event)">
       </mat-paginator>
 

src/app/plan-management/reinforce-plan/reinforce-plan.component.ts

@@ -74,8 +74,7 @@ export class ReinforcePlanComponent implements OnInit {
     "level",
     "addtime",
     "plantype",
-    "auditStatus",
-    "weihuStatus",
+    "auditstate",
     "openRange",
     "projectlevel",
     "operation",

src/app/plan-management/type-plan/type-plan.component.html

@@ -142,9 +142,12 @@
           <td mat-cell *matCellDef="let element">
             {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}</td>
         </ng-container>
-        <ng-container matColumnDef="weihustate">
-          <th mat-header-cell *matHeaderCellDef style="width: 10%;">维护审核</th>
-          <td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
+
+        <ng-container matColumnDef="auditstate">
+          <th mat-header-cell *matHeaderCellDef style="width: 10%;">审核状态</th>
+          <td mat-cell *matCellDef="let element">
+            {{element.auditStatus | auditState}}
+          </td>
         </ng-container>
         <ng-container matColumnDef="operation">
           <th mat-header-cell *matHeaderCellDef style="width: 20%;">操作</th>

src/app/plan-management/type-plan/type-plan.component.ts

@@ -114,7 +114,7 @@ export class TypePlanComponent implements OnInit {
     "isopen",
     "projectlevel",
     "passstate",
-    "weihustate",
+    "auditstate",
     "operation",
   ];
   tabledataSource;

src/index.html

@@ -24,9 +24,9 @@
     securityJsCode: 'dca2583973d0448116433fd64f97f8f8'
   }
 </script>
-<script
+<!-- <script
   src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=2584e43582b85680d76a515979503538&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
-<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
+<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
 <!-- <script
   src="https://webapi.amap.com/maps?v=2.0&key=2584e43582b85680d76a515979503538&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
 <script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->