diff --git a/packages/euler/components.d.ts b/packages/euler/components.d.ts index e74eed593db11351f465f4cdd9a5b0aec3ccdfff..1f59bfba62c60df199fe721bc47f068d9e178c9b 100644 --- a/packages/euler/components.d.ts +++ b/packages/euler/components.d.ts @@ -25,6 +25,7 @@ declare module '@vue/runtime-core' { ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] Loading: typeof import('element-plus/es')['ElLoadingDirective'] + RelationForm: typeof import('./src/components/RelationForm.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] TheBar: typeof import('./src/components/TheBar.vue')['default'] diff --git a/packages/euler/src/i18n/lang/enLanguage.ts b/packages/euler/src/i18n/lang/enLanguage.ts index 5730b6c8da393695a843fc2cc4e8a6ec9fb477d9..1dc424b596b881bf9382f0012bf1903a024e7f7f 100644 --- a/packages/euler/src/i18n/lang/enLanguage.ts +++ b/packages/euler/src/i18n/lang/enLanguage.ts @@ -30,6 +30,10 @@ export default { companyContributor: 'Contribution by Organizations', groupActive: 'SIG Active Degree Landscape', active: 'active', + groupRelations: 'Relationship between technical committee members and special interest groups', + Note: 'Note: The following are sorted by surname pinyin', + Committee: 'Member of technical Committee', + interestGroup:'Special interest group', ranking: 'Rank', backVitality: 'Back to Overview', searchTips: diff --git a/packages/euler/src/i18n/lang/zhLanguage.ts b/packages/euler/src/i18n/lang/zhLanguage.ts index bb8944a0505b7fa09dee414d6f054b1147767de6..652e854eba7965f4b5a5f84a0721bdbaafd2145f 100644 --- a/packages/euler/src/i18n/lang/zhLanguage.ts +++ b/packages/euler/src/i18n/lang/zhLanguage.ts @@ -30,6 +30,10 @@ export default { companyContributor: '单位会员贡献', groupActive: '特别兴趣小组活跃度全景图', active: '活跃度', + groupRelations: '技术委员会委员与特别兴趣小组关系', + Note: '注：以下按姓氏拼音排序', + Committee: '技术委员会委员', + interestGroup:'特别兴趣小组', ranking: '排名', backVitality: '回到数据总览', searchTips: '您搜索的组织在当前条件下暂无贡献，请尝试其他搜索条件', diff --git a/packages/euler/src/views/contributors/Index.vue b/packages/euler/src/views/contributors/Index.vue index 3a10b5a10923c295465597202d6d0ade179f66ee..1411d2a3d9f0faf5efa7ad2ebc8e77825eae0540 100644 --- a/packages/euler/src/views/contributors/Index.vue +++ b/packages/euler/src/views/contributors/Index.vue @@ -14,14 +14,12 @@ import useScroll from 'shared/hooks/useScroll'; import TheList from '@/components/TheList.vue'; import titleBg from '@/assets/title-bg.png'; import chevronsUp from '~icons/app/chevrons-up'; - +import { grouprelationsList } from 'shared/utils/groupList'; const { t, locale } = useI18n(); const usePersonal = usePersonalStore(); const useCommon = useCommonStore(); const router = useRouter(); - locale.value = localStorage.getItem('lang') || 'zh'; - const formOption = computed(() => { return [ { @@ -51,11 +49,9 @@ const formOption = computed(() => { // theform组件调用 const componentName = 'personal'; const loading = ref(true); - const getContributeInfo = () => { usePersonal.getPersonalData(); }; - onMounted(() => { usePersonal.getPersonalData(); loading.value = false; @@ -63,7 +59,11 @@ onMounted(() => { const hightRanking = computed(() => usePersonal.hightRanking); const lowRanking = computed(() => usePersonal.lowRanking); - +const number = Math.ceil(grouprelationsList.length / 2); +const hightSig = computed(() => grouprelationsList.slice(0, number)); +const lowSig = computed(() => + grouprelationsList.slice(number, grouprelationsList.length) +); const typeLable = ref(''); const switchType = () => { switch (usePersonal.personalForm.contributeType) { @@ -128,7 +128,6 @@ watch( -

{{ t('userContributor') }}

+
+

{{ t('groupRelations') }}

+
{{ t('Note') }}
+
+
+ + + + + + + +
+
+ + + + + +
+
+