Browse Source

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

master
邵佳豪 2 months ago
parent
commit
3799207fad
  1. 2
      proxy.config.json
  2. 149
      src/app/interface.ts
  3. 136
      src/app/pipes/boolean.pipe.ts
  4. 10
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  5. 5
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  6. 8
      src/app/plan-management/meet-plan/meet-plan.component.html
  7. 2
      src/app/plan-management/meet-plan/meet-plan.component.ts
  8. 8
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
  9. 937
      src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
  10. 15
      src/app/plan-management/open-plan/open-plan.component.html
  11. 439
      src/app/plan-management/open-plan/open-plan.component.ts
  12. 14
      src/app/plan-management/pass-plan/pass-plan.component.html
  13. 3
      src/app/plan-management/pass-plan/pass-plan.component.ts
  14. 10
      src/app/plan-management/plan-management.module.ts
  15. 222
      src/app/plan-management/reinforce-plan/reinforce-plan.component.html
  16. 3
      src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
  17. 9
      src/app/plan-management/type-plan/type-plan.component.html
  18. 2
      src/app/plan-management/type-plan/type-plan.component.ts
  19. 4
      src/index.html

2
proxy.config.json

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

149
src/app/interface.ts

@ -1,93 +1,102 @@
/* /*
* @Descripttion: * @Descripttion:
* @version: * @version:
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-12-24 10:59:48 * @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-04-09 17:12:59 * @LastEditTime: 2021-04-09 17:12:59
*/ */
export interface Data { export interface Data {
token:string, token: string;
refreshToken:string, refreshToken: string;
expires: number, expires: number;
realName:string, realName: string;
level:any, level: any;
isDefaultPassword:string isDefaultPassword: string;
} }
export interface windows { export interface windows {
token:string token: string;
} }
export enum isno { export enum isno {
"是", "是",
"否" "否",
} }
export enum PlanTypeEnum { export enum PlanTypeEnum {
"zero", "zero",
"二维预案", "二维预案",
"三维预案", "三维预案",
"three", "three",
"其他预案", "其他预案",
"five", "five",
"six", "six",
"seven", "seven",
"卡片预案", "卡片预案",
"none", "none",
"teen", "teen",
"shiyi", "shiyi",
"shier", "shier",
"shisan", "shisan",
"shisi", "shisi",
"shiwu", "shiwu",
"文本预案" "文本预案",
} }
export enum AuditStatusEnum { export enum AuditStatusEnum {
"zero", "zero",
"审核中", "审核中",
"审核通过", "审核通过",
"two", "two",
"终审退回", "终审退回",
"five", "five",
"six", "six",
"seven", "seven",
"未提交审核", "未提交审核",
"nine", "nine",
"ten", "ten",
"eleven", "eleven",
"twelve", "twelve",
"thieteen", "thieteen",
"fourteen", "fourteen",
"fifteen", "fifteen",
"待终审", "待终审",
"shiqi", "shiqi",
"shiba", "shiba",
"shijiu", "shijiu",
"ershi", "ershi",
"ershiyi", "ershiyi",
"ershier", "ershier",
"ershis", "ershis",
"t1", "t1",
"t2", "t2",
"t3", "t3",
"t4", "t4",
"t5", "t5",
"t6", "t6",
"t7", "t7",
"t8", "t8",
"初审退回", "初审退回",
} }
export enum PlanLevelEnum { export enum PlanLevelEnum {
"编制级别0", "编制级别0",
"总队", "总队",
"支队", "支队",
"编制级别3", "编制级别3",
"大队", "大队",
"编制级别5", "编制级别5",
"编制级别6", "编制级别6",
"编制级别7", "编制级别7",
"中队" "中队",
} }
export enum PlanAuditStatusEnum {
"非审核状态" = 0,
"未提交审核" = 8,
"待审核" = 1,
"初审通过" = 16,
"初审退回" = 32,
"终审通过" = 2,
"终审退回" = 4,
}

136
src/app/pipes/boolean.pipe.ts

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

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

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

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

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

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

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

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

