From 24484ff3f8cbaf27134948eaaa65b7de98d53728 Mon Sep 17 00:00:00 2001
From: chenrui <1950717904@qq.com>
Date: Tue, 5 Nov 2024 18:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=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/stat1.css   |  59 +++++++++-
 .../code/complaintStatic/complaintStatic.html | 105 +++++++++++++++---
 .../code/registration/registration.html       |   2 -
 .../code/registration/staticRegistration.html |  66 +----------
 .../statisticsEnterprise.html                 | 101 ++++++++++++++---
 .../statisticsWarning/statisticsWarning.html  |   2 +-
 6 files changed, 235 insertions(+), 100 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
index e51c85a8..645880af 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/static/css/stat1.css
@@ -213,7 +213,7 @@ body {
     height: 45%;
 }
 
-.chart-box h3 {
+.chart-title {
     position: relative;
     color: #333;
     font-size: 1.5rem;
@@ -240,7 +240,7 @@ body {
     padding-left: 20px;
 }
 
-.static-content li label:before, .chart-box h3::before {
+.static-content li label:before, .chart-title::before {
     position: absolute;
     top: 20%;
     left: -5px;
@@ -251,7 +251,7 @@ body {
     font-family: 'FontAwesome';
 }
 
-.chart-box h3::before {
+.chart-title::before {
     top: 25%;
     left: -25px;
 }
@@ -273,6 +273,59 @@ h1.page-title {
     color: #4c4c4c;
 }
 
+.detail-list {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    z-index: 999;
+    transform: translate(-50%, -50%);
+    padding: 2%;
+    width: 40%;
+    min-height: 25%;
+    background-color: #fff;
+    border-radius: 5px;
+    box-shadow: 0 0 10px #ddd;
+}
+
+.detail-list table {
+    border-collapse: separate;
+    border-top: 1px solid #dfe6ec;
+    border-left: 1px solid #dfe6ec;
+    width: 100%
+}
+
+.detail-list thead tr th {
+    background-color: #f8f8f9;
+    padding: 6px;
+    text-align: center;
+    border-bottom: 1px solid #dfe6ec;
+    border-right: 1px solid #dfe6ec;
+}
+
+.detail-list tbody tr td {
+    padding: 6px;
+    text-align: center;
+    height: 34px;
+    border-bottom: 1px solid #dfe6ec;
+    border-right: 1px solid #dfe6ec;
+}
+
+.detail-close {
+    position: absolute;
+    top: -5%;
+    right: -1%;
+    width: 30px;
+    height: 30px;
+    background-color: #fff;
+    color: #999;
+    cursor: pointer;
+    font-size: 24px;
+    font-family: sans-serif;
+    border-radius: 50%;
+    box-shadow: 0 0 5px #999;
+    text-align: center;
+    line-height: 25px;
+}
 
 
 /** 滚动条样式 **/
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 95c6a477..18f17998 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
@@ -6,8 +6,21 @@
     <th:block th:include="include :: header('执法投诉统计')"/>
     <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
     <style>
+        .row {
+            width: 100%;
+            height: 100%;
+        }
+
+        .search-collapse {
+            position: relative;
+            width: 100%;
+            height: 100%;
+        }
+
         .tab-content {
             display: none;
+            width: 100%;
+            height: calc(100% - 50px);
         }
 
         .tab-content.active {
@@ -17,13 +30,19 @@
         .cont-two {
             display: flex;
             justify-content: space-around;
-            width: 90%;
+            width: 100%;
+            height: 90%;
         }
 
-        .cont-two .bootstrap-table {
-            margin-left: -1.5%;
+        /*.cont-two .bootstrap-table {
+            margin-left: -0.5%;
+        }*/
+
+        .cont-two .chart-box {
+            margin: 0 0 0 10%;
         }
 
+
     </style>
 </head>
 <body>
@@ -87,15 +106,7 @@
                                 <a class="btn btn-success btn-sm" onclick="searchComplaint1()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-reset btn-sm" onclick="complaintRest(1)"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                                 <a class="btn btn-warning btn-sm" onclick="complaintDownload1()"><i class="fa fa-share-square-o"></i> 导出</a>
-                                <a id="closeButton" onclick="closeC()">关闭</a>
                             </li>
-                            <!--<ul>
-                                <li id="complaintA" th:fragment="complaintA">
-                                    <p th:text="|${year}年|"></p>
-                                    <p th:text="|投诉数量  ${Number1}|"></p>
-                                    <p th:text="|投诉对象  ${Number2}|"></p>
-                                </li>
-                            </ul>-->
                         </ul>
                         <div class="static-content">
                             <ul>
@@ -110,7 +121,8 @@
                     </div>
                 </form>
                 <div class="col-sm-12 select-table table-bordered">
-                    <div id="detail" style="width: 500px; margin-left: 528px;margin-top: 111px;position: absolute;">
+                    <div id="detail" class="detail-list">
+                        <span id="closeButton" class="detail-close" onclick="closeC()">×</span>
                         <table id="bootstrap-table"></table>
                     </div>
                     <table id="bootstrap-table1"></table>
@@ -182,7 +194,11 @@
                 </form>
                 <div class="cont-two">
                     <table id="bootstrap-table2" style="width: 750px;"></table>
-                    <div id="container" style="width: 600px;height:450px;"></div>
+                    <!--<div id="container" style="width: 600px;height:450px;"></div>-->
+                    <div class="chart-box">
+                        <h3 class="chart-title">投诉类型数量及占比</h3>
+                        <div id="echartComplaint" style="width: 600px;height:600px;"></div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -193,7 +209,7 @@
     <script th:inline="javascript">
         var prefix = ctx + "code/complaintStatic";
         var caseType=[[${@dict.getType('caseType')}]];
-        var myChart = echarts.init(document.getElementById('container'));
+        /*var myChart = echarts.init(document.getElementById('container'));*/
         var pieData;
         var deptName;
         window.onload = function () {
@@ -385,7 +401,7 @@
                 }
             })
         }
-        function rTable(name,n){
+        /*function rTable(name,n){
             var currentId=$('form').eq(n-1).attr('id')
             var params = $.common.formToJSON(currentId);
             $.ajax({
@@ -427,7 +443,7 @@
                     console.error("请求失败：",status,error);
                 }
             })
-        }
+        }*/
         function timeType1() {
             var dateSearch = document.getElementById("dateSearch");
             console.log(dateSearch.value)
@@ -521,6 +537,63 @@
                 }
             })
         }
+
+        /*******echarts:投诉类型/占比*********/
+
+        const ecsh = echarts.init(document.getElementById("echartComplaint"));
+        const optionsh = {
+            tooltip: {
+                trigger: 'item',
+                formatter: '{b}: {c} ({d}%)'
+            },
+            /*legend: {
+                x : 'left',
+                y : 'center',
+                itemGap: 20,
+                orient: 'vercital'
+            },*/
+            color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'],
+            series: [{
+                top: '10%',
+                left: '20%',
+                type: 'pie',
+                name: '名称',
+                radius: ['20%', '28%'],
+                center: ['50%', '25%'],
+                label: {
+                    formatter: '{b}: {c} ({d}%)',
+                    borderWidth: 1,
+                    borderRadius: 4,
+                    color: '#4F4F4F',
+                    fontFamily: 'PingFangSC-Regular',
+                    fontSize: '14',
+                    rich: {
+                        a: {
+                            color: '#4F4F4F',
+                            lineHeight: 18,
+                            align: 'center'
+                        }
+                    }
+                },
+                data: [
+                    {value: 18, name: '违法执法'},
+                    {value: 28, name: '违规执法'},
+                    {value: 22, name: '执法不文明'},
+                    {value: 12, name: '选择性执法'},
+                    {value: 10, name: '其他'},
+                    {value: 10, name: '入企不扫码'},
+                ],
+            }]
+        };
+        ecsh.clear();
+        ecsh.setOption(optionsh);
+
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+        window.addEventListener("resize",function(){
+            myChart.resize();
+        });
+
     </script>
 </body>
 </html>
\ No newline at end of file
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 7e8d06cd..5e0a12df 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
@@ -4,7 +4,6 @@
     <th:block th:include="include :: header('企业端-执法部门预约记录列表')" />
     <link type="text/css" href="/css/stat1.css" rel="stylesheet"/>
     <style>
-
         .row {
             width: 100%;
             height: 100%;
@@ -16,7 +15,6 @@
             height: 100%;
         }
 
-
     </style>
 </head>
 <body class="gray-bg">
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
index 3dcf0b33..7a5e4a8d 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/staticRegistration.html
@@ -3,63 +3,7 @@
 <head>
     <th:block th:include="zdxtInclude :: header('执法分析')" />
     <th:block th:include="zdxtInclude :: datetimepicker-css" />
-    <style type="text/css">
-        #showDetail{
-            position: absolute;
-            top: 27%;
-            left: 30%;
-            padding: 2%;
-            width: 40%;
-            min-height: 25%;
-            background-color: #fff;
-            border-radius: 5px;
-            box-shadow: 0 0 10px #ddd;
-        }
-        #showDetail table {
-            border-collapse: separate;
-            border-top: 1px solid #dfe6ec;
-            border-left: 1px solid #dfe6ec;
-            width: 100%
-        }
-        #showDetail thead tr th {
-            background-color: #f8f8f9;
-            padding: 6px;
-            text-align: center;
-            border-bottom: 1px solid #dfe6ec;
-            border-right: 1px solid #dfe6ec;
-        }
-        #showDetail tbody tr td {
-            padding: 6px;
-            text-align: center;
-            height: 34px;
-            border-bottom: 1px solid #dfe6ec;
-            border-right: 1px solid #dfe6ec;
-        }
-        #showDetail tbody tr td {
-            padding: 6px;
-            text-align: center;
-            height: 34px;
-            border-bottom: 1px solid #dfe6ec;
-            border-right: 1px solid #dfe6ec;
-        }
-        #detail-close{
-            position: absolute;
-            top: -5%;
-            right: -1%;
-            width: 30px;
-            height: 30px;
-            background-color: #fff;
-            color: #999;
-            cursor: pointer;
-            font-size: 24px;
-            font-family: sans-serif;
-            border-radius: 50%;
-            box-shadow: 0 0 5px #999;
-            text-align: center;
-            line-height: 25px;
-        }
-
-    </style>
+    <link type="text/css" href="/css/stat1.css" rel="stylesheet" />
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -125,12 +69,6 @@
                                     <option value="12">12月</option>
                                 </select>
                             </li>
