From 86d812292b18868ce54fa38c454c8ec337b881f9 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 24 Sep 2025 13:58:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=95=BF=E6=98=A5=E5=B8=82?= =?UTF-8?q?=E5=9C=B0=E5=B8=82=E4=B8=8B=E9=92=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bns/css/compreDisplay/homeCityJump.css | 6 +++--- bns/html/compreDisplay/dutyHome.html | 2 +- .../cityHomeJump/cityHomeEcharts.js | 17 ++++++++++++++++- bns/js/compreDisplay/compreDisplayEcharts.js | 12 ++++++------ .../compreDisplay/dutyHome/dutyHomeEcharts.js | 10 +++++----- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/bns/css/compreDisplay/homeCityJump.css b/bns/css/compreDisplay/homeCityJump.css index cfc5dbb..e7ad658 100644 --- a/bns/css/compreDisplay/homeCityJump.css +++ b/bns/css/compreDisplay/homeCityJump.css @@ -265,12 +265,12 @@ body { } #other-module { - width: 15%; + width: 21%; height: 100%; } #other-echarts { - width: 83%; + width: 78%; height: 100%; } @@ -325,7 +325,7 @@ body { .person-num-box p{ width: 24%; margin-right: 1%; - font-size: 13px; + font-size: 12px; } #person-echarts, #team-echarts { diff --git a/bns/html/compreDisplay/dutyHome.html b/bns/html/compreDisplay/dutyHome.html index 02f4902..c68ed93 100644 --- a/bns/html/compreDisplay/dutyHome.html +++ b/bns/html/compreDisplay/dutyHome.html @@ -86,7 +86,7 @@ style="display: none;"> -

全省

