From 9c88d0d5ad7c7f93f40dcc43f202b85154d4eb2f Mon Sep 17 00:00:00 2001
From: YCA001 <2915341988@qq.com>
Date: Wed, 22 Jun 2022 17:10:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=90=9C=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/euler/src/components/TheBar.vue      | 45 ++++++++-
 packages/euler/src/components/TheList.vue     | 16 ++--
 packages/euler/src/i18n/lang/enLanguage.ts    |  2 +-
 packages/euler/src/i18n/lang/zhLanguage.ts    |  2 +-
 packages/euler/src/views/company/Index.vue    | 95 +++++++++++++++++--
 .../euler/src/views/sig/ContributList.vue     | 77 ++++++++++++++-
 packages/euler/src/views/sig/Index.vue        |  2 +-
 packages/euler/src/views/sig/TableList.vue    |  5 +-
 packages/shared/components/ODiagram.vue       | 26 +++--
 9 files changed, 236 insertions(+), 34 deletions(-)

diff --git a/packages/euler/src/components/TheBar.vue b/packages/euler/src/components/TheBar.vue
index 49ed982..ca6234e 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) => {
         <p class="infos">
           <span class="index">{{ item.index }}</span>
           <span
+            v-if="
+              item.company_cn === '个人贡献者' ||
+              item.company_en === 'independent'
+            "
+            class="name"
+            >{{
+              useCommon.language === 'zh'
+                ? item.company_cn
+                : item.company_en === ''
+                ? item.company_cn
+                : item.company_en
+            }}</span
+          >
+          <span
+            v-else
             class="name"
             :title="
               useCommon.language === 'zh'
@@ -97,6 +119,9 @@ const goToCompany = (data: IObject) => {
                 ? item.company_cn
                 : item.company_en
             "
+            :style="{
+              cursor: 'pointer',
+            }"
             @click="goToCompany(item)"
             >{{
               useCommon.language === 'zh'
@@ -122,7 +147,8 @@ const goToCompany = (data: IObject) => {
             </div>
             <div class="info">
               <p>
-                <span class="index">{{ +index + 1 }}</span>
+                <span class="index">{{ item.index }}</span>
+
                 {{
                   useCommon.language === 'zh'
                     ? item.company_cn
@@ -139,7 +165,17 @@ const goToCompany = (data: IObject) => {
               </span>
             </div>
           </template>
-          <div class="progress">
+          <div
+            class="progress"
+            :style="{
+              cursor:
+                item.company_cn !== '个人贡献者' ||
+                item.company_en !== 'independent'
+                  ? 'pointer'
+                  : 'default',
+            }"
+            @click="goToCompany(item)"
+          >
             <div
               class="progress-inner"
               :style="{
@@ -234,6 +270,7 @@ const goToCompany = (data: IObject) => {
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
+        // cursor: pointer;
       }
     }
   }
diff --git a/packages/euler/src/components/TheList.vue b/packages/euler/src/components/TheList.vue
index 0837564..1259a2e 100644
--- a/packages/euler/src/components/TheList.vue
+++ b/packages/euler/src/components/TheList.vue
@@ -54,7 +54,6 @@
             :show-after="showAfter"
             class:bar-tooltip
             :show-arrow="false"
-
           >
             <div
               class="detail-menu menu-item"
@@ -69,7 +68,9 @@
               >
             </div>
             <template #content>
-              <div class="lable">{{ val.sig_names }}</div>
+              <div class="lable">
+                {{ val.sig_names }}
+              </div>
               <div class="info">
                 <p>
                   <span class="index">{{ t('ranking') }}</span>
@@ -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');
 };
 </script>
 <style scoped lang="scss">
@@ -234,14 +238,14 @@ const goTo = (item: any) => {
 }
 .right-btn {
   position: absolute;
-  right: 20px;
+  right: 100px;
   bottom: 6px;
 }
 .numberIndex {
   position: absolute;
-  right: 20px;
+  right: 80px;
 }
 .lable {
-  width: 160px;
+  min-width: 160px;
 }
 </style>
diff --git a/packages/euler/src/i18n/lang/enLanguage.ts b/packages/euler/src/i18n/lang/enLanguage.ts
index 82cb32a..639cabd 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 3131ca1..ca2e93d 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 334a7a8..c9a7b70 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;
+  }
+);
 </script>
 <template>
   <div class="container">
@@ -318,7 +343,7 @@ const clean = () => {
               {{ sencondTitle }}
             </div>
             <div class="edropdown">
-              <el-dropdown :handleClose="clean">
+              <el-dropdown>
                 <div class="btnc">
                   <el-icon :size="20">
                     <arrowDown />
@@ -409,7 +434,8 @@ const clean = () => {
               <o-form-radio
                 :option="firstformOption"
                 @get-contribute-info="getTreeContributeInfo($event)"
-              ></o-form-radio>
+              >
+              </o-form-radio>
             </div>
             <div class="color-box">
               <div class="blue-box">
@@ -454,6 +480,24 @@ const clean = () => {
                 :option="lastformOption"
                 :component-name="componentName"
                 @get-contribute-info="getContributeInfo"
+                ><template #searchInput>
+                  <div class="searchListInput">
+                    <el-input
+                      v-model="searchListInput"
+                      :trigger-on-focus="false"
+                      clearable
+                      :debounce="300"
+                      size="large"
+                      placeholder="请输入Gitee ID搜索"
+                      @change="queryListSearch"
+                      @clear="clearListSearchInput"
+                    >
+                      <template #prefix>
+                        <o-icon class="search-icon"
+                          ><icon-user></icon-user
+                        ></o-icon> </template
+                    ></el-input>
+                  </div> </template
               ></the-form>
             </div>
             <div class="edcolor-box">
@@ -477,7 +521,10 @@ const clean = () => {
                 <el-table
                   v-loading="loading"
                   :data="
-                    tableData.slice((currentPage - 1) * 10, currentPage * 10)
+                    reallListData.slice(
+                      (currentPage - 1) * 10,
+                      currentPage * 10
+                    )
                   "
                   style="width: 100%"
                 >
@@ -540,12 +587,12 @@ const clean = () => {
             </div>
             <div class="demo-pagination-block">
               <el-pagination
-                v-show="tableData.length > 0"
+                v-show="reallListData.length > 10"
                 background
                 :current-page="currentPage"
                 :page-size="10"
                 layout="total, prev, pager, next, jumper"
-                :total="tableData.length"
+                :total="reallListData.length"
                 @current-change="handleCurrentChange"
               >
               </el-pagination>
@@ -908,7 +955,39 @@ const clean = () => {
   text-align: center;
 }
 .searchInput {
-  width: 100%;
+  width: 90%;
+  margin: 20px;
+  .search-icon {
+    font-size: 20px;
+  }
+  :deep(.el-autocomplete) {
+    width: 100%;
+    &.active .el-input__inner {
+      box-shadow: 0 0 0 1px #002fa7 inset;
+    }
+  }
+  :deep(.el-input__prefix) {
+    left: 12px;
+    align-items: center;
+  }
+  @media screen and (min-width: 900px) {
+    :deep(.el-input__inner) {
+      padding-left: 40px;
+    }
+  }
+  @media screen and (max-width: 900px) {
+    :deep(.el-input__prefix) {
+      left: 10px;
+    }
+  }
+  :deep(.el-input__inner:focus) {
+    box-shadow: 0 0 0 1px #002fa7 inset;
+  }
+}
+.searchListInput {
+  width: 90%;
+  margin-left: 110px;
+  margin-bottom: 20px;
   .search-icon {
     font-size: 20px;
   }
diff --git a/packages/euler/src/views/sig/ContributList.vue b/packages/euler/src/views/sig/ContributList.vue
index b7af0dc..568cc16 100644
--- a/packages/euler/src/views/sig/ContributList.vue
+++ b/packages/euler/src/views/sig/ContributList.vue
@@ -7,6 +7,8 @@ import { openCommunityInfo } from '@/api/index';
 import { querySigUserContribute } from 'shared/api/index';
 import { sortExp } from 'shared/utils/helper';
 import { IObject } from 'shared/@types/interface';
+import IconUser from '~icons/app/search';
+import OIcon from 'shared/components/OIcon.vue';
 const { t } = useI18n();
 const props = defineProps({
   sig: {
@@ -23,6 +25,7 @@ const param = ref({
 } as IObject);
 const memberData = ref([]);
 const memberMax = ref(0);
+const searchInput = ref('');
 const getMemberData = () => {
   querySigUserContribute(param.value).then((data) => {
     const memberList = data?.data?.sort(sortExp('contribute', false)) || [];
@@ -32,6 +35,7 @@ const getMemberData = () => {
     } else {
       memberMax.value = memberList[0].contribute;
       memberData.value = memberList;
+      reallData.value = memberData.value
     }
   });
 };
@@ -105,6 +109,23 @@ const handleCurrentChange = (val: number) => {
 const indexMethod = (index: number) => {
   return (currentPage.value - 1) * 10 + index + 1;
 };
+// 搜索过滤
+
+const reallData = ref([] as IObject[]);
+const querySearch = () => {
+  if (searchInput.value !== '') {
+    const newList = memberData.value.filter((item: any) =>
+      item.gitee_id.toLowerCase().includes(searchInput.value)
+    );
+    reallData.value = newList;
+  } else {
+    getMemberData();
+  }
+};
+const clearSearchInput = () => {
+  getMemberData();
+  searchInput.value = '';
+};
 </script>
 <template>
   <div>
@@ -112,6 +133,25 @@ const indexMethod = (index: number) => {
       <o-form-radio
         :option="lastformOption"
         @get-contribute-info="getContributeInfo($event)"
+      >
+        <template #searchInput>
+          <div class="searchInput">
+            <el-input
+              v-model="searchInput"
+              :trigger-on-focus="false"
+              clearable
+              :debounce="300"
+              size="large"
+              placeholder="请输入Gitee ID搜索"
+              @change="querySearch"
+              @clear="clearSearchInput"
+            >
+              <template #prefix>
+                <o-icon class="search-icon"
+                  ><icon-user></icon-user
+                ></o-icon> </template
+            ></el-input>
+          </div> </template
       ></o-form-radio>
     </div>
     <div class="edcolor-box">
@@ -132,13 +172,12 @@ const indexMethod = (index: number) => {
       <div class="leader-box">Leader</div>
       <span>SIG Leader</span>
     </div>
-
     <div class="ranking-list">
       <div class="ranking-list-item">
         <p class="caption"></p>
         <el-table
           v-loading="loading"
-          :data="memberData.slice((currentPage - 1) * 10, currentPage * 10)"
+          :data="reallData.slice((currentPage - 1) * 10, currentPage * 10)"
           style="width: 100%"
         >
           <el-table-column
@@ -200,12 +239,12 @@ const indexMethod = (index: number) => {
     </div>
     <div class="demo-pagination-block">
       <el-pagination
-        v-show="memberData.length > 0"
+        v-show="reallData.length > 10"
         background
         :current-page="currentPage"
         :page-size="10"
         layout="total, prev, pager, next, jumper"
-        :total="memberData.length"
+        :total="reallData.length"
         @current-change="handleCurrentChange"
       />
     </div>
@@ -329,4 +368,34 @@ const indexMethod = (index: number) => {
     text-align: center;
   }
 }
+.searchInput {
+  width: 100%;
+  margin: 10px 0 20px;
+  .search-icon {
+    font-size: 20px;
+  }
+  :deep(.el-autocomplete) {
+    width: 100%;
+    &.active .el-input__inner {
+      box-shadow: 0 0 0 1px #002fa7 inset;
+    }
+  }
+  :deep(.el-input__prefix) {
+    left: 12px;
+    align-items: center;
+  }
+  @media screen and (min-width: 900px) {
+    :deep(.el-input__inner) {
+      padding-left: 40px;
+    }
+  }
+  @media screen and (max-width: 900px) {
+    :deep(.el-input__prefix) {
+      left: 10px;
+    }
+  }
+  :deep(.el-input__inner:focus) {
+    box-shadow: 0 0 0 1px #002fa7 inset;
+  }
+}
 </style>
diff --git a/packages/euler/src/views/sig/Index.vue b/packages/euler/src/views/sig/Index.vue
index e05b5d9..1e2bc39 100644
--- a/packages/euler/src/views/sig/Index.vue
+++ b/packages/euler/src/views/sig/Index.vue
@@ -88,7 +88,7 @@ const reallData = ref([] as IObject[]);
 const querySearch = () => {
   if (searchInput.value !== '') {
     const newList = drownData.value.filter((item: any) =>
-      item.includes(searchInput.value)
+      item.toLowerCase().includes(searchInput.value)
     );
     reallData.value = newList;
   }
diff --git a/packages/euler/src/views/sig/TableList.vue b/packages/euler/src/views/sig/TableList.vue
index 68e2350..44c573a 100644
--- a/packages/euler/src/views/sig/TableList.vue
+++ b/packages/euler/src/views/sig/TableList.vue
@@ -275,7 +275,10 @@ onMounted(() => {
             </div>
             <div class="info">
               <p>
-                <span class="index">{{ +index + 1 }}</span>
+                <span v-if="item.index !== '*'" class="index">{{
+                  item.index
+                }}</span>
+                <span v-else class="index"></span>
                 {{
                   useCommon.language === 'zh'
                     ? item.company_cn
diff --git a/packages/shared/components/ODiagram.vue b/packages/shared/components/ODiagram.vue
index 4f70b32..f1669eb 100644
--- a/packages/shared/components/ODiagram.vue
+++ b/packages/shared/components/ODiagram.vue
@@ -133,9 +133,12 @@ const getTipsHtml = (d: IObject) => {
               </span> ${t('Participated2')}
             </div>
             <div class="mark"
-                onclick="window.location.href='${window?.location?.origin}/${
-      localStorage?.lang
-    }/company/${d.data.key}'"
+                onclick="window.open(
+        '${window?.location?.origin}/${localStorage?.lang}/company/${
+      d.data.key
+    }',
+        '_blank'
+      )"
             >${t('viewDetail')} <span style="color: #002fa7">→</span></div>`;
   }
   return `<div>${t('interestGroup')}</div>
@@ -149,9 +152,10 @@ const getTipsHtml = (d: IObject) => {
               }</span> ${t('Participated4')}
             </div>
             <div class="mark"
-                onclick="window.location.href='${window?.location?.origin}/${
-    localStorage?.lang
-  }/sig/${d.data.key}'"
+                onclick="window.open(
+        '${window?.location?.origin}/${localStorage?.lang}/sig/${d.data.key}',
+        '_blank'
+      )"
             >${t('viewDetail')} <span style="color: #002fa7">→</span></div>`;
 };
 const chart = () => {
@@ -201,9 +205,15 @@ const chart = () => {
 
   function jumped(this: any, event: IObject, d: IObject) {
     if (d?.parent?.data?.name === 'company') {
-      window.location.href = `${window?.location?.origin}/${localStorage?.lang}/company/${d.data.key}`;
+      window.open(
+        `${window?.location?.origin}/${localStorage?.lang}/company/${d.data.key}`,
+        '_blank'
+      );
     } else {
-      window.location.href = `${window?.location?.origin}/${localStorage?.lang}/sig/${d.data.key}`;
+      window.open(
+        `${window?.location?.origin}/${localStorage?.lang}/sig/${d.data.key}`,
+        '_blank'
+      );
     }
   }
   function overed(this: any, event: IObject, d: IObject) {
-- 
Gitee