[修改]审核记录和待审核二维预案查看路由更改

src/app/app-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-11 14:48:03
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-02 15:22:22
+ * @LastEditTime: 2021-03-26 15:18:46
  */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -16,7 +16,7 @@ import { PlanPassComponent } from '../app/plan-audit/plan-pass/plan-pass.compone
 //路由守卫
 import {AuthGuard} from './auth.guard'
 import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥
-
+import {ViewUnitDetailsPlanComponent} from './key-unit/view-unit-details-plan/view-unit-details-plan.component'
 
 
 const routes: Routes = [
@@ -37,8 +37,10 @@ const routes: Routes = [
   },
 
   {path:'login',component:LoginComponent},
+  { path:'keyUnit/viewunitinfoplans', component:ViewUnitDetailsPlanComponent,canActivate: [AuthGuard],},
   {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
   { path: 'planAudit/planpass', component: PlanPassComponent },
+
 ];
 
 @NgModule({

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-24 16:06:43
+ * @LastEditTime: 2021-03-26 14:49:40
 -->
 <div class="box">
     <div class="boxleft">
@@ -59,7 +59,8 @@
                   <mat-form-field class="example-full-width" style="margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="addtime">
                   </mat-form-field>
-                  <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+                  <mat-icon *ngIf="!pcshow" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                  <span style="margin-left: 15px;" id="pcshow" *ngIf="pcshow">🠊</span>
                   <mat-form-field class="example-full-width" style="margin-left: 10px;margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
                   </mat-form-field>

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-03-20 15:12:24
+ * @LastEditTime: 2021-03-26 15:21:16
  */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -24,7 +24,13 @@ export class PlanRecordComponent implements OnInit {
 
   constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { }
 
+  pcshow
   ngOnInit(): void {
+    if(window.matchMedia("(max-width: 1300px)").matches){
+      this.pcshow=false
+    }else{
+      this.pcshow=true
+    }
     let level = sessionStorage.getItem("level");
     if(level == "0"){//如果是总队
       this.preparelevels = [
@@ -82,6 +88,7 @@ export class PlanRecordComponent implements OnInit {
   organizationName
   planData
   id
+  itemid
   companyId
   fetchUrl
   companyName
@@ -139,8 +146,9 @@ export class PlanRecordComponent implements OnInit {
   tableClick(e,item){
     this.showtype = -1
     //e.target.parentElement.bgColor='#2196F3'
-    //console.log(e,item)
+    console.log(item)
     this.organizationName=''
+    this.itemid=item.itemId
     this.id=item.id
     this.fetchUrl=''
     this.viewer={}
@@ -298,11 +306,11 @@ export class PlanRecordComponent implements OnInit {
       })
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
       sessionStorage.setItem("companyId",this.companyId);
-      sessionStorage.setItem("planId",this.id);
+      sessionStorage.setItem("planId",this.itemid);
       sessionStorage.setItem("editable",'0');
       sessionStorage.setItem("planName",data.name)
       let companyId = sessionStorage.getItem("companyId")
-      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
       //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
     } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
       this.showtype=2

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-03-25 08:45:05
+ * @LastEditTime: 2021-03-26 15:09:38
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -109,6 +109,7 @@ export class WaitExamineerComponent implements OnInit {
   organizationName
   planData
   id
+  itemid
   companyId
   fetchUrl
   companyName
@@ -147,6 +148,7 @@ export class WaitExamineerComponent implements OnInit {
   radioClick(e,item){
     this.showtype = -1
     this.organizationName=''
+    this.itemid=item.itemId
     this.id=item.id
     this.fetchUrl=''
     this.viewer={}
@@ -310,11 +312,11 @@ export class WaitExamineerComponent implements OnInit {
       })
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
       sessionStorage.setItem("companyId",this.companyId);
-      sessionStorage.setItem("planId",this.id);
+      sessionStorage.setItem("planId",this.itemid);
       sessionStorage.setItem("editable",'0');
       sessionStorage.setItem("planName",data.name)
       let companyId = sessionStorage.getItem("companyId")
-      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
       //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
     } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
       this.showtype=2