@ -84,7 +84,7 @@ export class MeetPlanComponent implements OnInit {
preparelevels: any preparelevels: any
plcheck: boolean //编制级别勾选框 plcheck: boolean //编制级别勾选框
IsNewData = '' //维护更新活新增 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 tabledataSource
typePlan//新预案类型 typePlan//新预案类型
unitname//预案名称 unitname//预案名称

8
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> <td mat-cell *matCellDef="let element">{{element.disasterType}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="passstate"> <ng-container matColumnDef="passstate">
<th mat-header-cell *matHeaderCellDef style="width: 8%;">新增审核</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">审核状态</th>
<td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td> <td mat-cell *matCellDef="let element"> {{element.auditStatus | auditState}}</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> </ng-container>
<ng-container matColumnDef="isopen"> <ng-container matColumnDef="isopen">
<th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th> <th mat-header-cell *matHeaderCellDef style="width: 8%;">是否公开</th>

937
src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

File diff suppressed because it is too large Load Diff

15
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=""> margin: 3px 0 0 3px;" src="../../../assets/images/custom.png" alt="">
</td> </td>
</ng-container> </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"> <ng-container matColumnDef="openRange">
<th mat-header-cell *matHeaderCellDef>是否公开</th> <th mat-header-cell *matHeaderCellDef>是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>

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

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

14
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=""> margin: 3px 0 0 3px;" src="../../../assets/images/custom.png" alt="">
</td> </td>
</ng-container> </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"> <ng-container matColumnDef="openRange">
<th mat-header-cell *matHeaderCellDef>是否公开</th> <th mat-header-cell *matHeaderCellDef>是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>

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

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

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

@ -55,7 +55,13 @@ import {
ChangeName, ChangeName,
ImgDetails, ImgDetails,
} from "./entry-plan-look/entry-plan-look.component"; } 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 { WebLookComponent } from "./web-look/web-look.component";
import { OnetwoEntryPlanComponent } from "./onetwo-entry-plan/onetwo-entry-plan.component"; import { OnetwoEntryPlanComponent } from "./onetwo-entry-plan/onetwo-entry-plan.component";
import { newunitComponent } 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, PlanDeductionComponent,
AddPlanComponent, AddPlanComponent,
OpenOrComponent, OpenOrComponent,
auditState,
], ],
imports: [ imports: [
CommonModule, CommonModule,
@ -215,6 +222,7 @@ import { NzTreeModule } from "ng-zorro-antd/tree";
PlanLevel, PlanLevel,
state, state,
CreatePlanOnlineFiveComponent, CreatePlanOnlineFiveComponent,
auditState,
], ],
}) })
export class PlanManagementModule {} export class PlanManagementModule {}

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

