รูป

src/app/portal-manage/dashboard-management/dashboard-viewer/dashboard-viewer.component.html

@@ -8,69 +8,41 @@
   </div>
 </div>
 
-<!-- Dashboard Viewer Container -->
-<div *ngIf="dashboardData" class="viewer-container">
-  <!-- Enhanced Header -->
-  <div class="viewer-header">
-    <div class="viewer-header-content">
-      <div class="viewer-header-flex">
-        <div class="viewer-title-section">
-          <div class="viewer-icon">
-            <i class="bi bi-eye"></i>
-          </div>
-          <div class="viewer-title-content">
-            <h1>{{ dashboardData.thName }}</h1>
-            <p>Dashboard Viewer</p>
-          </div>
-        </div>
-        <div>
-          <button
-            (click)="goBack()"
-            class="viewer-back-btn"
-          >
-            <i class="bi bi-arrow-left"></i>
-            Back
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- Dashboard Content -->
-  <div class="viewer-content-area">
-    <div class="viewer-content-card">
-      <div class="viewer-layout-container">
-        <ejs-dashboardlayout
-          id='dashboard_viewer'
-          #viewerLayout
-          [cellSpacing]="cellSpacing"
-          [columns]="columns"
-          [allowResizing]="false"
-          [allowDragging]="false"
-          class="dashboard-viewer-layout"
+<!-- Dashboard Viewer Container - Clean Layout -->
+<div *ngIf="dashboardData" class="viewer-container-clean">
+  <!-- Dashboard Content Only -->
+  <div class="viewer-content-clean">
+    <ejs-dashboardlayout
+      id='dashboard_viewer'
+      #viewerLayout
+      [cellSpacing]="cellSpacing"
+      [columns]="columns"
+      [allowResizing]="false"
+      [allowDragging]="false"
+      [allowFloating]="false"
+      [showGridLines]="false"
+      class="dashboard-viewer-layout-clean"
+    >
+      <e-panels>
+        <e-panel
+          *ngFor="let panel of panels"
+          [row]="panel.row"
+          [col]="panel.col"
+          [sizeX]="panel.sizeX"
+          [sizeY]="panel.sizeY"
+          [id]="panel.id"
+          class="widget-panel-clean"
         >
-          <e-panels>
-            <e-panel
-              *ngFor="let panel of panels"
-              [row]="panel.row"
-              [col]="panel.col"
-              [sizeX]="panel.sizeX"
-              [sizeY]="panel.sizeY"
-              [id]="panel.id"
-              class="widget-panel"
-            >
-              <ng-template #header>
-                <!-- Clean header for viewer -->
-              </ng-template>
-              <ng-template #content>
-                <div class="widget-content">
-                  <ng-container [ngComponentOutlet]="panel.componentType" [ngComponentOutletInputs]="panel.componentInputs"></ng-container>
-                </div>
-              </ng-template>
-            </e-panel>
-          </e-panels>
-        </ejs-dashboardlayout>
-      </div>
-    </div>
+          <ng-template #header>
+            <!-- No header -->
+          </ng-template>
+          <ng-template #content>
+            <div class="widget-content-clean">
+              <ng-container [ngComponentOutlet]="panel.componentType" [ngComponentOutletInputs]="panel.componentInputs"></ng-container>
+            </div>
+          </ng-template>
+        </e-panel>
+      </e-panels>
+    </ejs-dashboardlayout>
   </div>
 </div>

src/app/portal-manage/home/home.component.ts