+
diff --git a/bns/js/compreDisplay/cityHomeJump/cityHomeEcharts.js b/bns/js/compreDisplay/cityHomeJump/cityHomeEcharts.js index 2cd7158..eabdf44 100644 --- a/bns/js/compreDisplay/cityHomeJump/cityHomeEcharts.js +++ b/bns/js/compreDisplay/cityHomeJump/cityHomeEcharts.js @@ -6,6 +6,8 @@ let myChart6 = echarts.init(document.getElementById('weekPlan-echarts')); /*人员情况 echarts*/ function initEchartsOne(nameList, valueList) { let fontSize = '16', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff'; + nameList = nameList.slice(-5); + valueList = valueList.slice(-5); let option = { backgroundColor: 'transparent', grid: { @@ -29,13 +31,16 @@ function initEchartsOne(nameList, valueList) { }, xAxis: [{ type: 'category', + boundaryGap: 1, axisLine: { show: false }, axisLabel: { color: fontColor, - fontFamily: fontFamily + fontFamily: fontFamily, + interval: 0, + fontSize: 12, }, splitLine: { show: false @@ -135,6 +140,8 @@ function initEchartsOne(nameList, valueList) { /* 队伍情况 echarts */ function initEchartsTwo(nameList, valueList) { + nameList = nameList.slice(-5); + valueList = valueList.slice(-5); let fontSize = '16', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff'; let option = { backgroundColor: 'transparent', @@ -260,6 +267,9 @@ function initEchartsTwo(nameList, valueList) { /* 作业票趋势 echarts */ function initEchartsThree(nameList, valueList, valueList2) { + nameList = nameList.slice(-5); + valueList = valueList.slice(-5); + valueList2 = valueList2.slice(-5); let fontSize = '16', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff'; const backgroundColor = 'transparent'; const color = ['#FF5D5D', '#32F474', '#FFE922', '#32F474', '#3DD1F9', '#FFAD05']; //2个以上的series就需要用到color数组 @@ -409,6 +419,11 @@ function initEchartsThree(nameList, valueList, valueList2) { /* 风险趋势 echarts */ function initEchartsFour(nameList, valueList, valueList2, valueList3, valueList4) { + nameList = nameList.slice(-5); + valueList = valueList.slice(-5); + valueList2 = valueList2.slice(-5); + valueList3 = valueList3.slice(-5); + valueList4 = valueList4.slice(-5); let fontSize = '16', fontFamily = 'Alibaba PuHuiTi R', fontColor = '#fff'; const backgroundColor = 'transparent'; const color = ['#FF5D5D', '#F9770F', '#FFE922', '#32F474', '#3DD1F9', '#FFAD05']; //2个以上的series就需要用到color数组 diff --git a/bns/js/compreDisplay/compreDisplayEcharts.js b/bns/js/compreDisplay/compreDisplayEcharts.js index 609e038..9dfe5db 100644 --- a/bns/js/compreDisplay/compreDisplayEcharts.js +++ b/bns/js/compreDisplay/compreDisplayEcharts.js @@ -255,7 +255,7 @@ function initEchartsOne(listMap) { /*周风险echarts*/ function initEchartsTwo(nameList, twoRiskData, threeRiskData) { - let fontSize = "14", + let fontSize = "13", fontFamily = "Alibaba PuHuiTi R", fontColor = "#fff"; // 基于准备好的dom,初始化echarts图表 @@ -291,7 +291,7 @@ function initEchartsTwo(nameList, twoRiskData, threeRiskData) { moveOnMouseMove: true, moveOnMouseWheel: true, startValue: 0, - endValue: 5, + endValue: 3, }, ], legend: { @@ -488,7 +488,7 @@ function initEchartsFive(nameList, dataList) { let data = []; xAxisList = nameList; data = dataList; - let fontSize = "16"; + let fontSize = "13"; let option = { backgroundColor: "transparent", tooltip: { @@ -532,7 +532,7 @@ function initEchartsFive(nameList, dataList) { moveOnMouseMove: true, moveOnMouseWheel: true, startValue: 0, - endValue: 6, + endValue: 3, }, ], xAxis: [ @@ -542,7 +542,7 @@ function initEchartsFive(nameList, dataList) { interval: 0, // 解决x轴名称过长问题 textStyle: { color: "#fff", - fontSize: 16, + fontSize: 13, fontFamily: "Alibaba PuHuiTi R", }, }, @@ -648,7 +648,7 @@ function initEchartsFive(nameList, dataList) { //自动滚动 timeOut3 = setInterval(() => { if (option.dataZoom[0].endValue === xAxisList.length) { - option.dataZoom[0].endValue = 6; + option.dataZoom[0].endValue = 3; option.dataZoom[0].startValue = 0; } else { option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1; diff --git a/bns/js/compreDisplay/dutyHome/dutyHomeEcharts.js b/bns/js/compreDisplay/dutyHome/dutyHomeEcharts.js index 2ed0f14..a417fa6 100644 --- a/bns/js/compreDisplay/dutyHome/dutyHomeEcharts.js +++ b/bns/js/compreDisplay/dutyHome/dutyHomeEcharts.js @@ -681,7 +681,7 @@ function initEchartsByUser(nameList, dataList) { borderColor: "rgba(255,255,255, .5)", }, grid: { - left: "2%", + left: "1%", right: "0%", bottom: "3%", top: "8%", @@ -700,7 +700,7 @@ function initEchartsByUser(nameList, dataList) { color: "#fff", //字体颜色 fontFamily: "Alibaba PuHuiTi R", }, - right: "3%", //距离右侧 + // right: "3%", //距离右侧 }, dataZoom: [ { @@ -709,7 +709,7 @@ function initEchartsByUser(nameList, dataList) { moveOnMouseMove: true, moveOnMouseWheel: true, startValue: 0, - endValue: 6, + endValue: 3, }, ], xAxis: [ @@ -719,7 +719,7 @@ function initEchartsByUser(nameList, dataList) { interval: 0, // 解决x轴名称过长问题 textStyle: { color: "#fff", - fontSize: 16, + fontSize: 13, fontFamily: "Alibaba PuHuiTi R", }, }, @@ -825,7 +825,7 @@ function initEchartsByUser(nameList, dataList) { //自动滚动 timeOut3 = setInterval(() => { if (option.dataZoom[0].endValue === xAxisList.length) { - option.dataZoom[0].endValue = 6; + option.dataZoom[0].endValue = 3; option.dataZoom[0].startValue = 0; } else { option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1;