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 @@
{{ node.title }} - 新增 + 新增 编辑 删除 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 @@ 账号 姓名 - 角色 + 角色 所属机构 操作 @@ -36,7 +36,7 @@ {{ data.userName }} {{ data.name }} - + {{item}} diff --git a/src/assets/mesh/mark/outside/XFC/CarColor.png b/src/assets/mesh/mark/outside/xfc/CarColor.png similarity index 100% rename from src/assets/mesh/mark/outside/XFC/CarColor.png rename to src/assets/mesh/mark/outside/xfc/CarColor.png diff --git a/src/assets/mesh/mark/outside/XFC/FireCar.jpg b/src/assets/mesh/mark/outside/xfc/FireCar.jpg similarity index 100% rename from src/assets/mesh/mark/outside/XFC/FireCar.jpg rename to src/assets/mesh/mark/outside/xfc/FireCar.jpg diff --git a/src/assets/mesh/mark/outside/XFC/XFC.bin b/src/assets/mesh/mark/outside/xfc/XFC.bin similarity index 100% rename from src/assets/mesh/mark/outside/XFC/XFC.bin rename to src/assets/mesh/mark/outside/xfc/XFC.bin diff --git a/src/assets/mesh/mark/outside/XFC/XFC.gltf b/src/assets/mesh/mark/outside/xfc/XFC.gltf similarity index 100% rename from src/assets/mesh/mark/outside/XFC/XFC.gltf rename to src/assets/mesh/mark/outside/xfc/XFC.gltf diff --git a/src/assets/mesh/mark/outside/XFC/XFC.gltf.manifest b/src/assets/mesh/mark/outside/xfc/XFC.gltf.manifest similarity index 100% rename from src/assets/mesh/mark/outside/XFC/XFC.gltf.manifest rename to src/assets/mesh/mark/outside/xfc/XFC.gltf.manifest diff --git a/src/assets/mesh/mark/outside/XFY/Boots_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Boots_AlbedoTransparency.jpg similarity index 100% rename from src/assets/mesh/mark/outside/XFY/Boots_AlbedoTransparency.jpg rename to src/assets/mesh/mark/outside/xfy/Boots_AlbedoTransparency.jpg diff --git a/src/assets/mesh/mark/outside/XFY/BunkerClothing_AlbedoTransparency.png b/src/assets/mesh/mark/outside/xfy/BunkerClothing_AlbedoTransparency.png similarity index 100% rename from src/assets/mesh/mark/outside/XFY/BunkerClothing_AlbedoTransparency.png rename to src/assets/mesh/mark/outside/xfy/BunkerClothing_AlbedoTransparency.png diff --git a/src/assets/mesh/mark/outside/XFY/Head_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Head_AlbedoTransparency.jpg similarity index 100% rename from src/assets/mesh/mark/outside/XFY/Head_AlbedoTransparency.jpg rename to src/assets/mesh/mark/outside/xfy/Head_AlbedoTransparency.jpg diff --git a/src/assets/mesh/mark/outside/XFY/Helmet_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Helmet_AlbedoTransparency.jpg similarity index 100% rename from src/assets/mesh/mark/outside/XFY/Helmet_AlbedoTransparency.jpg rename to src/assets/mesh/mark/outside/xfy/Helmet_AlbedoTransparency.jpg diff --git a/src/assets/mesh/mark/outside/XFY/Straps_AlbedoTransparency.jpg b/src/assets/mesh/mark/outside/xfy/Straps_AlbedoTransparency.jpg similarity index 100% rename from src/assets/mesh/mark/outside/XFY/Straps_AlbedoTransparency.jpg rename to src/assets/mesh/mark/outside/xfy/Straps_AlbedoTransparency.jpg diff --git a/src/assets/mesh/mark/outside/XFY/XFY.bin b/src/assets/mesh/mark/outside/xfy/XFY.bin similarity index 100% rename from src/assets/mesh/mark/outside/XFY/XFY.bin rename to src/assets/mesh/mark/outside/xfy/XFY.bin diff --git a/src/assets/mesh/mark/outside/XFY/XFY.gltf b/src/assets/mesh/mark/outside/xfy/XFY.gltf similarity index 100% rename from src/assets/mesh/mark/outside/XFY/XFY.gltf rename to src/assets/mesh/mark/outside/xfy/XFY.gltf diff --git a/src/assets/mesh/mark/outside/XFY/XFY.gltf.manifest b/src/assets/mesh/mark/outside/xfy/XFY.gltf.manifest similarity index 100% rename from src/assets/mesh/mark/outside/XFY/XFY.gltf.manifest rename to src/assets/mesh/mark/outside/xfy/XFY.gltf.manifest