adata-ui 2.0.89 → 2.0.90

package/components/modals/ContentNavigationModal.vue

@@ -25,7 +25,14 @@ import Connections from "#adata-ui/icons/sviazi.vue";
 import {useCurrentModule} from "#adata-ui/composables/projectState";
 import IconCalc from '#adata-ui/icons/calculator.vue'
 import { buildLocalizedUrl } from '#adata-ui/utils/localizedNavigation'
-import { AIconFiles } from '#components'
+import {
+  AIconAkimat,
+  AIconCurrencyTenge,
+  AIconExcelIcon,
+  AIconFiles, AIconSearch,
+  AIconUsers,
+  AIconWarningTriangle
+} from '#components'
 import MapPinRect from '#adata-ui/icons/map/map-pin-rect.vue'
 import ChartBar from '#adata-ui/icons/chart-bar.vue'
 import Bank from '#adata-ui/icons/bank.vue'
@@ -146,29 +153,34 @@ const sideLinks = <any>{
   ],
   tenders: [
     {
-      icon: ChartBar,
-      label: t('header.products.tenders.items.monitoring.title'),
-      link: urls.zakupki + PAGES.tender.monitoring,
+      icon: AIconUsers,
+      label: t('header.products.tenders.items.customers.title'),
+      link: urls.zakupki + PAGES.tender.customers,
     },
     {
-      icon: Bank,
+      icon: AIconAkimat,
       label: t('header.products.tenders.items.akimat.title'),
       link: urls.zakupki + PAGES.tender.akimat,
     },
     {
-      icon: IconSearch,
-      label: 'header.products.tenders.items.tenders.title',
-      link: urls.tender + PAGES.tender.main
+      icon: AIconWarningTriangle,
+      label: 'header.products.tenders.items.tru.title',
+      link: urls.zakupki + PAGES.tender.tru
     },
     {
-      icon: IconFile,
-      label: 'header.products.tenders.items.contracts.title',
-      link: urls.tender + PAGES.tender.contracts
+      icon: AIconCurrencyTenge,
+      label: 'header.products.tenders.items.price.title',
+      link: urls.zakupki + PAGES.tender.price
+    },
+    {
+      icon: AIconExcelIcon,
+      label: 'header.products.tenders.items.constructor.title',
+      link: urls.zakupki + PAGES.tender.constructor
     },
     {
-      icon: IconCheck,
-      label: 'header.products.tenders.items.procurement.title',
-      link: urls.tender + PAGES.tender.plans
+      icon: AIconSearch,
+      label: 'header.products.tenders.items.monitoring.title',
+      link: urls.tender
     }
   ],
   analytics: [
@@ -177,11 +189,11 @@ const sideLinks = <any>{
     //   label: 'header.products.analytics.items.clients.title',
     //   link: myLayer.analyticsUrl + PAGES.analytics.clients
     // },
-    {
-      icon: IconCheck,
-      label: 'header.products.analytics.items.procurement.title',
-      link: urls.analyticsNew + PAGES.analytics.main
-    },
+    // {
+    //   icon: IconCheck,
+    //   label: 'header.products.analytics.items.procurement.title',
+    //   link: urls.analyticsNew + PAGES.analytics.main
+    // },
     {
       icon: IconArrowGraph,
       label: 'header.products.analytics.items.activity.title',

package/composables/useHeaderNavigationLinks.ts

@@ -38,7 +38,7 @@ import {
   AIconGlobe,
   AIconId,
   AIconFiles,
-  AIconArrowSquareDown, AIconExpandWindow
+  AIconArrowSquareDown, AIconExpandWindow, AIconUsers, AIconWarningTriangle, AIconSearch, AIconAkimat, AIconCurrencyTenge, AIconExcelIcon
 } from '#components'
 import MapPinRect from '#adata-ui/icons/map/map-pin-rect.vue'
 import MapPaper from '#adata-ui/icons/map-paper.vue'
@@ -140,35 +140,41 @@ export const useHeaderNavigationLinks = () => {
         to: urls.tender,
         items: [
           {
-            title: t('header.products.tenders.items.monitoring.title'),
-            subtitle: t('header.products.tenders.items.monitoring.subtitle'),
-            icon: ChartBar,
-            to: urls.zakupki + PAGES.tender.monitoring,
+            title: t('header.products.tenders.items.customers.title'),
+            subtitle: t('header.products.tenders.items.customers.subtitle'),
+            icon: AIconUsers,
+            to: urls.zakupki + PAGES.tender.customers,
           },
           {
             title: t('header.products.tenders.items.akimat.title'),
             subtitle: t('header.products.tenders.items.akimat.subtitle'),
-            icon: Bank,
+            icon: AIconAkimat,
             to: urls.zakupki + PAGES.tender.akimat,
           },
           {
-            title: t('header.products.tenders.items.tenders.title'),
-            subtitle: t('header.products.tenders.items.tenders.subtitle'),
-            icon: IconSearch,
-            to: urls.tender + PAGES.tender.main
+            title: t('header.products.tenders.items.tru.title'),
+            subtitle: t('header.products.tenders.items.tru.subtitle'),
+            icon: AIconWarningTriangle,
+            to: urls.zakupki + PAGES.tender.tru,
           },
           {
-            title: t('header.products.tenders.items.procurement.title'),
-            subtitle: t('header.products.tenders.items.procurement.subtitle'),
-            icon: IconCheck,
-            to: urls.tender + PAGES.tender.plans
+            title: t('header.products.tenders.items.price.title'),
+            subtitle: t('header.products.tenders.items.price.subtitle'),
+            icon: AIconCurrencyTenge,
+            to: urls.zakupki + PAGES.tender.price,
           },
           {
-            title: t('header.products.tenders.items.contracts.title'),
-            subtitle: t('header.products.tenders.items.contracts.subtitle'),
-            icon: IconFile,
-            to: urls.tender + PAGES.tender.contracts
-          }
+            title: t('header.products.tenders.items.constructor.title'),
+            subtitle: t('header.products.tenders.items.constructor.subtitle'),
+            icon: AIconExcelIcon,
+            to: urls.zakupki + PAGES.tender.constructor,
+          },
+          {
+            title: t('header.products.tenders.items.monitoring.title'),
+            subtitle: t('header.products.tenders.items.monitoring.subtitle'),
+            icon: AIconSearch,
+            to: urls.tender,
+          },
         ]
       },
       {
@@ -176,12 +182,12 @@ export const useHeaderNavigationLinks = () => {
         name: t('header.products.analytics.label'),
         icon: AIconArrowGraphUp,
         items: [
-          {
-            title: t('header.products.analytics.items.procurement.title'),
-            subtitle: t('header.products.analytics.items.procurement.subtitle'),
-            icon: IconClipboardText,
-            to: buildLocalizedUrl(locale, urls.analyticsNew, PAGES.analytics.main)
-          },
+          // {
+          //   title: t('header.products.analytics.items.procurement.title'),
+          //   subtitle: t('header.products.analytics.items.procurement.subtitle'),
+          //   icon: IconClipboardText,
+          //   to: buildLocalizedUrl(locale, urls.analyticsNew, PAGES.analytics.main)
+          // },
           {
             title: t('header.products.analytics.items.activity.title'),
             subtitle: t('header.products.analytics.items.activity.subtitle'),

package/icons/akimat.vue

@@ -0,0 +1,20 @@
+
+<template>
+  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_287_13679)">
+      <path d="M19.6002 10.0712H4.40303C3.68304 10.0712 3.37447 9.28688 3.94018 8.91402L11.5387 3.9383C11.679 3.85577 11.8388 3.81226 12.0016 3.81226C12.1644 3.81226 12.3242 3.85577 12.4645 3.9383L20.063 8.91402C20.6288 9.28688 20.3202 10.0712 19.6002 10.0712Z" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M19.7139 17.1428H4.28537C3.93033 17.1428 3.64252 17.4306 3.64252 17.7856V19.7142C3.64252 20.0692 3.93033 20.357 4.28537 20.357H19.7139C20.0689 20.357 20.3568 20.0692 20.3568 19.7142V17.7856C20.3568 17.4306 20.0689 17.1428 19.7139 17.1428Z" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M5.57111 10.0713V17.1427" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M9.8551 10.0713V17.1427" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M14.1442 10.0713V17.1427" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+      <path d="M18.4282 10.0713V17.1427" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    </g>
+    <defs>
+      <clipPath id="clip0_287_13679">
+        <rect width="18" height="18" fill="white" transform="translate(3.00134 3)"/>
+      </clipPath>
+    </defs>
+  </svg>
+</template>
+<script setup lang="ts">
+</script>

package/icons/currency/currency-tenge.vue

@@ -0,0 +1,9 @@
+
+<template>
+  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M6.85714 5.50375C6.85714 4.83104 7.40248 4.28571 8.07519 4.28571H16.1955C16.8682 4.28571 17.4135 4.83104 17.4135 5.50375C17.4135 6.17646 16.8682 6.7218 16.1955 6.7218H8.07519C7.40248 6.7218 6.85714 6.17646 6.85714 5.50375Z" fill="currentColor"/>
+    <path d="M6.85714 11.072C6.85714 10.3993 7.40248 9.85394 8.07519 9.85394H16.1955C16.8682 9.85394 17.4135 10.3993 17.4135 11.072C17.4135 11.7447 16.8682 12.29 16.1955 12.29H13.3534V18.4962C13.3534 19.1689 12.8081 19.7143 12.1353 19.7143C11.4626 19.7143 10.9173 19.1689 10.9173 18.4962V12.29H8.07519C7.40248 12.29 6.85714 11.7447 6.85714 11.072Z" fill="currentColor"/>
+  </svg>
+</template>
+<script setup lang="ts">
+</script>

package/icons/excel-icon.vue

@@ -0,0 +1,14 @@
+
+
+<template>
+  <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M11.3574 15.2141V20.357H13.9288" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M4.92883 15.2141L8.14312 20.357" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M8.14312 15.2141L4.92883 20.357" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M19.0717 16.0713C18.8951 15.5719 18.3458 15.2141 17.786 15.2141C17.1026 15.2141 16.5002 15.768 16.5002 16.4514C16.5002 16.9836 16.8624 17.4475 17.3788 17.5766L18.1052 17.7582C18.6732 17.9002 19.0717 18.4105 19.0717 18.996V19.0713C19.0717 19.7814 18.4961 20.357 17.786 20.357C17.2262 20.357 16.6768 19.9992 16.5002 19.4998" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M4.92883 12.6427V4.92841C4.92883 4.58742 5.0643 4.2604 5.30541 4.01928C5.54653 3.77816 5.87355 3.6427 6.21455 3.6427H14.5717L19.0717 8.1427V12.6427" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M14.5717 3.80341V8.14269H18.9109" stroke="currentColor" stroke-width="1.28571" stroke-linecap="round" stroke-linejoin="round"/>
+  </svg>
+</template>
+<script setup lang="ts">
+</script>

package/lang/en.ts

@@ -119,14 +119,30 @@ const EnLocale: RuLocale = {
       tenders: {
         label: 'Procurement',
         items: {
-          monitoring: {
-            title: 'Procurement Monitoring',
-            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+          customers: {
+            title: 'Participant Analysis',
+            subtitle: 'Ratings and profiles of participants: specialization, deals and prices, market share and dynamics',
           },
           akimat: {
             title: 'Akimat. Reports',
             subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
           },
+          tru: {
+            title: 'Goods, Works and Services Analysis',
+            subtitle: 'Procurement trends: thematic search, market by items, prices and volumes, total budget and leaders',
+          },
+          price: {
+            title: 'Price Analysis',
+            subtitle: 'Tracking prices for goods, works, and services with smart search and accurate selection for budgeting, margin calculation, and deviation detection',
+          },
+          contructor: {
+            title: 'Report Builder',
+            subtitle: 'Flexible creation and fast export of detailed reports',
+          },
+          monitoring: {
+            title: 'Procurement Monitoring',
+            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+          },
           tenders: {
             title: 'Tender search',
             subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',

package/lang/kk.ts

@@ -119,13 +119,29 @@ const KkLocale: RuLocale = {
       tenders: {
         label: 'Сатып алулар',
         items: {
-          monitoring: {
-            title: 'Сатып алуларды мониторингі',
-            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+          customers: {
+            title: 'Қатысушыларды талдау',
+            subtitle: 'Қатысушылардың рейтингтері мен профильдері: мамандану, мәмілелер мен бағалар, нарықтағы үлесі мен серпіні',
           },
           akimat: {
             title: 'Әкімдік. Есептер',
-            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+            subtitle: 'Сатып алулар туралы ақпарат, қызығушылығыңызға немесе қызмет бағытыңызға сәйкес келетін лоттарды іздеу үшін кілт сөздер бойынша іздеуді пайдаланыңыз',
+          },
+          tru: {
+            title: 'ТБЖ талдауы',
+            subtitle: 'Сатып алу үрдістері: тақырыптық іздеу, позициялар бойынша нарық, бағалар мен көлемдер, жалпы бюджет пен көшбасшылар',
+          },
+          price: {
+            title: 'Бағаларды талдау',
+            subtitle: 'Тауарлар, жұмыстар мен қызметтердің бағаларын бақылау — бюджетті, маржаны есептеу және ауытқуларды анықтау үшін ақылды іздеу және дәл іріктеу',
+          },
+          constructor: {
+            title: 'Есептер конструкторы',
+            subtitle: 'Икемді қалыптастыру және егжей-тегжейлі есептерді тез жүктеу',
+          },
+          monitoring: {
+            title: 'Сатып алуларды мониторингі',
+            subtitle: 'Сатып алулар туралы ақпарат, қызығушылығыңызға немесе қызмет бағытыңызға сәйкес келетін лоттарды іздеу үшін кілт сөздер бойынша іздеуді пайдаланыңыз',
           },
           tenders: {
             title: 'Тендерлерді іздеу',

package/lang/ru.ts

@@ -112,14 +112,30 @@ const RuLocale = {
       tenders: {
         label: 'Закупки',
         items: {
-          monitoring: {
-            title: 'Мониторинг закупок',
-            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+          customers: {
+            title: 'Анализ участников',
+            subtitle: 'Рейтинги и профили участников: специализация, сделки и цены, доля и динамика на рынке',
           },
           akimat: {
             title: 'Акимат. Отчёты',
             subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
           },
+          tru: {
+            title: 'Анализ ТРУ',
+            subtitle: 'Тренды закупок: тематический поиск, рынок по позициям, цены и объёмы, общий бюджет и лидеры',
+          },
+          price: {
+            title: 'Анализ цен',
+            subtitle: 'Отслеживание цен на товары, работы и услуги с умным поиском и точным подбором для расчёта бюджета, маржи и выявления отклонений',
+          },
+          constructor: {
+            title: 'Конструктор отчётов',
+            subtitle: 'Гибкое формирование и быстрая выгрузка детализированных отчётов',
+          },
+          monitoring: {
+            title: 'Мониторинг закупок',
+            subtitle: 'Information about procurements, use search by keywords to find lots that match your interests or line of work',
+          },
           tenders: {
             title: 'Поиск тендеров',
             subtitle:

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "adata-ui",
   "type": "module",
-  "version": "2.0.89",
+  "version": "2.0.90",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/shared/constans/pages.ts

@@ -39,6 +39,11 @@ export const PAGES = {
     vacancy: '/vacancy'
   },
   tender: {
+    customers: '/main/analytics/customers',
+    analytics: '/main/eoz/analytics',
+    tru: '/main/analytics/tru-dynamic-procurement',
+    price: '/main/price-analysis',
+    constructor: '/main/reporting/constructor',
     monitoring: '/',
     akimat: '/main/eoz',
     main: '/',