-                            <!--<li class="select-time" id="custom">
-                                <p>自定义时间：</p>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
-                                <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
-                            </li>-->
                             <li id="select-time" class="select-time">
                                 <p>自定义时间：</p>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="beginTime"/>
@@ -153,7 +91,7 @@
             </div>
 
             <div id="showDetail" class="detail-list">
-                <span id="detail-close" onclick="closeDetail()">×</span>
+                <span class="detail-close" onclick="closeDetail()">×</span>
                 <table>
                     <thead>
                         <tr>
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 1c39fc53..bc177838 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
@@ -6,8 +6,21 @@
     <th:block th:include="include :: header('企业统计')" />
     <link type="text/css" href="/css/stat1.css" rel="stylesheet" />
     <style>
+        .row {
+            width: 100%;
+            height: 100%;
+        }
+
+        .search-collapse {
+            position: relative;
+            width: 100%;
+            height: 100%;
+        }
+
         .tab-content {
             display: none;
+            width: 100%;
+            height: calc(100% - 50px);
         }
 
         .tab-content.active {
@@ -17,13 +30,19 @@
         .cont-two {
             display: flex;
             justify-content: space-around;
-            width: 90%;
+            width: 100%;
+            height: 90%;
         }
 
-        .cont-two .bootstrap-table {
-            margin-left: -1.5%;
+        /*.cont-two .bootstrap-table {
+            margin-left: -0.5%;
+        }*/
+
+        .cont-two .chart-box {
+            margin: 0 0 0 10%;
         }
 
+
     </style>
 </head>
 <body>
@@ -49,12 +68,6 @@
                                 <option th:fragment="jd" th:each="j:${jdList}" th:text="${j.dictLabel}" th:value="${j.dictValue}"></option>
                             </select>
                         </li>
-                        <!--<li id="fragmentE" th:fragment="fragmentE">
-                            <p th:text="全市"></p>
-                            <p th:text="|企业数量 ${number}|"></p>
-                            <p th:text="|续存企业数量 ${exist}|"></p>
-                            <p th:text="|注销企业数量 ${logout}|"></p>
-                        </li>-->
                         <li>
                             <a class="btn btn-success btn-sm" onclick="searchE()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="restE()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -147,7 +160,11 @@
                 </form>
                 <div class="cont-two">
                     <table id="bootstrap-table2" style="width: 750px;"></table>
-                    <div id="container" style="width: 600px;height:450px;"></div>
+                    <!--<div id="container" style="width: 600px;height:450px;"></div>-->
+                    <div class="chart-box">
+                        <h3 class="chart-title">企业类型数量及占比</h3>
+                        <div id="echartEnterprise" style="width: 600px;height:600px;"></div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -157,7 +174,7 @@
 <th:block th:include="zdxtInclude ::echarts-js"/>
 <script th:inline="javascript">
     var prefix = ctx + "code/statisticsEnterprise";
-    var myChart = echarts.init(document.getElementById('container'));
+    /*var myChart = echarts.init(document.getElementById('container'));*/
     window.onload = function () {
         $("#quarter2").hide();
         $("#month2").hide();
@@ -311,7 +328,7 @@
             }
         })
     }
