diff --git a/apis/searchApi.js b/apis/searchApi.js
index f6b4f16..5e1bd45 100644
--- a/apis/searchApi.js
+++ b/apis/searchApi.js
@@ -45,10 +45,8 @@ export default {
     list: "schema",
   },
   search: {
-    autoComplate:
-      "{{appname}}/complation/{{index_key}}/{{filter}}",
-    logAutoComplate:
-      "searchlog/complation/{{filter}}",
+    autoComplate: "{{appname}}/complation/{{index_key}}/{{filter}}",
+    logAutoComplate: "searchlog/complation/{{filter}}",
     default:
       "{{appname}}/data/{{index_key}}/{{sortKey}}/{{offset}}/{{limit}}/{{filter}}",
     queryNormal:
@@ -62,12 +60,16 @@ export default {
     items:
       "navigate/report/items/search/{{index_key}}/{{offset}}/{{limit}}/{{filter}}",
     chartTreeMap: "list/project/treemap/{{chart_key}}/{{filter}}",
-    treeItems:"navigate/report/items/search/{{index_key}}/{{offset}}/{{limit}}/{{filter}}",
+    treeItems:
+      "navigate/report/items/search/{{index_key}}/{{offset}}/{{limit}}/{{filter}}",
     tree: "list/subject/list",
-    graph:"repo/majles/{{to_key}}/relation"
+    graph: "repo/majles/{{to_key}}/relation",
+  },
+  synonym: {
+    getSynonyms: "synonym/get/words",
+    synonymSearch: "search/qasection/synonym/@listkey/@offset/@limit/@q",
+  },
+  entity: {
+    blist: "{{index_key}}/{{type}}/list",
   },
-  synonym:{
-    getSynonyms:"synonym/get/words",
-    synonymSearch:"search/qasection/synonym/@listkey/@offset/@limit/@q",
-  }
 };
diff --git a/components/search/view/ChartContent.vue b/components/search/view/ChartContent.vue
index 5803ca6..828d3b0 100644
--- a/components/search/view/ChartContent.vue
+++ b/components/search/view/ChartContent.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="main-chart"
-    :class="{ 'jahat-chart': this.activeSystemGetter?.link == 'jahat' }"
+    :class="{ 'jahat-chart': activeSystemGetter?.link == 'jahat' }"
   >
     <div class="body" :class="bodyclass">
       <div class="body-chart">
@@ -109,58 +109,13 @@
 </template>
 <script>
 // import HttpService from "~/services/httpService";
-import searchApi from "~/apis/searchApi";
-import repoApi from "~/apis/repoApi";
-import chartType from "~/json/search/chart.json";
+// import searchApi from "~/apis/searchApi";
+import searchApi from "@search/apis/searchApi";
+// import repoApi from "~/apis/repoApi";
+import chartType from "@search/json/search/chart.json";
 import { mapState } from "pinia";
