From 73a26b2cbf27c856409a49eaaabd1973a510abf5 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 8 Nov 2021 16:01:24 +0800
Subject: [PATCH 1/6] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=EF=BC=8C=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../criminal-records-admin.component.html     |   2 +-
 .../criminal-records.component.html           |   2 +-
 .../equipment-info.component.html             |   1 +
 .../equipment-info.component.scss             |   0
 .../equipment-info.component.ts               |  15 ++
 src/app/pages/home/home.component.html        |   6 +
 .../oil-station-info.component.html           |   1 +
 .../oil-station-info.component.scss           |   0
 .../oil-station-info.component.ts             |  15 ++
 src/app/pages/pages-routing.module.ts         |   7 +-
 src/app/pages/pages.module.ts                 |   4 +-
 .../today-warning-admin.component.html        |   2 +-
 .../today-warning-admin.component.scss        |  34 +---
 .../today-warning.component.html              |   2 +-
 .../today-warning.component.scss              |  27 ---
 src/app/service/tree.service.ts               |  14 +-
 .../navigation/navigation.component.html      |  39 +++-
 .../navigation/navigation.component.scss      |  78 ++++++++
 .../navigation/navigation.component.ts        |   4 +-
 .../organization/addor/addor.component.html   |  21 ++
 .../organization/addor/addor.component.scss   |   0
 .../organization/addor/addor.component.ts     |  26 +++
 .../organization/editor/editor.component.html |  21 ++
 .../organization/editor/editor.component.scss |   0
 .../organization/editor/editor.component.ts   |  27 +++
 .../organization/organization.component.html  |  44 ++++-
 .../organization/organization.component.scss  |  78 ++++++++
 .../organization/organization.component.ts    | 175 +++++++++++++++-
 .../role/addrole/addrole.component.html       |  21 ++
 .../role/addrole/addrole.component.scss       |   0
 .../role/addrole/addrole.component.ts         |  38 ++++
 .../role/editrole/editrole.component.html     |  18 ++
 .../role/editrole/editrole.component.scss     |   0
 .../role/editrole/editrole.component.ts       |  38 ++++
 .../role/role.component.html                  |  39 +++-
 .../role/role.component.scss                  |  54 +++++
 .../system-management/role/role.component.ts  | 127 +++++++++++-
 .../system-management-routing.module.ts       |  13 +-
 .../system-management.module.ts               |  48 ++++-
 .../user/adduser/adduser.component.html       |  39 ++++
 .../user/adduser/adduser.component.scss       |   0
 .../user/adduser/adduser.component.ts         |  54 +++++
 .../user/edituser/edituser.component.html     |  39 ++++
 .../user/edituser/edituser.component.scss     |   0
 .../user/edituser/edituser.component.ts       |  57 ++++++
 .../user/user.component.html                  |  64 +++++-
 .../user/user.component.scss                  |  87 ++++++++
 .../system-management/user/user.component.ts  | 186 +++++++++++++++++-
 src/app/ui/tabbar/tabbar.component.html       |   4 +-
 src/app/ui/tabbar/tabbar.component.ts         |   7 +-
 src/assets/images/icon/admin.png              | Bin 0 -> 346 bytes
 src/assets/images/icon/organization.png       | Bin 0 -> 329 bytes
 src/assets/images/icon/orgrey.png             | Bin 0 -> 387 bytes
 src/assets/images/icon/power.png              | Bin 0 -> 484 bytes
 src/assets/images/icon/role.png               | Bin 0 -> 438 bytes
 src/assets/images/icon/user.png               | Bin 0 -> 404 bytes
 src/assets/images/user.png                    | Bin 0 -> 2372 bytes
 src/assets/images/userbig.png                 | Bin 0 -> 8500 bytes
 src/styles.scss                               |  10 -
 src/theme.less                                | 172 +++++++++++-----
 60 files changed, 1605 insertions(+), 155 deletions(-)
 create mode 100644 src/app/pages/equipment-info/equipment-info.component.html
 create mode 100644 src/app/pages/equipment-info/equipment-info.component.scss
 create mode 100644 src/app/pages/equipment-info/equipment-info.component.ts
 create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.html
 create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.scss
 create mode 100644 src/app/pages/oil-station-info/oil-station-info.component.ts
 create mode 100644 src/app/system-management/organization/addor/addor.component.html
 create mode 100644 src/app/system-management/organization/addor/addor.component.scss
 create mode 100644 src/app/system-management/organization/addor/addor.component.ts
 create mode 100644 src/app/system-management/organization/editor/editor.component.html
 create mode 100644 src/app/system-management/organization/editor/editor.component.scss
 create mode 100644 src/app/system-management/organization/editor/editor.component.ts
 create mode 100644 src/app/system-management/role/addrole/addrole.component.html
 create mode 100644 src/app/system-management/role/addrole/addrole.component.scss
 create mode 100644 src/app/system-management/role/addrole/addrole.component.ts
 create mode 100644 src/app/system-management/role/editrole/editrole.component.html
 create mode 100644 src/app/system-management/role/editrole/editrole.component.scss
 create mode 100644 src/app/system-management/role/editrole/editrole.component.ts
 create mode 100644 src/app/system-management/user/adduser/adduser.component.html
 create mode 100644 src/app/system-management/user/adduser/adduser.component.scss
 create mode 100644 src/app/system-management/user/adduser/adduser.component.ts
 create mode 100644 src/app/system-management/user/edituser/edituser.component.html
 create mode 100644 src/app/system-management/user/edituser/edituser.component.scss
 create mode 100644 src/app/system-management/user/edituser/edituser.component.ts
 create mode 100644 src/assets/images/icon/admin.png
 create mode 100644 src/assets/images/icon/organization.png
 create mode 100644 src/assets/images/icon/orgrey.png
 create mode 100644 src/assets/images/icon/power.png
 create mode 100644 src/assets/images/icon/role.png
 create mode 100644 src/assets/images/icon/user.png
 create mode 100644 src/assets/images/user.png
 create mode 100644 src/assets/images/userbig.png

diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
index 8ad4b46..050e9bd 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html
@@ -1,4 +1,4 @@
-<div class="recordsbox">
+<div class="recordsboxadmin" id="recordsboxadmin"> 
   <div class="search">
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html
index 95a2328..c59c6ff 100644
--- a/src/app/pages/criminal-records/criminal-records.component.html
+++ b/src/app/pages/criminal-records/criminal-records.component.html
@@ -1,4 +1,4 @@
-<div class="recordsbox">
+<div class="recordsbox" id="recordsbox">
   <div class="search">
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item class="searchParams">
diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html
new file mode 100644
index 0000000..47b9f19
--- /dev/null
+++ b/src/app/pages/equipment-info/equipment-info.component.html
@@ -0,0 +1 @@
+<p>equipment-info works!</p>
diff --git a/src/app/pages/equipment-info/equipment-info.component.scss b/src/app/pages/equipment-info/equipment-info.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
new file mode 100644
index 0000000..e6bbd00
--- /dev/null
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-equipment-info',
+  templateUrl: './equipment-info.component.html',
+  styleUrls: ['./equipment-info.component.scss']
+})
+export class EquipmentInfoComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 15e5cfd..ed6f6c5 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -12,6 +12,12 @@
         <li [routerLink]="['/home/records/admin']"  routerLinkActive="router-link-active">
             违规记录
         </li>
+        <!-- <li [routerLink]="['/home/equipmentInfo']"  routerLinkActive="router-link-active">
+            器材信息
+        </li>
+        <li [routerLink]="['/home/oliStationInfo']"  routerLinkActive="router-link-active">
+            基本信息
+        </li> -->
     </div>
     <div class="content">
         <router-outlet></router-outlet>
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
new file mode 100644
index 0000000..4513a0b
--- /dev/null
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -0,0 +1 @@
+<p>oil-station-info works!</p>
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
new file mode 100644
index 0000000..30e2d0e
--- /dev/null
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-oil-station-info',
+  templateUrl: './oil-station-info.component.html',
+  styleUrls: ['./oil-station-info.component.scss']
+})
+export class OilStationInfoComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/pages/pages-routing.module.ts b/src/app/pages/pages-routing.module.ts
index 35bce70..1da3c55 100644
--- a/src/app/pages/pages-routing.module.ts
+++ b/src/app/pages/pages-routing.module.ts
@@ -6,13 +6,18 @@ import { CriminalRecordsComponent } from './criminal-records/criminal-records.co
 import {AuthGuard} from '../auth.guard'
 import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
 import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
+import { OilStationInfoComponent } from './oil-station-info/oil-station-info.component';
+import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
 
 const routes: Routes = [
     { path: 'plan', component: PlanComponent , data: { permission: 'xxxx' },canActivate: [AuthGuard]},
     { path: 'warning/petrolStation', component: TodayWarningComponent },
     { path: 'warning/admin', component: TodayWarningAdminComponent },
     { path: 'records/petrolStation', component: CriminalRecordsComponent },
-    { path: 'records/admin', component: CriminalRecordsAdminComponent }
+    { path: 'records/admin', component: CriminalRecordsAdminComponent },
+    { path: 'equipmentInfo', component: EquipmentInfoComponent },
+    { path: 'oliStationInfo', component: OilStationInfoComponent }
+   
 ];
 
 @NgModule({
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index ddab50b..e624f71 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -31,8 +31,10 @@ import { NzMessageModule } from 'ng-zorro-antd/message';
 import { NzSpinModule } from 'ng-zorro-antd/spin';
 import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component';
 import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component';
+import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
+import { OilStationInfoComponent } from './oil-station-info/oil-station-info.component';
 @NgModule({
-  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent,],
+  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, EquipmentInfoComponent, OilStationInfoComponent,],
   imports: [
     PagesRoutingModule,
     CommonModule,
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html
index 75a90ad..d6c5ca2 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.html
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html
@@ -1,4 +1,4 @@
-<div class="warningbox">
+<div class="warningbox" id="warningboxadmin">
   <div class="title">
     <app-title [name]="'当日违规事件列表'"></app-title>
   </div>
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
index fb8f536..57d146e 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss
@@ -35,14 +35,15 @@
       }
 
       nz-select {
-        color: rgba(145, 204, 255, 0.95);;
+        color: rgba(145, 204, 255, 0.95);
+        ;
       }
 
       nz-date-picker {
         background-color: rgba(0, 0, 0, 0);
         width: 145%;
       }
-      
+
     }
   }
 
@@ -91,6 +92,7 @@
         text-overflow: ellipsis;
         display: flex;
         align-items: center;
+
         button {
           font-size: 15px;
           background-color: #013064;
@@ -110,9 +112,11 @@
         text-align: center;
         margin-left: 8px;
       }
+
       .propsm1 {
         background: #2399FF;
       }
+
       .propsm2 {
         background: #FF9963;
       }
@@ -126,32 +130,6 @@
       color: #23D9FF;
     }
   }
-}
-
 
-//遮罩层
-::ng-deep .vertical-center-modal {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-::ng-deep .ant-modal-body {
-  background: #072549;
-  height: 660px;
-  padding: 5px;
-  // border: 1px solid #8eb9e3;
-  box-shadow: 0 0 3px #8eb9e3;
-  color: #fff;
-}
-
-::ng-deep .ant-modal-close-x {
-  width: 36px;
-  height: 36px;
-  line-height: 36px;
-  color: white;
-}
 
-::ng-deep .vertical-center-modal .ant-modal {
-  top: 0;
 }
diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html
index 4ca68b8..14ae5cd 100644
--- a/src/app/pages/today-warning/today-warning.component.html
+++ b/src/app/pages/today-warning/today-warning.component.html
@@ -1,4 +1,4 @@
-<div class="warningbox">
+<div class="warningbox" id="warningbox">
   <div class="title">
     <app-title [name]="'当日违规事件列表'"></app-title>
   </div>
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss
index 16a8d2c..1b26d4a 100644
--- a/src/app/pages/today-warning/today-warning.component.scss
+++ b/src/app/pages/today-warning/today-warning.component.scss
@@ -99,30 +99,3 @@
   }
 }
 
