From 28ff7b118403091f8dbebe76972234f018abd659 Mon Sep 17 00:00:00 2001 From: meizf <48540969@qq.com> Date: Wed, 26 Nov 2025 15:12:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=BB=BC=E5=90=88=E5=88=86=E6=9E=90=E5=92=8C?= =?UTF-8?q?=E8=A1=8C=E6=94=BF=E6=89=A7=E6=B3=95=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=202.?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=9B=BE=E6=A0=87=E5=8F=8A=E5=85=B6=E5=AE=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/css/newsty.css | 3 +- .../resources/static/img/icon_top_home.png | Bin 0 -> 2633 bytes .../statistical-new/scripts/charts-rank.js | 218 ++++++++++++++++-- .../statistical-new/styles/analysis.css | 4 +- .../code/complaintStatic/complaintStatic.html | 2 +- .../code/registration/registerView.html | 13 +- .../code/registration/registration.html | 18 ++ .../code/statistical-new/city-direct.html | 72 +++--- .../code/statistical-new/district-direct.html | 72 +++--- .../statisticsEnterprise.html | 22 +- 10 files changed, 324 insertions(+), 100 deletions(-) create mode 100644 lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/img/icon_top_home.png 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 0000000000000000000000000000000000000000..d133ff3c95f54bbd2c4298f44d2d7d4c2eba624a GIT binary patch literal 2633 zcmaJ@X;f3^77Yetgg~KCAfhz}1)`9VDS-$f14ID>Mn$A0BamVSl8a0aNRUJjC^!OA zl?s9=4pdhiP?`_{#Z!72@EEvO(+)YgjR1*`V`@b#{B*Zt17_C9Byea??t!itHo zvsqvR0)gz9k+e9=*K_uTLO>uZ6X{NnC4d9;cwntG8OY?yg&>MR$`c}(Vs45sPRJEx zr(YF@fIwhR5j!4;kB%borD8O97K6?b%PedVC?qsX#^t980R&H&B9f4i<84165h4K@ zxxqgg8!e*>Q$>+Ea^c#X7&bpAjZYLHLsud~vPhN$Vj;jqWQjLR6r?ON@@-y{3j_5DO&$lSW2b zZqNdefP|yd>ER4KkxB_-;BX8q1&bpP>3AxU#-P!N;X&`YOo;;EO8CO}T+u(=pnv6( zsB$3}kjmLo>E`#-W2H&~sUlS>Lr|%+(;_0gH;5zxX{G`-YwtU?Lb+&*P{5E&#fZ25 zkVGHR5J(Lt1O`xufpmi3tp0HSKn9IM#0TPo`~#>#c;q{-;3K`i<5K=F7h@5FnH}!` z4Ez0+WrJpqA6C~Ad{};=#Io^n%WCglHuDPz1Ub*7QP^2O^QO(_P%w#O1g z!2UHU!{Q6At>!?F(FZ^SRblgFR%4~A`7_gct^e?Zd1n6xrKgqdHIbzbqqlO*Ryu>; z+-9EU4uM-$_JTj(xC)kecsOmJG{8nT+Lsx_7S3Zox7rK^mq@Ikh(peJ$FaNmVO8uE zEe8syQI*$b#uw{<)uO`OtKqsY!L`p1?pWe_RH@pkzCYO42D@t}sPazO1kQJ6W9#o` zPA7FhU=S%8qB-trHt_`Ewl)DSnsLP3E1;29-Z^AlaK0($DhJjOd&ykU>dO7Jx4ef3 z%e1-YHnq?QcbWN9?GUj>F4J~)P3RB*VU{ph15QrWAS)Vh%VE(-uK*I&ANG?Oi=7r) z-RaPRVPmvPlWK`=56LuRH8z;NN5$=$G1mow8iN?AIed=Ni@F;j;6mpzc4K?f%tMnp zXv{T(7Mf?@5D02@aF_y5=Cz=~UF?;;JI7B|D@#t}ant*hj zJ|WdNeDmn&+yWKqX7O?L5C*$1-WD~b5}k>3Zeh!>4w7n1&l3*Xh!W#prk^zo<^~g_ z-8PN9GJXrk^!4C^o8L7Eit?greSo5MS)6YUU#xqrDqpK&CSAK4jEGy6*W9;WpC7#2 z%k{y9j_jF!zp6ifJtc+s^?(2Qqj>ix3+^pE>s$nf57rLEJ*hYe9jvOXnCoZ=?Mv~G z;4k(xIXuHpIr*%|D(_?yfO`<=m?;@(0 zoPhQ-{(=xSXXFH4zjvp(zG3YNUfz)|-`H254NSSOFQA-!w1X4Xd2t1=t*zz-d;?V% znYa~G)>8_t-7D7ggr%?OzI01QN+Ex)SC^giu%|tsabm{bpbMHp9Ll^#u02ZE8lO7D z%j=8q`%%UF<#w%&3iAa(q5Z8!z2?i$=Ah52MKg8Vy@tA9uV*t)?`1UGBz>>+&aN6= zCI%C6eHXUHgUdhp&YiMDk!*9e$0&?HiZJvip7qG8!*$Y)=d0SC$?u z?CsTwr&?+kGqRnJztotb*LgI4k9YB&1Z|WSxj7p{hXO`zSNSbKS9O2Mql9)gUW`~e z!CZ6Srn8V$QjPuA)Y{mz^KjWNazxgGpHx{#%8ien-FS2AM9iht_YGYxycieqU9?Yg z{H@<#**)D9_B%nFwrucK*|J5xNwOc~@JCAbl_-RVk9rhy0Y+u^`J&YinTbv9n4`#N z$Q?Z}to^PaO|EKw9R2zW5k}YGGod55YLQF($;vt}7dDcOGJdsDIdr>w zDEVB6yN;6Tjy}f=9M>I4WS2zQZ!^g5UO|jKuT%}16dc|>c=aDS@ZsUx*v+-Mn&U8V zZm)s8ejN3vDghV#>agEm2X7opJM?n;(`Fu3^YbxX^vdaWqt@BTYJZB*{Pp$Fcg677 zd0rv3HH!nI#+;^ar99qqFlL1z-zT7e;A7}&5bNuc(|xK@k5Q#9g zc5|@zFofUL|7u+Zkm5RcC~avy(vW88Tv-3ZCh>@2c>?Mj%VVKt|CWg@e5cb#V~|VJ zTi-wj+c~4fy*;}1*r%4MTJc|vv_`zp06d9~?4lkt-NA&;ue!>QwSFZ=F%I`z4kpeB=0wc?+%f4fv=iZ+!v6x7 CI$6H} literal 0 HcmV?d00001 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天

    +

    家

    +

    次

    +
    • +
+
-
+
当筛选起止日期为同年同月时有统计
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index 7f7e6a20..6acc7ff9 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -788,6 +788,12 @@ ] ) }}, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, } ] }; @@ -904,6 +910,12 @@ ) } }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, } ] }; @@ -1020,6 +1032,12 @@ ) } }, + label: { + normal: { + show: true, //是否显示标签 + position: 'outside', //标签的位置。 + } + }, } ] }; diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/city-direct.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/city-direct.html index 441df771..c6caf573 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/city-direct.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/city-direct.html @@ -32,67 +32,67 @@
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
联合执法数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
被执法企业数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
入企压减率
-
- + -
- + -
@@ -103,38 +103,38 @@
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
企业数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
@@ -289,11 +289,11 @@
投诉总量-
- - -%
+ + -%
- - -%
+ + -%
已办结--%
未办结--%
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html index f5cd17d6..b3c091a7 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical-new/district-direct.html @@ -50,67 +50,67 @@
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
联合执法数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
被执法企业数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
入企压减率
-
- + -
- + -
@@ -121,38 +121,38 @@
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
企业数量
-
- + -
- + -
- - -%
+ + -%
- - -%
+ + -%
@@ -167,11 +167,11 @@
投诉总量437
- - 1.13%
+ + 1.13%
- - 1.13%
+ + 1.13%
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html index 49751f5c..59cccf73 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html @@ -409,9 +409,10 @@ name: '名称', /*radius: ['28%', '36%'], center: ['50%', '30%'],*/ - radius: '70%', + radius: '50%', label: { - formatter: '{b}: {c} ({d}%)', + //formatter: '{b}: {c} ({d}%)', + formatter: "{b|{b}}" + "{b|:}" + " {a|{c}}" + "{d| ({d}%)}", borderWidth: 1, borderRadius: 4, color: '#4F4F4F', @@ -419,9 +420,20 @@ fontSize: '14', rich: { a: { - color: '#4F4F4F', - lineHeight: 18, - align: 'center' + color: 'rgba(0, 0, 0, .6)', + fontSize: 14, + //fontWeight: 550, + lineHeight: 16 + }, + b: { + color: 'rgba(0, 0, 0, .85)', + fontSize: 12, + lineHeight: 16 + }, + d: { + color: 'rgba(0, 0, 0, .6)', + fontSize: 14, + //lineHeight: 20 } } },