diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css index 594e7154..14024d1b 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat.css @@ -96,7 +96,7 @@ body { display: none; position: relative; margin: 2.0rem 0 0; - height: calc(100% - 9rem); + height: calc(100% - 15rem); clear: both; } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js index 99bab9f8..dfc537f0 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/js/charts-analy.js @@ -65,7 +65,7 @@ var echartUtil = { }; var _this = this; var myChartLine = echarts.init(document.getElementById(targetId)); - var myColor = ['#3C83FF'] + var myColor = ['#3C83FF']; var option = { grid: { //直角坐标系内绘图网格 top: '10%', @@ -112,7 +112,7 @@ var echartUtil = { var traceValue; for (var i = 0; i < dataAll.dataX.length; i++) { if (data === dataAll.dataX[i]) { - traceValue = dataAll.dataY[i] + traceValue = dataAll.dataY[i]; break } } @@ -120,7 +120,7 @@ var echartUtil = { '{a|' + data + '}', '{b|' + traceValue + '}', '{c|件}' - ] + ]; return arr.join('') }, textStyle: { @@ -194,14 +194,14 @@ var echartUtil = { var traceValue; for (var i = 0; i < dataAll.dataX.length; i++) { if (data.name === dataAll.dataX[i]) { - traceValue = dataAll.dataPercent[i] + traceValue = dataAll.dataPercent[i]; break } } var arr = [ '{a|' + traceValue + '}', '{b|%}' - ] + ]; return arr.join(''); }, textStyle: { @@ -239,8 +239,11 @@ var echartUtil = { ] }; myChartLine.setOption(option, true); + window.addEventListener("resize", function () { + myChartLine.resize(); + }); } -} +}; /*******1.检查类别***********/ // var dataX = ['生态环境检查', '卫生健康检查', '商务领域检查', '财务领域检查', '水务领域检查'] diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html index d042ba27..31b209ae 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/analysis/analysis.html @@ -26,6 +26,9 @@ 年度