-    function eTable2(){
+    /*function eTable2(){
         var currentId=$('form').eq(1).attr('id')
         var params = $.common.formToJSON(currentId);
         $.ajax({
@@ -321,7 +338,7 @@
             success:function (response){
                 $('#bootstrap-table2').bootstrapTable('load', response);
                 var option3 = {
-                    /*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*/
+                    /!*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*!/
                     tooltip: {},
                     legend: {
                         data: ['企业类型统计']
@@ -347,7 +364,7 @@
                 console.error("请求失败：",status,error);
             }
         })
-    }
+    }*/
 
     function eSearch2 () {
         eTable2();
@@ -463,6 +480,62 @@
         eSearch2();
         timeType2();
     }
+
+    /*******echarts:企业类型/占比*********/
+
+    const ecsh = echarts.init(document.getElementById("echartEnterprise"));
+    const optionsh = {
+        tooltip: {
+            trigger: 'item',
+            formatter: '{b}: {c} ({d}%)'
+        },
+        /*legend: {
+            x : 'left',
+            y : 'center',
+            itemGap: 20,
+            orient: 'vercital'
+        },*/
+        color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'],
+        series: [{
+            top: '10%',
+            left: '20%',
+            type: 'pie',
+            name: '名称',
+            radius: ['20%', '28%'],
+            center: ['50%', '25%'],
+            label: {
+                formatter: '{b}: {c} ({d}%)',
+                borderWidth: 1,
+                borderRadius: 4,
+                color: '#4F4F4F',
+                fontFamily: 'PingFangSC-Regular',
+                fontSize: '14',
+                rich: {
+                    a: {
+                        color: '#4F4F4F',
+                        lineHeight: 18,
+                        align: 'center'
+                    }
+                }
+            },
+            data: [
+                {value: 498000, name: '有限责任公司'},
+                {value: 28000, name: '外商投资企业'},
+                {value: 132000, name: '港澳台投资企业'},
+                {value: 353000, name: '内资企业'},
+
+            ],
+        }]
+    };
+    ecsh.clear();
+    ecsh.setOption(optionsh);
+
+    // 使用刚指定的配置项和数据显示图表。
+    myChart.setOption(option);
+    window.addEventListener("resize",function(){
+        myChart.resize();
+    });
+
 </script>
 </body>
 </html>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html
index f6a82b22..b7e9bba7 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsWarning/statisticsWarning.html
@@ -58,7 +58,7 @@
                         <li>
                             <a class="btn btn-success btn-sm" onclick="searchW()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-reset btn-sm" onclick="restW()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-download"></i>导出</a>
+                            <a class="btn btn-warning btn-sm" onclick="download1()"><i class="fa fa-share-square-o"></i> 导出</a>
                         </li>
                     </ul>
                     <div class="static-content">