From bd9fa757379d00b643ce0555a3c7760eee9e5dc4 Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Sun, 26 Nov 2023 15:52:20 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PopulationInfoBigdataRouteController.java |  18 +-
 src/main/resources/static/default.html        | 168 +++++++++++++++---
 2 files changed, 157 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoBigdataRouteController.java b/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoBigdataRouteController.java
index b09edae..3b6bb38 100644
--- a/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoBigdataRouteController.java
+++ b/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoBigdataRouteController.java
@@ -40,7 +40,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("nation")
-    public ModelAndView nation(@RequestParam String name) {
+    public ModelAndView nation(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "nation=" + name);
         return mv;
@@ -62,7 +62,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("jiedao")
-    public ModelAndView jiedao(@RequestParam String name) {
+    public ModelAndView jiedao(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "jiedao=" + name);
         return mv;
@@ -73,7 +73,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("sex")
-    public ModelAndView sex(@RequestParam String name) {
+    public ModelAndView sex(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "sex=" + name);
         return mv;
@@ -84,7 +84,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("organization")
-    public ModelAndView organization(@RequestParam String name) {
+    public ModelAndView organization(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "organization=" + organizationMap.get(name));
         return mv;
@@ -118,7 +118,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("religion")
-    public ModelAndView religion(@RequestParam String name) {
+    public ModelAndView religion(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "religion=" + name);
         return mv;
@@ -130,7 +130,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("xinfang")
-    public ModelAndView xinfang(@RequestParam String name) {
+    public ModelAndView xinfang(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "xinfang=" + name);
         return mv;
@@ -142,7 +142,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("baozhang")
-    public ModelAndView baozhang(@RequestParam String name) {
+    public ModelAndView baozhang(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "baozhang=" + name);
         return mv;
@@ -154,10 +154,10 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
      * @return
      */
     @GetMapping("teshu")
-    public ModelAndView teshu(@RequestParam String name) {
+    public ModelAndView teshu(String name) {
         ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
         mv.addObject("params", "teshu=" + name);
         return mv;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html
index 2ab024f..59efa66 100644
--- a/src/main/resources/static/default.html
+++ b/src/main/resources/static/default.html
@@ -10,7 +10,21 @@
     <link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"/>
     <link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all"/>
     <link rel="stylesheet" href="assets/home/css/index.css">
+    <style>
+        .person_sta ul li {
+            cursor: pointer;
+        }
 
+        .ratio div{
+            cursor: pointer;
+        }
+        .h51{
+            cursor: pointer;
+        }
+        .h52{
+            cursor: pointer;
+        }
+    </style>
 </head>
 <body>
 <!-- 父容器大盒子 -->
@@ -20,7 +34,7 @@
         <!--人口数量统计-->
         <div class="person_sta">
             <ul>
-                <li>
+                <li @click="personShow()">
                     <img src="assets/home/images/bj1.png" alt="" class="bj">
                     <img src="assets/home/images/bj11.png" alt="" class="dz">
                     <img src="assets/home/images/bj111.png" alt="" class="dzstb">
@@ -30,7 +44,7 @@
                         <i>人</i>
                     </span>
                 </li>
-                <li>
+                <li @click="jieDaoRenKouShow('稀土路街道')">
                     <img src="assets/home/images/bj2.png" alt="" class="bj">
                     <img src="assets/home/images/bj22.png" alt="" class="dz">
                     <img src="assets/home/images/bj222.png" alt="" class="dzstb">
@@ -40,7 +54,7 @@
                         <i>人</i>
                     </span>
                 </li>
-                <li>
+                <li @click="jieDaoRenKouShow('民馨路街道')">
                     <img src="assets/home/images/bj3.png" alt="" class="bj">
                     <img src="assets/home/images/bj33.png" alt="" class="dz">
                     <img src="assets/home/images/bj333.png" alt="" class="dzstb">
@@ -50,13 +64,13 @@
                             <i>人</i>
                         </span>
                 </li>
-                <li>
+                <li @click="jieDaoRenKouShow('万水泉镇')">
                     <img src="assets/home/images/bj4.png" alt="" class="bj">
                     <img src="assets/home/images/bj44.png" alt="" class="dz">
                     <img src="assets/home/images/bj444.png" alt="" class="dzstb">
                     <h5>万水泉镇</h5>
                     <span>
-                        <em>{{ wanShuiQuanpersonCount }}</em>
+                        <em >{{ wanShuiQuanpersonCount }}</em>
                         <i>人</i>
                     </span>
                 </li>
@@ -120,7 +134,7 @@
                 <em class="em_man">——{{ genderMaPercentage }}%</em>
                 <em class="em_woman">—{{ genderWomanPercentage }}%</em>
                 <div class="ratio">
-                    <div class="manbox" style="background-image: url('assets/home/images/manryzb.png');background-size: cover;">
+                    <div class="manbox" style="background-image: url('assets/home/images/manryzb.png');background-size: cover;" @click="xingBieRenYuanShow('男')">
                         <p class="man_p">{{ genderMaNum }}</p>
                         <h5>男性人数(人)</h5>
                         <span>
@@ -131,7 +145,7 @@
                             <div class="progress1"></div>
                         </div>
                     </div>
-                    <div class="womanbox" style="background-image: url('assets/home/images/womanryzb.png');background-size: cover;">
+                    <div class="womanbox" style="background-image: url('assets/home/images/womanryzb.png');background-size: cover;" @click="xingBieRenYuanShow('女')">
                         <p class="woman_p">{{ genderWomanNum }}</p>
                         <h5>女性人数(人)</h5>
                         <span>
@@ -165,8 +179,8 @@
             <div class="special_bottom">
                 <img src="assets/home/images/r_33_1.png" alt="" class="r_33_1">
                 <img src="assets/home/images/r_33_2.png" alt="" class="r_33_2">
-                <h5 class="h51">{{ correctCount }}人</h5>
-                <h5 class="h52">{{ releaseCount }}人</h5>
+                <h5 class="h51" @click="teShuRenYuanShow('社区矫正')">{{ correctCount }}人</h5>
+                <h5 class="h52" @click="teShuRenYuanShow('刑满释放')">{{ releaseCount }}人</h5>
                 <em class="em1">社区矫正对象</em>
                 <em class="em2">刑满释放人员</em>
             </div>
@@ -353,17 +367,21 @@
                             }
                         ]
                     };
+                    var myChart = echarts.init(document.getElementById('politicalStatusChart'));
                     $.ajax({
                         url: self.apiHost + "app/query/sqlrelease/qe41cc66",
                         type: 'GET',
                         dataType: 'JSON',
                         headers: self.headers,
                         success: function(data) {
-                            var myChart = echarts.init(document.getElementById('politicalStatusChart'))
-                            option.series[0]['data'] = data
+                            option.series[0]['data'] = data;
                             myChart.setOption(option);
                         }
-                    })
+                    });
+
+                    myChart.on('click', function(params) {
+                        self.zhengZhiMianMaoRenYuanShow(params.name);
+                    });
                 },
                 // 社会保障类人员情况
                 initProtectPerson: function(){
@@ -431,6 +449,7 @@
                             }
                         ]
                     };
+                    var myChart = echarts.init(document.getElementById('protectPersonChart'));
                     $.ajax({
                         url: self.apiHost + "app/query/sqlrelease/qe34cc66",
                         type: 'GET',
@@ -441,10 +460,12 @@
                                 option.xAxis[0]['data'].push(v.name);
                                 option.series[0]['data'].push(v.value);
                             });
-                            var myChart = echarts.init(document.getElementById('protectPersonChart'))
                             myChart.setOption(option);
                         }