-// import TermContent from "~/components/search/view/TermContent.vue";
-// import NeshaContent from "~/components/search/view/NeshaContent.vue";
-// import SearchContent from "~/components/search/view/SearchContent.vue";
-// import QanonContent from "~/components/search/view/QanonContent.vue";
-// import MajlesQanonContent from "~/components/search/view/MajlesQanonContent.vue";
-// import MajlesQavaninContent from "~/components/search/view/MajlesQavaninContent.vue";
-// import MajlesSectionContent from "~/components/search/view/MajlesSectionContent.vue";
-// import MajlesMashruhContent from "~/components/search/view/MajlesMashruhContent.vue";
-// import EmamainContent from "~/components/search/view/EmamainContent.vue";
-// import MyContent from "~/components/search/MyContent.vue";
-// import MajlesQaSectionContent from "~/components/search/view/MajlesQaSectionContent.vue";
-// import EntityContent from "~/components/search/view/EntityContent.vue";
-
-/**
- * @vue-prop {String|null} [addressBarUrl=null] - آدرس بار
- * @vue-prop {String} [selectedCategory=""] - دسته‌بندی انتخاب شده
- * @vue-prop {Array} [dataChart=[]] - داده‌های نمودار
- * @vue-prop {Array} [dataTreeMap=[]] - داده‌های درخت نقشه
- * @vue-prop {String} [chartComponentName=""] - نام کامپوننت نمودار
- *
- * @vue-data {Object} [PieOptions={ radius: "60%", selectedMode: "single" }] - گزینه‌های نمودار دایره‌ای
- * @vue-data {Number} [reRender=1] - شمارنده برای رندر مجدد
- * @vue-data {String} [controlRequest=""] - درخواست کنترل
- * @vue-data {Number} [listType=1] - نوع لیست
- * @vue-data {Boolean} [hiden=false] - وضعیت پنهان شدن
- * @vue-data {Boolean} [showBodyDescription=false] - نمایش توضیحات بدنه
- * @vue-data {String} [name=""] - نام
- * @vue-data {String} [y=""] - مقدار محور y
- * @vue-data {Array} [chartAnswer=[]] - پاسخ نمودار
- * @vue-data {String} [listSelectedPoint=""] - نقطه انتخاب شده در لیست
- * @vue-data {Array} [listEntity=[]] - موجودیت‌های لیست
- * @vue-data {String} [selectedPoint=""] - نقطه انتخاب شده
- * @vue-data {Object|undefined} [httpService=undefined] - سرویس HTTP
- * @vue-data {Array} [chartTypeList=chartType] - لیست انواع نمودار
- * @vue-data {Number} [Status=2] - وضعیت
- * @vue-data {String} [filterUrl=""] - آدرس فیلتر
- * @vue-data {String} [navigationList=""] - لیست ناوبری
- * @vue-data {String} [navigationItemTitle=""] - عنوان آیتم ناوبری
- * @vue-data {String} [navigationItem=""] - آیتم ناوبری
- * @vue-data {String} [chartName=chartType[0].chartName] - نام نمودار
- * @vue-data {Object} [pagination={ page: 1, pages: 0, total: 0, offset: 0, limit: 10 }] - اطلاعات صفحه‌بندی
- * @vue-data {Boolean} [showList=false] - نمایش لیست
- *
- * @vue-computed {String} repoBaseUrl - آدرس پایه مخزن از محیط
- * @vue-computed {String} bodyclass - کلاس بدنه بر اساس نام کامپوننت نمودار
- * @vue-computed {Boolean} showNavigateItems - نمایش آیتم‌های ناوبری بر اساس نام کامپوننت نمودار
- * @vue-computed {String} contentComponentName - نام کامپوننت محتوا بر اساس وضعیت جستجو
- */
+import { useSearchStore } from "@search/stores/searchStore";
+import { useCommonStore } from "~/stores/commonStore";
 
 export default {
   props: {
@@ -250,8 +205,9 @@ export default {
     ...mapState(useSearchStore, [
       "searchChartSchemaGetter",
       "searchChartActiveSchemaGetter",
-      // "activeTabGetter",
+      "activeTabGetter",
     ]),
+    ...mapState(useCommonStore, ["activeSystemGetter"]),
     // repoBaseUrl() {
     //   return import.meta.env.VITE_REPO;
     // },
@@ -462,7 +418,7 @@ export default {
       this.controlRequest = "getTreeChartInitialList";
       this.showBodyDescription = true;
       let url =
-        repoApi.entity.blist
+        searchApi.entity.blist
           .replace("{{index_key}}", this.activeTabGetter.key)
           .replace("{{type}}", this.activeTabGetter.key) +
         `/${this.pagination.offset}/${this.pagination.limit}`;
@@ -616,6 +572,31 @@ export default {
     // TreeMap: () => import("~/components/charts/TreeMap.vue"),
     // TimeLine: () => import("~/components/charts/TimeLine.vue"),
     // Gantt: () => import("~/components/charts/Gantt.vue"),
+
+    // BaseModal: defineAsyncComponent(() =>
+    //   import("~/components/global/BaseModal.vue")
+    // ),
+    // EntityContent: defineAsyncComponent(() =>
+    //   import("~/components/search/view/EntityContent.vue")
+    // ),
+    TreeSimple: defineAsyncComponent(() =>
+      import("~/components/charts/TreeSimple.vue")
+    ),
+    Bar: defineAsyncComponent(() =>
+      import("~/components/charts/Bar.vue")
+    ),
+    Pie: defineAsyncComponent(() =>
+      import("~/components/charts/Pie.vue")
+    ),
+    TreeMap: defineAsyncComponent(() =>
+      import("~/components/charts/TreeMap.vue")
+    ),
+    // TimeLine: defineAsyncComponent(() =>
+    //   import("~/components/charts/TimeLine.vue")
+    // ),
+    // Gantt: defineAsyncComponent(() =>
+    //   import("~/components/charts/Gantt.vue")
+    // ),
   },
 };
 </script>
diff --git a/components/search/view/ChartFilterList.vue b/components/search/view/ChartFilterList.vue
index 518f01e..cf6a901 100644
--- a/components/search/view/ChartFilterList.vue
+++ b/components/search/view/ChartFilterList.vue
@@ -82,7 +82,7 @@
 
 <script>
 import { mapState } from "pinia";
-
+import { useSearchStore } from "@search/stores/searchStore";
 export default {
   props: ["changePageFilter", "listFilter", "activeTabGetter"],
   watch: {
diff --git a/pages/search/charts.vue b/pages/search/charts.vue
index abd3645..90e6d59 100644
--- a/pages/search/charts.vue
+++ b/pages/search/charts.vue
@@ -1,5 +1,5 @@
 <template>
-  <NuxtLayout name="search-layout" :menu="sidbarMenu">
+  <SearchLayout :menu="sidbarMenuDefault">
     <div class="container-fluid">
       <div class="row border-bottom header-height main-page__content-header">
         <div
@@ -240,7 +240,7 @@
         </div>
       </div>
     </div>
-  </NuxtLayout>
+  </SearchLayout>
 </template>
 
 <script>
@@ -253,7 +253,7 @@ import sidbarMenuMin from "@search/json/search/sidbarMenuMin.json";
 
 import tableActions from "@search/json/search/listTableContextMenu";
 import { useSearchStore } from "@search/stores/searchStore";
-
+import { useCommonStore } from "~/stores/commonStore";
 export default {
   name: "searchChart",
 
@@ -416,7 +416,7 @@ export default {
     ...mapActions(useSearchStore, [
       "SET_SELECTED_PROJECT",
       "SET_LIST",
-      
+
       "searchChartActiveSchemaSetter",
       "searchChartSchemaSetter",
       "searchChartActiveTabSetter",
@@ -1079,6 +1079,26 @@ export default {
         });
     },
   },
+  components: {
+    SearchLayout: defineAsyncComponent(() =>
+      import("@search/layouts/SearchLayout.vue")
+    ),
+    ChartContent: defineAsyncComponent(() =>
+      import("@search/components/search/view/ChartContent.vue")
+    ),
+    ChartFilterList: defineAsyncComponent(() =>
+      import("@search/components/search/view/ChartFilterList.vue")
+    ),
+    // SubjectForm: defineAsyncComponent(() =>
+    //   import("@search/components/research/components/SubjectForm.vue")
+    // ),
+    // CategoryList: defineAsyncComponent(() =>
+    //   import("@search/components/search/view/CategoryList.vue")
+    // ),
+    // BaseModal: defineAsyncComponent(() =>
+    //   import("@search/components/global/BaseModal.vue")
+    // ),
+  },
 };
 </script>