diff --git a/src/app/plan-management/pass-plan/open-or/open-or.component.html b/src/app/plan-management/pass-plan/open-or/open-or.component.html new file mode 100644 index 0000000..a9157be --- /dev/null +++ b/src/app/plan-management/pass-plan/open-or/open-or.component.html @@ -0,0 +1,10 @@ +

选择要公开的消防救援站

+
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/plan-management/pass-plan/open-or/open-or.component.scss b/src/app/plan-management/pass-plan/open-or/open-or.component.scss new file mode 100644 index 0000000..9f8fddc --- /dev/null +++ b/src/app/plan-management/pass-plan/open-or/open-or.component.scss @@ -0,0 +1,4 @@ +.box{ + max-height: 400px; + overflow-y: auto; +} \ No newline at end of file diff --git a/src/app/plan-management/pass-plan/open-or/open-or.component.spec.ts b/src/app/plan-management/pass-plan/open-or/open-or.component.spec.ts new file mode 100644 index 0000000..80e7a10 --- /dev/null +++ b/src/app/plan-management/pass-plan/open-or/open-or.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OpenOrComponent } from './open-or.component'; + +describe('OpenOrComponent', () => { + let component: OpenOrComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OpenOrComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OpenOrComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-management/pass-plan/open-or/open-or.component.ts b/src/app/plan-management/pass-plan/open-or/open-or.component.ts new file mode 100644 index 0000000..0d0c9e1 --- /dev/null +++ b/src/app/plan-management/pass-plan/open-or/open-or.component.ts @@ -0,0 +1,92 @@ +import { HttpClient } from "@angular/common/http"; +import { Component, OnInit, AfterViewInit, ViewChild } from "@angular/core"; +import { + NzFormatEmitEvent, + NzTreeComponent, + NzTreeNodeOptions, +} from "ng-zorro-antd/tree"; + +@Component({ + selector: "app-open-or", + templateUrl: "./open-or.component.html", + styleUrls: ["./open-or.component.scss"], +}) +export class OpenOrComponent implements OnInit { + constructor(private http: HttpClient) {} + @ViewChild("nzTreeComponent", { static: false }) + nzTreeComponent!: NzTreeComponent; + defaultCheckedKeys = []; + defaultExpandedKeys = []; + isLoading = false; + nodes: NzTreeNodeOptions[] = []; + ngOnInit(): void { + this.getOrganizations(); + } + + //获得所有组织机构 + allorganizations = []; + getOrganizations() { + this.http.get("/api/Organizations").subscribe((data: any) => { + this.allorganizations = data; + this.getpresentOrganization(); + }); + } + //得到当前单位所在组织机构的tree型数据 + organizationName; + getpresentOrganization() { + let orData = JSON.parse(JSON.stringify(this.allorganizations)); + orData.forEach((item) => { + item.children = []; + orData.forEach((element) => { + if (element.parentId == item.id) { + item.children.push(element); + } + }); + }); + orData.forEach((item) => { + item.title = item.name; + item.key = item.id; + item.selectable = false; + if (item.children.length === 0) { + item.isLeaf = true; + } + }); + this.http.get("/api/Account/Profiles").subscribe((data: any) => { + this.organizationName = data.organizationName; + if (this.organizationName) { + orData.forEach((item) => { + if (item.name == this.organizationName) { + function lookForAllId(data = [], arr = []) { + for (let item of data) { + arr.push(item.id); + if (item.children && item.children.length) + lookForAllId(item.children, arr); + } + return arr; + } + + function lookForNode(data, id, node = []) { + for (let item of data) { + if (item.id === id) { + node.push(item); + } else { + if (item.children && item.children.length) { + lookForNode(item.children, id, node); + } + } + } + return node; + } + + this.defaultCheckedKeys = [...lookForAllId([item])]; + this.nodes = [...[item]]; + } + }); + } + }); + } + save() { + console.log(this.nzTreeComponent); + console.log(this.nzTreeComponent.getCheckedNodeList()); + } +} diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 3862e0e..062dcfa 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -1,38 +1,64 @@ -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"; +import { OpenOrComponent } from "./open-or/open-or.component"; +declare var CryptoJS; @Component({ - selector: 'app-pass-plan', - templateUrl: './pass-plan.component.html', - styleUrls: ['./pass-plan.component.scss'] + selector: "app-pass-plan", + templateUrl: "./pass-plan.component.html", + styleUrls: ["./pass-plan.component.scss"], }) export class PassPlanComponent 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(node => node.level, node => node.expandable); - treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + }; + treeControl = new FlatTreeControl( + (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,118 +68,139 @@ export class PassPlanComponent implements OnInit { paginator: MatPaginator; length: any; //共多少条数据 pageSize: any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [10]; //设置每页条数 PageNumber: any; //第几页 - displayedColumns: string[] = ['state', 'planname', 'addpeople', 'level', 'addtime', 'plantype', 'auditStatus', 'weihuState', 'openRange', 'projectlevel', 'operation']; - allorganizations: any //所有组织机构 - allunittype: any //所有单位类型 - tabledataSource: any //表格数据 - IsNewData = '' //维护更新活新增 - url + displayedColumns: string[] = [ + "state", + "planname", + "addpeople", + "level", + "addtime", + "plantype", + "auditStatus", + "weihuState", + "openRange", + "projectlevel", + "operation", + ]; + allorganizations: any; //所有组织机构 + allunittype: any; //所有单位类型 + tabledataSource: any; //表格数据 + IsNewData = ""; //维护更新活新增 + url; - preparelevels: 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" }]; } - this.url = window.location.href.substring(window.location.href.length - 1, window.location.href.length) + this.url = window.location.href.substring( + window.location.href.length - 1, + window.location.href.length + ); //console.log(this.url) } - 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 //存储所有预案信息 - IsNewCompanyData = '' //单位是新增还是维护更新 - templatePlan: boolean = false//模板录入预案checkbox - customPlan: boolean = false//自定义预案 + allPlanInfo: any; //存储所有预案信息 + IsNewCompanyData = ""; //单位是新增还是维护更新 + templatePlan: boolean = false; //模板录入预案checkbox + customPlan: boolean = false; //自定义预案 //获得所有预案信息 getAllPlanInfo() { - let planmode = [] - this.templatePlan ? planmode.push(2) : null - this.customPlan ? planmode.push(4) : null - let reservePlanType - this.reservePlanType ? reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType)) : reservePlanType = '' + let planmode = []; + this.templatePlan ? planmode.push(2) : null; + this.customPlan ? planmode.push(4) : null; + let reservePlanType; + this.reservePlanType + ? (reservePlanType = JSON.parse(JSON.stringify(this.reservePlanType))) + : (reservePlanType = ""); if (this.reservePlanType && this.reservePlanType.length != 0) { - reservePlanType = eval(this.reservePlanType.join("|")) + reservePlanType = eval(this.reservePlanType.join("|")); } let paramsdata: any = { - CompanyName: this.companyName || '', - OrganizationId: this.jsId || '', - HasChildrenOrganization: this.jscheck || '', - BuildingTypeId: this.unittype || '', - PlanType: this.reservePlanType || '', - AuditStatus: '', //审核状态 - PlanLevel: this.preparelevel || '', - HasChildrenPlanLevel: this.plcheck || '', - CreationTimeRangeStart: this.addtime || '', - CreationTimeRangeEnd: this.endtime || '', - PageNumber: this.PageNumber || '1', + CompanyName: this.companyName || "", + OrganizationId: this.jsId || "", + HasChildrenOrganization: this.jscheck || "", + BuildingTypeId: this.unittype || "", + PlanType: this.reservePlanType || "", + AuditStatus: "", //审核状态 + PlanLevel: this.preparelevel || "", + HasChildrenPlanLevel: this.plcheck || "", + CreationTimeRangeStart: this.addtime || "", + CreationTimeRangeEnd: this.endtime || "", + PageNumber: this.PageNumber || "1", PageSize: this.pageSizeOptions[0], - Sort: '', + Sort: "", PlanCategories: this.planCategory, IsNewData: this.IsNewData, IsNewCompanyData: this.IsNewCompanyData, - PlanModes: planmode - } - this.http.get("/api/ApprovedPlans", { params: paramsdata }).subscribe((data: any) => { - this.length = data.totalCount - this.allPlanInfo = data - this.tabledataSource = data.items - }) + PlanModes: planmode, + }; + this.http + .get("/api/ApprovedPlans", { params: paramsdata }) + .subscribe((data: any) => { + this.length = data.totalCount; + this.allPlanInfo = data; + this.tabledataSource = data.items; + }); } colorRgb(sColor) { @@ -185,7 +232,7 @@ export class PassPlanComponent implements OnInit { var strHex = "#"; for (var i = 0; i < aColor.length; i++) { var hex: any = Number(aColor[i]).toString(16); - hex = hex < 10 ? 0 + '' + hex : hex;// 保证每个rgb的值为2位 + hex = hex < 10 ? 0 + "" + hex : hex; // 保证每个rgb的值为2位 if (hex === "0") { hex += hex; } @@ -202,7 +249,7 @@ export class PassPlanComponent implements OnInit { } else if (aNum.length === 3) { var numHex = "#"; for (var i = 0; i < aNum.length; i += 1) { - numHex += (aNum[i] + aNum[i]); + numHex += aNum[i] + aNum[i]; } return numHex; } @@ -212,8 +259,8 @@ export class PassPlanComponent implements OnInit { } gradientColor(startColor, endColor, step) { - let _this = this - let startRGB = _this.colorRgb(startColor);//转换为rgb数组模式 + let _this = this; + let startRGB = _this.colorRgb(startColor); //转换为rgb数组模式 let startR = startRGB[0]; let startG = startRGB[1]; let startB = startRGB[2]; @@ -223,118 +270,115 @@ export class PassPlanComponent implements OnInit { let endG = endRGB[1]; let endB = endRGB[2]; - let sR = (endR - startR) / step;//总差值 + let sR = (endR - startR) / step; //总差值 let sG = (endG - startG) / step; let sB = (endB - startB) / step; var colorArr = []; for (var i = 0; i < step; i++) { - //计算每一步的hex值 - var hex = _this.colorHex('rgb(' + parseInt((sR * i + startR)) + ',' + parseInt((sG * i + startG)) + ',' + parseInt((sB * i + startB)) + ')'); + //计算每一步的hex值 + var hex = _this.colorHex( + "rgb(" + + parseInt(sR * i + startR) + + "," + + parseInt(sG * i + startG) + + "," + + parseInt(sB * i + startB) + + ")" + ); colorArr.push(hex); } return colorArr; } integrity(width) { - let _this = this + let _this = this; - let style: any = {} - style.width = width + '%'; + let style: any = {}; + style.width = width + "%"; if (width < 30) { - let colorArr = this.gradientColor('#D50000', '#E53935', 30); + let colorArr = this.gradientColor("#D50000", "#E53935", 30); for (let i = 0; i < 30; i++) { if (i == width) { - style.background = colorArr[i] + style.background = colorArr[i]; } } } if (width >= 30 && width < 60) { - let colorArr = this.gradientColor('#FF9800', '#E65100', 30); + let colorArr = this.gradientColor("#FF9800", "#E65100", 30); for (let i = 30; i < 60; i++) { if (i == width) { - style.background = colorArr[i - 30] + style.background = colorArr[i - 30]; } } } if (width >= 60) { - let colorArr = this.gradientColor('#81C784', '#2E7D32', 41); + let colorArr = this.gradientColor("#81C784", "#2E7D32", 41); for (let i = 60; i <= 100; i++) { if (i == width) { - style.background = colorArr[i - 60] + style.background = colorArr[i - 60]; } } } - return style + return style; } integrityDetails(width, zong) { - let style: any = {} - style.width = (width / zong) * 100 + '%'; - return style + let style: any = {}; + style.width = (width / zong) * 100 + "%"; + return style; } - - //得到当前单位信息 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; + }); } - addtime//开始时间 - endtime//结束时间 - integrityScoreMin//完整度最小值 - integrityScoreMax//完整度最大值 - organizationName: any //当前单位组织机构名称 - treedata: any //组织机构树型数据 - newArr: any = [] - newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段 + addtime; //开始时间 + endtime; //结束时间 + integrityScoreMin; //完整度最小值 + integrityScoreMax; //完整度最大值 + 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); } }); }); - this.http.get("/api/Account/Profiles").subscribe( - (data: any) => { - this.organizationName = data.organizationName - if (this.organizationName) { - this.newallorganizations.forEach(item => { - if (item.name == this.organizationName) { - this.dataSource.data = [item] - } - }); - } else { - this.dataSource.data = this.tree.toTree(this.treedata); - } + this.http.get("/api/Account/Profiles").subscribe((data: any) => { + this.organizationName = data.organizationName; + if (this.organizationName) { + this.newallorganizations.forEach((item) => { + if (item.name == this.organizationName) { + 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.treedata = this.tree.toTree(data); - this.getpresentOrganization(); - } - ) + 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; + }); } //查看单位信息 lookUnitInfo(element) { @@ -343,194 +387,244 @@ export class PassPlanComponent implements OnInit { // width: '1500px', // height:'800px' // }); - sessionStorage.setItem("editable", "0") - sessionStorage.setItem("companyName", element.company.name) - sessionStorage.setItem("companyId", element.company.id) - sessionStorage.setItem(element.company.id, JSON.stringify(element.company.companyIntegrityScore)) - window.open(`/keyUnit/viewunitinfo?id=${element.company.id}&usci=${element.company.usci}`, '_blank'); + sessionStorage.setItem("editable", "0"); + sessionStorage.setItem("companyName", element.company.name); + sessionStorage.setItem("companyId", element.company.id); + sessionStorage.setItem( + element.company.id, + JSON.stringify(element.company.companyIntegrityScore) + ); + window.open( + `/keyUnit/viewunitinfo?id=${element.company.id}&usci=${element.company.usci}`, + "_blank" + ); } //跳转查看预案页面 审核通过预案 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 = []; } } //预案公开 openReserve(e) { - this.http.put(`/api/PlanAudits/${e.id}/Public`, []).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('预案已公开', '确定', config); - }) + console.log(e); + const dialogRef = this.dialog.open(OpenOrComponent, { + width: "500px", + data: { plan: e }, + }); + + dialogRef.afterClosed().subscribe((result) => { + console.log("The dialog was closed"); + }); + // this.http.put(`/api/PlanAudits/${e.id}/Public`, []).subscribe(data => { + // const config = new MatSnackBarConfig(); + // config.verticalPosition = 'top'; + // config.duration = 3000 + // this.snackBar.open('预案已公开', '确定', config); + // }) } //预案取消公开 closeReserve(e) { - this.http.put(`/api/PlanAudits/${e.id}/Unpublic`, []).subscribe(data => { + this.http.put(`/api/PlanAudits/${e.id}/Unpublic`, []).subscribe((data) => { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('预案已取消公开', '确定', config); - }) + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("预案已取消公开", "确定", config); + }); } //分页事件 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.PageNumber = 1 - this.pageEvent.pageIndex = 0 - this.getAllPlanInfo() + this.PageNumber = 1; + this.pageEvent.pageIndex = 0; + this.getAllPlanInfo(); } - companyName: any //单位名称 - js: any //所选组织机构 - jsId: any //所选组织机构的id - jscheck: boolean //所选组织机构勾选框 - unittype: any //单位类型 - reservePlanType: any //预案类型 - preparelevel: any //编制级别 - plcheck: boolean //编制级别勾选框 - planCategory = []//预案级别 + companyName: any; //单位名称 + js: any; //所选组织机构 + jsId: any; //所选组织机构的id + jscheck: boolean; //所选组织机构勾选框 + unittype: any; //单位类型 + reservePlanType: any; //预案类型 + preparelevel: any; //编制级别 + plcheck: boolean; //编制级别勾选框 + planCategory = []; //预案级别 //重置 reset() { - this.IsNewData = '' - this.IsNewCompanyData = '' - this.companyName = '' - this.js = '' - this.jsId = '' - this.jscheck = false - this.unittype = '' - this.reservePlanType = '' - this.preparelevel = '' - this.addtime = '' - this.endtime = '' - this.plcheck = false + this.IsNewData = ""; + this.IsNewCompanyData = ""; + this.companyName = ""; + this.js = ""; + this.jsId = ""; + this.jscheck = false; + this.unittype = ""; + this.reservePlanType = ""; + this.preparelevel = ""; + this.addtime = ""; + this.endtime = ""; + this.plcheck = false; //重新获取初始化列表 - this.pageEvent.pageIndex = 0 - this.PageNumber = 1 - this.planCategory = [] + this.pageEvent.pageIndex = 0; + this.PageNumber = 1; + this.planCategory = []; - - this.templatePlan = false - this.customPlan = false + this.templatePlan = false; + this.customPlan = false; this.getAllPlanInfo(); } } @Component({ - selector: 'PsViewer', - templateUrl: './PsvShow.html', - styleUrls: ['./pass-plan.component.scss'] + selector: "PsViewer", + templateUrl: "./PsvShow.html", + styleUrls: ["./pass-plan.component.scss"], }) export class GkPsViewer { - constructor(private router: Router, private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } + constructor( + private router: Router, + private http: HttpClient, + public dialog: MatDialog, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef, + @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, }); } } - @Component({ - selector: 'unitInfo', - templateUrl: './unitInfo.html', - styleUrls: ['./pass-plan.component.scss'] + selector: "unitInfo", + templateUrl: "./unitInfo.html", + styleUrls: ["./pass-plan.component.scss"], }) export class UnitInfo { - constructor(private router: Router, private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } + constructor( + private router: Router, + private http: HttpClient, + public dialog: MatDialog, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) {} ngOnInit(): void { // console.log(this.data) } -} \ No newline at end of file +} diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 80d0c5f..32c20d5 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -99,6 +99,8 @@ import { PlanDeductionComponent } from "./plan-deduction/plan-deduction.componen import { AddPlanComponent } from "./plan-deduction/add-plan/add-plan.component"; import { NzSelectModule } from "ng-zorro-antd/select"; import { NzSpinModule } from "ng-zorro-antd/spin"; +import { OpenOrComponent } from "./pass-plan/open-or/open-or.component"; +import { NzTreeModule } from "ng-zorro-antd/tree"; @NgModule({ declarations: [ EntryPlanComponent, @@ -147,6 +149,7 @@ import { NzSpinModule } from "ng-zorro-antd/spin"; SixFamiliarizeComponent, PlanDeductionComponent, AddPlanComponent, + OpenOrComponent, ], imports: [ CommonModule, @@ -204,6 +207,7 @@ import { NzSpinModule } from "ng-zorro-antd/spin"; NzTreeSelectModule, NzSelectModule, NzSpinModule, + NzTreeModule, ], exports: [PlanType, AuditSatus, PlanLevel, state], }) diff --git a/src/index.html b/src/index.html index 3931af2..fac3faa 100644 --- a/src/index.html +++ b/src/index.html @@ -24,9 +24,9 @@ securityJsCode: '0afa0b144398727fad2ca06f5f7156b3' } - - + -->