-                    })
+                    });
+                    myChart.on('click', function(params) {
+                        self.sheHuiBaoZhangRenYuanShow(params.name)
+                    });
                 },
 
                 // 近一年信访管理类人员记录
@@ -504,7 +525,14 @@
                                 type: 'line',
                                 // stack: 'Total',
                                 smooth: true,
-                                data: []
+                                data: [],
+                                /*label: {
+                                    show: true,
+                                    formatter: function(params) {
+                                        // 在标签中显示数据值
+                                        return params.value + "131232";
+                                    }
+                                }*/
                             },
                             {
                                 name: "社会治安",
@@ -536,6 +564,7 @@
                             },
                         ]
                     };
+                    var myChart = echarts.init(document.getElementById('petitionRecordChart'));
                     $.ajax({
                         url: self.apiHost + "app/query/sqlrelease/q8d0f588",
                         type: 'GET',
@@ -550,10 +579,14 @@
                                 option.series[3]['data'].push(v['涉邪人员']);
                                 option.series[4]['data'].push(v['重点上访户']);
                             });
-                            var myChart = echarts.init(document.getElementById('petitionRecordChart'))
                             myChart.setOption(option);
                         }
-                    })
+                    });
+
+                    myChart.on('click', function(params) {
+                        self.xinFangRenYuanShow(params.seriesName)
+                    });
+
                 },
                 // 近半年特殊人员记录
                 initSpecialPersonData: function(){
@@ -622,6 +655,7 @@
                             }
                         ]
                     };