-
-//遮罩层
-::ng-deep .vertical-center-modal {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-::ng-deep .ant-modal-body {
-  background: #072549;
-  height: 660px;
-  padding: 5px;
-  // border: 1px solid #8eb9e3;
-  box-shadow: 0 0 3px #8eb9e3;
-  color: #fff;
-}
-
-::ng-deep .ant-modal-close-x {
-  width: 36px;
-  height: 36px;
-  line-height: 36px;
-  color: white;
-}
-
-::ng-deep .vertical-center-modal .ant-modal {
-  top: 0;
-}
diff --git a/src/app/service/tree.service.ts b/src/app/service/tree.service.ts
index f6c9713..8753b54 100644
--- a/src/app/service/tree.service.ts
+++ b/src/app/service/tree.service.ts
@@ -18,13 +18,13 @@ export class TreeService {
                     parentNode.children = []
                 }
 
-                if (parentNode.children.length == 0) {
-                    item.isTop = true;
-                } else {
-                    item.isTop = false;
-                    parentNode.children[parentNode.children.length -1].isBottom = false;
-                }
-                item.isBottom = true;
+                // if (parentNode.children.length == 0) {
+                //     item.isTop = true;
+                // } else {
+                //     item.isTop = false;
+                //     parentNode.children[parentNode.children.length -1].isBottom = false;
+                // }
+                // item.isBottom = true;
 
                 parentNode.children.push(item)
             }else{
diff --git a/src/app/system-management/navigation/navigation.component.html b/src/app/system-management/navigation/navigation.component.html
index 2b28ba1..3ab03ce 100644
--- a/src/app/system-management/navigation/navigation.component.html
+++ b/src/app/system-management/navigation/navigation.component.html
@@ -1 +1,38 @@
-<p>系统管理页面</p>
+<!-- <p>系统管理页面</p> -->
+<nz-layout>
+  <nz-sider [nzWidth]='300'>
+    <div class="logo">
+      <img src="../../../assets/images/logo.png" alt="">
+    </div>
+    <div class="headPortrait">
+      <div class="photograph">
+        <img src="../../../assets/images/userbig.png" alt="">
+      </div>
+      <span>Administrator</span>
+      <span><img src="../../../assets/images/icon/admin.png" alt=""> 管理员</span>
+    </div>
+    <div class="nav">
+      <ul>
+        <li [routerLink]="['/system/organization']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/organization.png" alt="">组织机构管理</li>
+        <li [routerLink]="['/system/user']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/user.png" alt="">用户管理</li>
+        <li [routerLink]="['/system/role']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/role.png" alt="">角色管理</li>
+      </ul>
+    </div>
+  </nz-sider>
+  <nz-layout>
+    <nz-header>
+      <span>Hey，欢迎登录中化油站可视化智能安全管理系统</span>
+      <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
+        <i nz-icon nzType="setting"></i>
+      </a>
+      <nz-dropdown-menu #menu="nzDropdownMenu">
+        <ul nz-menu nzSelectable>
+          <li nz-menu-item (click)="signOut()">退出</li>
+        </ul>
+      </nz-dropdown-menu>
+    </nz-header>
+    <nz-content>
+      <router-outlet></router-outlet>
+    </nz-content>
+  </nz-layout>
+</nz-layout>
diff --git a/src/app/system-management/navigation/navigation.component.scss b/src/app/system-management/navigation/navigation.component.scss
index e69de29..3a4a07a 100644
--- a/src/app/system-management/navigation/navigation.component.scss
+++ b/src/app/system-management/navigation/navigation.component.scss
@@ -0,0 +1,78 @@
+nz-layout {
+  width: 100%;
+  height: 100%;
+  color: #fff;
+  font-size: 16px !important;
+}
+
+nz-sider {
+  background: #001B3B;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .logo {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    margin-top: 40px;
+  }
+
+  .headPortrait {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-top: 46px;
+    margin-bottom: 46px;
+
+    .photograph {
+      // width: 140px;
+      // height: 140px;
+      // border: 4px solid #FFFFFF;
+      // opacity: 1;
+      // border-radius: 32px;
+    }
+
+    span {
+      margin-top: 18px;
+    }
+  }
+
+  .nav {
+    ul {
+      li {
+        width: 300px;
+        height: 40px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: left;
+        margin-bottom: 16px;
+        box-sizing: border-box;
+        padding-left: 26%;
+        img{
+            margin-right: 8px;
+        }
+      }
+
+      .router-link-active {
+        background: linear-gradient(90deg, rgba(0, 13, 33, 0) 0%, #2399FF 52%, rgba(0, 13, 33, 0) 100%);
+      }
+    }
+  }
+}
+
+nz-header {
+  height: 56px;
+  background: #FFFFFF;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 16px;
+}
+
+nz-content {
+  background: #F2F2F2;
+  box-sizing: border-box;
+  padding: 16px;
+}
diff --git a/src/app/system-management/navigation/navigation.component.ts b/src/app/system-management/navigation/navigation.component.ts
index 18be053..d9b293a 100644
--- a/src/app/system-management/navigation/navigation.component.ts
+++ b/src/app/system-management/navigation/navigation.component.ts
@@ -11,5 +11,7 @@ export class NavigationComponent implements OnInit {
 
   ngOnInit(): void {
   }
-
+  signOut() {
+    // history.go(-1);
+  }
 }
diff --git a/src/app/system-management/organization/addor/addor.component.html b/src/app/system-management/organization/addor/addor.component.html
new file mode 100644
index 0000000..ab9ed73
--- /dev/null
+++ b/src/app/system-management/organization/addor/addor.component.html
@@ -0,0 +1,21 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control nzErrorTip="请输入名称">
+        <nz-input-group>
+          <input nz-input type="text" formControlName="name" placeholder="请输入名称" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <!-- <nz-form-item>
+      <nz-form-control>
+        <nz-select formControlName="power" nzPlaceHolder="请选择权限" (nzScrollToBottom)="loadMore()" nzMode="multiple">
+          <nz-option *ngFor="let o of optionList" [nzValue]="o" [nzLabel]="o.displayName"></nz-option>
+        </nz-select>
+        <ng-template #renderTemplate>
+          <nz-spin *ngIf="isLoading"></nz-spin>
+        </ng-template>
+      </nz-form-control>
+    </nz-form-item> -->
+  </form>
+</div>
diff --git a/src/app/system-management/organization/addor/addor.component.scss b/src/app/system-management/organization/addor/addor.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/organization/addor/addor.component.ts b/src/app/system-management/organization/addor/addor.component.ts
new file mode 100644
index 0000000..3a5dc13
--- /dev/null
+++ b/src/app/system-management/organization/addor/addor.component.ts
@@ -0,0 +1,26 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+@Component({
+  selector: 'app-addor',
+  templateUrl: './addor.component.html',
+  styleUrls: ['./addor.component.scss']
+})
+export class AddorComponent implements OnInit {
+
+  @Input() title?: string;
+  @Input() subtitle?: string;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      name: [null, [Validators.required]]
+    });
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+}
diff --git a/src/app/system-management/organization/editor/editor.component.html b/src/app/system-management/organization/editor/editor.component.html
new file mode 100644
index 0000000..4769623
--- /dev/null
+++ b/src/app/system-management/organization/editor/editor.component.html
@@ -0,0 +1,21 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control nzErrorTip="请输入名称">
+        <nz-input-group>
+          <input nz-input type="text" formControlName="name" placeholder="请输入名称" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <!-- <nz-form-item>
+        <nz-form-control>
+          <nz-select formControlName="power" nzPlaceHolder="请选择权限" (nzScrollToBottom)="loadMore()" nzMode="multiple">
+            <nz-option *ngFor="let o of optionList" [nzValue]="o" [nzLabel]="o.displayName"></nz-option>
+          </nz-select>
+          <ng-template #renderTemplate>
+            <nz-spin *ngIf="isLoading"></nz-spin>
+          </ng-template>
+        </nz-form-control>
+      </nz-form-item> -->
+  </form>
+</div>
diff --git a/src/app/system-management/organization/editor/editor.component.scss b/src/app/system-management/organization/editor/editor.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/organization/editor/editor.component.ts b/src/app/system-management/organization/editor/editor.component.ts
new file mode 100644
index 0000000..c7a7805
--- /dev/null
+++ b/src/app/system-management/organization/editor/editor.component.ts
@@ -0,0 +1,27 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+@Component({
+  selector: 'app-editor',
+  templateUrl: './editor.component.html',
+  styleUrls: ['./editor.component.scss']
+})
+export class EditorComponent implements OnInit {
+
+  @Input() data?: any;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      name: [null, [Validators.required]],
+      power: [null, [Validators.required]]
+    });
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+
+}
diff --git a/src/app/system-management/organization/organization.component.html b/src/app/system-management/organization/organization.component.html
index 414c783..4bcf388 100644
--- a/src/app/system-management/organization/organization.component.html
+++ b/src/app/system-management/organization/organization.component.html
@@ -1 +1,43 @@
-<p>organization works!</p>
+<div class="orbox" id="orbox">
+  <div class="topbox">
+    <div class="lefttop">
+      <span>组织机构列表</span>
+      <span><img style="vertical-align: top;" src="../../../assets/images/icon/orgrey.png" alt=""> {{totalCount}}个单位</span>
+    </div>
+    <div class="righttop">
+      <!-- <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-control>
+            <nz-input-group nzPrefixIcon="search">
+              <input type="text" nz-input placeholder="请输入单位" formControlName="search" [(ngModel)]="searchValue"/>
+            </nz-input-group>
+          </nz-form-control>
+          <button style="display: none;" type="submit"></button>
+        </nz-form-item>
+      </form> -->
+      <nz-input-group nzPrefixIcon="search">
+        <input type="text" nz-input placeholder="请输入单位" [(ngModel)]="searchValue"/>
+      </nz-input-group>
+      <button nz-button nzType="primary" (click)="addOr()"><i nz-icon nzType="plus-circle"
+          nzTheme="outline"></i>新增</button>
+    </div>
+  </div>
+  <div class="treeTitle">
+    <span>组织机构</span>
+    <span>操作</span>
+  </div>
+  <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes" [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys"
+    (nzClick)="nzClick($event)" (nzContextMenu)="nzClick($event)" (nzCheckBoxChange)="nzCheck($event)"
+    (nzExpandChange)="nzCheck($event)" [nzTreeTemplate]="nzTreeTemplate">
+  </nz-tree>
+  <ng-template #nzTreeTemplate let-node let-origin="origin">
+    <div class="nodebox">
+      <span class="name">{{ node.title }}</span>
+      <span class="operation">
+        <span (click)="addOr(node)">新增</span>
+        <span (click)="editOr(node)">编辑</span>
+        <span (click)="deleteOr(node)">删除</span>
+      </span>
+    </div>
+  </ng-template>
+</div>
diff --git a/src/app/system-management/organization/organization.component.scss b/src/app/system-management/organization/organization.component.scss
index e69de29..a365d13 100644
--- a/src/app/system-management/organization/organization.component.scss
+++ b/src/app/system-management/organization/organization.component.scss
@@ -0,0 +1,78 @@
+.orbox {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+  background: #fff;
+  box-sizing: border-box;
+  padding: 20px;
+  font-size: 15px;
+}
+
+.topbox {
+  width: 700px;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .lefttop {
+    span:nth-child(1) {
+      color: #000D21;
+      margin-right: 16px;
+    }
+
+    span:nth-child(2) {
+      color: rgba(36, 36, 36, 0.24);
+    }
+  }
+
+  .righttop {
+    height: 36px;
+    display: flex;
+
+    button {
+      margin-left: 16px;
+    }
+
+    nz-input-group {
+      height: 32px;
+    }
+  }
+}
+
+.treeTitle {
+  width: 700px;
+  height: 36px;
+  line-height: 36px;
+  display: flex;
+  justify-content: space-between;
+  color: #000D21;
+  box-sizing: border-box;
+  padding-left: 30px;
+  padding-right: 180px;
+  background: rgba(145, 204, 255, 0.2);
+  margin: 12px 0;
+}
+
+.nodebox {
+  font-size: 15px;
+
+}
+
+.operation {
+  position: absolute;
+  right: 0;
+
+  span {
+    margin-left: 40px;
+  }
+
+  span:nth-child(1),
+  span:nth-child(2) {
+    color: #2399FF;
+  }
+
+  span:nth-child(3) {
+    color: rgba(0, 13, 33, 0.48);
+  }
+}
diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts
index b7e9eee..3629aaa 100644
--- a/src/app/system-management/organization/organization.component.ts
+++ b/src/app/system-management/organization/organization.component.ts
@@ -1,15 +1,182 @@
-import { Component, OnInit } from '@angular/core';
-
+import { HttpClient } from '@angular/common/http';
+import { Component, OnInit, AfterViewInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { TreeService } from 'src/app/service/tree.service';
+import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { AddorComponent } from './addor/addor.component';
+import { EditorComponent } from './editor/editor.component';
 @Component({
   selector: 'app-organization',
   templateUrl: './organization.component.html',
   styleUrls: ['./organization.component.scss']
 })
 export class OrganizationComponent implements OnInit {
-
-  constructor() { }
+  validateForm!: FormGroup;
+  constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private message: NzMessageService, private viewContainerRef: ViewContainerRef) { }
 
   ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      search: [null]
+    });
+    this.getAllOrganization()
+  }
+  //搜索框提交
+  submitForm(): void {
+    console.log(12345)
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+  }
+
+  //获取所有组织机构
+  searchValue = '';
+  nzExpandAll = false;
+  totalCount:string
+  getAllOrganization() {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+      this.totalCount = data.result.totalCount
+      // console.log('组织机构',data.result.totalCount)
+      data.result.items.forEach(element => {
+        element.key = element.code
+        element.title = element.displayName
+        element.selectable = false
+      });
+      this.nodes = [...this.toTree.toTree(data.result.items)]
+      // this.nzExpandAll = true;
+      this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+        this.defaultExpandedKeys.push(item.key)
+      })
+    })
+  }
+
+
+  @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+
+  defaultExpandedKeys = [];
+
+  nodes: any[] = []
+
+  nzClick(event: NzFormatEmitEvent): void {
+    // console.log(event);
+    console.log('展开节点', this.nzTreeComponent.getExpandedNodeList())
+
+
   }
 
