From 00c1eed1ba9bcca6e0c6943c4c3ffa0d345fd36a Mon Sep 17 00:00:00 2001 From: Lei OT Date: Mon, 25 Aug 2025 11:03:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20`=5FAsJOSN`=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libs/ht.js | 12 ++++++------ src/stores/MeetingData2024.js | 32 ++++++++++++++++---------------- src/stores/MeetingData2025.js | 28 ++++++++++++++-------------- src/views/DataPivot.jsx | 8 ++++---- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/libs/ht.js b/src/libs/ht.js index 555c959..bca157c 100644 --- a/src/libs/ht.js +++ b/src/libs/ht.js @@ -321,11 +321,11 @@ export const pivotBy = (_data, [rows, columns, date]) => { return ele; }); // 数组的字段值, 拆分处理 - if (groupbyKeys.includes('destinationCountry_AsJOSN')) { + if (groupbyKeys.includes('destinationCountry')) { data = data.reduce((r, v, i) => { - const vjson = isEmpty(v.destinationCountry_AsJOSN) ? [] : v.destinationCountry_AsJOSN; + const vjson = isEmpty(v.destinationCountry) ? [] : v.destinationCountry; const xv = (vjson).reduce((rv, cv, vi) => { - rv.push({...v, destinationCountry_AsJOSN: cv, key: vi === 0 ? v.key : `${v.key}@${cv}`}); + rv.push({...v, destinationCountry: cv, key: vi === 0 ? v.key : `${v.key}@${cv}`}); return rv; }, []); @@ -333,11 +333,11 @@ export const pivotBy = (_data, [rows, columns, date]) => { return r; }, []); } - if (groupbyKeys.includes('destinations_AsJOSN')) { + if (groupbyKeys.includes('destinations')) { data = data.reduce((r, v, i) => { - const vjson = isEmpty(v.destinations_AsJOSN) ? [] : v.destinations_AsJOSN; + const vjson = isEmpty(v.destinations) ? [] : v.destinations; const xv = (vjson).reduce((rv, cv, vi) => { - rv.push({...v, destinations_AsJOSN: cv, key: vi === 0 ? v.key : `${v.key}@${cv}`}); + rv.push({...v, destinations: cv, key: vi === 0 ? v.key : `${v.key}@${cv}`}); return rv; }, []); diff --git a/src/stores/MeetingData2024.js b/src/stores/MeetingData2024.js index ce91927..75cd379 100644 --- a/src/stores/MeetingData2024.js +++ b/src/stores/MeetingData2024.js @@ -33,8 +33,8 @@ const getAgentGroupInfoALL = async (param) => { const paramBody = objectMapper(param, { DateType: 'DateType', DepartmentList: 'DepList', // { key: 'DepartmentList', transform: (v) => v.join(',') }, - Date1: 'OldDate1', - Date2: 'OldDate2', + // Date1: 'OldDate1', + // Date2: 'OldDate2', }); const url = '/service-web/QueryData/GetAgentGroupInfoALL'; const json = await fetchJSON(url, paramBody); @@ -132,23 +132,23 @@ const dataSales = (tKey, rawData, yearData, yearData2) => { const exceptTargetList = Object.keys(GHCountryListSetting).reduce((r, c, i) => r.concat(i < tIndex ? GHCountryListSetting[c] : []), []); // console.log(tIndex, tKey, 'exceptTargetList', exceptTargetList, 'targetList', targetList); - const filterRaw1 = rawData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + const filterRaw1 = rawData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); // console.log(tKey, 'filterRaw1', filterRaw1); - const filterDataC = filterRaw1.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterDataC = filterRaw1.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataT = tKey === 'se' ? filterRaw1.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterData = filterDataC.concat(filterDataT); const CJCount = filterData.length; // filterData.reduce((r, c) => r + c.CJCount, 0); const YJLY = filterData.reduce((r, c) => r + price_to_number(c.ML), 0); - const filterRaw2 = yearData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - const filterDataYearC = filterRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterRaw2 = yearData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); + const filterDataYearC = filterRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataYearT = tKey === 'se' ? filterRaw2.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterDataYear = filterDataYearC.concat(filterDataYearT); const rowYearData = { CJCount: filterDataYear.length, YJLY: filterDataYear.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log(tKey, filterDataYear.map(ee => ee.destinationCountry_AsJOSN), filterDataYear.map(ee => ee.productType), filterDataYear); + // console.log(tKey, filterDataYear.map(ee => ee.destinationCountry), filterDataYear.map(ee => ee.productType), filterDataYear); - const filterDataYearRaw2 = yearData2.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - const filterDataYear2C = filterDataYearRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterDataYearRaw2 = yearData2.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); + const filterDataYear2C = filterDataYearRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataYear2T = tKey === 'se' ? filterDataYearRaw2.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterDataYear2 = filterDataYear2C.concat(filterDataYear2T); const rowYearData2 = { CJCount: filterDataYear2.length, YJLY: filterDataYear2.reduce((r, c) => r + price_to_number(c.ML), 0) }; @@ -164,25 +164,25 @@ const dataSales = (tKey, rawData, yearData, yearData2) => { const dataSalesGHOther = (rawData, yearData, yearData2) => { const exceptContry = Object.values(GHCountryListSetting).reduce((r, c) => r.concat(c), []); // console.log('exceptContry', exceptContry); - // console.log('OOoo rawData', rawData.map(e => e.destinationCountry_AsJOSN)); + // console.log('OOoo rawData', rawData.map(e => e.destinationCountry)); const filterData = rawData .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - // console.log('OOoo', filterData.map(e => e.destinationCountry_AsJOSN), filterData.map(e => e.productType)); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); + // console.log('OOoo', filterData.map(e => e.destinationCountry), filterData.map(e => e.productType)); const CJCount = filterData.length; // filterData.reduce((r, c) => r + c.CJCount, 0); const YJLY = filterData.reduce((r, c) => r + price_to_number(c.ML), 0); const filterDataYear = yearData .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); const rowYearData = { CJCount: filterDataYear.length, YJLY: filterDataYear.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log('OOoo year', filterDataYear.map(e => e.destinationCountry_AsJOSN), filterDataYear.map(e => e.productType)); + // console.log('OOoo year', filterDataYear.map(e => e.destinationCountry), filterDataYear.map(e => e.productType)); const filterDataYear2 = yearData2 .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); const rowYearData2 = { CJCount: filterDataYear2.length, YJLY: filterDataYear2.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log('Oo', filterDataYear2.map(e => e.destinationCountry_AsJOSN), filterDataYear2); + // console.log('Oo', filterDataYear2.map(e => e.destinationCountry), filterDataYear2); // console.log('Oo row', rowYearData2); const rowYear = { diff --git a/src/stores/MeetingData2025.js b/src/stores/MeetingData2025.js index 26c932f..47d46e4 100644 --- a/src/stores/MeetingData2025.js +++ b/src/stores/MeetingData2025.js @@ -132,23 +132,23 @@ const dataSales = (tKey, rawData, yearData, yearData2) => { const exceptTargetList = Object.keys(GHCountryListSetting).reduce((r, c, i) => r.concat(i < tIndex ? GHCountryListSetting[c] : []), []); // console.log(tIndex, tKey, 'exceptTargetList', exceptTargetList, 'targetList', targetList); - const filterRaw1 = rawData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + const filterRaw1 = rawData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); // console.log(tKey, 'filterRaw1', filterRaw1); - const filterDataC = filterRaw1.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterDataC = filterRaw1.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataT = tKey === 'se' ? filterRaw1.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterData = filterDataC.concat(filterDataT); const CJCount = filterData.length; // filterData.reduce((r, c) => r + c.CJCount, 0); const YJLY = filterData.reduce((r, c) => r + price_to_number(c.ML), 0); - const filterRaw2 = yearData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - const filterDataYearC = filterRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterRaw2 = yearData.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); + const filterDataYearC = filterRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataYearT = tKey === 'se' ? filterRaw2.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterDataYear = filterDataYearC.concat(filterDataYearT); const rowYearData = { CJCount: filterDataYear.length, YJLY: filterDataYear.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log(tKey, filterDataYear.map(ee => ee.destinationCountry_AsJOSN), filterDataYear.map(ee => ee.productType), filterDataYear); + // console.log(tKey, filterDataYear.map(ee => ee.destinationCountry), filterDataYear.map(ee => ee.productType), filterDataYear); - const filterDataYearRaw2 = yearData2.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - const filterDataYear2C = filterDataYearRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry_AsJOSN.includes(item))); + const filterDataYearRaw2 = yearData2.filter((ele) => exceptTargetList.every((item) => !ele.destinationCountry.includes(item))); + const filterDataYear2C = filterDataYearRaw2.filter((ele) => targetList.some((item) => ele.destinationCountry.includes(item))); const filterDataYear2T = tKey === 'se' ? filterDataYearRaw2.filter((ele) => ['泰国水灯节'].some((item) => ele.productType.toLocaleLowerCase().indexOf(item) !== -1)) : []; const filterDataYear2 = filterDataYear2C.concat(filterDataYear2T); const rowYearData2 = { CJCount: filterDataYear2.length, YJLY: filterDataYear2.reduce((r, c) => r + price_to_number(c.ML), 0) }; @@ -164,25 +164,25 @@ const dataSales = (tKey, rawData, yearData, yearData2) => { const dataSalesGHOther = (rawData, yearData, yearData2) => { const exceptContry = Object.values(GHCountryListSetting).reduce((r, c) => r.concat(c), []); // console.log('exceptContry', exceptContry); - // console.log('OOoo rawData', rawData.map(e => e.destinationCountry_AsJOSN)); + // console.log('OOoo rawData', rawData.map(e => e.destinationCountry)); const filterData = rawData .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); - // console.log('OOoo', filterData.map(e => e.destinationCountry_AsJOSN), filterData.map(e => e.productType)); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); + // console.log('OOoo', filterData.map(e => e.destinationCountry), filterData.map(e => e.productType)); const CJCount = filterData.length; // filterData.reduce((r, c) => r + c.CJCount, 0); const YJLY = filterData.reduce((r, c) => r + price_to_number(c.ML), 0); const filterDataYear = yearData .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); const rowYearData = { CJCount: filterDataYear.length, YJLY: filterDataYear.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log('OOoo year', filterDataYear.map(e => e.destinationCountry_AsJOSN), filterDataYear.map(e => e.productType)); + // console.log('OOoo year', filterDataYear.map(e => e.destinationCountry), filterDataYear.map(e => e.productType)); const filterDataYear2 = yearData2 .filter((ele) => ['泰国水灯节'].every((item) => ele.productType.toLocaleLowerCase().indexOf(item) === -1)) - .filter((ele) => exceptContry.every((item) => !ele.destinationCountry_AsJOSN.includes(item))); + .filter((ele) => exceptContry.every((item) => !ele.destinationCountry.includes(item))); const rowYearData2 = { CJCount: filterDataYear2.length, YJLY: filterDataYear2.reduce((r, c) => r + price_to_number(c.ML), 0) }; - // console.log('Oo', filterDataYear2.map(e => e.destinationCountry_AsJOSN), filterDataYear2); + // console.log('Oo', filterDataYear2.map(e => e.destinationCountry), filterDataYear2); // console.log('Oo row', rowYearData2); const rowYear = { diff --git a/src/views/DataPivot.jsx b/src/views/DataPivot.jsx index 31dd60f..71c43a7 100644 --- a/src/views/DataPivot.jsx +++ b/src/views/DataPivot.jsx @@ -31,8 +31,8 @@ const filterFields = [ { key: 'isCusCommend_txt', label: '是否老客户推荐' }, { key: 'hasOld_txt', label: '老客户(推荐)' }, { key: 'HotelStar', label: '酒店星级' }, - { key: 'destinationCountry_AsJOSN', label: '目的地国籍' }, - { key: 'destinations_AsJOSN', label: '目的地城市' }, + { key: 'destinationCountry', label: '目的地国籍' }, + { key: 'destinations', label: '目的地城市' }, { key: 'RTXF_WB_range', label: '人天消费(外币)' }, { key: 'PPPriceRange', label: '人均天/单(外币)' }, // { key: 'unitPPPriceRange', label: '人均天(外币)' }, @@ -50,7 +50,7 @@ const quickOptions = [ { label: ' 来源站点 ', fields: [['WebCode'], []] }, { label: '[ 产品×客群 ]', fields: [['productType', 'guestGroupType'], []] }, { label: '[ 国籍×客群 ]', fields: [['country', 'guestGroupType'], []] }, - { label: '[ 客群×目的地国籍 ]', fields: [['guestGroupType', 'destinationCountry_AsJOSN'], []] }, + { label: '[ 客群×目的地国籍 ]', fields: [['guestGroupType', 'destinationCountry'], []] }, // { label: '[ 国籍×客群 ]×[ ]', fields: [['country', 'guestGroupType'], []] }, ]; @@ -183,7 +183,7 @@ export default observer((props) => { // console.log(';;;;;', pivotDateColumns); const { data, columnValues, summaryRows, summaryColumns, pivotKeys, summaryMix } = pivotBy(_rawData || rawData, [].concat(pivotDateColumns, [curXfield])); // console.log('data====', data, '\ncolumnValues', columnValues, '\nsummaryRows', summaryRows, '\nsummaryColumns', summaryColumns, '\nsummaryMix', summaryMix); - setShowPassCountryTips(pivotKeys.includes('destinationCountry_AsJOSN')); + setShowPassCountryTips(pivotKeys.includes('destinationCountry')); setDataBeforePick(data.sort(sortBy(curXfield))); // 折线图汇总数据, 排序 // const sortMixData = cloneDeep(summaryMix).sort(sortBy(defaultValKey)).reverse();