From 3be6452604ab1fbe36ca83b59e3547dd8ebaf4a5 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 12 Jul 2023 11:18:57 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=85=AD=E7=86=9F=E6=82=89?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.config.json                                           | 2 +-
 .../drill-record/drill-record.component.html                | 2 +-
 .../drill-record/drill-record.component.scss                | 1 +
 .../six-familiarity/six-familiarity.component.html          | 6 +++---
 .../six-familiarity/six-familiarity.component.scss          | 1 +
 src/app/ui/navmenus/navmenus.component.ts                   | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/proxy.config.json b/proxy.config.json
index 8129e12..1dbc1c7 100644
--- a/proxy.config.json
+++ b/proxy.config.json
@@ -1,6 +1,6 @@
 {
   "/api": {
-    "target": "http://121.36.37.70:8201/",
+    "target": "http://183.194.244.232:8088/",
     "生产": "http://10.81.73.39:8000/",
     "测试": "http://121.36.37.70:8201/",
     "生产2": "http://183.194.244.232:8088/",
diff --git a/src/app/plan-management/drill-record/drill-record.component.html b/src/app/plan-management/drill-record/drill-record.component.html
index fe3b830..316808b 100644
--- a/src/app/plan-management/drill-record/drill-record.component.html
+++ b/src/app/plan-management/drill-record/drill-record.component.html
@@ -46,7 +46,7 @@
                 <th mat-header-cell *matHeaderCellDef style="width: 200px;">操作</th>
                 <td mat-cell *matCellDef="let element" class="operate">
                     <span (click)="look(element)">查看</span>
-                    <!-- <span (click)="delete(element)">删除</span> -->
+                    <span (click)="delete(element)">删除</span>
                 </td>
             </ng-container>
             <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/src/app/plan-management/drill-record/drill-record.component.scss b/src/app/plan-management/drill-record/drill-record.component.scss
index c191340..4bcad7e 100644
--- a/src/app/plan-management/drill-record/drill-record.component.scss
+++ b/src/app/plan-management/drill-record/drill-record.component.scss
@@ -54,5 +54,6 @@
   span {
     color: #40a9ff;
     cursor: pointer;
+    margin: 0 3px;
   }
 }
diff --git a/src/app/plan-management/six-familiarity/six-familiarity.component.html b/src/app/plan-management/six-familiarity/six-familiarity.component.html
index 3662516..4f2aa89 100644
--- a/src/app/plan-management/six-familiarity/six-familiarity.component.html
+++ b/src/app/plan-management/six-familiarity/six-familiarity.component.html
@@ -35,11 +35,11 @@
             </ng-container>
             <ng-container matColumnDef="name">
                 <th mat-header-cell *matHeaderCellDef>熟悉对象</th>
-                <td mat-cell *matCellDef="let element"></td>
+                <td mat-cell *matCellDef="let element">{{element.planComponent.plan.company.name}}</td>
             </ng-container>
             <ng-container matColumnDef="or">
                 <th mat-header-cell *matHeaderCellDef>组织机构</th>
-                <td mat-cell *matCellDef="let element"></td>
+                <td mat-cell *matCellDef="let element">{{element.planComponent.plan.company.organizationName}}</td>
             </ng-container>
             <ng-container matColumnDef="people">
                 <th mat-header-cell *matHeaderCellDef>人员数量</th>
@@ -54,7 +54,7 @@
                 <th mat-header-cell *matHeaderCellDef style="width: 200px;">操作</th>
                 <td mat-cell *matCellDef="let element" class="operate">
                     <span (click)="look(element)">查看</span>
-                    <!-- <span (click)="delete(element)">删除</span> -->
+                    <span (click)="delete(element)">删除</span>
                 </td>
             </ng-container>
             <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
diff --git a/src/app/plan-management/six-familiarity/six-familiarity.component.scss b/src/app/plan-management/six-familiarity/six-familiarity.component.scss
index 985135e..3205c6b 100644
--- a/src/app/plan-management/six-familiarity/six-familiarity.component.scss
+++ b/src/app/plan-management/six-familiarity/six-familiarity.component.scss
@@ -55,5 +55,6 @@
   span {
     color: #40a9ff;
     cursor: pointer;
+    margin: 0 3px;
   }
 }
diff --git a/src/app/ui/navmenus/navmenus.component.ts b/src/app/ui/navmenus/navmenus.component.ts
index 7b35c97..3e1adfc 100644
--- a/src/app/ui/navmenus/navmenus.component.ts
+++ b/src/app/ui/navmenus/navmenus.component.ts
@@ -154,10 +154,10 @@ export class CreateMenus {
     // this.http
     //   .post("/api/NavMenus", {
     //     id: "",
-    //     name: "预案推演",
+    //     name: "预案熟悉",
     //     icon: "featured_play_list",
     //     // url: value.url,
-    //     order: 5,
+    //     order: 4,
     //     parentId: null,
     //   })
     //   .subscribe(