From 58181ac2942374d50bf06fb372ac5874b49a7280 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 16 Dec 2021 10:35:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E8=A1=A8=E6=A0=BC=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/organization.component.html                  | 2 +-
 .../system-management/organization/organization.component.ts  | 2 +-
 src/app/system-management/user/user.component.html            | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/system-management/organization/organization.component.html b/src/app/system-management/organization/organization.component.html
index 8d6f01f..44c77bf 100644
--- a/src/app/system-management/organization/organization.component.html
+++ b/src/app/system-management/organization/organization.component.html
@@ -35,7 +35,7 @@
     <div class="nodebox">
       <span class="name">{{ node.title }}</span>
       <span class="operation">
-        <span (click)="addOr(node)">新增</span>
+        <span (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
         <span (click)="editOr(node)">编辑</span>
         <span (click)="deleteOr(node)">删除</span>
       </span>
diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts
index 864c721..6f1c6bb 100644
--- a/src/app/system-management/organization/organization.component.ts
+++ b/src/app/system-management/organization/organization.component.ts
@@ -70,7 +70,7 @@ export class OrganizationComponent implements OnInit {
 
 
   addOr(node?: any) {
-    // console.log(node)
+    console.log(node)
     const modal = this.modal.create({
       nzTitle: node ? '新增组织机构' : '新增一级组织机构',
       nzContent: AddorComponent,
diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html
index c6f9069..ff7193e 100644
--- a/src/app/system-management/user/user.component.html
+++ b/src/app/system-management/user/user.component.html
@@ -26,7 +26,7 @@
           <th></th>
           <th>账号</th>
           <th>姓名</th>
-          <th>角色</th>
+          <th style="width:45%;">角色</th>
           <th>所属机构</th>
           <th>操作</th>
         </tr>
@@ -36,7 +36,7 @@
           <td><img src="../../../assets/images/user.png" alt=""></td>
           <td>{{ data.userName }}</td>
           <td>{{ data.name }}</td>
-          <td>
+          <td nzBreakWord>
             <span style="margin-right: 8px;" *ngFor="let item of data.roleNames">{{item}}</span>
           </td>
           <td>

From ac141b225019e58995ccd2d87a42f42746f5e1ff Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Thu, 16 Dec 2021 10:58:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesh/mark/outside/{XFC => xfc1}/CarColor.png    | Bin
 .../mesh/mark/outside/{XFC => xfc1}/FireCar.jpg     | Bin
 src/assets/mesh/mark/outside/{XFC => xfc1}/XFC.bin  | Bin
 src/assets/mesh/mark/outside/{XFC => xfc1}/XFC.gltf |   0
 .../mark/outside/{XFC => xfc1}/XFC.gltf.manifest    |   0
 .../{XFY => xfy2}/Boots_AlbedoTransparency.jpg      | Bin
 .../BunkerClothing_AlbedoTransparency.png           | Bin
 .../{XFY => xfy2}/Head_AlbedoTransparency.jpg       | Bin
 .../{XFY => xfy2}/Helmet_AlbedoTransparency.jpg     | Bin
 .../{XFY => xfy2}/Straps_AlbedoTransparency.jpg     | Bin
 src/assets/mesh/mark/outside/{XFY => xfy2}/XFY.bin  | Bin
 src/assets/mesh/mark/outside/{XFY => xfy2}/XFY.gltf |   0
 .../mark/outside/{XFY => xfy2}/XFY.gltf.manifest    |   0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename src/assets/mesh/mark/outside/{XFC => xfc1}/CarColor.png (100%)
 rename src/assets/mesh/mark/outside/{XFC => xfc1}/FireCar.jpg (100%)
 rename src/assets/mesh/mark/outside/{XFC => xfc1}/XFC.bin (100%)
 rename src/assets/mesh/mark/outside/{XFC => xfc1}/XFC.gltf (100%)
 rename src/assets/mesh/mark/outside/{XFC => xfc1}/XFC.gltf.manifest (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/Boots_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/BunkerClothing_AlbedoTransparency.png (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/Head_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/Helmet_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/Straps_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/XFY.bin (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/XFY.gltf (100%)
 rename src/assets/mesh/mark/outside/{XFY => xfy2}/XFY.gltf.manifest (100%)

diff --git a/src/assets/mesh/mark/outside/XFC/CarColor.png b/src/assets/mesh/mark/outside/xfc1/CarColor.png
similarity index 100%
rename from src/assets/mesh/mark/outside/XFC/CarColor.png
rename to src/assets/mesh/mark/outside/xfc1/CarColor.png
diff --git a/src/assets/mesh/mark/outside/XFC/FireCar.jpg b/src/assets/mesh/mark/outside/xfc1/FireCar.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/XFC/FireCar.jpg
rename to src/assets/mesh/mark/outside/xfc1/FireCar.jpg
diff --git a/src/assets/mesh/mark/outside/XFC/XFC.bin b/src/assets/mesh/mark/outside/xfc1/XFC.bin
similarity index 100%
rename from src/assets/mesh/mark/outside/XFC/XFC.bin
rename to src/assets/mesh/mark/outside/xfc1/XFC.bin
diff --git a/src/assets/mesh/mark/outside/XFC/XFC.gltf b/src/assets/mesh/mark/outside/xfc1/XFC.gltf
similarity index 100%
rename from src/assets/mesh/mark/outside/XFC/XFC.gltf
rename to src/assets/mesh/mark/outside/xfc1/XFC.gltf
diff --git a/src/assets/mesh/mark/outside/XFC/XFC.gltf.manifest b/src/assets/mesh/mark/outside/xfc1/XFC.gltf.manifest
similarity index 100%
rename from src/assets/mesh/mark/outside/XFC/XFC.gltf.manifest
rename to src/assets/mesh/mark/outside/xfc1/XFC.gltf.manifest
diff --git a/src/assets/mesh/mark/outside/XFY/Boots_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy2/Boots_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/Boots_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy2/Boots_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/XFY/BunkerClothing_AlbedoTransparency.png b/src/assets/mesh/mark/outside/xfy2/BunkerClothing_AlbedoTransparency.png
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/BunkerClothing_AlbedoTransparency.png
rename to src/assets/mesh/mark/outside/xfy2/BunkerClothing_AlbedoTransparency.png
diff --git a/src/assets/mesh/mark/outside/XFY/Head_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy2/Head_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/Head_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy2/Head_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/XFY/Helmet_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy2/Helmet_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/Helmet_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy2/Helmet_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/XFY/Straps_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy2/Straps_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/Straps_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy2/Straps_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/XFY/XFY.bin b/src/assets/mesh/mark/outside/xfy2/XFY.bin
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/XFY.bin
rename to src/assets/mesh/mark/outside/xfy2/XFY.bin
diff --git a/src/assets/mesh/mark/outside/XFY/XFY.gltf b/src/assets/mesh/mark/outside/xfy2/XFY.gltf
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/XFY.gltf
rename to src/assets/mesh/mark/outside/xfy2/XFY.gltf
diff --git a/src/assets/mesh/mark/outside/XFY/XFY.gltf.manifest b/src/assets/mesh/mark/outside/xfy2/XFY.gltf.manifest
similarity index 100%
rename from src/assets/mesh/mark/outside/XFY/XFY.gltf.manifest
rename to src/assets/mesh/mark/outside/xfy2/XFY.gltf.manifest

From ef01f340d059e0b62b343da13c7f7ff4417bb6ab Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Thu, 16 Dec 2021 10:59:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesh/mark/outside/{xfc1 => xfc}/CarColor.png    | Bin
 .../mesh/mark/outside/{xfc1 => xfc}/FireCar.jpg     | Bin
 src/assets/mesh/mark/outside/{xfc1 => xfc}/XFC.bin  | Bin
 src/assets/mesh/mark/outside/{xfc1 => xfc}/XFC.gltf |   0
 .../mark/outside/{xfc1 => xfc}/XFC.gltf.manifest    |   0
 .../{xfy2 => xfy}/Boots_AlbedoTransparency.jpg      | Bin
 .../BunkerClothing_AlbedoTransparency.png           | Bin
 .../{xfy2 => xfy}/Head_AlbedoTransparency.jpg       | Bin
 .../{xfy2 => xfy}/Helmet_AlbedoTransparency.jpg     | Bin
 .../{xfy2 => xfy}/Straps_AlbedoTransparency.jpg     | Bin
 src/assets/mesh/mark/outside/{xfy2 => xfy}/XFY.bin  | Bin
 src/assets/mesh/mark/outside/{xfy2 => xfy}/XFY.gltf |   0
 .../mark/outside/{xfy2 => xfy}/XFY.gltf.manifest    |   0
 13 files changed, 0 insertions(+), 0 deletions(-)
 rename src/assets/mesh/mark/outside/{xfc1 => xfc}/CarColor.png (100%)
 rename src/assets/mesh/mark/outside/{xfc1 => xfc}/FireCar.jpg (100%)
 rename src/assets/mesh/mark/outside/{xfc1 => xfc}/XFC.bin (100%)
 rename src/assets/mesh/mark/outside/{xfc1 => xfc}/XFC.gltf (100%)
 rename src/assets/mesh/mark/outside/{xfc1 => xfc}/XFC.gltf.manifest (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/Boots_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/BunkerClothing_AlbedoTransparency.png (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/Head_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/Helmet_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/Straps_AlbedoTransparency.jpg (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/XFY.bin (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/XFY.gltf (100%)
 rename src/assets/mesh/mark/outside/{xfy2 => xfy}/XFY.gltf.manifest (100%)

diff --git a/src/assets/mesh/mark/outside/xfc1/CarColor.png b/src/assets/mesh/mark/outside/xfc/CarColor.png
similarity index 100%
rename from src/assets/mesh/mark/outside/xfc1/CarColor.png
rename to src/assets/mesh/mark/outside/xfc/CarColor.png
diff --git a/src/assets/mesh/mark/outside/xfc1/FireCar.jpg b/src/assets/mesh/mark/outside/xfc/FireCar.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/xfc1/FireCar.jpg
rename to src/assets/mesh/mark/outside/xfc/FireCar.jpg
diff --git a/src/assets/mesh/mark/outside/xfc1/XFC.bin b/src/assets/mesh/mark/outside/xfc/XFC.bin
similarity index 100%
rename from src/assets/mesh/mark/outside/xfc1/XFC.bin
rename to src/assets/mesh/mark/outside/xfc/XFC.bin
diff --git a/src/assets/mesh/mark/outside/xfc1/XFC.gltf b/src/assets/mesh/mark/outside/xfc/XFC.gltf
similarity index 100%
rename from src/assets/mesh/mark/outside/xfc1/XFC.gltf
rename to src/assets/mesh/mark/outside/xfc/XFC.gltf
diff --git a/src/assets/mesh/mark/outside/xfc1/XFC.gltf.manifest b/src/assets/mesh/mark/outside/xfc/XFC.gltf.manifest
similarity index 100%
rename from src/assets/mesh/mark/outside/xfc1/XFC.gltf.manifest
rename to src/assets/mesh/mark/outside/xfc/XFC.gltf.manifest
diff --git a/src/assets/mesh/mark/outside/xfy2/Boots_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Boots_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/Boots_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy/Boots_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/xfy2/BunkerClothing_AlbedoTransparency.png b/src/assets/mesh/mark/outside/xfy/BunkerClothing_AlbedoTransparency.png
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/BunkerClothing_AlbedoTransparency.png
rename to src/assets/mesh/mark/outside/xfy/BunkerClothing_AlbedoTransparency.png
diff --git a/src/assets/mesh/mark/outside/xfy2/Head_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Head_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/Head_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy/Head_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/xfy2/Helmet_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Helmet_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/Helmet_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy/Helmet_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/xfy2/Straps_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Straps_AlbedoTransparency.jpg
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/Straps_AlbedoTransparency.jpg
rename to src/assets/mesh/mark/outside/xfy/Straps_AlbedoTransparency.jpg
diff --git a/src/assets/mesh/mark/outside/xfy2/XFY.bin b/src/assets/mesh/mark/outside/xfy/XFY.bin
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/XFY.bin
rename to src/assets/mesh/mark/outside/xfy/XFY.bin
diff --git a/src/assets/mesh/mark/outside/xfy2/XFY.gltf b/src/assets/mesh/mark/outside/xfy/XFY.gltf
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/XFY.gltf
rename to src/assets/mesh/mark/outside/xfy/XFY.gltf
diff --git a/src/assets/mesh/mark/outside/xfy2/XFY.gltf.manifest b/src/assets/mesh/mark/outside/xfy/XFY.gltf.manifest
similarity index 100%
rename from src/assets/mesh/mark/outside/xfy2/XFY.gltf.manifest
rename to src/assets/mesh/mark/outside/xfy/XFY.gltf.manifest