[修改]毕升请求地址更改

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方法打开对话框并且携带参数过去

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方法打开对话框并且携带参数过去

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
     })

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方法打开对话框并且携带参数过去

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方法打开对话框并且携带参数过去

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}`)
            })
   }
   //查看按钮跳转

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}`)
            })
   }
   //查看按钮跳转

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}`)
     })
       }
     }

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}`)
     })
   }
 

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}`)
     })
     
     

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}`)
       })
         }
       }

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}`)
       })
         }
       }

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}`)
     })
     
     

src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts

@@ -232,7 +232,7 @@ export class AddUnitOneComponent implements OnInit {
        
       }
       this.res+='</tbody>'
-      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
+      this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">100%</td></tfoot>'
       this.res+='</table></div></div>'
       return this.res
   }

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'}})
             }

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}`)
     })
       }
     }

src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html

@@ -87,21 +87,21 @@
           <mat-checkbox style="margin-left: 6px;" [(ngModel)]="plcheck" name="plcheck">包含下级</mat-checkbox>
         </div>
 
-        <!-- <div class="queryField" *ngIf="!padMore&&!pcMore">
+        <div class="queryField" *ngIf="!padMore&&!pcMore">
           <label style="margin-right: 10px;">预案级别:</label>
           <mat-form-field>
             <mat-select placeholder='请选择预案级别' [(ngModel)]="planCategory" name="planCategory" [multiple]="true">
-              <mat-option value=6>应急预案(国家级)</mat-option>
+              <!-- <mat-option value=6>应急预案(国家级)</mat-option>
               <mat-option value=7>应急预案(市级)</mat-option>
               <mat-option value=8>类型预案</mat-option>
               <mat-option value=1>Ⅰ级预案</mat-option>
-              <mat-option value=2>Ⅱ级预案</mat-option>
+              <mat-option value=2>Ⅱ级预案</mat-option> -->
               <mat-option value=3>Ⅲ级预案</mat-option>
               <mat-option value=4>Ⅳ级预案</mat-option>
               <mat-option value=5>Ⅴ级预案</mat-option>
             </mat-select>
           </mat-form-field>
-        </div> -->
+        </div>
 
         <div class="queryField" *ngIf="!padMore&&!pcMore">
           <label style="margin-right: 10px;">审核时间:</label>

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}`)
         })
       }
     }