diff --git a/src/views/commandScreen/components/radarMapOption.vue b/src/views/commandScreen/components/radarMapOption.vue index 9f80fa1..1cd40bd 100644 --- a/src/views/commandScreen/components/radarMapOption.vue +++ b/src/views/commandScreen/components/radarMapOption.vue @@ -58,15 +58,15 @@ function radarMapEchart() { '
' + props.randerInfo.indicator[index].name + ":" + - item * 100 + + (item * 100).toFixed(2) + "%
"; } else { - htmlobj = "
" + props.randerInfo.indicator[index].name + ":" + item * 100 + "%
"; + htmlobj = "
" + props.randerInfo.indicator[index].name + ":" + (item * 100).toFixed(2) + "%
"; } return htmlobj; }) .join(""); - console.log(11111111, textHTML); + // console.log(11111111, textHTML); return textHTML; } } @@ -85,12 +85,12 @@ function radarMapEchart() { const itemUp = props.randerInfo.workerList[index] > 1 ? props.randerInfo.workerList[index] - : props.randerInfo.workerList[index] * 100 + "%"; + : (props.randerInfo.workerList[index] * 100).toFixed(2) + "%"; htmlobj = "
" + props.randerInfo.indicator[index].name + ":" + itemUp + "
"; return htmlobj; }) .join(""); - console.log(11111111, textHTML); + // console.log(11111111, textHTML); return textHTML; } } diff --git a/src/views/overviewScreen/commandCenter/rightAll.vue b/src/views/overviewScreen/commandCenter/rightAll.vue index 01c5ee7..5ad520c 100644 --- a/src/views/overviewScreen/commandCenter/rightAll.vue +++ b/src/views/overviewScreen/commandCenter/rightAll.vue @@ -658,8 +658,10 @@ function getManAnalysisEchart() { }, legend: { trigger: "item", + type: "scroll", //legend要多,进行分页处理 position: "inside", top: "3%", + left: "1%", x: "center", textStyle: { color: "#fff" @@ -667,7 +669,19 @@ function getManAnalysisEchart() { itemWidth: 10, itemHeight: 10, icon: "roundRect", - data: workerRegionInfo.workerRegionList.map((item: any) => item.regionName) + data: workerRegionInfo.workerRegionList.map((item: any) => item.regionName), + formatter: function (data: any) { + if (workerRegionInfo.workerRegionList && workerRegionInfo.workerRegionList.length) { + for (let i = 0; i < workerRegionInfo.workerRegionList.length; i++) { + if (data === workerRegionInfo.workerRegionList[i].regionName) { + if (data == "无") return; + + const newData = data.length > 5 ? data.substr(0, 5) + "..." : data; + return newData; + } + } + } + } }, // color: ["#2BA5FF", "#F97766", "#1EF1FF", "#1EF1FF"], grid: {