Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

angular.json

@@ -67,8 +67,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "6kb",
+                  "maximumWarning": "16kb",
-                  "maximumError": "10kb"
+                  "maximumError": "32kb"
                 }
               ]
             }

package.json

@@ -5,6 +5,7 @@
     "ng": "ng",
     "start": "ng serve --proxy-config  proxy.config.json  --open",
     "build": "ng build",
+    "publish": "ng build --prod --verbose",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"

src/app/data-collection/fire-force/fire-force.component.ts

@@ -1137,7 +1137,7 @@ export class FireForceComponent implements OnInit {
         doc: {
           docId: new Date(), 
           title: item.fileName,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
         },
         user: {
           uid: "test",
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/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

@@ -871,7 +871,7 @@ export class LinkageForcesComponent implements OnInit {
         doc: {
           docId: new Date(), 
           title: item.fileName,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
         },
         user: {
           uid: "test",
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/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

@@ -87,7 +87,7 @@ export class ExternalLinksPlanComponent implements OnInit {
           docId: docId,
           title: filename,
           //title: filename,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/` + this.fetchUrl
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/` + this.fetchUrl
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`
+      this.src = `http://10.81.73.39:18080/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

@@ -172,7 +172,7 @@ export class FireforceAuditComponent implements OnInit {
         doc: {
           docId: docId, 
           title: item.fileName,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/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

@@ -182,7 +182,7 @@ export class LinkageforcesAuditComponent implements OnInit {
         doc: {
           docId: docId, 
           title: item.fileName,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/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

@@ -246,7 +246,7 @@ export class PlanRecordComponent implements OnInit {
                 docId: docId, 
                 title: filename,
                //title: filename,
-                fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
+                fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+this.fetchUrl
              },
              user: {
                 uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`
+           this.src=`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`
            this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
-           //window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+           //window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
            })
   }
   //查看按钮跳转

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -275,7 +275,7 @@ export class WaitExamineerComponent implements OnInit {
                 docId: docId, 
                 title: filename,
                //title: filename,
-                fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
+                fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+this.fetchUrl
              },
              user: {
                 uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`
+           this.src=`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`
            this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src);
-           //window.open(`http://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+           //window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
            })
   }
   //查看按钮跳转

src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@@ -137,7 +137,7 @@ export class EntryPlanLookComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
@@ -153,7 +153,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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
     })
       }
     }

src/app/plan-management/meet-plan/meet-plan.component.ts

@@ -217,7 +217,7 @@ export class MeetPlanComponent implements OnInit {
    
   //查看预案
   openPlan(element){
-    //fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl
+    //fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl
     let filename:string
     let fetchUrl = element.attachmentUrls[0]
     let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl);
@@ -232,7 +232,7 @@ export class MeetPlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
     })
   }
 

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@@ -241,7 +241,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
     })
     
     

src/app/plan-management/open-plan/open-plan.component.ts

@@ -222,7 +222,7 @@ export class OpenPlanComponent implements OnInit {
           doc: {
             docId: docId,
             title: filename,
-            fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+            fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
           },
           user: {
             uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+        window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
       })
         }
       }

src/app/plan-management/pass-plan/pass-plan.component.ts

@@ -369,7 +369,7 @@ export class PassPlanComponent implements OnInit {
           doc: {
             docId: docId,
             title: filename,
-            fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+            fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
           },
           user: {
             uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+        window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
       })
         }
       }

src/app/plan-management/type-plan/type-plan.component.ts

@@ -222,7 +222,7 @@ export class TypePlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
     })
     
     

src/app/statistic-analysis/all-plan/all-plan.component.ts

@@ -108,7 +108,7 @@ export class AllPlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+      window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
     })
       }
     }

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

@@ -370,7 +370,7 @@ export class PlanAnalysisBySynthesisComponent implements OnInit {
             doc: {
               docId: docId,
               title: filename,
-              fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/` + fetchUrl,
+              fetchUrl: `http://172.18.0.1:8000/api/Objects/PlanPlatform/` + fetchUrl,
             },
             user: {
               uid: identityJsonparse.sub,
@@ -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://${location.host}/bisheng/apps/editor/openPreview?data=${base64}`)
+          window.open(`http://10.81.73.39:18080/apps/editor/openPreview?data=${base64}`)
         })
       }
     }