@ -2,47 +2,47 @@
<div class="header"> <div class="header">
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm"> <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox"> <div class="queryBox">
<div class="queryField"> <div class="queryField">
<label style="margin-right: 10px;">单位名称:</label> <label style="margin-right: 10px;">单位名称:</label>
<mat-form-field class="example-full-width"> <mat-form-field class="example-full-width">
<input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off"> <input matInput placeholder="请输入单位名称" name="companyName" [(ngModel)]="companyName" autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField ordiv"> <div class="queryField ordiv">
<label style="margin-right: 10px;">消防救援站:</label> <label style="margin-right: 10px;">消防救援站:</label>
<mat-form-field class="example-full-width"> <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-form-field>
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox> <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="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span> [src]='imgsrcopen'> </span>
<span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'>
</span>
<div class="organizationbox" *ngIf="isorganizationbox"> <div class="organizationbox" *ngIf="isorganizationbox">
<div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div> <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl"> <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist"> <mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button type="button" mat-icon-button disabled ></button> <button type="button" mat-icon-button disabled></button>
<li>{{node.name}}</li> <li>{{node.name}}</li>
</mat-tree-node> </mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)' class="organizationlist"> <mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)'
<button class="organizationlist">
type="button" <button type="button" mat-icon-button matTreeNodeToggle [attr.aria-label]="'toggle ' + node.name">
mat-icon-button <mat-icon class="mat-icon-rtl-mirror">
matTreeNodeToggle {{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
[attr.aria-label]="'toggle ' + node.name"> </mat-icon>
<mat-icon class="mat-icon-rtl-mirror"> </button>
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}} <li>{{node.name}}</li>
</mat-icon> </mat-tree-node>
</button> </mat-tree>
<li>{{node.name}}</li>
</mat-tree-node>
</mat-tree>
</div> </div>
</div> </div>
<div class="queryField" *ngIf="!pcfind"> <div class="queryField" *ngIf="!pcfind">
<button mat-raised-button color="primary">查询</button> <button mat-raised-button color="primary">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">编制级别:</label> <label style="margin-right: 10px;">编制级别:</label>
@ -58,14 +58,14 @@
<mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox> <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位类型:</label> <label style="margin-right: 10px;">单位类型:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype"> <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
<mat-option *ngFor="let unit of allunittype" [value]="unit.id" > <mat-option *ngFor="let unit of allunittype" [value]="unit.id">
{{unit.name}} {{unit.name}}
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案类型:</label> <label style="margin-right: 10px;">预案类型:</label>
@ -80,100 +80,96 @@
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">单位状态:</label> <label style="margin-right: 10px;">单位状态:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData"> <mat-select placeholder='请选择单位状态' [(ngModel)]="IsNewCompanyData" name="IsNewCompanyData">
<mat-option value='true'>新增</mat-option> <mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option> <mat-option value="false">维护更新</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" *ngIf="!padMore"> <div class="queryField" *ngIf="!padMore">
<label style="margin-right: 10px;">预案状态:</label> <label style="margin-right: 10px;">预案状态:</label>
<mat-form-field> <mat-form-field>
<mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData"> <mat-select placeholder='请选择预案状态' [(ngModel)]="IsNewData" name="IsNewData">
<mat-option value='true'>新增</mat-option> <mat-option value='true'>新增</mat-option>
<mat-option value="false">维护更新</mat-option> <mat-option value="false">维护更新</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind"> <div class="queryField" style="width: 100%;text-align: center;" *ngIf="pcfind">
<button mat-raised-button color="primary" type="submit">查询</button> <button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button> <button mat-raised-button style="margin-left: 25px;" type="button" (click)="reset()">重置</button>
</div>
</div> </div>
</div>
</form> </form>
</div> </div>
<!-- <mat-divider></mat-divider> --> <!-- <mat-divider></mat-divider> -->
<div class="body"> <div class="body">
<div class="tablebox"> <div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8"> <table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="state"> <ng-container matColumnDef="state">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th> <th mat-header-cell *matHeaderCellDef style="width: 10%;">预案状态</th>
<td mat-cell *matCellDef="let element"> <td mat-cell *matCellDef="let element">
<span class="add" *ngIf="element.isNewData">新增</span> <span class="add" *ngIf="element.isNewData">新增</span>
<span class="weihu" *ngIf="!element.isNewData">维护更新</span> <span class="weihu" *ngIf="!element.isNewData">维护更新</span>
</td> </td>
</ng-container>
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef>单位名称</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td>
</ng-container>
<ng-container matColumnDef="planname">
<th mat-header-cell *matHeaderCellDef>预案名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container>
<ng-container matColumnDef="addpeople">
<th mat-header-cell *matHeaderCellDef>添加人</th>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td>
</ng-container>
<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>
</ng-container>
<ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef>添加时间</th>
<td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="unitname"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef>单位名称</th> <th mat-header-cell *matHeaderCellDef>预案类型</th>
<td mat-cell *matCellDef="let element">{{element.companyName}}</td> <td mat-cell *matCellDef="let element">二维预案</td>
</ng-container> </ng-container>
<ng-container matColumnDef="planname"> <ng-container matColumnDef="auditstate">
<th mat-header-cell *matHeaderCellDef>预案名称</th> <th mat-header-cell *matHeaderCellDef>审核状态</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">
</ng-container> {{element.auditStatus | auditState}}
<ng-container matColumnDef="addpeople"> </td>
<th mat-header-cell *matHeaderCellDef>添加人</th> </ng-container>
<td mat-cell *matCellDef="let element">{{element.creatorName}}</td> <ng-container matColumnDef="openRange">
</ng-container> <th mat-header-cell *matHeaderCellDef>是否公开</th>
<ng-container matColumnDef="level"> <td mat-cell *matCellDef="let element">{{element.openRange}}</td>
<th mat-header-cell *matHeaderCellDef>预案级别</th> </ng-container>
<td mat-cell *matCellDef="let element">{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案': <ng-container matColumnDef="projectlevel">
element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}}</td> <th mat-header-cell *matHeaderCellDef>编制级别</th>
</ng-container> <td mat-cell *matCellDef="let element">{{element.planLevel | planlevel}}</td>
<ng-container matColumnDef="addtime"> </ng-container>
<th mat-header-cell *matHeaderCellDef>添加时间</th> <ng-container matColumnDef="operation">
<td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td> <th mat-header-cell *matHeaderCellDef>操作</th>
</ng-container> <td mat-cell *matCellDef="let element">
<ng-container matColumnDef="plantype"> <span style="color: blue;cursor: pointer;" (click)="openPlan(element)">查看预案</span>
<th mat-header-cell *matHeaderCellDef>预案类型</th> </td>
<td mat-cell *matCellDef="let element">二维预案</td> </ng-container>
</ng-container> <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<ng-container matColumnDef="auditStatus"> <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
<th mat-header-cell *matHeaderCellDef>新增审核</th> </table>
<td mat-cell *matCellDef="let element">{{element.newVerifyState}}</td> <mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
</ng-container> (page)="chagePage($event)">
<ng-container matColumnDef="weihuStatus"> </mat-paginator>
<th mat-header-cell *matHeaderCellDef>维护审核</th>
<td mat-cell *matCellDef="let element">{{element.maintenanceVerifyState}}</td>
</ng-container>
<ng-container matColumnDef="openRange">
<th mat-header-cell *matHeaderCellDef>是否公开</th>
<td mat-cell *matCellDef="let element">{{element.openRange}}</td>
</ng-container>
<ng-container matColumnDef="projectlevel">
<th mat-header-cell *matHeaderCellDef>编制级别</th>
<td mat-cell *matCellDef="let element">{{element.planLevel | planlevel}}</td>
</ng-container>
<ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef>操作</th>
<td mat-cell *matCellDef="let element">
<span style="color: blue;cursor: pointer;" (click)="openPlan(element)">查看预案</span>
</td>
</ng-container>
<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"
(page)="chagePage($event)">
</mat-paginator>
</div> </div>
</div> </div>
</div> </div>

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

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

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

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

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

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

4
src/index.html

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

Loading…
Cancel
Save