+  nzCheck(event: NzFormatEmitEvent): void {
+    console.log(event);
+  }
+
+  // nzSelectedKeys change
+  nzSelect(keys: string[]): void {
+    console.log(keys, this.nzTreeComponent.getSelectedNodeList());
+  }
+
+  ngAfterViewInit(): void {
+    // get node by key: '10011'
+    console.log(this.nzTreeComponent.getTreeNodeByKey('10011'));
+    // use tree methods
+    console.log(
+      this.nzTreeComponent.getTreeNodes(),
+      this.nzTreeComponent.getCheckedNodeList(),
+      this.nzTreeComponent.getSelectedNodeList(),
+      this.nzTreeComponent.getExpandedNodeList()
+    );
+  }
+
+  addOr(node?: any) {
+    const modal = this.modal.create({
+      nzTitle: node ? '新增组织机构' : '新增一级组织机构',
+      nzContent: AddorComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        title: '',
+        subtitle: ''
+      },
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+
+            }
+            this.http.post('/api/services/app/User/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '创建成功！');
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+
+  }
+  editOr(node) {
+    console.log(node)
+    const modal = this.modal.create({
+      nzTitle: '编辑组织机构',
+      nzContent: EditorComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        data: node,
+      },
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+
+            }
+            this.http.post('/api/services/app/User/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '编辑成功！');
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+  }
+  deleteOr(item) {
+    console.log(item)
+    this.modal.confirm({
+      nzTitle: `确定要删除${item.title}这个机构吗?`,
+      nzOkText: '确定',
+      nzOkType: 'danger',
+      nzOnOk: () => {
+        this.http.delete('/api/services/app/Role/Delete', {
+          params: {
+            Id: item.id
+          }
+        }).subscribe(data => {
+          this.message.create('success', '删除成功！');
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => {
+
+      }
+    });
+  }
 }
diff --git a/src/app/system-management/role/addrole/addrole.component.html b/src/app/system-management/role/addrole/addrole.component.html
new file mode 100644
index 0000000..1727024
--- /dev/null
+++ b/src/app/system-management/role/addrole/addrole.component.html
@@ -0,0 +1,21 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control nzErrorTip="请输入名称">
+        <nz-input-group>
+          <input nz-input type="text" formControlName="name" placeholder="请输入名称" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-select formControlName="power" nzPlaceHolder="请选择权限" (nzScrollToBottom)="loadMore()" nzMode="multiple">
+          <nz-option *ngFor="let o of optionList" [nzValue]="o" [nzLabel]="o.displayName"></nz-option>
+        </nz-select>
+        <ng-template #renderTemplate>
+          <nz-spin *ngIf="isLoading"></nz-spin>
+        </ng-template>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+</div>
diff --git a/src/app/system-management/role/addrole/addrole.component.scss b/src/app/system-management/role/addrole/addrole.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/role/addrole/addrole.component.ts b/src/app/system-management/role/addrole/addrole.component.ts
new file mode 100644
index 0000000..030d7e4
--- /dev/null
+++ b/src/app/system-management/role/addrole/addrole.component.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+@Component({
+  selector: 'app-addrole',
+  templateUrl: './addrole.component.html',
+  styleUrls: ['./addrole.component.scss']
+})
+export class AddroleComponent implements OnInit {
+
+  @Input() title?: string;
+  @Input() subtitle?: string;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+  ngOnInit(): void {
+    this.loadMore();
+    this.validateForm = this.fb.group({
+      name: [null, [Validators.required]],
+      power: [null, [Validators.required]]
+    });
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+  optionList = [];
+  isLoading = false;
+  //获取权限列表
+  loadMore() {
+    this.isLoading = true;
+    this.http.get('/api/services/app/Role/GetAllPermissions').subscribe((data:any) => {
+      this.isLoading = false;
+      this.optionList = data.result.items
+      console.log('所有权限',data)
+    })
+  }
+}
diff --git a/src/app/system-management/role/editrole/editrole.component.html b/src/app/system-management/role/editrole/editrole.component.html
new file mode 100644
index 0000000..7db4fd5
--- /dev/null
+++ b/src/app/system-management/role/editrole/editrole.component.html
@@ -0,0 +1,18 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control nzErrorTip="请输入名称">
+        <nz-input-group>
+          <input [(ngModel)]="data.name" nz-input type="text" formControlName="name" placeholder="请输入名称" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-select [(ngModel)]="multipleValue" formControlName="power" nzPlaceHolder="请选择权限" (nzScrollToBottom)="loadMore()" nzMode="multiple">
+          <nz-option *ngFor="let o of optionList" [nzValue]="o.name" [nzLabel]="o.displayName"></nz-option>
+        </nz-select>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+</div>
diff --git a/src/app/system-management/role/editrole/editrole.component.scss b/src/app/system-management/role/editrole/editrole.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/role/editrole/editrole.component.ts b/src/app/system-management/role/editrole/editrole.component.ts
new file mode 100644
index 0000000..2dae734
--- /dev/null
+++ b/src/app/system-management/role/editrole/editrole.component.ts
@@ -0,0 +1,38 @@
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { HttpClient } from '@angular/common/http';
+@Component({
+  selector: 'app-editrole',
+  templateUrl: './editrole.component.html',
+  styleUrls: ['./editrole.component.scss']
+})
+export class EditroleComponent implements OnInit {
+
+  @Input() data?: any;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+  multipleValue:any
+  ngOnInit(): void {
+    this.multipleValue = this.data.grantedPermissions
+    this.loadMore();
+    this.validateForm = this.fb.group({
+      name: [null, [Validators.required]],
+      power: [null, [Validators.required]]
+    });
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+  
+  optionList = [];
+  //获取权限列表
+  loadMore() {
+    this.http.get('/api/services/app/Role/GetAllPermissions').subscribe((data:any) => {
+      this.optionList = data.result.items
+      console.log('所有权限',data)
+    })
+  }
+
+}
diff --git a/src/app/system-management/role/role.component.html b/src/app/system-management/role/role.component.html
index ce1bd50..dd622e4 100644
--- a/src/app/system-management/role/role.component.html
+++ b/src/app/system-management/role/role.component.html
@@ -1 +1,38 @@
-<p>role works!</p>
+<div class="roleBox" id="roleBox">
+  <div class="topbox">
+    <div class="lefttop">
+      <span>角色列表</span>
+    </div>
+    <div class="righttop">
+      <button nz-button nzType="primary" (click)="addRole()"><i nz-icon nzType="plus-circle"
+          nzTheme="outline"></i>新增</button>
+    </div>
+  </div>
+  <div class="tablebox">
+    <nz-table #basicTable [nzData]="listOfData" [nzShowPagination]='false' [nzPageSize]='16'>
+      <thead>
+        <tr>
+          <th style="padding-left: 40px;">角色</th>
+          <th>权限</th>
+          <th>创建/修改时间</th>
+          <th>操作</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let data of basicTable.data">
+          <td>{{data.name}}</td>
+          <td>
+            <span *ngFor="let item of data.grantedFlatPermissions">{{item.displayName}}</span>
+          </td>
+          <td>
+            {{(data.lastModificationTime ? data.lastModificationTime : data.creationTime) | date:"yyyy-MM-dd HH:mm:ss"}}
+          </td>
+          <td class="operation">
+            <a (click)="edit(data)">编辑</a>
+            <a (click)="delete(data)">删除</a>
+          </td>
+        </tr>
+      </tbody>
+    </nz-table>
+  </div>
+</div>
diff --git a/src/app/system-management/role/role.component.scss b/src/app/system-management/role/role.component.scss
index e69de29..44dcc71 100644
--- a/src/app/system-management/role/role.component.scss
+++ b/src/app/system-management/role/role.component.scss
@@ -0,0 +1,54 @@
+.roleBox {
+  width: 100%;
+  height: 100%;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  
+  tbody {
+    tr {
+      td {
+        span {
+          margin-right: 18px;
+        }
+      }
+      td:nth-child(1){
+        padding-left: 40px;
+      }
+    }
+    .operation {
+      a {
+        color: #2399FF;
+        margin-right: 8px;
+      }
+      a:last-child {
+        color: rgba(0, 13, 33, 0.48);
+      }
+    }
+
+  }
+}
+
+.topbox {
+  width: 100%;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+
+  .lefttop {
+    span {
+      color: #000D21;
+    }
+  }
+}
+
+.tablebox {
+  flex: 1;
+  overflow-y: auto;
+  
+}
diff --git a/src/app/system-management/role/role.component.ts b/src/app/system-management/role/role.component.ts
index dbd7a84..41abbde 100644
--- a/src/app/system-management/role/role.component.ts
+++ b/src/app/system-management/role/role.component.ts
@@ -1,5 +1,11 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { NzModalService } from 'ng-zorro-antd/modal';
 
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { HttpClient } from '@angular/common/http';
+import { AddroleComponent } from './addrole/addrole.component';
+import { EditroleComponent } from './editrole/editrole.component';
 @Component({
   selector: 'app-role',
   templateUrl: './role.component.html',
@@ -7,9 +13,126 @@ import { Component, OnInit } from '@angular/core';
 })
 export class RoleComponent implements OnInit {
 
-  constructor() { }
+
+  constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
 
   ngOnInit(): void {
+    this.getAllRoles()
+  }
+
+  listOfData: any[] = [];
+
+  //获取角色列表
+
+  getAllRoles() {
+    this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => {
+      console.log('角色列表', data.result.items)
+      this.listOfData = data.result.items
+    })
+  }
+
+  addRole(): void {
+    const modal = this.modal.create({
+      nzTitle: '新增角色',
+      nzContent: AddroleComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {},
+      nzOnOk: async () => {
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            console.log('表单信息', instance.validateForm)
+            let arr = []
+            instance.validateForm.value.power.forEach(element => {
+              arr.push(element.name)
+            });
+            let body = {
+              name: instance.validateForm.value.name,
+              DisplayName: instance.validateForm.value.name,
+              grantedPermissions: arr
+            }
+            this.http.post('/api/services/app/Role/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '创建成功！');
+              this.getAllRoles()
+              return true
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+    modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
+    // Return a result when closed
+    modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
+  }
+
+
+  edit(item) {
+    const modal = this.modal.create({
+      nzTitle: '编辑角色',
+      nzContent: EditroleComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        data: item
+      },
+      nzOnOk: async () => {
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            console.log('表单信息', instance.validateForm)
+            let arr = []
+            instance.validateForm.value.power.forEach(element => {
+              arr.push(element.name ? element.name : element)
+            });
+            let body = {
+              id: item.id,
+              name: instance.validateForm.value.name,
+              DisplayName: instance.validateForm.value.name,
+              grantedPermissions: arr
+            }
+            this.http.put('/api/services/app/Role/Update', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '修改成功！');
+              this.getAllRoles()
+              return true
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+    modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
+    // Return a result when closed
+    modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
   }
 
+  delete(item) {
+    console.log(item)
+    this.modal.confirm({
+      nzTitle: `确定要删除${item.name}这个角色吗?`,
+      nzOkText: '确定',
+      nzOkType: 'danger',
+      nzOnOk: () => {
+        this.http.delete('/api/services/app/Role/Delete', {
+          params: {
+            Id: item.id
+          }
+        }).subscribe(data => {
+          this.message.create('success', '删除成功！');
+          this.getAllRoles()
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => {
+
+      }
+    });
+  }
 }
diff --git a/src/app/system-management/system-management-routing.module.ts b/src/app/system-management/system-management-routing.module.ts
index 54f7104..843186b 100644
--- a/src/app/system-management/system-management-routing.module.ts
+++ b/src/app/system-management/system-management-routing.module.ts
@@ -1,14 +1,15 @@
 import { Routes, RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 
-import {AuthGuard} from '../auth.guard'
+import { AuthGuard } from '../auth.guard'
+import { RoleComponent } from './role/role.component';
+import { OrganizationComponent } from './organization/organization.component';
+import { UserComponent } from './user/user.component';
 
 const routes: Routes = [
-    // { path: 'plan', component: PlanComponent },
-    // { path: 'warning/petrolStation', component: TodayWarningComponent },
-    // { path: 'warning/admin', component: TodayWarningAdminComponent },
-    // { path: 'records/petrolStation', component: CriminalRecordsComponent },
-    // { path: 'records/admin', component: CriminalRecordsAdminComponent }
+    { path: 'organization', component: OrganizationComponent },
+    { path: 'user', component: UserComponent },
+    { path: 'role', component: RoleComponent }
 ];
 
 @NgModule({
diff --git a/src/app/system-management/system-management.module.ts b/src/app/system-management/system-management.module.ts
index a757a84..870c5a5 100644
--- a/src/app/system-management/system-management.module.ts
+++ b/src/app/system-management/system-management.module.ts
@@ -5,14 +5,50 @@ import { OrganizationComponent } from './organization/organization.component';
 import { UserComponent } from './user/user.component';
 import { RoleComponent } from './role/role.component';
 import { NavigationComponent } from './navigation/navigation.component';
-
-
-
+import { NzLayoutModule } from 'ng-zorro-antd/layout';
+import { NzIconModule } from 'ng-zorro-antd/icon';
+import { NzTableModule } from 'ng-zorro-antd/table';
+import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
+import { NzPaginationModule } from 'ng-zorro-antd/pagination';
+import { NzInputModule } from 'ng-zorro-antd/input';
+import { NzButtonModule } from 'ng-zorro-antd/button';
+import { NzFormModule } from 'ng-zorro-antd/form';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NzModalModule } from 'ng-zorro-antd/modal';
+import { AdduserComponent } from './user/adduser/adduser.component';
+import { EdituserComponent } from './user/edituser/edituser.component';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { NzMessageModule } from 'ng-zorro-antd/message';
+import { NzTreeModule } from 'ng-zorro-antd/tree';
+import { AddroleComponent } from './role/addrole/addrole.component';
+import { EditroleComponent } from './role/editrole/editrole.component';
+import { NzSpinModule } from 'ng-zorro-antd/spin';
+import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
+import { AddorComponent } from './organization/addor/addor.component';
+import { EditorComponent } from './organization/editor/editor.component';
 @NgModule({
-  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent],
+  declarations: [OrganizationComponent, UserComponent, RoleComponent, NavigationComponent, AdduserComponent, EdituserComponent, AddroleComponent, EditroleComponent, AddorComponent, EditorComponent],
   imports: [
     CommonModule,
-    SystemRoutingModule
-  ]
+    SystemRoutingModule,
+    NzLayoutModule,
+    NzIconModule,
+    NzTableModule,
+    NzDropDownModule,
+    NzPaginationModule,
+    NzInputModule,
+    NzButtonModule,
+    NzFormModule,
+    FormsModule,
+    ReactiveFormsModule,
+    NzModalModule,
+    NzSelectModule,
+    NzMessageModule,
+    NzTreeModule,
+    NzSpinModule,
+    NzTreeSelectModule
+  ],
+  entryComponents :[AdduserComponent,EdituserComponent,AddroleComponent,EditroleComponent,AddorComponent,EditorComponent]
+  
 })
 export class SystemManagementModule { }
diff --git a/src/app/system-management/user/adduser/adduser.component.html b/src/app/system-management/user/adduser/adduser.component.html
new file mode 100644
index 0000000..954b570
--- /dev/null
+++ b/src/app/system-management/user/adduser/adduser.component.html
@@ -0,0 +1,39 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input nz-input type="text" formControlName="account" placeholder="请输入账号" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input nz-input type="text" formControlName="name" placeholder="请输入姓名" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-tree-select formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+          
+        </nz-tree-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-select formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
+          <nz-option *ngFor="let item of listOfData" [nzValue]="item.name" [nzLabel]="item.displayName"></nz-option>
+        </nz-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input nz-input type="text" formControlName="phonenum" placeholder="请输入手机号" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+</div>
diff --git a/src/app/system-management/user/adduser/adduser.component.scss b/src/app/system-management/user/adduser/adduser.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/user/adduser/adduser.component.ts b/src/app/system-management/user/adduser/adduser.component.ts
new file mode 100644
index 0000000..290dbbc
--- /dev/null
+++ b/src/app/system-management/user/adduser/adduser.component.ts
@@ -0,0 +1,54 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { TreeService } from 'src/app/service/tree.service';
+@Component({
+  selector: 'app-adduser',
+  templateUrl: './adduser.component.html',
+  styleUrls: ['./adduser.component.scss']
+})
+export class AdduserComponent implements OnInit {
+
+  @Input() title?: string;
+  @Input() subtitle?: string;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { }
+
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      account: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      organization: [null, [Validators.required]],
+      role: [null, [Validators.required]],
+      phonenum: [null, [Validators.required]]
+    });
+
+    this.getAllRoles()
+    this.getAllOrganization()
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+  listOfData: any[] = [];
+
+  //获取角色列表
+  getAllRoles() {
+    this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => {
+      console.log('角色列表', data.result.items)
+      this.listOfData = data.result.items
+    })
+  }
+  //获取所有组织机构
+  nodes:any = []
+  getAllOrganization() {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+      data.result.items.forEach(element => {
+        element.key = element.code
+        element.title = element.displayName
+      });
+      this.nodes = [...this.toTree.toTree(data.result.items)]
+    })
+  }
+}
diff --git a/src/app/system-management/user/edituser/edituser.component.html b/src/app/system-management/user/edituser/edituser.component.html
new file mode 100644
index 0000000..dc1a983
--- /dev/null
+++ b/src/app/system-management/user/edituser/edituser.component.html
@@ -0,0 +1,39 @@
+<div class="box">
+  <form nz-form [formGroup]="validateForm">
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input [(ngModel)]="data.userName" nz-input type="text" formControlName="account" placeholder="请输入账号" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input [(ngModel)]="data.name" nz-input type="text" formControlName="name" placeholder="请输入姓名" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-tree-select [(ngModel)]="data.organizationId" formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构">
+
+        </nz-tree-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-select [(ngModel)]="data.roleNames" formControlName="role" nzPlaceHolder="请选择角色" nzMode="multiple">
+          <nz-option *ngFor="let item of listOfData" [nzValue]="item.name" [nzLabel]="item.displayName"></nz-option>
+        </nz-select>
+      </nz-form-control>
+    </nz-form-item>
+    <nz-form-item>
+      <nz-form-control>
+        <nz-input-group>
+          <input [(ngModel)]="data.phoneNumber" nz-input type="text" formControlName="phonenum" placeholder="请输入手机号" />
+        </nz-input-group>
+      </nz-form-control>
+    </nz-form-item>
+  </form>
+</div>
diff --git a/src/app/system-management/user/edituser/edituser.component.scss b/src/app/system-management/user/edituser/edituser.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/system-management/user/edituser/edituser.component.ts b/src/app/system-management/user/edituser/edituser.component.ts
new file mode 100644
index 0000000..89b8f2b
--- /dev/null
+++ b/src/app/system-management/user/edituser/edituser.component.ts
@@ -0,0 +1,57 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { TreeService } from 'src/app/service/tree.service';
+
+@Component({
+  selector: 'app-edituser',
+  templateUrl: './edituser.component.html',
+  styleUrls: ['./edituser.component.scss']
+})
+export class EdituserComponent implements OnInit {
+
+  @Input() data?: any;
+  validateForm!: FormGroup;
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService) { }
+
+  ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      account: [null, [Validators.required]],
+      name: [null, [Validators.required]],
+      organization: [null, [Validators.required]],
+      role: [null, [Validators.required]],
+      phonenum: [null, [Validators.required]]
+    });
+
+
+    console.log(this.data)
+    this.getAllRoles()
+    this.getAllOrganization()
+  }
+  destroyModal(): void {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+  listOfData: any[] = [];
+
+  //获取角色列表
+  getAllRoles() {
+    this.http.get('/api/services/app/Role/GetAll').subscribe((data: any) => {
+      console.log('角色列表', data.result.items)
+      this.listOfData = data.result.items
+    })
+  }
+  //获取所有组织机构
+  nodes:any = []
+  getAllOrganization() {
+    this.http.get('/api/services/app/Organization/GetAll').subscribe((data: any) => {
+      data.result.items.forEach(element => {
+        element.key = element.code
+        element.title = element.displayName
+      });
+      this.nodes = [...this.toTree.toTree(data.result.items)]
+    })
+  }
+
+}
diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html
index d039bb7..22c1157 100644
--- a/src/app/system-management/user/user.component.html
+++ b/src/app/system-management/user/user.component.html
@@ -1 +1,63 @@
-<p>user works!</p>
+<div class="userBox" id="userBox">
+  <div class="topbox">
+    <div class="lefttop">
+      <span>用户列表</span>
+      <span><i nz-icon nzType="search"></i> {{usersNum}}名用户</span>
+    </div>
+    <div class="righttop">
+      <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+        <nz-form-item>
+          <nz-form-control>
+            <nz-input-group nzPrefixIcon="search">
+              <input type="text" nz-input placeholder="请输入用户名" formControlName="search" />
+            </nz-input-group>
+          </nz-form-control>
+          <button style="display: none;" type="submit"></button>
+        </nz-form-item>
+      </form>
+      <button nz-button nzType="primary" (click)="addUser()"><i nz-icon nzType="plus-circle"
+          nzTheme="outline"></i>新增</button>
+    </div>
+  </div>
+  <div class="tablebox">
+    <nz-table #basicTable [nzData]="usersLIst" [nzShowPagination]='false' [nzPageSize]='16'>
+      <thead>
+        <tr>
+          <th></th>
+          <th>账号</th>
+          <th>姓名</th>
+          <th>角色</th>
+          <th>所属机构</th>
+          <th>操作</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let data of basicTable.data">
+          <td><img src="../../../assets/images/user.png" alt=""></td>
+          <td>{{ data.userName }}</td>
+          <td>{{ data.name }}</td>
+          <td>
+            <span *ngFor="let item of data.roleNames">{{item}}</span>
+          </td>
+          <td>
+            <div class="ortype">
+              自营
+            </div>
+            {{data.organization}}
+          </td>
+          <td class="operation">
+            <a (click)="editUser(data)">编辑</a>
+            <a (click)="resetPassword(data)">重置密码</a>
+            <a (click)="delete(data)">删除</a>
+          </td>
+        </tr>
+      </tbody>
+    </nz-table>
+  </div>
+  <div class="pagination">
+    <nz-pagination [nzHideOnSinglePage]="true" [nzPageIndex]="1" [nzTotal]="usersNum" [nzPageSize]="1"
+      [nzShowTotal]="totalTemplate" nzShowQuickJumper (nzPageIndexChange)="pageChange($event)">
+    </nz-pagination>
+    <ng-template #totalTemplate let-total> 16条/页,共{{usersNum}}条 </ng-template>
+  </div>
+</div>
diff --git a/src/app/system-management/user/user.component.scss b/src/app/system-management/user/user.component.scss
index e69de29..2cf35a9 100644
--- a/src/app/system-management/user/user.component.scss
+++ b/src/app/system-management/user/user.component.scss
@@ -0,0 +1,87 @@
+.userBox {
+  width: 100%;
+  height: 100%;
+  background: #FFFFFF;
+  box-sizing: border-box;
+  padding: 20px;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+  thead {}
+
+  tbody {
+    tr {
+      td:nth-child(1) {
+        text-align: right;
+      }
+    }
+
+    .operation {
+      a {
+        color: #2399FF;
+        margin-right: 18px;
+      }
+
+      a:last-child {
+        color: rgba(0, 13, 33, 0.48);
+      }
+    }
+  }
+}
+
+.topbox {
+  width: 100%;
+  height: 36px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+
+  .lefttop {
+    span:nth-child(1) {
+      color: #000D21;
+      margin-right: 16px;
+    }
+
+    span:nth-child(2) {
+      color: rgba(36, 36, 36, 0.24);
+    }
+  }
+
+  .righttop {
+    display: flex;
+
+    button {
+      margin-left: 16px;
+    }
+
+    nz-input-group {
+      height: 32px;
+    }
+  }
+}
+
+.tablebox {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.pagination {
+  margin: 15px 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.ortype {
+  width: 36px;
+  height: 20px;
+  background: #2399FF;
+  opacity: 1;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  color: #fff;
+  text-align: center;
+}
diff --git a/src/app/system-management/user/user.component.ts b/src/app/system-management/user/user.component.ts
index 5df0c83..955db12 100644
--- a/src/app/system-management/user/user.component.ts
+++ b/src/app/system-management/user/user.component.ts
@@ -1,15 +1,193 @@
-import { Component, OnInit } from '@angular/core';
-
+import { Component, OnInit, TemplateRef, ViewContainerRef } from '@angular/core';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { AdduserComponent } from './adduser/adduser.component';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { HttpClient } from '@angular/common/http';
+import { EdituserComponent } from './edituser/edituser.component';
 @Component({
   selector: 'app-user',
   templateUrl: './user.component.html',
   styleUrls: ['./user.component.scss']
 })
 export class UserComponent implements OnInit {
-
-  constructor() { }
+  validateForm!: FormGroup;
+  constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
 
   ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      search: [null]
+    });
+    this.getAllUsers()
+  }
+
+
+  //获取所有用户
+  usersLIst: any = []
+  usersNum:string
+
+  SkipCount: number = 0  //0 16 32 48
+  MaxResultCount: number = 16
+  getAllUsers() {
+    let params = {
+      SkipCount: String(this.SkipCount),
+      MaxResultCount: String(this.MaxResultCount)
+    }
+    this.http.get('/api/services/app/User/GetAll', {
+      params: params
+    }).subscribe((data: any) => {
+      this.usersLIst = data.result.items
+      this.usersNum = data.result.totalCount
+      console.log('所有用户', this.usersLIst)
+    })
   }
 
+  pageChange($event){
+    console.log('页码改变',$event)
+  }
+
+
+
+  //搜索框提交
+  submitForm(): void {
+    console.log(12345)
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+  }
+
+  //新增用户
+  addUser(): void {
+    const modal = this.modal.create({
+      nzTitle: '新增用户',
+      nzContent: AdduserComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        title: '',
+        subtitle: ''
+      },
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+              userName: instance.validateForm.value.account,
+              name: instance.validateForm.value.name,
+              organizationId: instance.validateForm.value.organization,
+              roleNames: instance.validateForm.value.role,
+              phoneNumber: instance.validateForm.value.phonenum,
+              isActive: true
+            }
+            this.http.post('/api/services/app/User/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '创建成功！');
+              this.getAllUsers()
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+    modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
+    // Return a result when closed
+    modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
+  }
+
+  //编辑用户
+  editUser(data): void {
+    const modal = this.modal.create({
+      nzTitle: '编辑用户',
+      nzContent: EdituserComponent,
+      nzViewContainerRef: this.viewContainerRef,
+      nzWidth: 288,
+      nzComponentParams: {
+        data: data,
+      },
+      nzOnOk: async () => {
+        console.log('hhhhhhh', instance.validateForm)
+        if (instance.validateForm.valid) {
+          await new Promise(resolve => {
+            let body = {
+              userName: instance.validateForm.value.account,
+              name: instance.validateForm.value.name,
+              organizationId: instance.validateForm.value.organization,
+              roleNames: instance.validateForm.value.role,
+              phoneNumber: instance.validateForm.value.phonenum,
+              isActive: true
+            }
+            this.http.post('/api/services/app/User/Create', body).subscribe(data => {
+              resolve(data)
+              this.message.create('success', '创建成功！');
+              this.getAllUsers()
+              return true
+            }, err => {
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
+        } else {
+          this.message.create('warning', '请填写完整！');
+          return false
+        }
+      }
+    });
+    const instance = modal.getContentComponent();
+  }
+
+  //重置密码
+  resetPassword(item) {
+    this.modal.confirm({
+      nzTitle: `确定要重置${item.userName}这个账户的密码吗?`,
+      nzOkText: '确定',
+      nzOkType: 'primary',
+      nzOnOk: () => {
+        this.http.delete('/api/services/app/Role/Delete', {
+          params: {
+            Id: item.id
+          }
+        }).subscribe(data => {
+          this.message.create('success', '重置成功！');
+          this.getAllUsers()
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => {
+
+      }
+    });
+  }
+
+  //删除
+  delete(item) {
+    this.modal.confirm({
+      nzTitle: `确定要删除${item.userName}这个账户吗?`,
+      nzOkText: '确定',
+      nzOkType: 'danger',
+      nzOnOk: () => {
+        this.http.delete('/api/services/app/Role/Delete', {
+          params: {
+            Id: item.id
+          }
+        }).subscribe(data => {
+          this.message.create('success', '删除成功！');
+          this.getAllUsers()
+        })
+      },
+      nzCancelText: '取消',
+      nzOnCancel: () => {
+
+      }
+    });
+  }
 }
diff --git a/src/app/ui/tabbar/tabbar.component.html b/src/app/ui/tabbar/tabbar.component.html
index 15c0c56..523028d 100644
--- a/src/app/ui/tabbar/tabbar.component.html
+++ b/src/app/ui/tabbar/tabbar.component.html
@@ -16,7 +16,9 @@
     </a>
     <nz-dropdown-menu #menu="nzDropdownMenu">
       <ul nz-menu nzSelectable>
-        <li nz-menu-item (click)="system()">系统管理</li>
+        <li nz-menu-item (click)="navChange('/home/oliStationInfo')">基本信息</li>
+        <li nz-menu-item (click)="navChange('/home/equipmentInfo')">器材信息</li>
+        <li nz-menu-item (click)="navChange('/system/organization')">系统管理</li>
         <li nz-menu-item (click)="signOut()">退出系统</li>
       </ul>
     </nz-dropdown-menu>
diff --git a/src/app/ui/tabbar/tabbar.component.ts b/src/app/ui/tabbar/tabbar.component.ts
index 5d2dada..776f81d 100644
--- a/src/app/ui/tabbar/tabbar.component.ts
+++ b/src/app/ui/tabbar/tabbar.component.ts
@@ -59,9 +59,12 @@ export class TabbarComponent implements OnInit {
     this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/');
     this.router.navigate(['/login'])
   }
-  system(){
-    this.router.navigate(['/system'])
+
+  navChange(router){
+    this.router.navigate([router])
   }
+
+  
   //修改密码
   changpsw() {
     // let dialogRef = this.dialog.open(ChangepasswordComponent, { width: '348.000051px' });
diff --git a/src/assets/images/icon/admin.png b/src/assets/images/icon/admin.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7f11ef61f8a29d04589c6bce797df47394575ea
GIT binary patch
literal 346
zcmV-g0j2(lP)<h;3K|Lk000e1NJLTq000gE000mO1^@s6CX`M(0003YNkl<ZI8T+6
z{ZRr@48(uifhE|1Pytwh(t%c>RG?HKRv>gh2Wkb<fky{)5N6*zZo=bm#{9$Fkz_xz
zCz^_gS6~86fi19+v}pU3Uqpl(Z-9581FnGw;8)T(_x6Jo=>-@|@`6$kF#^7Tr6jW{
zl?VOjR?_nT{iW$=)I1o#B5zHoru!kO@Ba_tRFY|*Q8mT43mQLd*r3L0#0I#t5x^d}
zs;=%b+KD+ykCE@|Ex+yPknZ-5Ho*rs+MkupIcl6qGG*WJ7>IVsz6?f0u^V`lv`VzC
z^$D2Q_}Nt(xK>TZPkE5M;G`nL=+3SqSC}}*9&{$17#ng{5#g}=9Jlqigv5iFba;us
s3P*8p(6{On(Li>Rx{7LM)?dzZ07fB;r`F!0NdN!<07*qoM6N<$f_-S4JOBUy

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/organization.png b/src/assets/images/icon/organization.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fc46c27574a0232ae49fb7c5cf99d6ce6584356
GIT binary patch
literal 329
zcmV-P0k-~$P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI10003HNkl<ZI8WV^
z(M`iZ5JYD?poDZlN`Ma1LFj-`0hACb!0CVvpoEl=bdXdq=vjNw**;tOW+hA3-p=gK
z>|JOkY_BA}OL~#?77_baX^fM$pCr9X+T__)(lH{)PvS;k8vwvkc#!lVsROl0V4Lv(
z(~bWwB2EBp|K3AD(F5Hh;*vl-Ao>ZARL*K0y@a~U$b;vUK^bzsBz;TzEE5h0vgju}
z;K42dq}T@F$2^B*Hzojpnfpr0z=K>bxf8}tBouwN=}6&Z3$^6&1Z9<gG4bX>y~ZU1
zjKYI+`hjM?!97?a=sQP5uY2wu%o4P2Tk9hIHv-!@zs<LBY`oaDB;E(x;GZbDE^NC2
bx;ym;Ixe=0`ncy300000NkvXXu0mjfX}OQZ

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/orgrey.png b/src/assets/images/icon/orgrey.png
new file mode 100644
index 0000000000000000000000000000000000000000..b29d3f9e0662ed9c9f2c18ae7a3c8c9519ae4131
GIT binary patch
literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI10003>Nkl<ZI8Wu1
z-%G<V5XZks=31H#g$acYDl286;Qj;u|95>D42`T(p$`K^J37}U(sZ_4+x>VqZ@IgC
za`(MEf`cb8V8|Qvm4iHc!Rqb3E0na2{w3_(1)<m4m&pv2eIpT1Cjg@%xZ#4TD;@Yl
zVyx)`Tu$`;D8Tf5T(FV;O|b|mje+O2e#rg%(|{sK<vpwxMVeWeYG9OrDuY?=tBWZ$
z*!yKigD>(34zJ7rAuLQFvnA4g^p{}+fDi*Utu+t=+`laWbPj8C2S#mu-{cX}P&5FE
zfXRnQMbWadl$Hj80ZUFnkQTyrl(4Ojj~yiJqq7S;&?aC8(|1APfGHDu8tlx$VZc^{
zoTMNsMDn_<H8=}E=YTW;@mV#hYYvW-&>q+S05E+|x2@QPVr`p8<~9h+^a!&a*Y3)O
hm|!q|=-TshZNG@K#KxDmNTvV)002ovPDHLkV1iKdsyYAw

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/power.png b/src/assets/images/icon/power.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9e96003ef7587b71b9102024d920c2768b52921
GIT binary patch
literal 484
zcmV<A0UQ2_P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100052Nkl<ZI8Swy
z;Wa}+5JvA*KnJJ*6`%r11*8H|fv5l#kP0LfpaOId6`+D~?mM$N%ZdH9?`8Iz@4Ig{
z!G@KY2fz(*4BP_O5%IODHu{&DxeZ(aQ{WqT22KGF&m!XPugF>;Gd<*CMdo#2m6^@O
zKJW%yMuft{in4nTX#3sneL*YC%=3z~1uTGxu@qQUR}VgH%GrtNZU$WFG9u2KfU3f}
z`wx~PnYmkVM+J7KfG@RVM%|dv=k+SMc9qk>$nK4S8yQGl+B-#Gp|{Mmo1fH1GP03%
zC;qO3tj@lWx*6?cEU63kqu?$|@DW%>#7F_NYft-<eXdvvd3X^K?q%S!dt=-hRRJHK
zs@OX7YhS^hgNJqH`qqA9;7}X^FO}V4GNaCx<xCE8>X%<^ssoEZfpI|-mh;d=h5T9o
zhbYC!5kFC&pD+(<|Eoq=ae<xzhjqF9O4sG=b+`+~LCY5Yx;U9>#I1-pEVu4$EUVMM
zx6zBEP3;SD447XolVW5<m*D5W1iG1Tv1FrliMMgLOwm1uYokCHYq!7-^H5Xj&kmOV
a4-Y@hywtKi`KD(80000<MNUMnLSTaDE8YMA

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/role.png b/src/assets/images/icon/role.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ec88e9ff567b1f3cf3fbf03c54617e8eb8ca16a
GIT binary patch
literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0004fNkl<ZI8TL?
zfi*)x5JlgsKvDrJpaW3>DhL&b3Qz$m5EY0DBo&|nbU+2;+;9Isn>9J+oSgjKzw>6^
zd$ZqaA|ghT&Ly2n+L81nX({Q>Hveh3-i-(nA0_QedXw~8z*uidI<q~`kXj%T_avRz
zUi1m20BhbIW}OW{5pi6)xwd_kP^Mc7Ep2mlEovZ=FD32T{>a*o2sApdy~c#Ie}J+>
z6-D%!{s%OZbkpk7m;tqsZD?+!#>@Aj1A=1v5E0QAN;Pa<V|MN(p%ICn#dh}jF%pxu
z$eKo#4kX+bfV!y%z%!5(h|MzHlQNi4T+~i7SFN)dwW*{F+X&l5nKAaS3uT@eP}W?h
zr`moxc+PZ)h<@UGY-j>DL<bZR+$BK1p_4d9^=(P3P7iw)5ok$q+#b2;f$f0e$Uv#0
z)>}VLilE^fpl<9pUB;^8m*g_T<aa+JK#Veo*%e~|m*pHu^*0G1F7Oy29%y}2%=rdI
g1UelhhgP;HKM*jw5Uh%bSpWb407*qoM6N<$f-H=<xc~qF

literal 0
HcmV?d00001

diff --git a/src/assets/images/icon/user.png b/src/assets/images/icon/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..6962ffd808ac72ab8c4ef89ae22ad151a325ca5f
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100047Nkl<ZI8T+6
z;Wa}+5QV>6fpj1`paM|=I-mknfC{7oQGuv{4p0H<AS$@dec8=<Z<9F3{M?=W=FZGr
zu_bI@09U|ax&8pAlAhXh^$%>1fY<VH0pwvKpnc#CIG41n?^?hdI0fz{-8JxOQ8kxz
zz5%eED(}FHq_Z8Z)dEM7I(2IWwo~yIIFS^o8(}-(XW&Ls6#W}8DKlEP*jJFrKLVGM
zW`AsFkkbcb1K)swgZ`ugD;xSMs>k)d-9l9n&^7Q`lpF(@(YRGO0F+9BWI%gO8$W@z
z?QH|3l|&|<iis%73TazwTZk9p#D%14<BniEdygBl=IYSF8dEJs3Uty>Du4jvj|@3R
zimDZ$`2%Ys*<P7N%0QD>jT8mRTdH|H@PO^kk&<Gd+DhHj3SztZdu`8N@&=$NiJ}K!
y7C?H+_w3|0k!p!;&J1J}z^=V-;SG*DU;F|=8mkos%>}Ul0000<MNUMnLSTZ@<E;4r

literal 0
HcmV?d00001

diff --git a/src/assets/images/user.png b/src/assets/images/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..95dd7920f25c8586a3eb177aeb061c1a16907461
GIT binary patch
literal 2372
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/userbig.png b/src/assets/images/userbig.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3a8388251448f7afbe1be4a314cc1117d51dd94
GIT binary patch
literal 8500
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

literal 0
HcmV?d00001

diff --git a/src/styles.scss b/src/styles.scss
index 92c1a83..f53bed5 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -102,15 +102,5 @@ h1 {
   font-size: 16px;
 }
 
-//滚动条样式
-::-webkit-scrollbar {
-  width: 10px;
-}
-::-webkit-scrollbar-thumb {
-  background-image: linear-gradient(#2495f8, #1c73c2,#0a3d6a, #061d3c);
-}
-::-webkit-scrollbar-track {
-  background-color: #061d3c;
-}
 
 
diff --git a/src/theme.less b/src/theme.less
index 6c9653c..88ed239 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -1,59 +1,29 @@
 @import "../node_modules/ng-zorro-antd/ng-zorro-antd.less";
 
-// @component-background: #002552;
-
-
-
-@border-color-base: #91CCFF;
-
-@select-background: transparent;
-
-.ant-select-single:not(.ant-select-customize-input) .ant-select-selector,
-.ant-picker,
-.ant-btn {
-  border-radius: 0px;
-}
-.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active{
-  // background: #083461;
-}
-//select picker 小剪头
-.ant-select-arrow,
-.ant-picker-separator {
-  color: #36A2FF;
-}
-
-//日期选择器
-@input-placeholder-color: #345d85;
-
-.ant-picker-suffix,
-.ant-picker-input>input {
-  color: rgba(145, 204, 255, 0.95);
-}
 
 
+//分页器
+#recordsboxadmin,
+#recordsbox {
 
-//弹窗遮罩层
-.ant-modal-mask {
-  background: rgba(0, 0, 0, 0.05);
-}
+  .ant-pagination-total-text,
+  .ant-pagination-options-quick-jumper {
+    color: white
+  }
 
-//分页器
-.ant-pagination-total-text,
-.ant-pagination-options-quick-jumper {
-  color: white
-}
+  .ant-pagination-item a,
+  .ant-pagination-prev .ant-pagination-item-link,
+  .ant-pagination-next .ant-pagination-item-link,
+  .ant-pagination-options-quick-jumper input {
+    color: white;
+    background: #0e2f4e;
+  }
 
-.ant-pagination-item a,
-.ant-pagination-prev .ant-pagination-item-link,
-.ant-pagination-next .ant-pagination-item-link,
-.ant-pagination-options-quick-jumper input {
-  color: white;
-  background: #0e2f4e;
+  .ant-pagination-item-active a {
+    background: #107495;
+  }
 }
 
-.ant-pagination-item-active a {
-  background: #107495;
-}
 
 
 //查询重置按钮
@@ -156,3 +126,111 @@
     -webkit-font-size: 16px !important;
   }
 }
+
+//表格
+#userBox,
+#roleBox {
+  .ant-table-thead>tr>th {
+    background: rgba(145, 204, 255, 0.15);
+  }
+}
+
+@select-background: transparent;
+@border-color-base: #91CCFF;
+
+//日期选择器
+// @input-placeholder-color: #345d85;
+#recordsboxadmin,
+#recordsbox,
+#warningbox,
+#warningboxadmin {
+  ::-webkit-input-placeholder {
+    /* WebKit browsers */
+    color: #345d85;
+  }
+
+  //滚动条样式
+  ::-webkit-scrollbar {
+    width: 10px;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    background-image: linear-gradient(#2495f8, #1c73c2, #0a3d6a, #061d3c);
+  }
+
+  ::-webkit-scrollbar-track {
+    background-color: #061d3c;
+  }
+
+
+
+
+  .ant-select-single:not(.ant-select-customize-input) .ant-select-selector,
+  .ant-picker,
+  .ant-btn {
+    border-radius: 0px;
+  }
+
+  //select picker 小剪头
+  .ant-select-arrow,
+  .ant-picker-separator {
+    color: #36A2FF;
+  }
+
+  //日期选择器
+  // @input-placeholder-color: #345d85;
+
+  .ant-picker-suffix,
+  .ant-picker-input>input {
+    color: rgba(145, 204, 255, 0.95);
+  }
+
+
+  //弹窗遮罩层
+  .ant-modal-mask {
+    background: rgba(0, 0, 0, 0.05);
+  }
+
+  //遮罩层
+  .vertical-center-modal {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .ant-modal-body {
+    background: #072549;
+    height: 660px;
+    padding: 5px;
+    // border: 1px solid #8eb9e3;
+    box-shadow: 0 0 3px #8eb9e3;
+    color: #fff;
+  }
+
+  .ant-modal-close-x {
+    width: 36px;
+    height: 36px;
+    line-height: 36px;
+    color: white;
+  }
+
+  .vertical-center-modal .ant-modal {
+    top: 0;
+  }
+}
+
+// //弹窗遮罩层
+// .ant-modal-mask {
+//   background: rgba(0, 0, 0, 0.05);
+// }
+
+
+#orbox {
+  nz-tree {
+    width: 660px;
+  }
+
+  nz-tree-node {
+    position: relative;
+  }
+}

From 6c1cb8e62e8495ed6d4d9424313aebcc02a54f2c Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Mon, 8 Nov 2021 16:16:43 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E4=B9=8B=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=AF=BB=E6=89=BE=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E7=84=B6=E5=90=8E=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=98=BB=E6=8C=A1=E7=89=A9=E5=AF=BB=E6=89=BE=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/controller/info-manager.ts    |   7 +-
 src/app/babylon/controller/scene-manager.ts   |   9 +-
 .../model/info/model/model-info-building.ts   |  10 ++
 .../babylon/model/info/model/model-info.ts    |   2 +-
 .../view/building-window/building-window.ts   | 106 ++++++++++++++++--
 .../view/facility-window/facility-window.ts   |   7 ++
 6 files changed, 121 insertions(+), 20 deletions(-)

diff --git a/src/app/babylon/controller/info-manager.ts b/src/app/babylon/controller/info-manager.ts
index 7a8fc35..c3746bf 100644
--- a/src/app/babylon/controller/info-manager.ts
+++ b/src/app/babylon/controller/info-manager.ts
@@ -174,12 +174,13 @@ export class InfoManager {
 
         let mesh: AbstractMesh = null;
         let facilityData = facilities[i].facilities[j]
-        if (facilityData.posType == FacilityPosType.In) {
-          mesh = SceneManager.Instance.scene.getMeshByID(facilityData.resName);
-          console.log("找到内置设备", mesh.uniqueId);
+        if (facilityData.posType == FacilityPosType.In && buildingInfo.ModelInfo != null) {
+          mesh = buildingInfo.ModelInfo.getChildrenByName(facilityData.resName);
+          console.log("内建模型找到", mesh);
         }
 
 
+
         FacilityWindow.instance.createFacility(
           modelEditData.facilities[i].facilities[j],
           false,
diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts
index 5e14706..dd219a5 100644
--- a/src/app/babylon/controller/scene-manager.ts
+++ b/src/app/babylon/controller/scene-manager.ts
@@ -252,11 +252,13 @@ export class SceneManager {
    */
   addToHighLight(mesh: Mesh, color: Color3) {
     if (this.highLightLayer == null) {
-      this.highLightLayer = new HighlightLayer("highLight", this.scene);
+      this.highLightLayer = new HighlightLayer("highLight", this.scene,
+        {
+          mainTextureRatio: 1,
+        });
       this.highLightLayer.innerGlow = false;
     }
 
-
     let allMesh = mesh.getChildMeshes();
     this.highLightLayer.addMesh(mesh, color);
     allMesh.push(mesh);
@@ -268,9 +270,6 @@ export class SceneManager {
       }
     }
 
-
-
-
   }
 
   highLightNum = 0;
diff --git a/src/app/babylon/model/info/model/model-info-building.ts b/src/app/babylon/model/info/model/model-info-building.ts
index 2d47b2a..2e50775 100644
--- a/src/app/babylon/model/info/model/model-info-building.ts
+++ b/src/app/babylon/model/info/model/model-info-building.ts
@@ -46,6 +46,16 @@ export class ModelInfo_building extends ModelInfo {
             }
         }
 
+        if (this.neiRoot == null) {
+            for (let i = 0; i < allTransformNode.length; i++) {
+                if (TsTool.stringContain(allTransformNode[i].name, "wai")) {
+                    this.neiRoot = allTransformNode[i];
+                    break;
+                }
+            }
+        }
+
+
         if (this.neiRoot == null) {
             this.neiRoot = this.modelBox;
 
diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts
index 066d77a..06ca14d 100644
--- a/src/app/babylon/model/info/model/model-info.ts
+++ b/src/app/babylon/model/info/model/model-info.ts
@@ -144,7 +144,7 @@ export class ModelInfo {
   playShowAnim(play: boolean) {
     if (this.modelBox != null) {
       if (play) {
-        SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Red());
+        SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Green());
 
       }
       else {
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index 298de6a..b16dc32 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -1,4 +1,5 @@
 
+import { AbstractMesh, Material, Mesh } from "@babylonjs/core";
 import { PlanComponent } from "src/app/pages/plan/plan.component";
 import { DataManager } from "../../controller/data-manager";
 import { InfoManager } from "../../controller/info-manager";
@@ -23,6 +24,11 @@ import { BuildingUIItem } from "./building-ui-item";
 //建筑界面
 export class BuildingWindow extends UIBase {
 
+    /**
+     * uv动画材质的特殊命名
+     */
+    readonly c_MAT_UV = "MAT_UV";
+
     static instance: BuildingWindow;
 
     buldingStatus: BuildingStatus;
@@ -370,6 +376,9 @@ export class BuildingWindow extends UIBase {
             if (updateFacility) {
 
                 InfoManager.createFacilityInfos(buildingInfo.buildingData.outdoorData, buildingInfo);
+
+
+
             }
             if (buildingInfo instanceof BuildingInfo_Environment) {
                 buildingInfo.updateFuGaiCeng();
@@ -581,11 +590,14 @@ export class BuildingWindow extends UIBase {
             for (let i = 0; i < allNode.length; i++) {
                 let nodeName = allNode[i].name;
 
-                if (TsTool.stringContain(nodeName, this.c_xiaoFang)) //消防
+                if (TsTool.stringContain(nodeName, "primitive")) {
+                    //复合材质被分解为多个子mesh，不看做特殊意义的对象
+                }
+                else if (TsTool.stringContain(nodeName, this.c_xiaoFang)) //消防
                 {
                     this.currentBuidngItem.createFacilityByMesh(allNode[i]);
                 }
-                else if (TsTool.stringContain(nodeName, this.c_xiaoFang))//加油站
+                else if (TsTool.stringContain(nodeName, this.c_jiaYou))//加油站
                 {
                     this.currentBuidngItem.createOilingByMesh(allNode[i]);
                 }
@@ -621,6 +633,11 @@ export class BuildingWindow extends UIBase {
      */
     zdByMoudle: Map<JYZInfoMoudleType, FacilityInfoByType[]> = new Map();
 
+    /**
+     * uv动画所需材质
+     */
+    mat_UV: Map<JYZInfoMoudleType, Material[]> = new Map();
+
     /**
      * 展示加油站信息模块
      * @param type 
@@ -652,10 +669,12 @@ export class BuildingWindow extends UIBase {
         if (this.zdByMoudle.has(type)) {
             zdByType = this.zdByMoudle.get(type);
         }
+        console.log("阻挡物", zdByType);
         for (let i = 0; i < zdByType.length; i++) {
             let infos = zdByType[i].facilityInfo;
             if (infos != null) {
                 for (let j = 0; j < infos.length; j++) {
+                    console.log("隐藏阻挡物", infos[j]);
                     infos[j].setEnable(!show);
                 }
             }
@@ -694,24 +713,18 @@ export class BuildingWindow extends UIBase {
             return; //没有设备
         }
 
-
-
         for (let i = 0; i < allFacilityByType.length; i++) {
             let l_facilityByType = allFacilityByType[i];
             if (TsTool.stringContain(l_facilityByType.type, zdKey)) {
+                if (!this.zdByMoudle.has(moudleType)) {
+                    this.zdByMoudle.set(moudleType, []);
+                }
                 this.zdByMoudle.get(moudleType).push(l_facilityByType);
             }
             else if (TsTool.stringContain(l_facilityByType.type, moudleTypeKey)) {
                 this.facilitysByMoudle.get(moudleType).push(l_facilityByType);
             }
         }
-
-        // for (var l_facility in FacilityType) {
-
-
-
-
-        // }
     }
 
     /**
@@ -731,7 +744,78 @@ export class BuildingWindow extends UIBase {
         }
     }
 
+    /**
+     * 获取设备所需UV材质(如果有的话)
+     * @param facilityType 
+     * @param mesh 
+     */
+    getUVMat(facilityType: FacilityType, mesh: AbstractMesh) {
+        let moudleType: JYZInfoMoudleType = null;
+        switch (facilityType) {
+            case FacilityType.XF_TSLX:
+                moudleType = JYZInfoMoudleType.TSLX;
+                break;
+            case FacilityType.JY_SYGX:
+                moudleType = JYZInfoMoudleType.SYG;
+                break;
+            case FacilityType.JY_YQHSGX:
+                moudleType = JYZInfoMoudleType.YQHSGX;
+                break;
+        }
+
+        if (moudleType != null) {
+            if (!this.mat_UV.has(moudleType)) {
+                this.mat_UV.set(moudleType, []);
+            }
+
+            let mats = this.findUVMat(mesh); //找到mesh上的uv材质
+
+            for (let i = 0; i < mats.length; i++) {
+                let l_mat = mats[i];
+
+                let mat_uvByType = this.mat_UV.get(moudleType);
+                let isRepeat = false;//是重复的
+                for (let j = 0; j < mat_uvByType.length; j++) {
+                    if (isRepeat) {
+                        continue;
+                    }
+                    if (l_mat == mat_uvByType[j]) {
+                        isRepeat = true;
+                    }
+                }
+
+                if (!isRepeat)//不重复，就添加进去
+                {
+                    this.mat_UV.get(moudleType).push(l_mat);
+                }
+            }
+        }
+    }
 
+    /**
+     * 查找mesh中uv动画所需的材质
+     * @param mesh 
+     */
+    private findUVMat(mesh: AbstractMesh) {
+        let result = [];
+
+        let childMesh = mesh.getChildMeshes();
+        childMesh.push(mesh);
+
+        for (let i = 0; i < childMesh.length; i++) {
+            let mat = childMesh[i].material;
+            if (TsTool.stringContain(mat.name, this.c_MAT_UV)) {
+                // for(let j =0;j< result.length;j++)
+                // {
+                //     if(mat != result[j])
+                //     {
+                result.push(mat);
+                //     }
+                // }
+            }
+        }
+        return result;
+    }
 
     //#endregion
 
diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts
index feb8e24..25d2447 100644
--- a/src/app/babylon/view/facility-window/facility-window.ts
+++ b/src/app/babylon/view/facility-window/facility-window.ts
@@ -32,6 +32,7 @@ import { BabylonTool } from '../../tool/babylon-tool';
 import { BabylonUIStyleTool } from '../../tool/babylon-ui-style-tool';
 import { GizmoTool } from '../../tool/gizmo-tool';
 import { TsTool } from '../../tool/ts-tool';
+import { BuildingWindow } from '../building-window/building-window';
 import { CopyFacilityInfo, FacilityInfoInSceneWindow } from '../facilityinfoinscene-window/facilityinfoinscene-window';
 import { ToolbarWindow } from '../toolbar-window/toobar-window';
 import { UIBase } from '../window-base/ui-base';
@@ -413,6 +414,8 @@ export class FacilityWindow extends UIBase {
         onSuccess?: (modelInfo: ModelInfo_facility) => void
     ): ModelInfo_facility {
 
+        BuildingWindow.instance.getUVMat(facilityData.facilityType, mesh);
+
         if (buildingInfo == null) {
             buildingInfo = this.getCurrentBuildingInfo();
         }
@@ -613,15 +616,19 @@ export class FacilityWindow extends UIBase {
     createOilingByMesh(mesh: AbstractMesh) {
 
         if (TsTool.stringContain(mesh.name, FacilityType.JY_JYJ)) {
+            console.log("找到加油机", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_JYJ);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_SYGX)) {
+            console.log("找到输油管线", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_SYGX);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_YG)) {
+            console.log("找到油罐", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_YG);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_YQHSGX)) {
+            console.log("找到油气回收", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_YQHSGX);
         }
     }

From 0a9a816550f57df86be9d9495f1d4769c0018ba7 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Mon, 8 Nov 2021 16:56:08 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE=E5=B1=95=E7=A4=BA=E5=B9=B6=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E7=9B=B8=E5=BA=94=E9=81=AE=E6=8C=A1=E7=89=A9=EF=BC=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../babylon/model/info/model/model-info.ts    |  2 +-
 .../view/building-window/building-window.ts   |  8 +++++---
 .../view/facility-window/facility-window.ts   | 19 ++++++++++++-------
 .../view/toolbar-window/toobar-window.ts      |  1 +
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts
index 06ca14d..07765c2 100644
--- a/src/app/babylon/model/info/model/model-info.ts
+++ b/src/app/babylon/model/info/model/model-info.ts
@@ -145,7 +145,7 @@ export class ModelInfo {
     if (this.modelBox != null) {
       if (play) {
         SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Green());
-
+        console.log("高亮", this.modelBox.name);
       }
       else {
         SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh);
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index b16dc32..dd4ac7e 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -655,6 +655,7 @@ export class BuildingWindow extends UIBase {
         if (this.facilitysByMoudle.has(type)) {
             facilityByType = this.facilitysByMoudle.get(type);
         }
+        console.log("显示设备", facilityByType);
         for (let i = 0; i < facilityByType.length; i++) {
             let infos = facilityByType[i].facilityInfo;
             if (infos != null) {
@@ -693,11 +694,11 @@ export class BuildingWindow extends UIBase {
 
     /**
      * 根据功能模块，获取所需的设备类型
-     * @param moudleType 
+     * @param moudleType 功能模块
      */
     initFacilityTypeByMoudleType(moudleType: JYZInfoMoudleType, buildingInfo: BuildingInfo) {
 
-        let moudleTypeKey = moudleType + "_"; //当前模块物体的特殊字段
+        let moudleTypeKey = moudleType; //当前模块物体的特殊字段
         let zdKey = "ZD_" + moudleType; //阻挡类物体特殊字段
 
         if (this.facilitysByMoudle.has(moudleType)) {
@@ -721,7 +722,7 @@ export class BuildingWindow extends UIBase {
                 }
                 this.zdByMoudle.get(moudleType).push(l_facilityByType);
             }
-            else if (TsTool.stringContain(l_facilityByType.type, moudleTypeKey)) {
+            else if (TsTool.stringContain(l_facilityByType.type, "_" + moudleTypeKey) || TsTool.stringContain(l_facilityByType.type, moudleTypeKey + "_")) {
                 this.facilitysByMoudle.get(moudleType).push(l_facilityByType);
             }
         }
@@ -732,6 +733,7 @@ export class BuildingWindow extends UIBase {
      * @param show false 表示隐藏罩棚
      */
     showZP(show: boolean) {
+        console.log("展示罩棚", show)
         this.initFacilityTypeByMoudleType(JYZInfoMoudleType.ZP, this.currentBuidngItem.buildingInfo);
         let zpInfoByTypes = this.facilitysByMoudle.get(JYZInfoMoudleType.ZP);
         if (zpInfoByTypes != null) {
diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts
index 25d2447..adf86a6 100644
--- a/src/app/babylon/view/facility-window/facility-window.ts
+++ b/src/app/babylon/view/facility-window/facility-window.ts
@@ -317,10 +317,11 @@ export class FacilityWindow extends UIBase {
     createNewFacilityByMesh(mesh: AbstractMesh, type: FacilityType) {
         let facilityData = this.createFacilityDataFromMesh(mesh, type);
         //let facilityInfo = this.createFacilityInfoFromMesh(facilityData, mesh, buildingInfo);
-        console.log("获取到设备" + type, mesh);
+
 
         if (!this.isRepeatFacilityFromMesh(type, mesh.id)) //不重复
         {
+            console.log("获取到设备" + type, mesh);
             this.createNewFacility(facilityData, mesh);
         }
 
@@ -641,21 +642,25 @@ export class FacilityWindow extends UIBase {
         if (TsTool.stringContain(mesh.name, FacilityType.ZD_YG)) {
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_YG);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.ZD_SYGX)) {
+        if (TsTool.stringContain(mesh.name, FacilityType.ZD_SYGX)) {
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_SYGX);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.ZD_YQHSGX)) {
-            this.createNewFacilityByMesh(mesh, FacilityType.ZD_SYGX);
+        if (TsTool.stringContain(mesh.name, FacilityType.ZD_YQHSGX)) {
+            this.createNewFacilityByMesh(mesh, FacilityType.ZD_YQHSGX);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.ZD_XF)) {
+        if (TsTool.stringContain(mesh.name, FacilityType.ZD_XF)) {
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_XF);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.ZD_ZP)) {
+        if (TsTool.stringContain(mesh.name, FacilityType.ZD_ZP)) {
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_ZP);
         }
     }
 
-
+    /**
+     * 用已有mesh创建设备
+     * @param mesh 
+     * @param type 
+     */
     createFacilityDataFromMesh(mesh: AbstractMesh, type: FacilityType) {
         let name = ConfigManager.getFacilityTypeName(type);
         let result = new ModelData_facility(mesh.name, type, name, mesh.id, new TransformData(), FacilityPosType.In);
diff --git a/src/app/babylon/view/toolbar-window/toobar-window.ts b/src/app/babylon/view/toolbar-window/toobar-window.ts
index 19987bb..6f9d582 100644
--- a/src/app/babylon/view/toolbar-window/toobar-window.ts
+++ b/src/app/babylon/view/toolbar-window/toobar-window.ts
@@ -115,6 +115,7 @@ export class ToolbarWindow extends UIBase {
      * @param show false表示隐藏罩棚
      */
     showZP(show: boolean) {
+        console.log("显示罩棚", show);
         BuildingWindow.instance.showZP(show);
     }
 

From 35f1674947400e76408241ce03f728402608ffbe Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Mon, 8 Nov 2021 17:16:56 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=A9=E6=A3=9A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/model/info/model/model-info.ts         |  1 -
 .../babylon/view/building-window/building-window.ts    |  8 +-------
 src/app/babylon/view/toolbar-window/toobar-window.ts   |  1 -
 src/app/pages/plan/plan.component.ts                   | 10 +++++-----
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts
index 07765c2..8c628ef 100644
--- a/src/app/babylon/model/info/model/model-info.ts
+++ b/src/app/babylon/model/info/model/model-info.ts
@@ -145,7 +145,6 @@ export class ModelInfo {
     if (this.modelBox != null) {
       if (play) {
         SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Green());
-        console.log("高亮", this.modelBox.name);
       }
       else {
         SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh);
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index dd4ac7e..2cc2a71 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -644,7 +644,6 @@ export class BuildingWindow extends UIBase {
      * @param show 
      */
     showJYZModules(type: JYZInfoMoudleType, show: boolean) {
-        console.log("切换页签", type, show);
         if (this.currentBuidngItem == null) {
             return;
         }
@@ -655,7 +654,6 @@ export class BuildingWindow extends UIBase {
         if (this.facilitysByMoudle.has(type)) {
             facilityByType = this.facilitysByMoudle.get(type);
         }
-        console.log("显示设备", facilityByType);
         for (let i = 0; i < facilityByType.length; i++) {
             let infos = facilityByType[i].facilityInfo;
             if (infos != null) {
@@ -670,12 +668,10 @@ export class BuildingWindow extends UIBase {
         if (this.zdByMoudle.has(type)) {
             zdByType = this.zdByMoudle.get(type);
         }
-        console.log("阻挡物", zdByType);
         for (let i = 0; i < zdByType.length; i++) {
             let infos = zdByType[i].facilityInfo;
             if (infos != null) {
                 for (let j = 0; j < infos.length; j++) {
-                    console.log("隐藏阻挡物", infos[j]);
                     infos[j].setEnable(!show);
                 }
             }
@@ -684,7 +680,6 @@ export class BuildingWindow extends UIBase {
             this.currentJYZInfoMoudleType = type;
         }
         else {
-            console.log("隐藏", this.currentJYZInfoMoudleType);
             this.currentJYZInfoMoudleType = null;
             // SceneManager.Instance.highLightLayer.removeAllMeshes();
 
@@ -733,9 +728,8 @@ export class BuildingWindow extends UIBase {
      * @param show false 表示隐藏罩棚
      */
     showZP(show: boolean) {
-        console.log("展示罩棚", show)
         this.initFacilityTypeByMoudleType(JYZInfoMoudleType.ZP, this.currentBuidngItem.buildingInfo);
-        let zpInfoByTypes = this.facilitysByMoudle.get(JYZInfoMoudleType.ZP);
+        let zpInfoByTypes = this.zdByMoudle.get(JYZInfoMoudleType.ZP);
         if (zpInfoByTypes != null) {
             for (let i = 0; i < zpInfoByTypes.length; i++) {
                 let infos = zpInfoByTypes[i].facilityInfo;
diff --git a/src/app/babylon/view/toolbar-window/toobar-window.ts b/src/app/babylon/view/toolbar-window/toobar-window.ts
index 6f9d582..19987bb 100644
--- a/src/app/babylon/view/toolbar-window/toobar-window.ts
+++ b/src/app/babylon/view/toolbar-window/toobar-window.ts
@@ -115,7 +115,6 @@ export class ToolbarWindow extends UIBase {
      * @param show false表示隐藏罩棚
      */
     showZP(show: boolean) {
-        console.log("显示罩棚", show);
         BuildingWindow.instance.showZP(show);
     }
 
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 4c1043f..c1e90c3 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -96,7 +96,7 @@ export class PlanComponent implements OnInit {
   allFence: string[] = ["基本信息", "加油机", "油罐设备", "消防设施", "安全疏散", "输油管线", "油气回收", "应急处置"]; //头部 功能栏
   selectFence: number = -1; //选中 头部功能栏
   isShowChildComponent: boolean = false; //是否 显示左侧子组件
-  @ViewChild('leftDomain')leftDomain: LeftDomainComponent; //子组件引用
+  @ViewChild('leftDomain') leftDomain: LeftDomainComponent; //子组件引用
   isOpenAwning: boolean = true; //是否 打开罩棚
   selectMeasure: number = 0; //当前选择 测量工具
 
@@ -106,14 +106,14 @@ export class PlanComponent implements OnInit {
     let buildingWindow: BuildingWindow = this.beforeOneSatus.buildingWindow;
     let fenceType: JYZInfoMoudleType = this.getFenceType(type)
     if (this.selectFence != type) {
-      this.isShowChildComponent && this.leftDomain? this.leftDomain.initComponent(type) : null; //手动初始化子组件
+      this.isShowChildComponent && this.leftDomain ? this.leftDomain.initComponent(type) : null; //手动初始化子组件
       this.selectFence = type
       this.isShowChildComponent = true
-      type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, true) : null
+      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, true) : null
     } else { //取消选中
       this.selectFence = -1
       this.isShowChildComponent = false
-      type>0 && type<7? buildingWindow.showJYZInfoModel(fenceType, false) : null
+      type > 0 && type < 7 ? buildingWindow.showJYZInfoModel(fenceType, false) : null
     }
   }
 
@@ -138,7 +138,7 @@ export class PlanComponent implements OnInit {
 
   //切换 头部罩棚
   toggleHeaderAwning(isOpen: boolean) {
-    this.isOpenAwning = isOpen
+    this.isOpenAwning = isOpen;
     ToolbarWindow.instance.showZP(isOpen)
   }
 

From 5e2e219adaf7a23e4a7724ad9cc117c114229c6e Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 8 Nov 2021 17:20:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=99=A8=E6=9D=90=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addequipment/addequipment.component.html  |   1 +
 .../addequipment/addequipment.component.scss  |   0
 .../addequipment/addequipment.component.ts    |  15 +++
 .../editequipment.component.html              |   1 +
 .../editequipment.component.scss              |   0
 .../editequipment/editequipment.component.ts  |  15 +++
 .../equipment-info.component.html             |  83 ++++++++++++-
 .../equipment-info.component.scss             | 117 ++++++++++++++++++
 .../equipment-info.component.ts               |  16 ++-
 src/app/pages/pages.module.ts                 |   4 +-
 src/theme.less                                |   5 +-
 11 files changed, 249 insertions(+), 8 deletions(-)
 create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.html
 create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.scss
 create mode 100644 src/app/pages/equipment-info/addequipment/addequipment.component.ts
 create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.html
 create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.scss
 create mode 100644 src/app/pages/equipment-info/editequipment/editequipment.component.ts

diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.html b/src/app/pages/equipment-info/addequipment/addequipment.component.html
new file mode 100644
index 0000000..39fbbb6
--- /dev/null
+++ b/src/app/pages/equipment-info/addequipment/addequipment.component.html
@@ -0,0 +1 @@
+<p>addequipment works!</p>
diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.scss b/src/app/pages/equipment-info/addequipment/addequipment.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.ts b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
new file mode 100644
index 0000000..d4bf6b1
--- /dev/null
+++ b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-addequipment',
+  templateUrl: './addequipment.component.html',
+  styleUrls: ['./addequipment.component.scss']
+})
+export class AddequipmentComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.html b/src/app/pages/equipment-info/editequipment/editequipment.component.html
new file mode 100644
index 0000000..f5d5238
--- /dev/null
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.html
@@ -0,0 +1 @@
+<p>editequipment works!</p>
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.scss b/src/app/pages/equipment-info/editequipment/editequipment.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.ts b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
new file mode 100644
index 0000000..6aacf38
--- /dev/null
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-editequipment',
+  templateUrl: './editequipment.component.html',
+  styleUrls: ['./editequipment.component.scss']
+})
+export class EditequipmentComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html
index 47b9f19..d7c1748 100644
--- a/src/app/pages/equipment-info/equipment-info.component.html
+++ b/src/app/pages/equipment-info/equipment-info.component.html
@@ -1 +1,82 @@
-<p>equipment-info works!</p>
+<!-- <p>器材管理</p> -->
+<div class="box" id="equipmentInfo">
+  <div class="content">
+    <div class="title">
+      <app-title [name]="'编辑器材信息'"></app-title>
+    </div>
+    <div class="topbox">
+      <div class="lefttop">
+        <span>消防器材列表</span>
+      </div>
+      <div class="righttop">
+        <form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
+          <nz-form-item>
+            <nz-form-control>
+              <nz-input-group nzPrefixIcon="search">
+                <input type="text" nz-input placeholder="请输入器材名称" formControlName="search" />
+              </nz-input-group>
+            </nz-form-control>
+            <button style="display: none;" type="submit"></button>
+          </nz-form-item>
+        </form>
+        <button nz-button (click)="add()">新增</button>
+      </div>
+    </div>
+    <div class="tablebox">
+      <div class="table">
+        <div nz-row class="th">
+          <div nz-col nzSpan="5" style="box-sizing: border-box;padding-left: 28px;">
+            消防器材
+          </div>
+          <div nz-col nzSpan="4">
+            规格
+          </div>
+          <div nz-col nzSpan="4">
+            购入日期
+          </div>
+          <div nz-col nzSpan="4">
+            生产日期
+          </div>
+          <div nz-col nzSpan="4">
+            有效期至
+          </div>
+          <div nz-col nzSpan="3">
+            操作
+          </div>
+        </div>
+        <div class="tbody">
+          <div nz-row class="tr" *ngFor="let item of arr">
+            <div nz-col nzSpan="5" style="box-sizing: border-box;padding-left: 28px;">
+              干粉灭火器
+            </div>
+            <div nz-col nzSpan="4">
+              普通
+            </div>
+            <div nz-col nzSpan="4">
+              2021.01.05
+            </div>
+            <div nz-col nzSpan="4">
+              2021.01.05
+            </div>
+            <div nz-col nzSpan="4">
+              2021.01.05
+            </div>
+            <div nz-col nzSpan="3" class="btn">
+              <span>
+                编辑
+              </span>
+              <span>
+                删除
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="pagination">
+        <nz-pagination [nzPageIndex]="1" [nzTotal]="85" [nzPageSize]="20" [nzShowTotal]="totalTemplate"
+          nzShowQuickJumper></nz-pagination>
+        <ng-template #totalTemplate let-total> 16条/页,共100条 </ng-template>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/pages/equipment-info/equipment-info.component.scss b/src/app/pages/equipment-info/equipment-info.component.scss
index e69de29..251eb3c 100644
--- a/src/app/pages/equipment-info/equipment-info.component.scss
+++ b/src/app/pages/equipment-info/equipment-info.component.scss
@@ -0,0 +1,117 @@
+.box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+}
+
+.content {
+  width: 1000px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .title {
+    height: 48px;
+    width: 100%;
+    margin: 16px 0;
+  }
+
+  .topbox {
+    width: 1000px;
+    height: 34px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    .lefttop {
+      span {
+        color: #C4E2FC;
+        font-size: 16px;
+      }
+    }
+
+    .righttop {
+      height: 34px;
+      display: flex;
+
+      button {
+        margin-left: 16px;
+        background: #143c61;
+        color: #91CCFF;
+        border-radius: 0px;
+        border: 1px solid #36A2FF;
+        width: 64px;
+      }
+
+      nz-input-group {
+        height: 32px;
+      }
+    }
+  }
+
+  .tablebox {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    overflow: hidden;
+
+    .table {
+      color: white;
+      flex: 1;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      overflow: hidden;
+      font-size: 16px;
+
+      .th {
+        height: 40px;
+        line-height: 40px;
+        color: #23D9FF;
+        background: rgba(35, 153, 255, 0.2);
+        border: 1px solid rgba(35, 217, 255, 0.4);
+        // box-shadow:  0 0 3px 1px rgba(35, 217, 255, 0.4);
+      }
+
+      .tbody {
+        flex: 1;
+        overflow-y: auto;
+        color: #C4E2FC;
+        font-size: 15px;
+
+        .tr {
+          height: 40px;
+          line-height: 40px;
+          border-bottom: 1px solid #115188;
+
+          .btn {
+            span {
+              color: #2399FF;
+              cursor: pointer;
+            }
+
+            span:nth-child(1) {
+              margin-right: 18px;
+            }
+          }
+        }
+      }
+    }
+
+    .pagination {
+      height: 32px;
+      margin: 15px 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    ::-webkit-scrollbar {
+      width: 0px;
+    }
+
+  }
+}
diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
index e6bbd00..0acf9db 100644
--- a/src/app/pages/equipment-info/equipment-info.component.ts
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -1,15 +1,23 @@
 import { Component, OnInit } from '@angular/core';
-
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 @Component({
   selector: 'app-equipment-info',
   templateUrl: './equipment-info.component.html',
   styleUrls: ['./equipment-info.component.scss']
 })
 export class EquipmentInfoComponent implements OnInit {
-
-  constructor() { }
-
+  validateForm!: FormGroup;
+  constructor(private fb: FormBuilder) { }
+  arr = [1,1,1,1,1,1,1,1,1]
   ngOnInit(): void {
+    this.validateForm = this.fb.group({
+      search: [null]
+    });
   }
+  submitForm(){
 
+  }
+  add(){
+
+  }
 }
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 9068a3d..5cb9708 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -34,8 +34,10 @@ import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal
 import { EquipmentInfoComponent } from './equipment-info/equipment-info.component';
 import { OilStationInfoComponent } from './oil-station-info/oil-station-info.component';
 import { LeftDomainComponent } from './left-domain/left-domain.component';
+import { AddequipmentComponent } from './equipment-info/addequipment/addequipment.component';
+import { EditequipmentComponent } from './equipment-info/editequipment/editequipment.component';
 @NgModule({
-  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent],
+  declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, AddequipmentComponent, EditequipmentComponent],
   imports: [
     PagesRoutingModule,
     CommonModule,
diff --git a/src/theme.less b/src/theme.less
index 88ed239..60a9c9b 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -4,7 +4,8 @@
 
 //分页器
 #recordsboxadmin,
-#recordsbox {
+#recordsbox,
+#equipmentInfo {
 
   .ant-pagination-total-text,
   .ant-pagination-options-quick-jumper {
@@ -111,7 +112,7 @@
 
 
 //登录页input
-#login {
+#login,#equipmentInfo {
 
   nz-input-group,
   input {

From befe1e51d80f66aa9ace70badbf640ac9743497f Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Tue, 9 Nov 2021 10:05:18 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E5=92=8C=E9=98=BB=E6=8C=A1=E7=89=A9=E7=9A=84=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/controller/info-manager.ts    |  4 --
 src/app/babylon/controller/scene-manager.ts   |  6 ++-
 .../controller/status/building-status.ts      |  6 ++-
 .../data/model-data/model-data-facility.ts    |  4 +-
 .../model/info/model/model-info-facility.ts   |  1 +
 .../babylon/model/info/model/model-info.ts    |  5 +--
 .../view/building-window/building-window.ts   | 43 +++++++++++++++----
 .../view/facility-window/facility-window.ts   | 17 ++++----
 src/app/pages/plan/plan.component.ts          |  2 +-
 9 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/src/app/babylon/controller/info-manager.ts b/src/app/babylon/controller/info-manager.ts
index c3746bf..c6beb2c 100644
--- a/src/app/babylon/controller/info-manager.ts
+++ b/src/app/babylon/controller/info-manager.ts
@@ -164,7 +164,6 @@ export class InfoManager {
     modelEditData: ModelEditData,
     buildingInfo: BuildingInfo = null
   ) {
-    console.trace("创建设备", buildingInfo);
 
     let facilities = modelEditData.facilities;
 
@@ -176,11 +175,8 @@ export class InfoManager {
         let facilityData = facilities[i].facilities[j]
         if (facilityData.posType == FacilityPosType.In && buildingInfo.ModelInfo != null) {
           mesh = buildingInfo.ModelInfo.getChildrenByName(facilityData.resName);
-          console.log("内建模型找到", mesh);
         }
 
-
-
         FacilityWindow.instance.createFacility(
           modelEditData.facilities[i].facilities[j],
           false,
diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts
index dd219a5..ed25a86 100644
--- a/src/app/babylon/controller/scene-manager.ts
+++ b/src/app/babylon/controller/scene-manager.ts
@@ -256,16 +256,18 @@ export class SceneManager {
         {
           mainTextureRatio: 1,
         });
-      this.highLightLayer.innerGlow = false;
+      this.highLightLayer.innerGlow = true;
+      this.highLightLayer.outerGlow = true;
+
     }
 
     let allMesh = mesh.getChildMeshes();
-    this.highLightLayer.addMesh(mesh, color);
     allMesh.push(mesh);
     for (let i = 0; i < allMesh.length; i++) {
       let childMesh = allMesh[i];
       if (childMesh instanceof Mesh) {
         this.highLightLayer.addMesh(childMesh, color);
+
         this.highLightNum++;
       }
     }
diff --git a/src/app/babylon/controller/status/building-status.ts b/src/app/babylon/controller/status/building-status.ts
index 54bcaa9..a087bdd 100644
--- a/src/app/babylon/controller/status/building-status.ts
+++ b/src/app/babylon/controller/status/building-status.ts
@@ -137,9 +137,13 @@ export class BuildingStatus extends StatusBase {
             //判断已经有了就不创建了
             // InfoManager.createFacilityInfos(buildingInfo.buildingData.outdoorData, buildingInfo);
             //显示
-            this.buildingWindow.showFacilityInfosIcon(this.currentBuildingInfo, true);
+            //this.buildingWindow.showFacilityInfosIcon(this.currentBuildingInfo, true);
         }
 
+        this.buildingWindow.changeCurrentBuildingInfo(buildingInfo.ModelInfo);
+
+
+
     }
 
     //模型变化
diff --git a/src/app/babylon/model/data/model-data/model-data-facility.ts b/src/app/babylon/model/data/model-data/model-data-facility.ts
index d01fbfe..5fe89f2 100644
--- a/src/app/babylon/model/data/model-data/model-data-facility.ts
+++ b/src/app/babylon/model/data/model-data/model-data-facility.ts
@@ -246,11 +246,11 @@ export enum FacilityType {
     /**
      * 逃生路线
      */
-    XF_TSLX = "XF_TSLX",
+    AQSS_TSLX = "AQSS_TSLX",
     /**
      * 疏散点
      */
-    XF_SSD = "XF_SSD",
+    AQSS_SSD = "AQSS_SSD",
 
     /**
      * 罩棚
diff --git a/src/app/babylon/model/info/model/model-info-facility.ts b/src/app/babylon/model/info/model/model-info-facility.ts
index 2057ec4..f39a964 100644
--- a/src/app/babylon/model/info/model/model-info-facility.ts
+++ b/src/app/babylon/model/info/model/model-info-facility.ts
@@ -92,6 +92,7 @@ export class ModelInfo_facility extends ModelInfo {
         });
 
         this.uiFollowRoot.zIndex = BabylonUIStyleTool.c_zIndex_facilityIcon;
+        this.showFollowUI(false);
     }
 
 
diff --git a/src/app/babylon/model/info/model/model-info.ts b/src/app/babylon/model/info/model/model-info.ts
index 8c628ef..227a539 100644
--- a/src/app/babylon/model/info/model/model-info.ts
+++ b/src/app/babylon/model/info/model/model-info.ts
@@ -133,7 +133,6 @@ export class ModelInfo {
   showFollowUI(show: boolean) {
     if (this.uiFollowRoot != null) {
       this.uiFollowRoot.isVisible = show;
-
     }
   }
 
@@ -142,13 +141,13 @@ export class ModelInfo {
    * @param play false表示停止，并恢复正常
    */
   playShowAnim(play: boolean) {
+    this.showFollowUI(play);
     if (this.modelBox != null) {
       if (play) {
-        SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Green());
+        SceneManager.Instance.addToHighLight(this.modelBox as Mesh, Color3.Yellow());
       }
       else {
         SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh);
-
       }
     }
   }
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index 2cc2a71..8d8c3b4 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -308,10 +308,13 @@ export class BuildingWindow extends UIBase {
             }
         }
 
+        console.log("选中建筑", modelInfo);
+        this.showJYZModules(JYZInfoMoudleType.AQSS, false);
 
         //this.onChangeCurrentBuildingItem(item);
 
         // this.three.selectLeftBuilding(item);
+
     }
 
     /**
@@ -593,6 +596,10 @@ export class BuildingWindow extends UIBase {
                 if (TsTool.stringContain(nodeName, "primitive")) {
                     //复合材质被分解为多个子mesh，不看做特殊意义的对象
                 }
+                else if (TsTool.stringContain(nodeName, this.c_zheDang))//遮挡
+                {
+                    this.currentBuidngItem.createStopByMesh(allNode[i]);
+                }
                 else if (TsTool.stringContain(nodeName, this.c_xiaoFang)) //消防
                 {
                     this.currentBuidngItem.createFacilityByMesh(allNode[i]);
@@ -601,10 +608,7 @@ export class BuildingWindow extends UIBase {
                 {
                     this.currentBuidngItem.createOilingByMesh(allNode[i]);
                 }
-                else if (TsTool.stringContain(nodeName, this.c_zheDang))//遮挡
-                {
-                    this.currentBuidngItem.createStopByMesh(allNode[i]);
-                }
+
             }
         }
 
@@ -659,14 +663,26 @@ export class BuildingWindow extends UIBase {
             if (infos != null) {
                 for (let j = 0; j < infos.length; j++) {
                     infos[j].playShowAnim(show);
+                    //安全疏散，特殊，要在不显示时隐藏本体
+                    if (type == JYZInfoMoudleType.AQSS) {
+                        infos[j].setEnable(show);
+                    }
                 }
             }
         }
 
+
+
+
+
         //阻挡类物体
         let zdByType: FacilityInfoByType[] = [];
         if (this.zdByMoudle.has(type)) {
             zdByType = this.zdByMoudle.get(type);
+            console.log("查找阻挡物", type, zdByType);
+        }
+        else {
+            console.log("没找到阻挡物", type, zdByType);
         }
         for (let i = 0; i < zdByType.length; i++) {
             let infos = zdByType[i].facilityInfo;
@@ -711,6 +727,17 @@ export class BuildingWindow extends UIBase {
 
         for (let i = 0; i < allFacilityByType.length; i++) {
             let l_facilityByType = allFacilityByType[i];
+
+            // if (moudleType == JYZInfoMoudleType.XF) //消防-逃生
+            // {
+            //     if (TsTool.stringContain(l_facilityByType.type, FacilityType.XF_TSLX)) {
+            //         continue;
+            //     }
+            //     if (TsTool.stringContain(l_facilityByType.type, FacilityType.XF_SSD)) {
+            //         continue;
+            //     }
+
+            // }
             if (TsTool.stringContain(l_facilityByType.type, zdKey)) {
                 if (!this.zdByMoudle.has(moudleType)) {
                     this.zdByMoudle.set(moudleType, []);
@@ -748,8 +775,8 @@ export class BuildingWindow extends UIBase {
     getUVMat(facilityType: FacilityType, mesh: AbstractMesh) {
         let moudleType: JYZInfoMoudleType = null;
         switch (facilityType) {
-            case FacilityType.XF_TSLX:
-                moudleType = JYZInfoMoudleType.TSLX;
+            case FacilityType.AQSS_TSLX:
+                moudleType = JYZInfoMoudleType.AQSS;
                 break;
             case FacilityType.JY_SYGX:
                 moudleType = JYZInfoMoudleType.SYG;
@@ -843,9 +870,9 @@ export enum JYZInfoMoudleType {
      */
     YQHSGX = "YQHSGX",
     /**
-     * 逃生路线
+     * 安全疏散
      */
-    TSLX = "TSLX",
+    AQSS = "AQSS",
 
     /**
      * 罩棚
diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts
index adf86a6..fafdc00 100644
--- a/src/app/babylon/view/facility-window/facility-window.ts
+++ b/src/app/babylon/view/facility-window/facility-window.ts
@@ -587,11 +587,11 @@ export class FacilityWindow extends UIBase {
         else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHT)) {
             this.createNewFacilityByMesh(mesh, FacilityType.XF_MHT);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.XF_SSD)) {
-            this.createNewFacilityByMesh(mesh, FacilityType.XF_SSD);
+        else if (TsTool.stringContain(mesh.name, FacilityType.AQSS_SSD)) {
+            this.createNewFacilityByMesh(mesh, FacilityType.AQSS_SSD);
         }
-        else if (TsTool.stringContain(mesh.name, FacilityType.XF_TSLX)) {
-            this.createNewFacilityByMesh(mesh, FacilityType.XF_TSLX);
+        else if (TsTool.stringContain(mesh.name, FacilityType.AQSS_TSLX)) {
+            this.createNewFacilityByMesh(mesh, FacilityType.AQSS_TSLX);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.XF_XFCM)) {
             this.createNewFacilityByMesh(mesh, FacilityType.XF_XFCM);
@@ -617,19 +617,19 @@ export class FacilityWindow extends UIBase {
     createOilingByMesh(mesh: AbstractMesh) {
 
         if (TsTool.stringContain(mesh.name, FacilityType.JY_JYJ)) {
-            console.log("找到加油机", mesh)
+            // console.log("找到加油机", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_JYJ);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_SYGX)) {
-            console.log("找到输油管线", mesh)
+            // console.log("找到输油管线", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_SYGX);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_YG)) {
-            console.log("找到油罐", mesh)
+            // console.log("找到油罐", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_YG);
         }
         else if (TsTool.stringContain(mesh.name, FacilityType.JY_YQHSGX)) {
-            console.log("找到油气回收", mesh)
+            // console.log("找到油气回收", mesh)
             this.createNewFacilityByMesh(mesh, FacilityType.JY_YQHSGX);
         }
     }
@@ -649,6 +649,7 @@ export class FacilityWindow extends UIBase {
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_YQHSGX);
         }
         if (TsTool.stringContain(mesh.name, FacilityType.ZD_XF)) {
+            console.log("找到消防阻挡物", mesh.name);
             this.createNewFacilityByMesh(mesh, FacilityType.ZD_XF);
         }
         if (TsTool.stringContain(mesh.name, FacilityType.ZD_ZP)) {
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index c1e90c3..fceba58 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -127,7 +127,7 @@ export class PlanComponent implements OnInit {
     } else if (type === 3) {
       fenceType = JYZInfoMoudleType.XF
     } else if (type === 4) {
-      fenceType = JYZInfoMoudleType.TSLX
+      fenceType = JYZInfoMoudleType.AQSS
     } else if (type === 5) {
       fenceType = JYZInfoMoudleType.SYG
     } else if (type === 6) {