diff --git a/proxy.config.json b/proxy.config.json index f25983f..14daf3d 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://121.36.37.70:8201", + "target": "http://10.81.73.39:8000", "secure": false, "changeOrigin": true } diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html index 67cee60..10718fc 100644 --- a/src/app/data-collection/fire-force/fire-force.component.html +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -43,8 +43,9 @@
- + {{node.name}} @@ -113,7 +114,8 @@
{{item.name}} + *ngFor="let item of checkBoxList">{{item.name}} +
@@ -219,8 +221,8 @@ 备注: - +

位置信息

@@ -350,8 +352,8 @@ 备注: - +

位置信息

@@ -540,8 +542,8 @@ 备注: - +

位置信息

diff --git a/src/app/external-links-plan/external-links-plan.component.ts b/src/app/external-links-plan/external-links-plan.component.ts index 99c8647..1c1a7af 100644 --- a/src/app/external-links-plan/external-links-plan.component.ts +++ b/src/app/external-links-plan/external-links-plan.component.ts @@ -74,13 +74,13 @@ export class ExternalLinksPlanComponent implements OnInit { src//文件存储地址 lookWord() { this.showType = 0 - let src + let src let suffix = this.fetchUrl.split('.')[this.fetchUrl.split('.').length - 1].toLowerCase() if (suffix == 'docx' || suffix == 'doc') { let arr = this.fetchUrl.split('.') arr[arr.length - 1] = 'pdf' - src = `/api/Objects/PlanPlatform/` + arr.join('.') - }else if (suffix == 'pdf') { + src = `/api/Objects/PlanPlatform/` + arr.join('.') + } else if (suffix == 'pdf') { src = `/api/Objects/PlanPlatform/` + this.fetchUrl } this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src); @@ -91,7 +91,7 @@ export class ExternalLinksPlanComponent implements OnInit { threedUrl: any handleData() { let data = this.planData - if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 + if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { console.log(data) @@ -110,12 +110,12 @@ export class ExternalLinksPlanComponent implements OnInit { // this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) // this.showType = 2 // }) - let localhostPath = window.document.location.href.substring( 0, window.document.location.href.indexOf(window.document.location.pathname)) + let localhostPath = window.document.location.href.substring(0, window.document.location.href.indexOf(window.document.location.pathname)) //localhostPath : http://39.106.78.171:8000/ let url = data.url - if(url.indexOf(localhostPath) != -1){ + if (url.indexOf(localhostPath) != -1) { window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` - }else{ + } else { // let substr = url.split('/').splice(3,url.split('/').length) // let port = url.split(':')[2] // if(port.indexOf('/') != -1){ diff --git a/src/app/plan-audit/plan-pass/plan-pass.component.ts b/src/app/plan-audit/plan-pass/plan-pass.component.ts index 5ce008f..cf5a693 100644 --- a/src/app/plan-audit/plan-pass/plan-pass.component.ts +++ b/src/app/plan-audit/plan-pass/plan-pass.component.ts @@ -4,20 +4,20 @@ 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 { 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 { MatTableDataSource } from '@angular/material/table'; import { DomSanitizer } from '@angular/platform-browser'; -import {PlanOpen} from '../plan-audit/plan-audit.component' -import {ViewUnitDetailsPlanComponent} from '../../key-unit/view-unit-details-plan/view-unit-details-plan.component' +import { PlanOpen } from '../plan-audit/plan-audit.component' +import { ViewUnitDetailsPlanComponent } from '../../key-unit/view-unit-details-plan/view-unit-details-plan.component' export interface Food { - name:string; + name: string; value: string; } @Component({ @@ -27,133 +27,133 @@ export interface Food { }) export class PlanPassComponent implements OnInit { - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog, - public snackBar: MatSnackBar,private sanitizer: DomSanitizer) { } + constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, + public snackBar: MatSnackBar, private sanitizer: DomSanitizer) { } ngOnInit(): void { - this.type = this.route.snapshot.queryParams.type + this.type = this.route.snapshot.queryParams.type this.getCompanyData() this.getPlanData() } - type:any //审核按钮是否出现 - displayedColumns: string[] = ['filename','addtime','operation']; //表头 - compantData:any = {name:'',organizationName: '', buildingTypes:[{name:''}], address:''}; //当前单位信息 - organizationName:any = ''; //组织机构名称 - planData:any; //审核预案信息 + type: any //审核按钮是否出现 + displayedColumns: string[] = ['filename', 'addtime', 'operation']; //表头 + compantData: any = { name: '', organizationName: '', buildingTypes: [{ name: '' }], address: '' }; //当前单位信息 + organizationName: any = ''; //组织机构名称 + planData: any; //审核预案信息 //获取当前单位信息 - getCompanyData () { - this.http.get(`/api/Plans/${this.route.snapshot.queryParams.id}`).subscribe((data:any)=>{ - data && data.company? this.compantData = data.company : null + getCompanyData() { + this.http.get(`/api/Plans/${this.route.snapshot.queryParams.id}`).subscribe((data: any) => { + data && data.company ? this.compantData = data.company : null }) } //获取当前单位审核预案的信息 - getPlanData () { - let header = { + getPlanData() { + let header = { CompanyName: this.route.snapshot.queryParams.companyName || '', AuditStatus: this.route.snapshot.queryParams.auditStatus || '', PageSize: '100', } let api - this.route.snapshot.queryParams.planType == 1? api = '/api/PlanAudits' : api = '/api/PublicPlans' //1=预案审核 2=公开预案 - this.http.get(api,{params:header}).subscribe((data:any)=>{ + this.route.snapshot.queryParams.planType == 1 ? api = '/api/PlanAudits' : api = '/api/PublicPlans' //1=预案审核 2=公开预案 + this.http.get(api, { params: header }).subscribe((data: any) => { data.items.forEach(element => { - if (element.id===this.route.snapshot.queryParams.auditPlanId) { + if (element.id === this.route.snapshot.queryParams.auditPlanId) { this.planData = element this.organizationName = element.committerOrganizationName this.handleData() - return + return } }); }) } - planType:any; //展示预案类型 - allFile:any = []; //类型=0时所有文件 - thirdPartyURL:any; //类型=3时网址 + planType: any; //展示预案类型 + allFile: any = []; //类型=0时所有文件 + thirdPartyURL: any; //类型=3时网址 - handleData () { + handleData() { this.planType = this.planData.planMode let data = this.planData - if (this.planData.planMode==0) { //预案planMode=0时, 下载文件 + if (this.planData.planMode == 0) { //预案planMode=0时, 下载文件 data.attachmentUrls.forEach(item => { - this.http.get(`/api/ObjectMetadata/PlanPlatform/${item}`).subscribe((data:any)=>{ + this.http.get(`/api/ObjectMetadata/PlanPlatform/${item}`).subscribe((data: any) => { data.isLoading = false this.allFile.push(data) - this.allFile = new MatTableDataSource(this.allFile) }) + this.allFile = new MatTableDataSource(this.allFile) + }) }); - } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档 - - } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件 - sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined); - sessionStorage.setItem("companyId",this.route.snapshot.queryParams.id); - sessionStorage.setItem("planId",this.route.snapshot.queryParams.auditPlanId); - sessionStorage.setItem("editable",'0'); - } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址 + } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 + sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length ? this.compantData.buildingTypes[0].id : undefined); + sessionStorage.setItem("companyId", this.route.snapshot.queryParams.id); + sessionStorage.setItem("planId", this.route.snapshot.queryParams.auditPlanId); + sessionStorage.setItem("editable", '0'); + } else if (this.planData.planMode == 3) { //预案planMode=3时, 第三方网址 this.thirdPartyURL = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) } } //预案审核 - toExamine () { + toExamine() { let data = this.route.snapshot.queryParams.auditPlanId - const dialogRef = this.dialog.open(PlanOpen,{data}); + const dialogRef = this.dialog.open(PlanOpen, { data }); } - suffix:string; //文件名后缀 + suffix: string; //文件名后缀 //下载 - download (e) { + download(e) { e.isLoading = true let file = e let fileSize = file.fileLength //下载文件的总大小 let shardSize = 10 * 1024 * 1024 //文件大小是否大于10MB - this.suffix = this.compantData.name + '.' + (e.objectName.substring(e.objectName.lastIndexOf(".")+1,e.objectName.length)); + this.suffix = this.compantData.name + '.' + (e.objectName.substring(e.objectName.lastIndexOf(".") + 1, e.objectName.length)); - if (file && fileSize<=shardSize) { //<=10MB时直接下载 - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`,{responseType: 'blob'},).subscribe(data=>{ + if (file && fileSize <= shardSize) { //<=10MB时直接下载 + this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { responseType: 'blob' },).subscribe(data => { let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址 let link = document.createElement("a"); link.style.display = "none"; link.href = url; - link.setAttribute("download", e.fileName?e.fileName : this.suffix); + link.setAttribute("download", e.fileName ? e.fileName : this.suffix); document.body.appendChild(link); link.click(); e.isLoading = false }) - } else if (file && fileSize>shardSize) { //>10MB时分块下载 + } else if (file && fileSize > shardSize) { //>10MB时分块下载 this.blockingDownload(e) //分段下载 } } //分段下载并合并 - async blockingDownload (e) { + async blockingDownload(e) { let file = e let fileSize = file.fileLength //下载文件的总大小 let shardSize = 3 * 1024 * 1024 //3MB一个分片 let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段 - let allFile:any = [] //所有的file分段 + let allFile: any = [] //所有的file分段 - for (let i=0;i{ - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`,{headers:{'range':`bytes= ${start}-${end}`},responseType:'blob'}).subscribe(data=>{ - result(data) }) + let result = await new Promise((result, reject) => { + this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { + result(data) + }) }) allFile.push(result) - e.progress = Number((i/allSlice).toFixed(2))*100 + '%' + e.progress = Number((i / allSlice).toFixed(2)) * 100 + '%' if (allFile.length === allSlice) { //合并文件输出给浏览器 let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址 let link = document.createElement("a"); link.style.display = "none"; link.href = url; - link.setAttribute("download", e.fileName?e.fileName : this.suffix); + link.setAttribute("download", e.fileName ? e.fileName : this.suffix); document.body.appendChild(link); link.click(); e.isLoading = false diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index f683be1..c55be7f 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -93,7 +93,7 @@ export class PlanRecordComponent implements OnInit { fetchUrl companyName plantypes - IsNewData=[true,false] + IsNewData = [true, false] //获取表格数据 getAlltabledate() { @@ -104,8 +104,8 @@ export class PlanRecordComponent implements OnInit { verifyState: this.verifyState || [1, 2, 4, 5], QueryStartTime: this.addtime || '', QueryEndTime: this.endtime || '', - PlanType:this.plantypes||[], - IsNewData:this.IsNewData + PlanType: this.plantypes || [], + IsNewData: this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { //console.log(data) @@ -127,7 +127,7 @@ export class PlanRecordComponent implements OnInit { this.endtime = '' let level = sessionStorage.getItem("level"); this.PlanLevel = '' - this.plantypes=[] + this.plantypes = [] this.getAlltabledate() } //表格点击事件 @@ -187,14 +187,14 @@ export class PlanRecordComponent implements OnInit { this.companyId = data.companyId this.companyName = data.companyName //this.bianzhi = false - if (data.planType != 2 && data.planType != 1) { - if (data.planMode == 2) { - this.showtype = 0 - this.bianzhi = true - this.src = `/CreatePlanOnlineFive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` - this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}` - } else{ + if (data.planType != 2 && data.planType != 1) { + if (data.planMode == 2) { + this.showtype = 0 + this.bianzhi = true + this.src = `/CreatePlanOnlineFive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` + this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src); + //this.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}` + } else { this.bianzhi = false this.fetchUrl = data.attachmentUrls[0] var index = this.fetchUrl.indexOf("\/") @@ -215,19 +215,19 @@ export class PlanRecordComponent implements OnInit { } else { this.lookWord() } - } - - } else { - this.organizationName = item.organizationName - this.planData = data - this.handleData() - return - - //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1` - //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`) } - + + } else { + this.organizationName = item.organizationName + this.planData = data + this.handleData() + return + + //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1` + //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); + //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`) + } + @@ -274,6 +274,7 @@ export class PlanRecordComponent implements OnInit { planType twoOrthree handleData() { + console.log(this.planData) this.compantData = { name: '', buildingTypes: [], address: '' } this.planType = this.planData.planMode let data = this.planData @@ -284,9 +285,7 @@ export class PlanRecordComponent implements OnInit { } if (this.planData.planMode == 0) { //预案planMode=0时, 查看word //this.lookWord() - } else if (this.planData.planMode == 1) { //预案planMode=1时, 解析文档 - - } else if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 + } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 this.showtype = 2 this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { data && data.company ? this.compantData = data.company : null @@ -315,12 +314,12 @@ export class PlanRecordComponent implements OnInit { this.dialog.open(recordshow3D, { width: '1650px', height: '850px', data: { url: this.thirdPartyURL, twoOrthree: this.twoOrthree } }); } //判断iframe是否加载完成 - iftrue=true - ifranmeLoad(){ + iftrue = true + ifranmeLoad() { var iframe = document.getElementById("myiframe"); - iframe.onload = function(){ - } - this.iftrue=!this.iftrue + iframe.onload = function () { + } + this.iftrue = !this.iftrue } } diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index bf36843..fac86d0 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -64,7 +64,7 @@ export class WaitExamineerComponent implements OnInit { this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - + } planTypeIndex //平面图类型 选择是总平面图还是层平面图 @@ -110,7 +110,7 @@ export class WaitExamineerComponent implements OnInit { fetchUrl companyName plantypes - IsNewData=[true,false] + IsNewData = [true, false] //获取表格数据 getAlltabledate() { @@ -119,8 +119,8 @@ export class WaitExamineerComponent implements OnInit { ContentType: Number(this.projectlevel) || [], Level: this.PlanLevel || [], verifyState: [0, 3], - PlanType:this.plantypes||[], - IsNewData:this.IsNewData + PlanType: this.plantypes || [], + IsNewData: this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.tableDate = data.items @@ -136,21 +136,21 @@ export class WaitExamineerComponent implements OnInit { this.level = '' this.projectlevel = '' this.PlanLevel = '' - this.plantypes=[] + this.plantypes = [] let level = sessionStorage.getItem("level"); this.getAlltabledate() } - lookImg(imgUrl,type?:boolean) { + lookImg(imgUrl, type?: boolean) { // console.log(imgUrl) let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img") node.style.display = "none"; - if(type){ + if (type) { let src = imgUrl.split("?")[0] node.src = src - }else{ + } else { node.src = "/api/Objects/PlanPlatform/" + imgUrl; } node.id = 'imgxxx' @@ -181,7 +181,7 @@ export class WaitExamineerComponent implements OnInit { bianzhi = false radioClick(e, item) { this.selectedItem = item - //console.log(item) + // console.log('当前选择的信息',JSON.parse(this.selectedItem.differentContent) ) if (item.contentType == 11 && this.selectedItem.differentContent) { @@ -200,7 +200,7 @@ export class WaitExamineerComponent implements OnInit { if (differentContent.filter(item => item.propertyName == 'buildings').length != 0) { //建筑信息 this.differentContentOfBuildingsInfo = JSON.parse(JSON.stringify(differentContent.filter(item => item.propertyName == 'buildings')[0])) - + function resolveDiff(list: Array, path?: Array): Array { let resultList: Array = []; for (let i = 0; i < list.length; i++) { @@ -242,9 +242,6 @@ export class WaitExamineerComponent implements OnInit { // console.log('功能分区', this.differentContentOfFunction) - - - this.showtype = -1 this.organizationName = '' this.itemid = item.itemId @@ -302,7 +299,7 @@ export class WaitExamineerComponent implements OnInit { this.companyId = data.companyId this.companyName = data.companyName if (data.planType != 2 && data.planType != 1) { - if (data.planMode == 2 ||data.planMode==4) { + if (data.planMode == 2 || data.planMode == 4) { this.showtype = 0 this.bianzhi = true this.src = `/CreatePlanOnlineFive?navIsOpen=false&companyId=${data.companyId}&planName=${data.name}&unitName=${data.companyName}&planCategory=${data.planCategory}&planId=${data.id}&unitTypeId=${data.company.buildingTypes[0].id}&orName=${data.company.organizationName}&orId=${data.company.organizationId}&pattern=false` @@ -380,6 +377,7 @@ export class WaitExamineerComponent implements OnInit { planType twoOrthree handleData() { + this.compantData = { name: '', buildingTypes: [], address: '' } this.planType = this.planData.planMode let data = this.planData @@ -390,9 +388,7 @@ export class WaitExamineerComponent implements OnInit { } if (this.planData.planMode == 0) { //预案planMode=0时, 查看word //this.lookWord() - } else if (this.planData.planMode == 1) { //预案planMode=1时, 解析文档 - - } else if (this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 + } else if (this.planData.planMode == 1 || this.planData.planMode == 2) { //预案planMode=2时, 跳查看页面组件 this.showtype = 2 this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { data && data.company ? this.compantData = data.company : null @@ -608,12 +604,12 @@ export class WaitExamineerComponent implements OnInit { } } //判断iframe是否加载完成 - iftrue=true - ifranmeLoad(){ + iftrue = true + ifranmeLoad() { var iframe = document.getElementById("myiframe"); - iframe.onload = function(){ - } - this.iftrue=!this.iftrue + iframe.onload = function () { + } + this.iftrue = !this.iftrue } } diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index aa396aa..97935bf 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -1157,7 +1157,7 @@ export class AddPlanone { this.website = false } if (formdata.value.firstCtrltwo == '1') { //如果是2D预案 - this.localup = true + this.localup = false this.inputword = false this.onlineedit = true this.website = true diff --git a/src/index.html b/src/index.html index 2ccf502..7aab4f9 100644 --- a/src/index.html +++ b/src/index.html @@ -23,10 +23,10 @@ - - - + + +