diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js index 7539cf74..16398847 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/scripts/charts-analyov.js @@ -508,7 +508,7 @@ function chartRegType() { { name: '检查类别数量及占比', type: 'pie', - radius: ['35%', '60%'], + radius: ['42%', '60%'], avoidLabelOverlap: false, itemStyle: { borderRadius: 0, @@ -555,7 +555,7 @@ function chartEnterpriseType() { { name: '被检查企业类别数量及占比', type: 'pie', - radius: ['35%', '60%'], + radius: ['42%', '60%'], avoidLabelOverlap: false, itemStyle: { borderRadius: 0, @@ -603,7 +603,7 @@ function chartComplaintType() { { name: '投诉类别数量及占比', type: 'pie', - radius: ['35%', '60%'], + radius: ['42%', '60%'], avoidLabelOverlap: false, itemStyle: { borderRadius: 0, @@ -648,7 +648,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -678,7 +678,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], @@ -747,7 +752,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -777,7 +782,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], @@ -846,7 +856,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -876,7 +886,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], @@ -948,7 +963,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -979,7 +994,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], @@ -1051,7 +1071,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -1082,7 +1102,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], @@ -1156,7 +1181,7 @@ function chartComplaintType() { }, grid: { - left: '0', + left: '5%', right: '0', bottom: '5%', top: '15%', @@ -1187,7 +1212,12 @@ function chartComplaintType() { textStyle: { color: '#999', fontSize: 12, - } + }, + formatter: function (value) { + // 设定一个最大长度,例如10个字符 + const maxLength = 6; + return value.length > maxLength ? value.slice(0, maxLength) + '...' : value; + } }, } ], diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/styles/home.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/styles/home.css index fe7c6d09..a1648b64 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/styles/home.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical/styles/home.css @@ -143,7 +143,7 @@ html, body { .link_btn { float: right; margin: 0.45% 5% 2%; - min-width: 26.5rem; + min-width: 31rem; height: 2rem; font-size: 1.2rem; line-height: 2; @@ -151,8 +151,8 @@ html, body { } .link_btn a { position: relative; - margin: 3% 5%; - padding-left: 2.25rem; + margin: 3% 3%; + padding-left: 2rem; opacity: .8; } .link_btn a:hover { @@ -165,11 +165,11 @@ html, body { content: ""; width: 1.75rem; height: 1.75rem; - background: url(../images/icon_dist50.png) no-repeat; + background: url(../images/icon_dept50.png) no-repeat; background-size: 100% auto; } .link_btn a:last-child::before { - background: url(../images/icon_dept50.png) no-repeat; + background: url(../images/icon_dist50.png) no-repeat; background-size: 100% auto; } .link_btn a::after { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html index a8967317..ee8e5245 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html @@ -135,15 +135,16 @@
深圳市 -
@@ -910,9 +911,9 @@ function chart_2(data) { name:'行政检查类别数量及占比', type:'pie', color: ['#4b7efe', '#0566e8', '#02a7a1', '#febf75','#dd5a73','#224ca8',"#9fe9b7","#26cee1",], - radius : [35, 100], + radius : [60, 80], center : ['50%', '50%'], - roseType : 'area', + //roseType : 'area', label: { show: true, formatter: "{b|{b}} " + "{b|:}" + "\n " + "{a|{c}}" + "\n " + "{d|({d}%)}", @@ -938,8 +939,8 @@ function chart_2(data) { labelLine: { normal: { show: true, - length: 5, - length2: 2, + length: 18, + length2: 10, smooth: 0 }, emphasis: {