From ca8d2104a86201578ff255c9b8d3ec426917d6d2 Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Sat, 20 Feb 2021 16:39:17 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=BE=85=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=AF=95=E5=8D=87=E6=96=87=E6=A1=A3=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan-record/plan-record.component.ts           | 14 ++++++++++----
 .../wait-examineer/wait-examineer.component.html   |  4 ++--
 .../wait-examineer/wait-examineer.component.ts     | 14 ++++++++++----
 .../meet-plan/meet-plan.component.ts               |  2 +-
 .../onetwo-entry-plan.component.ts                 |  4 ++--
 5 files changed, 25 insertions(+), 13 deletions(-)

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 42013c4..3aedb68 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-20 10:39:50
+ * @LastEditTime: 2021-02-20 16:35:38
  */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -191,19 +191,25 @@ export class PlanRecordComponent implements OnInit {
   //毕升
   lookWord(){
     this.showtype=0
+    let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + this.fetchUrl);
+    let docId = CryptoJS.enc.Base64.stringify(docIdWordArray);
+    let jwt = sessionStorage.getItem("token");
+    let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]);
+    let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt);
+    let identityJsonparse=JSON.parse(identityJson)
     let filename:string
           this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data:any)=>{
             filename=data.fileName 
             let json={
              doc: {
-                docId: this.id, 
+                docId: docId, 
                 title: filename,
                //title: filename,
                 fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
              },
              user: {
-                uid: "test",
-                nickName: "test",
+                uid: identityJsonparse.sub,
+                nickName: identityJsonparse.name,
                 avatar: "",
                 privilege: [
                   'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' 
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 2c3a4ea..9719e05 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html
@@ -269,9 +269,9 @@
         <app-water-audit></app-water-audit>
       </div> -->
       <!-- 消防力量审核 -->
-      <div class="fireForceAudit">
+      <!-- <div class="fireForceAudit">
         <app-fireforce-audit></app-fireforce-audit>
-      </div>
+      </div> -->
       <!-- 联动力量审核 -->
       <!-- <div class="LinkageForcesAudit">
         <app-linkageforces-audit></app-linkageforces-audit>
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 14887f7..089b7ae 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-07 14:37:44
+ * @LastEditTime: 2021-02-20 16:34:00
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -212,19 +212,25 @@ export class WaitExamineerComponent implements OnInit {
   //毕升
   lookWord(){
     this.showtype=0
+    let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + this.fetchUrl);
+    let docId = CryptoJS.enc.Base64.stringify(docIdWordArray);
+    let jwt = sessionStorage.getItem("token");
+    let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]);
+    let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt);
+    let identityJsonparse=JSON.parse(identityJson)
     let filename:string
           this.http.get(`/api/ObjectMetadata/PlanPlatform/${this.fetchUrl}`).subscribe((data:any)=>{
             filename=data.fileName 
             let json={
              doc: {
-                docId: this.id, 
+                docId: docId, 
                 title: filename,
                //title: filename,
                 fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl
              },
              user: {
-                uid: "test",
-                nickName: "test",
+                uid: identityJsonparse.sub,
+                nickName: identityJsonparse.name,
                 avatar: "",
                 privilege: [
                   'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' 
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 5a24607..0f15262 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -181,7 +181,7 @@ export class MeetPlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,
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 3a92ba4..9c9e94f 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-02-07 16:13:54
+ * @LastEditTime: 2021-02-20 16:34:35
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -205,7 +205,7 @@ export class OnetwoEntryPlanComponent implements OnInit {
         doc: {
           docId: docId,
           title: filename,
-          fetchUrl: `http://39.106.78.171:8000/api/Objects/PlanPlatform/`+fetchUrl,
+          fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl,
         },
         user: {
           uid: identityJsonparse.sub,