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 }; };