From f300770d1177c3a176859f5d516d132b0da85671 Mon Sep 17 00:00:00 2001
From: YCA001 <2915341988@qq.com>
Date: Mon, 22 Jan 2024 15:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 packages/euler/src/views/company/DataShow.vue | 35 ++++-----
 pnpm-lock.yaml                                | 71 ++++++++-----------
 3 files changed, 48 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 6eb45e9..b68505d 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "typescript": "^4.5.4",
     "unplugin-auto-import": "^0.7.1",
     "unplugin-vue-components": "^0.19.2",
-    "vite": "^4.0.5",
+    "vite": "^4.5.2",
     "vue-tsc": "^0.29.8"
   }
 }
diff --git a/packages/euler/src/views/company/DataShow.vue b/packages/euler/src/views/company/DataShow.vue
index 4a0a47b..4a3c538 100644
--- a/packages/euler/src/views/company/DataShow.vue
+++ b/packages/euler/src/views/company/DataShow.vue
@@ -2,7 +2,7 @@
   <div class="edropdown">
     <el-dropdown placement="bottom-start">
       <div class="main-left-title">
-        {{ t(timeTitle) }}{{t('zhcontribut')}}
+        {{ t(timeTitle) }}{{ t('zhcontribut') }}
         <span class="btnc"></span>
       </div>
       <template #dropdown>
@@ -12,32 +12,34 @@
           class="dropdownItem"
           @click="clickDrownItem(item)"
         >
-        {{ t(item.label)}}{{t('zhcontribut')}}</el-dropdown-item
+          {{ t(item.label) }}{{ t('zhcontribut') }}</el-dropdown-item
         >
       </template>
     </el-dropdown>
   </div>
   <div class="left-first">
     <div class="left-first-child">
-      <span :title="`${t('Mergerequest')} PR`">{{ t("Mergerequest") }} PR</span>
+      <span :title="`${t('Mergerequest')} PR`">{{ t('Mergerequest') }} PR</span>
       <div class="left-first-child-data">
         {{ toThousands(mergeRequest) }}
       </div>
     </div>
     <div class="left-first-child">
-      <span :title="`${t('NeedsProblems')} Issue`">{{ t("NeedsProblems") }} Issue</span>
+      <span :title="`${t('NeedsProblems')} Issue`"
+        >{{ t('NeedsProblems') }} Issue</span
+      >
       <div class="left-first-child-data">
         {{ toThousands(issueData) }}
       </div>
     </div>
     <div class="left-first-child">
-      <span :title="`${t('review')} Comment`">{{ t("review") }} Comment</span>
+      <span :title="`${t('review')} Comment`">{{ t('review') }} Comment</span>
       <div class="left-first-child-data">
         {{ toThousands(comment) }}
       </div>
     </div>
     <div class="left-first-child">
-      <span :title="`${t('SIGNumber')}`">{{ t("SIGNumber") }}</span>
+      <span :title="`${t('SIGNumber')}`">{{ t('SIGNumber') }}</span>
       <div class="left-first-child-data">
         {{ toThousands(contributors) }}
       </div>
@@ -46,9 +48,9 @@
 </template>
 <script setup lang="ts">
 import { toRefs, ref, onMounted, watch } from 'vue';
-import { queryCompanyUserContribute, queryCompanyUsers } from 'shared/api';
+import { queryCompanyUserContribute, queryCompanySigDetails } from 'shared/api';
 import { IObject } from 'shared/@types/interface';