@@ -291,7 +291,7 @@ export class HomeComponent implements OnInit {
         name: 'meeting-booking',
         displayName: 'Meeting Booking',
         description: 'ระบบจองห้องประชุม',
-        icon: './assets/images/icons/calendar.png',
+        icon: './assets/images/logoallHR/booking.png',
         path: '/portal-manage/meeting-booking',
         isVisible: true,
         category: 'services',
@@ -303,7 +303,7 @@ export class HomeComponent implements OnInit {
         name: 'permission-management',
         displayName: 'Permission Management',
         description: 'ระบบจัดการสิทธิ์และบทบาท',
-        icon: './assets/images/icons/widget.png',
+        icon: './assets/images/logoallHR/permission.png',
         path: '/portal-manage/permission-management',
         isVisible: true,
         category: 'system',
@@ -316,7 +316,7 @@ export class HomeComponent implements OnInit {
         name: 'dashboard-management',
         displayName: 'Dashboard Management',
         description: 'ระบบจัดการแดชบอร์ด และคลังวิดเจ็ต',
-        icon: './assets/images/icons/dashboard.png',
+        icon: './assets/images/logoallHR/widget.webp',
         path: '/portal-manage/dashboard-management',
         isVisible: true,
         category: 'system',
@@ -327,7 +327,7 @@ export class HomeComponent implements OnInit {
         name: 'my-portal',
         displayName: 'my-Portal',
         description: 'ระบบจัดการเอกสารและเมนูกลางสำหรับแอปพลิเคชันต่างๆ',
-        icon: './assets/images/icons/portal.png',
+        icon: './assets/images/logoallHR/portal.webp',
         path: '/portal-manage/my-portal',
         isVisible: true,
         category: 'system',

src/app/shared/components/header/header.component.html

@@ -387,7 +387,7 @@
                 <div class="">
                   <a routerLink="/portal-manage/meeting-booking"
                     class="p-3 items-center related-app block text-center rounded-sm hover:bg-gray-50 dark:hover:bg-black/20">
-                    <img src="./assets/images/icons/calendar.png" alt="Meeting Booking"
+                    <img src="./assets/images/logoallHR/booking.png" alt="Meeting Booking"
                       class="leading-[1.5] text-2xl !h-[1.5rem] align-middle flex justify-center mx-auto">
                     <div class="text-[0.7rem] text-defaulttextcolor dark:text-[#8c9097] dark:text-white/50 mt-1">Meeting</div>
                   </a>
@@ -397,7 +397,7 @@
                 <div class="">
                   <a routerLink="/portal-manage/my-portal"
                     class="p-3 items-center related-app block text-center rounded-sm hover:bg-gray-50 dark:hover:bg-black/20">
-                    <img src="./assets/images/icons/portal.png" alt="my-Portal"
+                    <img src="./assets/images/logoallHR/portal.webp" alt="my-Portal"
                       class="leading-[1.5] text-2xl !h-[1.5rem] align-middle flex justify-center mx-auto">
                     <div class="text-[0.7rem] text-defaulttextcolor dark:text-[#8c9097] dark:text-white/50 mt-1">my-Portal</div>
                   </a>
@@ -407,7 +407,7 @@
                 <div class="">
                   <a routerLink="/portal-manage/permission-management"
                     class="p-3 items-center related-app block text-center rounded-sm hover:bg-gray-50 dark:hover:bg-black/20">
-                    <img src="./assets/images/icons/widget.png" alt="Permission Management"
+                    <img src="./assets/images/logoallHR/permission.png" alt="Permission Management"
                       class="leading-[1.5] text-2xl !h-[1.5rem] align-middle flex justify-center mx-auto">
                     <div class="text-[0.7rem] text-defaulttextcolor dark:text-[#8c9097] dark:text-white/50 mt-1">Permission</div>
                   </a>
@@ -417,7 +417,7 @@
                 <div class="">
                   <a routerLink="/portal-manage/dashboard-management"
                     class="p-3 items-center related-app block text-center rounded-sm hover:bg-gray-50 dark:hover:bg-black/20">
-                    <img src="./assets/images/icons/dashboard.png" alt="Dashboard Management"
+                    <img src="./assets/images/logoallHR/widget.webp" alt="Dashboard Management"
                       class="leading-[1.5] text-2xl !h-[1.5rem] align-middle flex justify-center mx-auto">
                     <div class="text-[0.7rem] text-defaulttextcolor dark:text-[#8c9097] dark:text-white/50 mt-1">Dashboard Mgt</div>
                   </a>