diff --git a/src/pages/ElecEvaluation/Monitor/Home/index.tsx b/src/pages/ElecEvaluation/Monitor/Home/index.tsx index e564d44..babd485 100644 --- a/src/pages/ElecEvaluation/Monitor/Home/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Home/index.tsx @@ -658,6 +658,11 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: seriesIndex: 0, dataIndex: index, }); + myChart.dispatchAction({ + type: 'showTip', + seriesIndex: 0, + dataIndex: index, + }); } const colors = ['#1B7EF2', '#29F1FA', '#1B7EF2']; const categoryOption: EChartsOption = { @@ -1011,9 +1016,6 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: } const mapTwiceOption: EChartsOption = { tooltip: { - trigger: 'item', - showDelay: 0, - transitionDuration: 0.2, show: false, }, geo: { @@ -1031,8 +1033,8 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: } }, visualMap: { - min: 1, - max: 50, + min: 0, + max: 100, inRange: { color: [ '#01417f', @@ -1057,6 +1059,19 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: // label: { // show: false // }, + tooltip: { + formatter(value) { + if (value.data?.name) { + return value.data.name + "
" + "活跃供应商数量:" + value.data?.data.supplierCount + "
" + "投标次数总量:" + value.data?.data.tenderCount; + } + return ""; + }, + backgroundColor: "#0a0c11cc", + textStyle: { + color: '#fff' + }, + show: true + }, emphasis: { label: { show: true, @@ -1310,7 +1325,7 @@ export const GraphChart = (props: { type: string, chartData: any[], chartColor?: if (type == "mapTwice") { myChart.on('selectchanged', function (params: any) { if (params.selected.length > 0) { - onSelect(chartData[params.selected[0].dataIndex[0]].name); + onSelect(chartData[params.selected[0].dataIndex[0]]?.name); } else { onSelect(""); } @@ -1466,7 +1481,7 @@ const MonitorHome: React.FC<{}> = () => { } //参与供应商数 const getSupplierCount = (ym: string) => { - getSupplierCountAPI(ym).then(res => { + getSupplierCountAPI({ year: Number(ym) }).then(res => { if (res?.code == 200) { setSupplierCount(res?.data); } diff --git a/src/pages/ElecEvaluation/Monitor/Supplier/index.tsx b/src/pages/ElecEvaluation/Monitor/Supplier/index.tsx index 100a644..68d4ecf 100644 --- a/src/pages/ElecEvaluation/Monitor/Supplier/index.tsx +++ b/src/pages/ElecEvaluation/Monitor/Supplier/index.tsx @@ -115,8 +115,9 @@ const Supplier: React.FC<{}> = () => { const getProvinceActiveSupplierInfo = (ym: string) => { getProvinceActiveSupplierInfoAPI(ym).then(res => { if (res?.code == 200) { - provinceActiveSupplierInfoData.current = res?.data; - setProvinceData(res?.data.map((item: any) => ({ name: item.provinceName, value: 0 }))) + const data = res?.data ? res?.data : []; + provinceActiveSupplierInfoData.current = data; + setProvinceData(data.map((item: any) => ({ name: item.provinceName, value: item.supplierCount, data: item }))) } }) } diff --git a/src/pages/ElecEvaluation/Monitor/service.ts b/src/pages/ElecEvaluation/Monitor/service.ts index d03e3e2..55c6499 100644 --- a/src/pages/ElecEvaluation/Monitor/service.ts +++ b/src/pages/ElecEvaluation/Monitor/service.ts @@ -55,8 +55,9 @@ export async function getActiveSupplierAPI(params: any) { * 首页-参与供应商数 */ export async function getSupplierCountAPI(params: any) { - return request(`/api/biz-service-ebtp-statistics/v1/tenderMonitor/supplierCount/${params}`, { + return request(`/api/biz-service-ebtp-statistics/v1/tenderMonitor/supplierCount`, { method: 'GET', + params: params }); }