-import { processing, toThousands } from 'shared/utils/helper';
+import { toThousands } from 'shared/utils/helper';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
@@ -66,12 +68,12 @@ const comment = ref(0);
 const contributors = ref(0);
 const timeRange = [
   {
-    label: "from.lastonemonth",
-    value: "lastonemonth",
+    label: 'from.lastonemonth',
+    value: 'lastonemonth',
   },
-  { label: "from.lasthalfyear", value: "lasthalfyear" },
-  { label: "from.lastoneyear", value: "lastoneyear" },
-  { label: "from.all", value: "all" },
+  { label: 'from.lasthalfyear', value: 'lasthalfyear' },
+  { label: 'from.lastoneyear', value: 'lastoneyear' },
+  { label: 'from.all', value: 'all' },
 ];
 const time = ref('');
 const getItemListData = (data: IObject[], template: string) => {
@@ -121,9 +123,8 @@ const getcontributeListData = () => {
     timeRange: time.value,
     community: 'openeuler',
   };
-  queryCompanyUsers(query).then((data) => {
-    const Data = processing(data?.data || []);
-    contributors.value = Data.sigData['0'];
+  queryCompanySigDetails(query).then((data) => {
+    contributors.value = data?.data.length;
   });
 };
 const getAllData = () => {
@@ -153,7 +154,7 @@ const clickDrownItem = (item: IObject) => {
 };
 onMounted(() => {
   time.value = 'all';
-  timeTitle.value = "from.all";
+  timeTitle.value = 'from.all';
 });
 </script>
 <style scoped lang="scss">
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fb8fcc1..6ef751e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,7 +53,7 @@ importers:
     devDependencies:
       '@intlify/vite-plugin-vue-i18n':
         specifier: ^3.3.1
-        version: 3.3.1(vite@4.5.1)(vue-i18n@9.1.9)
+        version: 3.3.1(vite@4.5.2)(vue-i18n@9.1.9)
       '@types/lodash-es':
         specifier: ^4.17.6
         version: 4.17.6
@@ -68,7 +68,7 @@ importers:
         version: 5.16.0(eslint@8.11.0)(typescript@4.6.2)
       '@vitejs/plugin-vue':
         specifier: ^2.2.0
-        version: 2.2.4(vite@4.5.1)(vue@3.2.31)
+        version: 2.2.4(vite@4.5.2)(vue@3.2.31)
       '@vue/eslint-config-prettier':
         specifier: ^7.0.0
         version: 7.0.0(eslint@8.11.0)(prettier@2.6.0)
@@ -92,13 +92,13 @@ importers:
         version: 4.6.2
       unplugin-auto-import:
         specifier: ^0.7.1
-        version: 0.7.1(vite@4.5.1)
+        version: 0.7.1(vite@4.5.2)
       unplugin-vue-components:
         specifier: ^0.19.2
-        version: 0.19.2(vite@4.5.1)(vue@3.2.31)
+        version: 0.19.2(vite@4.5.2)(vue@3.2.31)
       vite:
-        specifier: ^4.0.5
-        version: 4.5.1(@types/node@17.0.22)(sass@1.49.9)
+        specifier: ^4.5.2
+        version: 4.5.2(@types/node@17.0.22)(sass@1.49.9)
       vue-tsc:
         specifier: ^0.29.8
         version: 0.29.8(typescript@4.6.2)
@@ -110,7 +110,7 @@ importers:
         version: link:../shared
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
   packages/gauss:
     dependencies:
@@ -119,7 +119,7 @@ importers:
         version: link:../shared
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
   packages/harmony:
     dependencies:
@@ -128,7 +128,7 @@ importers:
         version: link:../shared
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
   packages/lookeng:
     dependencies:
@@ -137,7 +137,7 @@ importers:
         version: link:../shared
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
   packages/mindspore:
     dependencies:
@@ -146,13 +146,13 @@ importers:
         version: link:../shared
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
   packages/shared:
     dependencies:
       unplugin-icons:
         specifier: ^0.14.0
-        version: 0.14.0(vite@4.5.1)
+        version: 0.14.0(vite@4.5.2)
 
 packages:
 
@@ -540,7 +540,7 @@ packages:
     engines: {node: '>= 16'}
     dev: true
 
-  /@intlify/vite-plugin-vue-i18n@3.3.1(vite@4.5.1)(vue-i18n@9.1.9):
+  /@intlify/vite-plugin-vue-i18n@3.3.1(vite@4.5.2)(vue-i18n@9.1.9):
     resolution: {integrity: sha512-b9HIUANzL4/LmrA5RqeiPabZl2/RiWNAJ90TVZ8kSi3APRZ4BbmwUAclKe8ip+1jCDhqaGO/qfAI7SbQ0Y76Uw==}
     engines: {node: '>= 12'}
     peerDependencies:
@@ -559,7 +559,7 @@ packages:
       debug: 4.3.4
       fast-glob: 3.2.11
       source-map: 0.6.1
-      vite: 4.5.1(@types/node@17.0.22)(sass@1.49.9)
+      vite: 4.5.2(@types/node@17.0.22)(sass@1.49.9)
       vue-i18n: 9.1.9(vue@3.2.31)
     transitivePeerDependencies:
       - supports-color
@@ -938,14 +938,14 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-vue@2.2.4(vite@4.5.1)(vue@3.2.31):
+  /@vitejs/plugin-vue@2.2.4(vite@4.5.2)(vue@3.2.31):
     resolution: {integrity: sha512-ev9AOlp0ljCaDkFZF3JwC/pD2N4Hh+r5srl5JHM6BKg5+99jiiK0rE/XaRs3pVm1wzyKkjUy/StBSoXX5fFzcw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       vite: ^2.5.10
       vue: ^3.2.25
     dependencies:
-      vite: 4.5.1(@types/node@17.0.22)(sass@1.49.9)
+      vite: 4.5.2(@types/node@17.0.22)(sass@1.49.9)
       vue: 3.2.31
     dev: true
 
@@ -1034,7 +1034,7 @@ packages:
       '@vue/shared': 3.2.31
       estree-walker: 2.0.2
       magic-string: 0.25.9
-      postcss: 8.4.12
+      postcss: 8.4.33
       source-map: 0.6.1
 
   /@vue/compiler-ssr@3.2.31:
@@ -2443,11 +2443,6 @@ packages:
   /ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
-  /nanoid@3.3.1:
-    resolution: {integrity: sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
   /nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -2587,14 +2582,6 @@ packages:
       pathe: 1.1.1
     dev: true
 
-  /postcss@8.4.12:
-    resolution: {integrity: sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.1
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-
   /postcss@8.4.33:
     resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -2950,7 +2937,7 @@ packages:
     resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
     dev: true
 
-  /unplugin-auto-import@0.7.1(vite@4.5.1):
+  /unplugin-auto-import@0.7.1(vite@4.5.2):
     resolution: {integrity: sha512-9865OV9eP99PNxHR2mtTDExeN01m4M9boT5U2BtIwsU1wDRsaFIYWLwcCBEjvXzXfTTC2NNMskhHGVAMfL2WgA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -2964,7 +2951,7 @@ packages:
       local-pkg: 0.4.1
       magic-string: 0.26.1
       resolve: 1.22.0
-      unplugin: 0.6.1(vite@4.5.1)
+      unplugin: 0.6.1(vite@4.5.2)
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -2972,7 +2959,7 @@ packages:
       - webpack
     dev: true
 
-  /unplugin-icons@0.14.0(vite@4.5.1):
+  /unplugin-icons@0.14.0(vite@4.5.2):
     resolution: {integrity: sha512-VznBG8Jl9D4jtsAIY8hycyQZEDB8KVjnk19MzMlifLLs4QoIUPx8TILDoy6U46yDeYViqZu4hvb5fYI5OarekQ==}
     peerDependencies:
       '@svgr/core': '>=5.5.0'
@@ -2995,7 +2982,7 @@ packages:
       debug: 4.3.4
       kolorist: 1.5.1
       local-pkg: 0.4.1
-      unplugin: 0.5.2(vite@4.5.1)
+      unplugin: 0.5.2(vite@4.5.2)
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -3004,7 +2991,7 @@ packages:
       - webpack
     dev: false
 
-  /unplugin-vue-components@0.19.2(vite@4.5.1)(vue@3.2.31):
+  /unplugin-vue-components@0.19.2(vite@4.5.2)(vue@3.2.31):
     resolution: {integrity: sha512-7DhQfTyHLyVIWR6VBQONLU6dDBOXtEYvZQYUpN9C+t11WOb5baIFoxfzDxkeFHTHGMhznyEOw6afHyV9JKWnig==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -3026,7 +3013,7 @@ packages:
       magic-string: 0.26.1
       minimatch: 5.0.1
       resolve: 1.22.0
-      unplugin: 0.6.1(vite@4.5.1)
+      unplugin: 0.6.1(vite@4.5.2)
       vue: 3.2.31
     transitivePeerDependencies:
       - esbuild
@@ -3036,7 +3023,7 @@ packages:
       - webpack
     dev: true
 
-  /unplugin@0.5.2(vite@4.5.1):
+  /unplugin@0.5.2(vite@4.5.2):
     resolution: {integrity: sha512-3SPYtus/56cxyD4jfjrnqCvb6jPxvdqJNaRXnEaG2BhNEMaoygu/39AG+LwKmiIUzj4XHyitcfZ7scGlWfEigA==}
     peerDependencies:
       esbuild: '>=0.13'
@@ -3054,12 +3041,12 @@ packages:
         optional: true
     dependencies:
       chokidar: 3.5.3
-      vite: 4.5.1(@types/node@17.0.22)(sass@1.49.9)
+      vite: 4.5.2(@types/node@17.0.22)(sass@1.49.9)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.3
     dev: false
 
-  /unplugin@0.6.1(vite@4.5.1):
+  /unplugin@0.6.1(vite@4.5.2):
     resolution: {integrity: sha512-cQqRCgQ2v/Q4fPIWNVZ6sNIDdl5v8JXOnlsUOsGzT4fblTONoPWaytiYSpu5qJ9lvSDZYAQN6BRVo3XQoZMfUQ==}
     peerDependencies:
       esbuild: '>=0.13'
@@ -3077,7 +3064,7 @@ packages:
         optional: true
     dependencies:
       chokidar: 3.5.3
-      vite: 4.5.1(@types/node@17.0.22)(sass@1.49.9)
+      vite: 4.5.2(@types/node@17.0.22)(sass@1.49.9)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.3
     dev: true
@@ -3103,8 +3090,8 @@ packages:
     resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==}
     dev: true
 
-  /vite@4.5.1(@types/node@17.0.22)(sass@1.49.9):
-    resolution: {integrity: sha512-AXXFaAJ8yebyqzoNB9fu2pHoo/nWX+xZlaRwoeYUxEqBO+Zj4msE5G+BhGBll9lYEKv9Hfks52PAF2X7qDYXQA==}
+  /vite@4.5.2(@types/node@17.0.22)(sass@1.49.9):
+    resolution: {integrity: sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
-- 
Gitee