2 次代碼提交 b26902a77d ... 5cb4c1d2e3

作者 SHA1 備註 提交日期
  SalemRoman 5cb4c1d2e3 Merge branches 'master' and 'salemDev' of http://209.50.56.224/git/JoseBrito/SAM_FRONT_V2 into salemDev 2 月之前
  Jose Brito 8eb67c83c5 Correcciones detalles de equipamientos 2 月之前

+ 5 - 1
src/app/components/equipment-management/equipment-details/equipment-details.component.css

@@ -55,7 +55,7 @@
 .equipment-details-column{
   display: flex;
   flex-direction: column;
-  width: 100%;
+  width: calc(100% - 384px);
 }
 
 .bold{ font-weight: 500; }
@@ -74,4 +74,8 @@
 .obscure-text:hover{
   background-color: rgba(0, 0, 0, 0.025);
   cursor: pointer;
+}
+
+.break_code{
+  word-break: break-all;
 }

+ 4 - 4
src/app/components/equipment-management/equipment-details/equipment-details.component.html

@@ -20,7 +20,7 @@
       <h3 class="m-16"><b>Su perfil no cuenta con los permisos necesarios para visualizar la información de esta sección.</b></h3>
     </div>
     <div class="form-row animated fadeIn" *ngIf="equipmentDetailsEnabled">
-      <div class="form-cell C12 center_text border_bottom overflow-ellipsis obscure-text" [matTooltip]="equipment!.CODIGO">
+      <div class="form-cell C12 center_text border_bottom overflow-ellipsis obscure-text break_code" [matTooltip]="equipment!.CODIGO">
         {{ equipment!.CODIGO }}
       </div>
       <div class="form-cell border_bottom overflow-ellipsis obscure-text" [matTooltip]="equipment!.TIPO_EQUIPAMIENTO" 
@@ -143,11 +143,11 @@
       [ngClass]="{ C03: screenWidth > 1540, C06: screenWidth <= 1540 && screenWidth > 980, C12: screenWidth <= 980, border_right: screenWidth > 1540 }">
         <span class="bold">Código del elemento de destino: </span>{{ equipment!.CODIGO_ELEMENTO_DESTINO == null ? 'No aplica' : equipment!.CODIGO_ELEMENTO_DESTINO }}
       </div>
-      <div class="form-cell border_bottom overflow-ellipsis obscure-text" [matTooltip]="equipment!.NIVEL_CRITICIDAD == null ? 'No configurado' : equipment!.NIVEL_CRITICIDAD_OBJ.label" 
+      <div class="form-cell border_bottom overflow-ellipsis obscure-text" [matTooltip]="equipment!.NIVEL_CRITICIDAD == null || equipment!.NIVEL_CRITICIDAD_OBJ == undefined ? 'No configurado' : equipment!.NIVEL_CRITICIDAD_OBJ.label" 
       [ngClass]="{ C03: screenWidth > 1540, C06: screenWidth <= 1540 && screenWidth > 980, C12: screenWidth <= 980, border_right: screenWidth > 980 }">
-        <span class="bold">Nivel de criticidad de seguridad: </span><span *ngIf="equipment!.NIVEL_CRITICIDAD != null" style="font-weight: 500;" [style.color]="equipment!.NIVEL_CRITICIDAD_OBJ.color">
+        <span class="bold">Nivel de criticidad de seguridad: </span><span *ngIf="equipment!.NIVEL_CRITICIDAD != null && equipment!.NIVEL_CRITICIDAD_OBJ != undefined" style="font-weight: 500;" [style.color]="equipment!.NIVEL_CRITICIDAD_OBJ.color">
           {{ equipment!.NIVEL_CRITICIDAD_OBJ.label }}
-        </span><span *ngIf="equipment!.NIVEL_CRITICIDAD == null">No configurado</span>
+        </span><span *ngIf="equipment!.NIVEL_CRITICIDAD == null || equipment!.NIVEL_CRITICIDAD_OBJ == undefined">No configurado</span>
       </div>
       <div class="form-cell border_bottom overflow-ellipsis obscure-text" [matTooltip]="equipment!.FECHA_ADQUISICION" 
       [ngClass]="{ C03: screenWidth > 1540, C06: screenWidth <= 1540 && screenWidth > 980, C12: screenWidth <= 980 }">

+ 1 - 0
src/app/components/equipment-management/equipment-details/equipment-details.component.ts

@@ -50,6 +50,7 @@ export class EquipmentDetailsComponent implements OnInit {
 
   ngOnInit(): void {
     this.images = this.equipment?.GALERIA_IMAGENES as string[];
+    console.log(this.images);
   }
 
   onResize(){

+ 2 - 2
src/app/components/equipment-management/equipment-types-management/equipment-types-management.component.ts

@@ -137,8 +137,8 @@ export class EquipmentTypesManagementComponent implements OnInit {
 
   openEquipmentDetails(codeEnc: string){
     this._dialog.open(EquipmentDetailsDialogComponent, {
-      width: '480px',
-      maxWidth: '480px',
+      width: '840px',
+      maxWidth: '840px',
       data: {
         code: codeEnc,
       }

+ 0 - 15
src/app/components/equipment-management/new-equipment/equipment-details-dialog/equipment-details-dialog.component.html

@@ -9,21 +9,6 @@
     <mat-icon class="red_primary_font">error</mat-icon>
     <h2>{{ errorStr }}</h2>
   </div>
-  <!--<div class="dialog_details_column" *ngIf="!isLoading && !hasError">
-    <p style="word-break: break-all;"><b>Código:</b> {{ equipment!.CODIGO }}</p>
-    <p><b>Jerarquía:</b> {{ equipment!.JERARQUIA }}</p>
-    <p><b>Equipo padre:</b> {{ equipment!.EQUIPO_PADRE == null ? 'N/A' : equipment!.EQUIPO_PADRE }}</p>
-    <p><b>Tipo de codificación:</b> {{ equipment!.TIPO_CODIGO }}</p>
-    <p><b>Ubicación de origen:</b> {{ equipment!.UBICACION_ORIGEN }}</p>
-    <p><b>Nivel de origen:</b> {{ equipment!.NIVEL_ORIGEN }}</p>
-    <p><b>Ocupación de origen:</b> {{ equipment!.OCUPACION_ORIGEN }}</p>
-    <p><b>Elemento de origen:</b> {{ equipment!.ELEMENTO_ORIGEN }}</p>
-    <p><b>Familia:</b> {{ equipment!.FAMILIA }}</p>
-    <p><b>Subfamilia:</b> {{ equipment!.SUBFAMILIA }}</p>
-    <p><b>Estado:</b> {{ equipment!.ESTADO }}</p>
-    <p><b>Tipo de equipamiento:</b> {{ equipment!.TIPO_EQUIPAMIENTO }}</p>
-    <p><b>Modelo del equipamiento:</b> {{ equipment!.MODELO }}</p>
-  </div>-->
   <app-equipment-details *ngIf="!isLoading && !hasError" class="w-100 animated fadeIn" [equipment]="equipment" [equipmentDetailsEnabled]="equipmentDetailsEnabled" 
   (refreshCriticality)="updateEquipmentCriticality($event)" (printFile)="generateFile($event)" [relatedDocumentsTableEnabled]="relatedDocumentsTableEnabled" 
   [equipmentImagesGalleryEnabled]="equipmentImagesGalleryEnabled" [securityCriticalityEnabled]="securityCriticalityEnabled"></app-equipment-details>