diff --git a/packages/euler/src/components/TheBar.vue b/packages/euler/src/components/TheBar.vue index 49ed9827ebefac974bc175daf7e90cc53f2daeb3..ca6234e60bca1aad87f05d3fa7bac9baea7f357f 100644 --- a/packages/euler/src/components/TheBar.vue +++ b/packages/euler/src/components/TheBar.vue @@ -70,9 +70,16 @@ const showAfter = 200; // 跳转社区详情 const goToCompany = (data: IObject) => { - if (hasPermission('sigRead')) { + if ( + hasPermission('sigRead') && + data.company_cn !== '个人贡献者' && + data.company_en !== 'independent' + ) { data; - router.push(`/${useCommon.language}/company/${data.company_cn}`); + const routeData: any = router.resolve( + `/${useCommon.language}/company/${data.company_cn}` + ); + window.open(routeData.href, '_blank'); } else { } }; @@ -89,6 +96,21 @@ const goToCompany = (data: IObject) => {
{{ item.index }}
{{
+ useCommon.language === 'zh'
+ ? item.company_cn
+ : item.company_en === ''
+ ? item.company_cn
+ : item.company_en
+ }}
+ {{
useCommon.language === 'zh'
@@ -122,7 +147,8 @@ const goToCompany = (data: IObject) => {
- {{ +index + 1 }}
+ {{ item.index }}
+
{{
useCommon.language === 'zh'
? item.company_cn
@@ -139,7 +165,17 @@ const goToCompany = (data: IObject) => {
{{ t('ranking') }}
@@ -138,7 +139,10 @@ const getList = () => {
};
getList();
const goTo = (item: any) => {
- router.push(`/${useCommon.language}/sig/${item.sig_names}`);
+ const routeData: any = router.resolve(
+ `/${useCommon.language}/sig/${item.sig_names}`
+ );
+ window.open(routeData.href, '_blank');
};
diff --git a/packages/euler/src/i18n/lang/enLanguage.ts b/packages/euler/src/i18n/lang/enLanguage.ts
index 82cb32a6d71d710dd76c2285d8b34f87b56d7c96..639cabd4a1ae468f8134001ef62e82d3f46b8c2f 100644
--- a/packages/euler/src/i18n/lang/enLanguage.ts
+++ b/packages/euler/src/i18n/lang/enLanguage.ts
@@ -47,7 +47,7 @@ export default {
userContributor: 'Contribution by Individuals',
companyContributor: 'Contribution by Organizations',
groupActive: 'SIG Active Degree Landscape',
- Currentcontributionranking: "Current/last month's contribution ranking",
+ Currentcontributionranking: "Current/last month's contribution",
Numbercontributors: 'Number of contributors',
Contributordistribution: 'Contributor distribution',
Commitcontribution: 'Commit contribution',
diff --git a/packages/euler/src/i18n/lang/zhLanguage.ts b/packages/euler/src/i18n/lang/zhLanguage.ts
index 3131ca1d856918be5c98d1991ab3d94d35d6e287..ca2e93db521426b13b6d7aa076d20c2a93340b39 100644
--- a/packages/euler/src/i18n/lang/zhLanguage.ts
+++ b/packages/euler/src/i18n/lang/zhLanguage.ts
@@ -52,7 +52,7 @@ export default {
NeedsProblems: '需求&问题',
staffContributor: '员工贡献',
review: '评审',
- Currentcontributionranking: '当前/最近一个月的贡献排名',
+ Currentcontributionranking: '当前/最近一个月的贡献',
Numbercontributors: '贡献者数量',
toHome: '前往主页',
MailingList: '邮件列表',
diff --git a/packages/euler/src/views/company/Index.vue b/packages/euler/src/views/company/Index.vue
index 334a7a80d65d14e3d586637324725e386e392ee6..c9a7b7060de929dc6e6bbaf9c517bd38bf3e8982 100644
--- a/packages/euler/src/views/company/Index.vue
+++ b/packages/euler/src/views/company/Index.vue
@@ -24,6 +24,8 @@ import TheProgress from '@/components/TheProgress.vue';
import { useStaffStore } from '@/stores/staff';
import OFormRadio from '@/components/OFormRadio.vue';
import { Search } from '@element-plus/icons-vue';
+import IconUser from '~icons/app/search';
+import OIcon from 'shared/components/OIcon.vue';
const useStaff = useStaffStore();
const useCommon = useCommonStore();
const route = useRoute();
@@ -113,7 +115,6 @@ const getDrownData = () => {
});
reallData.value = drownData.value;
};
-console.log(drownData);
const getSigsData = () => {
const query = {
company: sencondTitleValue.value,
@@ -194,6 +195,7 @@ onMounted(() => {
useStaff.getStaffData(sencondTitleValue.value);
loading.value = false;
});
+
const lastformOption = computed(() => {
return [
{
@@ -282,7 +284,6 @@ const indexMethod = (index: number) => {
const anchorData = ['ecological', 'staffContributor'];
// 搜索过滤
-// const isSearch = ref(false);
const searchInput = ref('');
const reallData = ref([] as IObject[]);
@@ -302,6 +303,30 @@ const clearSearchInput = () => {
const clean = () => {
searchInput.value = '';
};
+// 贡献表搜索
+const reallListData = ref([] as IObject[]);
+
+const searchListInput = ref('');
+const queryListSearch = () => {
+ if (searchListInput.value !== '') {
+ const newList = tableData.value.filter((item: any) =>
+ item.gitee_id.toLowerCase().includes(searchListInput.value)
+ );
+ reallListData.value = newList;
+ } else {
+ reallListData.value = tableData.value;
+ }
+};
+const clearListSearchInput = () => {
+ reallListData.value = tableData.value;
+ searchListInput.value = '';
+};
+watch(
+ () => tableData.value,
+ () => {
+ reallListData.value = tableData.value;
+ }
+);
- {{ +index + 1 }}
+ {{
+ item.index
+ }}
+
{{
useCommon.language === 'zh'
? item.company_cn
diff --git a/packages/shared/components/ODiagram.vue b/packages/shared/components/ODiagram.vue
index 4f70b32035817ea5fe92ecc5c15579ec778c43ba..f1669eb178f5953268b44ebe9e4b02e659da7a5d 100644
--- a/packages/shared/components/ODiagram.vue
+++ b/packages/shared/components/ODiagram.vue
@@ -133,9 +133,12 @@ const getTipsHtml = (d: IObject) => {
${t('Participated2')}