diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css index 630aaf0a..2380f29a 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/newsty.css @@ -83,7 +83,8 @@ body { font-size: 16px; }*/ .nav_home { - background: url(../img/icon_top_fx.png); + /*background: url(../img/icon_top_fx.png);*/ + background: url(../img/icon_top_home.png); } .nav_yjzs { diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icon_top_home.png b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icon_top_home.png new file mode 100644 index 00000000..d133ff3c Binary files /dev/null and b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icon_top_home.png differ diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/scripts/charts-rank.js b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/scripts/charts-rank.js index f62d6460..50498db7 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/scripts/charts-rank.js +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/scripts/charts-rank.js @@ -91,7 +91,13 @@ function rankCommpany(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -195,7 +201,13 @@ function rankInspect(data) { color: '#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -299,7 +311,13 @@ function rankComplaint(data) { color: '#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -329,7 +347,7 @@ function rankPieAuto(data) { }, series: [ { - name: '执法类别数量及占比', + name: '委托执法数量及占比', type: 'pie', radius: ['42%', '60%'], avoidLabelOverlap: false, @@ -348,6 +366,28 @@ function rankPieAuto(data) { alignTo:'labelLine' }, }, + label: { + show: true, + formatter: "{b|{b}}" + "{b|:}" + " {a|{c}}" + "{d| ({d}%)}", + rich: { + a: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //fontWeight: 550, + lineHeight: 14 + }, + b: { + color: 'rgba(0, 0, 0, .85)', + fontSize: 12, + lineHeight: 16 + }, + d: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //lineHeight: 20 + } + } + }, labelLine: { normal: { show: true, @@ -468,7 +508,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -576,7 +622,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -682,7 +734,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -787,7 +845,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -893,7 +957,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -1001,7 +1071,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -1112,7 +1188,13 @@ function rankPieAuto(data) { color:'#7ca9fb', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, @@ -1400,7 +1482,13 @@ function rankPieAuto(data) { color:'#7baaf4', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, { name:'联合执法', @@ -1414,7 +1502,13 @@ function rankPieAuto(data) { color:'#82dfe6', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, { name:'被执法企业', @@ -1428,7 +1522,13 @@ function rankPieAuto(data) { color:'#a39ddf', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, { name:'入企压减率', @@ -1438,7 +1538,13 @@ function rankPieAuto(data) { color:'#75c99f', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, { name:'涉企投诉', @@ -1452,7 +1558,13 @@ function rankPieAuto(data) { color:'#fc9797', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, }, { name:'企业数量', @@ -1466,7 +1578,13 @@ function rankPieAuto(data) { color:'#a3d7f8', itemStyle: { borderRadius: [10, 10, 0, 0] - } + }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, } ] }; @@ -1514,6 +1632,28 @@ function rankPieAuto(data) { alignTo:'labelLine' }, }, + label: { + show: true, + formatter: "{b|{b}}" + "{b|:}" + " {a|{c}}" + "{d| ({d}%)}", + rich: { + a: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //fontWeight: 550, + lineHeight: 14 + }, + b: { + color: 'rgba(0, 0, 0, .85)', + fontSize: 12, + lineHeight: 16 + }, + d: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //lineHeight: 20 + } + } + }, labelLine: { normal: { show: true, @@ -1589,6 +1729,28 @@ function rankPieAuto(data) { alignTo:'labelLine' }, }, + label: { + show: true, + formatter: "{b|{b}}" + "{b|:}" + " {a|{c}}" + "{d| ({d}%)}", + rich: { + a: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //fontWeight: 550, + lineHeight: 14 + }, + b: { + color: 'rgba(0, 0, 0, .85)', + fontSize: 12, + lineHeight: 16 + }, + d: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //lineHeight: 20 + } + } + }, labelLine: { normal: { show: true, @@ -1664,6 +1826,28 @@ function rankPieAuto(data) { alignTo:'labelLine' }, }, + label: { + show: true, + formatter: "{b|{b}}" + "{b|:}" + " {a|{c}}" + "{d| ({d}%)}", + rich: { + a: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //fontWeight: 550, + lineHeight: 14 + }, + b: { + color: 'rgba(0, 0, 0, .85)', + fontSize: 12, + lineHeight: 16 + }, + d: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 12, + //lineHeight: 20 + } + } + }, labelLine: { normal: { show: true, diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/styles/analysis.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/styles/analysis.css index 92a52b15..0135df09 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/styles/analysis.css +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/statistical-new/styles/analysis.css @@ -227,7 +227,7 @@ body { } .cont-total b { - margin-right: 1rem; + margin-right: 1.5rem; color: #ff8400; font-size: 2.5rem; font-weight: 500; @@ -259,7 +259,7 @@ body { } .percent-tag label { - margin: 0 2% 0 1%; + margin: 0 5% 0 1%; color: #999; font-size: 0.75rem; } diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html index ce791261..0f18a0ff 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html @@ -578,7 +578,7 @@ name: '名称', /*radius: ['28%', '36%'], center: ['50%', '30%'],*/ - radius:'65%', + radius:'50%', itemStyle:{ borderWidth:2, //设置border的宽度有多大 borderColor:'#fff', diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html index cb0b8eb0..a17930d7 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registerView.html @@ -34,12 +34,21 @@ +
近30天
+家
+次
+