From 401d5720d8c2322558d2da7e060451aa7986fa9c Mon Sep 17 00:00:00 2001 From: Lei OT Date: Thu, 25 Apr 2024 11:03:30 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20GH=E4=BE=8B=E4=BC=9A=E6=95=B0=E6=8D=AE:?= =?UTF-8?q?=20=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4:=20=E5=8D=B0=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/MeetingData.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/stores/MeetingData.js b/src/stores/MeetingData.js index 999c8f9..30fd89f 100644 --- a/src/stores/MeetingData.js +++ b/src/stores/MeetingData.js @@ -30,7 +30,7 @@ const getOrderCountByType = async (param) => { const GHproductTypeListSetting = { ja: ['日本', '东亚跨国'], se: ['东南亚跨国', '泰国', '越南', '印度尼西亚', '水灯节'], - in: ['印度', '次大陆跨国', '尼泊尔', '不丹', '斯里兰卡'], + in: ['印度', '印度次大陆跨国', '尼泊尔', '不丹', '斯里兰卡'], }; const rowItem = (filterData) => { @@ -69,8 +69,13 @@ const dataSE = (rawData, yearData) => { // 印度+: 印度+次大陆跨国+尼泊尔+不丹+斯里兰卡 const dataIN = (rawData, yearData) => { const productTypeList = GHproductTypeListSetting.in; - const filterData = rawData.filter((ele) => productTypeList.some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)); - const filterDataYear = yearData.filter((ele) => productTypeList.some((item) => ele.OrderType.toLocaleLowerCase().indexOf(item) !== -1)); + const exceptProduct = ['印度尼西亚']; + const filterData = rawData + .filter((ele) => productTypeList.some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) + .filter((ele) => exceptProduct.every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)); + const filterDataYear = yearData + .filter((ele) => productTypeList.some((item) => ele.OrderType.toLocaleLowerCase().indexOf(item) !== -1)) + .filter((ele) => exceptProduct.every((item) => ele.OrderType.toLocaleLowerCase().indexOf(item) === -1)); const rowYear = filterDataYear.reduce((r, c) => r + c.OrderCount, 0); return { ...rowItem(filterData), rowYear }; };