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 cc6a04c..a3f5d6d 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -185,13 +185,16 @@ export class PlanRecordComponent implements OnInit {
this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data: any) => {
this.companyId = data.companyId
this.companyName = data.companyName
- if (data.planMode == 2) {
- this.bianzhi = true
- this.src = `/planManagement/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.src=`/keyUnit/viewunitinfoplan?id=${data.companyId}&orName=${data.company.organizationId}&orId=${data.company.organizationName}`
- } else {
- this.bianzhi = false
+ //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{
+ this.bianzhi = false
this.fetchUrl = data.attachmentUrls[0]
var index = this.fetchUrl.indexOf("\/")
if (this.fetchUrl.substr(0, index) == 'psw') {
@@ -211,6 +214,8 @@ export class PlanRecordComponent implements OnInit {
} else {
this.lookWord()
}
+ }
+
} else {
this.organizationName = item.organizationName
this.planData = data
@@ -221,7 +226,7 @@ export class PlanRecordComponent implements OnInit {
//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`)
}
- }
+
@@ -248,16 +253,15 @@ export class PlanRecordComponent implements OnInit {
//毕升
lookWord() {
this.showtype = 0
- 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('.')
+ this.src = `/api/Objects/PlanPlatform/` + arr.join('.')
} else if (suffix == 'pdf') {
- src = `/api/Objects/PlanPlatform/` + this.fetchUrl
+ this.src = `/api/Objects/PlanPlatform/` + this.fetchUrl
}
- this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
+ this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
}
//查看按钮跳转
lookNew() {
@@ -272,7 +276,6 @@ export class PlanRecordComponent implements OnInit {
this.compantData = { name: '', buildingTypes: [], address: '' }
this.planType = this.planData.planMode
let data = this.planData
- // console.log(data)
if (data.planType == 1) {
this.twoOrthree = 2
} else if (data.planType == 2) {
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
index 300f880..22d0fed 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -57,7 +57,7 @@
-
+
| 类型 |
预案类型 |
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
index 57c2287..8b8e8ec 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss
@@ -11,8 +11,9 @@
background-color: #ffffff;
display: flex;
flex-direction: column;
- overflow: auto;
+ //overflow: auto;
.lefthead {
+ height: 30%;
display: flex;
flex-direction: column;
.headdiv {
@@ -131,13 +132,13 @@
}
.tablediv {
width: 100%;
- height: 100%;
+ height: 70%;
.tbodycss {
@media screen and (min-device-width: 1400px) {
overflow-y: auto;
}
- height: 650px;
+ height: 600px;
width: 100%;
.selectedTr {
background-color: #b3d3ee;
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 dfb6ac5..88c8066 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -357,16 +357,16 @@ export class WaitExamineerComponent implements OnInit {
lookWord() {
console.log('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('.')
+ this.src = `/api/Objects/PlanPlatform/` + arr.join('.')
} else if (suffix == 'pdf') {
- src = `/api/Objects/PlanPlatform/` + this.fetchUrl
+ this.src = `/api/Objects/PlanPlatform/` + this.fetchUrl
}
- this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(src);
+ this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
}
//查看按钮跳转
lookNew() {
diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.ts b/src/app/statistic-analysis/combined-query/combined-query.component.ts
index 692e926..96af8a3 100644
--- a/src/app/statistic-analysis/combined-query/combined-query.component.ts
+++ b/src/app/statistic-analysis/combined-query/combined-query.component.ts
@@ -563,14 +563,12 @@ export class CombinedQueryComponent implements OnInit {
const httpOptions = {
responseType: 'blob' as 'json'
};
- let formData = new FormData()
- console.log('000')
- this.http.post(`/api/StatisticsAnalysis/Excel?queryMode=${this.preparelevels}`,this.excelData).subscribe((data:any) => {
+ this.http.post(`/api/StatisticsAnalysis/Excel?queryMode=${this.preparelevels}`,this.excelData,httpOptions).subscribe((data:any) => {
// // 文件名中有中文 则对文件名进行转码
const link = document.createElement('a');
const blob = new Blob([data], {type: 'application/vnd.ms-excel'});
link.setAttribute('href', window.URL.createObjectURL(blob));
- link.setAttribute('download', '统计信息'+'.xlsx');
+ link.setAttribute('download', '统计信息'+'.xls');
link.style.visibility = 'hidden';
document.body.appendChild(link);
link.click();