+                    var myChart = echarts.init(document.getElementById('specialPersonChart'))
                     $.ajax({
                         url: self.apiHost + "app/query/sqlrelease/q316ecca",
                         type: 'GET',
@@ -633,11 +667,105 @@
                                 option.series[0]['data'].push(v['sheQu']);
                                 option.series[1]['data'].push(v['xingMan']);
                             });
-                            var myChart = echarts.init(document.getElementById('specialPersonChart'))
                             myChart.setOption(option);
                         }
-                    })
-                }
+                    });
+                    myChart.on('click', function(params) {
+                        self.teShuRenYuanShow(params.seriesName)
+                    });
+
+                },
+                // 二级页面 - 人口总数
+                personShow: function(){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/total', []),
+                        title: '人口总数',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+                // 二级页面 - 街道人口
+                jieDaoRenKouShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/jiedao?name={name}', [data]),
+                        title: data + '人口',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+                // 二级页面 - 特殊人员
+                teShuRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/teshu?name={name}', [data]),
+                        title: data,
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+                // 二级页面 - 性别人员
+                xingBieRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/sex?name={name}', [data]),
+                        title: data + '性人员',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+
+                //二级页面 - 社会保障类人员
+                sheHuiBaoZhangRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/baozhang?name={name}', [data]),
+                        title: data + '人员',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+                //二级页面 - 政治面貌
+                zhengZhiMianMaoRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/organization?name={name}', [data]),
+                        title: data + '人员',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+                /*//二级页面 - 近半年特殊人员
+                banNianTeShuRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/organization?name={name}', [data]),
+                        title: data + '人员',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },*/
+
+                //二级页面 - 近一年信访人员记录
+                xinFangRenYuanShow: function(data){
+                    top.dialog.open({
+                        url: top.restAjax.path('route/populationinfo-data/xinfang?name={name}', [data]),
+                        title: data + '人员',
+                        width: '80%',
+                        height: '80%',
+                        onClose: function() {
+                        }
+                    });
+                },
+
 
 
 

From 3d56ca3113e81ef03ce2659a71d07db52c30f627 Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Sun, 26 Nov 2023 16:09:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/default.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html
index 59efa66..832bf73 100644
--- a/src/main/resources/static/default.html
+++ b/src/main/resources/static/default.html
@@ -134,7 +134,7 @@
                 <em class="em_man">——{{ genderMaPercentage }}%</em>
                 <em class="em_woman">—{{ genderWomanPercentage }}%</em>
                 <div class="ratio">
-                    <div class="manbox" style="background-image: url('assets/home/images/manryzb.png');background-size: cover;" @click="xingBieRenYuanShow('男')">
+                    <div class="manbox" style="background-image: url('assets/home/images/manryzb.png');background-size: cover;" @click="xingBieRenYuanShow('男性')">
                         <p class="man_p">{{ genderMaNum }}</p>
                         <h5>男性人数(人)</h5>
                         <span>
@@ -145,7 +145,7 @@
                             <div class="progress1"></div>
                         </div>
                     </div>
-                    <div class="womanbox" style="background-image: url('assets/home/images/womanryzb.png');background-size: cover;" @click="xingBieRenYuanShow('女')">
+                    <div class="womanbox" style="background-image: url('assets/home/images/womanryzb.png');background-size: cover;" @click="xingBieRenYuanShow('女性')">
                         <p class="woman_p">{{ genderWomanNum }}</p>
                         <h5>女性人数(人)</h5>
                         <span>
@@ -712,7 +712,7 @@
                 xingBieRenYuanShow: function(data){
                     top.dialog.open({
                         url: top.restAjax.path('route/populationinfo-data/sex?name={name}', [data]),
-                        title: data + '性人员',
+                        title: data + '人员',
                         width: '80%',
                         height: '80%',
                         onClose: function() {

From c872d01c3900ffbd8a012a24aec802bbb96462ff Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Sun, 26 Nov 2023 16:29:59 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/default.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html
index 832bf73..aafb5f3 100644
--- a/src/main/resources/static/default.html
+++ b/src/main/resources/static/default.html
@@ -640,14 +640,14 @@
                         color: ["#FF9313", "#48EDF5"],
                         series: [
                             {
-                                name: "社区矫正对象",
+                                name: "社区矫正",
                                 type: 'line',
                                 // stack: 'Total',
                                 smooth: true,
                                 data: []
                             },
                             {
-                                name: "刑满释放人员",
+                                name: "刑满释放",
                                 type: 'line',
                                 // stack: 'Total',
                                 smooth: true,

From 3efa22189ddcf531ce8888a2114bf0c35986028b Mon Sep 17 00:00:00 2001
From: LiuY <1622779752@qq.com>
Date: Sun, 26 Nov 2023 16:40:22 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/default.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/static/default.html b/src/main/resources/static/default.html
index aafb5f3..a8cf0b6 100644
--- a/src/main/resources/static/default.html
+++ b/src/main/resources/static/default.html
@@ -542,7 +542,7 @@
                                 data: []
                             },
                             {
-                                name: "涉毒人员",
+                                name: "吸毒人员",
                                 type: 'line',
                                 // stack: 'Total',
                                 smooth: true,
@@ -556,7 +556,7 @@
                                 data: []
                             },
                             {
-                                name: "重点上访户",
+                                name: "重点上访",
                                 type: 'line',
                                 // stack: 'Total',
                                 smooth: true,
@@ -756,9 +756,10 @@
 
                 //二级页面 - 近一年信访人员记录
                 xinFangRenYuanShow: function(data){
+                    console.log(data)
                     top.dialog.open({
                         url: top.restAjax.path('route/populationinfo-data/xinfang?name={name}', [data]),
-                        title: data + '人员',
+                        title: data,
                         width: '80%',
                         height: '80%',
                         onClose: function() {

From 4b6b4aa2c6987b479c09d3dbb901c84ed0d0b08e Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Sun, 26 Nov 2023 16:49:15 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/house/list-summary.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/house/list-summary.html b/src/main/resources/templates/house/list-summary.html
index 3cdbef2..26e5e6b 100644
--- a/src/main/resources/templates/house/list-summary.html
+++ b/src/main/resources/templates/house/list-summary.html
@@ -574,7 +574,7 @@
                     type: 2,
                     title: false,
                     closeBtn: 0,
-                    area: ['60%', '100%'],
+                    area: ['90%', '100%'],
                     offset: 'r',
                     shadeClose: true,
                     anim: 2,