Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/TheCommandPlatform-Anxin

src/app/app-routing.module.ts

@@ -30,10 +30,12 @@ const routes: Routes = [
   },
   {path:'plan',
   component:planComponent},
-  {path:'similarPlans',
+  {path:'similarPlans/details',
   component:CollectionToolsComponent},
   {path:'planAssistance',
   component:PlanAssistanceComponent},
+  {path:'similarPlans',
+  component:SimilarPlansComponent},
   // {path:'getNoMToken',
   // component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
 

src/app/ui/similar-plans/similar-plans.component.html

@@ -1,7 +1,7 @@
 <div style="width: 100%;height: 100%;position: relative;">
-    <div class="backBtn" *ngIf="isResponsePlans" (click)="back()">
+    <!-- <div class="backBtn" *ngIf="isResponsePlans" (click)="back()">
         返回
-    </div>
+    </div> -->
     <div class="bigTalkBox" style="position: absolute;right: 26px;top: 8px;" [ngClass]="{cssClass: !isResponsePlans}">
         <mat-icon class="titleIcon" (click)="openTalkDiv()">volume_up</mat-icon>
         <div class="talkBox" *ngIf="isOpenTalk">

src/app/ui/similar-plans/similar-plans.component.scss

@@ -1,9 +1,7 @@
 .leisiTable{
-    border:1px solid  #0E79A9;
-    height: 95%;
+    height: 100%;
     width: 100%;
-    background-color: #05385E;
-    margin-top: 50px;
+    background-color: #0A264B;
     table{
         width: 100%;
         height: 100%;
@@ -11,7 +9,7 @@
         thead{
             td{
                 color:#F7BA2A;
-                height: 50px;
+                height: 55px;
                 text-align:center;
                 border-bottom: 1px solid  #0E79A9;
             }

src/app/ui/similar-plans/similar-plans.component.ts

@@ -1,14 +1,6 @@
-/*
- * @Descripttion: 
- * @version: 
- * @Author: sueRimn
- * @Date: 2020-09-25 10:30:04
- * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-05 17:05:31
- */
 import { Component, OnInit } from '@angular/core';
 import { Color } from 'cesium';
-
+import { Router } from '@angular/router';
 @Component({
   selector: 'app-similar-plans',
   templateUrl: './similar-plans.component.html',
@@ -16,7 +8,7 @@ import { Color } from 'cesium';
 })
 export class SimilarPlansComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router) { }
 
   ngOnInit(): void {
     
@@ -44,7 +36,7 @@ export class SimilarPlansComponent implements OnInit {
   isResponsePlans = false //默认是否是处置预案
 
   openDeatails(){
-    this.isResponsePlans = true
+    this.router.navigate(['similarPlans/details'])
   }
   back(){
     this.isResponsePlans = false