From aee3d5843ae8f93e23380717030adc100fb378ff Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Sat, 15 May 2021 08:45:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=AF=95=E5=8D=87=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-collection/fire-force/fire-force.component.ts | 2 +- .../linkage-forces/linkage-forces.component.ts | 2 +- .../external-links-plan/external-links-plan.component.ts | 2 +- .../fireforce-audit/fireforce-audit.component.ts | 2 +- .../linkageforces-audit/linkageforces-audit.component.ts | 2 +- src/app/plan-audit/plan-record/plan-record.component.ts | 4 ++-- .../plan-audit/wait-examineer/wait-examineer.component.ts | 4 ++-- .../entry-plan-look/entry-plan-look.component.ts | 2 +- src/app/plan-management/meet-plan/meet-plan.component.ts | 2 +- .../onetwo-entry-plan/onetwo-entry-plan.component.ts | 4 ++-- src/app/plan-management/open-plan/open-plan.component.ts | 2 +- src/app/plan-management/pass-plan/pass-plan.component.ts | 2 +- src/app/plan-management/type-plan/type-plan.component.ts | 2 +- .../addUnit/add-unit-one/add-unit-one.component.ts | 2 +- .../add-unit-two-type-statistics.component.ts | 2 +- src/app/statistic-analysis/all-plan/all-plan.component.ts | 2 +- .../plan-analysis-by-synthesis.component.html | 8 ++++---- .../plan-analysis-by-synthesis.component.ts | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts index cc567f7..bfb5663 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -1151,7 +1151,7 @@ export class FireForceComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) } if(suffix == 'mp4'){ const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts index 391c199..25faae4 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -885,7 +885,7 @@ export class LinkageForcesComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) } if(suffix == 'mp4'){ const dialogRef = this.dialog.open(ViewDetails2, {//调用open方法打开对话框并且携带参数过去 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 a3bffbf..0faff8e 100644 --- a/src/app/external-links-plan/external-links-plan.component.ts +++ b/src/app/external-links-plan/external-links-plan.component.ts @@ -101,7 +101,7 @@ export class ExternalLinksPlanComponent implements OnInit { var stringjson = JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - this.src = `http://121.5.10.84:80/apps/editor/openPreview?data=${base64}` + this.src = `http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}` this.iframeSrc = this.sanitizer.bypassSecurityTrustResourceUrl(this.src); this.showType = 0 }) diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts index e691ce8..b135278 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts @@ -186,7 +186,7 @@ export class FireforceAuditComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) } if(suffix == 'mp4'){ const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去 diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts index dc9b47e..cba3866 100644 --- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts +++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.ts @@ -196,7 +196,7 @@ export class LinkageforcesAuditComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) } if(suffix == 'mp4'){ const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去 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 fb5d6e4..708ae75 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -260,9 +260,9 @@ export class PlanRecordComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - this.src=`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}` + this.src=`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}` this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + //window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } //查看按钮跳转 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 a13eeda..e68fbe9 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -289,9 +289,9 @@ export class WaitExamineerComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - this.src=`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}` + this.src=`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}` this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + //window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } //查看按钮跳转 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 d2802ab..0a8eddf 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 @@ -146,7 +146,7 @@ export class EntryPlanLookComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } } diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 8dab35f..c5ed0c5 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -248,7 +248,7 @@ export class MeetPlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index c5ed166..9fbb033 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-31 14:12:46 + * @LastEditTime: 2021-05-14 17:09:58 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -257,7 +257,7 @@ export class OnetwoEntryPlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts index 2182d1a..d6a781a 100644 --- a/src/app/plan-management/open-plan/open-plan.component.ts +++ b/src/app/plan-management/open-plan/open-plan.component.ts @@ -236,7 +236,7 @@ export class OpenPlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } } 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 86e1bd5..c762af4 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -383,7 +383,7 @@ export class PassPlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } } diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 034b5de..f403c87 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -238,7 +238,7 @@ export class TypePlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index 122da53..32e38a2 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -232,7 +232,7 @@ export class AddUnitOneComponent implements OnInit { } this.res+='' - this.res+='总计'+countall+''+allCountbi.toFixed(2)+'%' + this.res+='总计'+countall+'100%' this.res+='' return this.res } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index 98ad815..606541e 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -426,7 +426,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { if (item.echart.containPixel('grid',pointInPixel)){ let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; if(this.zhiorbuild=='zhi'){ - if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>=1){ + if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>1){ //总队，支队跳转 this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex],'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts index a20df2f..57eb55b 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.ts +++ b/src/app/statistic-analysis/all-plan/all-plan.component.ts @@ -122,7 +122,7 @@ export class AllPlanComponent implements OnInit { var stringjson=JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } } diff --git a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html index 8dfb1ae..329f4e5 100644 --- a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html +++ b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html @@ -87,21 +87,21 @@ 包含下级 - Ⅲ级预案 Ⅳ级预案 Ⅴ级预案 - --> +
diff --git a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts index e59c70a..6a18708 100644 --- a/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts +++ b/src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts @@ -384,7 +384,7 @@ export class PlanAnalysisBySynthesisComponent implements OnInit { var stringjson = JSON.stringify(json) var wordArray = CryptoJS.enc.Utf8.parse(stringjson); var base64 = CryptoJS.enc.Base64.stringify(wordArray); - window.open(`http://121.5.10.84:80/apps/editor/openPreview?data=${base64}`) + window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`) }) } }