Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/upgrade' into upgrade

Browse Source
This commit is contained in:
Renpc-kilig 2023-11-26 17:27:31 +08:00
commit 5e5f1f6052
3 changed files with 163 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoBigdataRouteController.java
View File

@ -40,7 +40,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("nation") @GetMapping("nation")
public ModelAndView nation(@RequestParam String name) { public ModelAndView nation(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "nation=" + name); mv.addObject("params", "nation=" + name);
return mv; return mv;
@ -62,7 +62,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("jiedao") @GetMapping("jiedao")
public ModelAndView jiedao(@RequestParam String name) { public ModelAndView jiedao(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "jiedao=" + name); mv.addObject("params", "jiedao=" + name);
return mv; return mv;
@ -73,7 +73,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("sex") @GetMapping("sex")
public ModelAndView sex(@RequestParam String name) { public ModelAndView sex(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "sex=" + name); mv.addObject("params", "sex=" + name);
return mv; return mv;
@ -84,7 +84,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("organization") @GetMapping("organization")
public ModelAndView organization(@RequestParam String name) { public ModelAndView organization(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "organization=" + organizationMap.get(name)); mv.addObject("params", "organization=" + organizationMap.get(name));
return mv; return mv;
@ -118,7 +118,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("religion") @GetMapping("religion")
public ModelAndView religion(@RequestParam String name) { public ModelAndView religion(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "religion=" + name); mv.addObject("params", "religion=" + name);
return mv; return mv;
@ -130,7 +130,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("xinfang") @GetMapping("xinfang")
public ModelAndView xinfang(@RequestParam String name) { public ModelAndView xinfang(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "xinfang=" + name); mv.addObject("params", "xinfang=" + name);
return mv; return mv;
@ -142,7 +142,7 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("baozhang") @GetMapping("baozhang")
public ModelAndView baozhang(@RequestParam String name) { public ModelAndView baozhang(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "baozhang=" + name); mv.addObject("params", "baozhang=" + name);
return mv; return mv;
@ -154,10 +154,10 @@ public class PopulationInfoBigdataRouteController extends AbstractController {
* @return * @return
*/ */
@GetMapping("teshu") @GetMapping("teshu")
public ModelAndView teshu(@RequestParam String name) { public ModelAndView teshu(String name) {
ModelAndView mv = new ModelAndView("populationinfo/list-bigdata"); ModelAndView mv = new ModelAndView("populationinfo/list-bigdata");
mv.addObject("params", "teshu=" + name); mv.addObject("params", "teshu=" + name);
return mv; return mv;
} }
} }

177
src/main/resources/static/default.html
View File

@ -10,7 +10,21 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all"/> <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/layuiadmin/style/admin.css" media="all"/>
<link rel="stylesheet" href="assets/home/css/index.css"> <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> </head>
<body> <body>
<!-- 父容器大盒子 --> <!-- 父容器大盒子 -->
@ -20,7 +34,7 @@
<!--人口数量统计--> <!--人口数量统计-->
<div class="person_sta"> <div class="person_sta">
<ul> <ul>
<li> <li @click="personShow()">
<img src="assets/home/images/bj1.png" alt="" class="bj"> <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/bj11.png" alt="" class="dz">
<img src="assets/home/images/bj111.png" alt="" class="dzstb"> <img src="assets/home/images/bj111.png" alt="" class="dzstb">
@ -30,7 +44,7 @@
<i>人</i> <i>人</i>
</span> </span>
</li> </li>
<li> <li @click="jieDaoRenKouShow('稀土路街道')">
<img src="assets/home/images/bj2.png" alt="" class="bj"> <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/bj22.png" alt="" class="dz">
<img src="assets/home/images/bj222.png" alt="" class="dzstb"> <img src="assets/home/images/bj222.png" alt="" class="dzstb">
@ -40,7 +54,7 @@
<i>人</i> <i>人</i>
</span> </span>
</li> </li>
<li> <li @click="jieDaoRenKouShow('民馨路街道')">
<img src="assets/home/images/bj3.png" alt="" class="bj"> <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/bj33.png" alt="" class="dz">
<img src="assets/home/images/bj333.png" alt="" class="dzstb"> <img src="assets/home/images/bj333.png" alt="" class="dzstb">
@ -50,13 +64,13 @@
<i>人</i> <i>人</i>
</span> </span>
</li> </li>
<li> <li @click="jieDaoRenKouShow('万水泉镇')">
<img src="assets/home/images/bj4.png" alt="" class="bj"> <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/bj44.png" alt="" class="dz">
<img src="assets/home/images/bj444.png" alt="" class="dzstb"> <img src="assets/home/images/bj444.png" alt="" class="dzstb">
<h5>万水泉镇</h5> <h5>万水泉镇</h5>
<span> <span>
<em>{{ wanShuiQuanpersonCount }}</em> <em >{{ wanShuiQuanpersonCount }}</em>
<i>人</i> <i>人</i>
</span> </span>
</li> </li>
@ -120,7 +134,7 @@
<em class="em_man">——{{ genderMaPercentage }}%</em> <em class="em_man">——{{ genderMaPercentage }}%</em>
<em class="em_woman">—{{ genderWomanPercentage }}%</em> <em class="em_woman">—{{ genderWomanPercentage }}%</em>
<div class="ratio"> <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> <p class="man_p">{{ genderMaNum }}</p>
<h5>男性人数(人)</h5> <h5>男性人数(人)</h5>
<span> <span>
@ -131,7 +145,7 @@
<div class="progress1"></div> <div class="progress1"></div>
</div> </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> <p class="woman_p">{{ genderWomanNum }}</p>
<h5>女性人数(人)</h5> <h5>女性人数(人)</h5>
<span> <span>
@ -165,8 +179,8 @@
<div class="special_bottom"> <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_1.png" alt="" class="r_33_1">
<img src="assets/home/images/r_33_2.png" alt="" class="r_33_2"> <img src="assets/home/images/r_33_2.png" alt="" class="r_33_2">
<h5 class="h51">{{ correctCount }}人</h5> <h5 class="h51" @click="teShuRenYuanShow('社区矫正')">{{ correctCount }}人</h5>
<h5 class="h52">{{ releaseCount }}人</h5> <h5 class="h52" @click="teShuRenYuanShow('刑满释放')">{{ releaseCount }}人</h5>
<em class="em1">社区矫正对象</em> <em class="em1">社区矫正对象</em>
<em class="em2">刑满释放人员</em> <em class="em2">刑满释放人员</em>
</div> </div>
@ -353,17 +367,21 @@
} }
] ]
}; };
var myChart = echarts.init(document.getElementById('politicalStatusChart'));
$.ajax({ $.ajax({
url: self.apiHost + "app/query/sqlrelease/qe41cc66", url: self.apiHost + "app/query/sqlrelease/qe41cc66",
type: 'GET', type: 'GET',
dataType: 'JSON', dataType: 'JSON',
headers: self.headers, headers: self.headers,
success: function(data) { success: function(data) {
var myChart = echarts.init(document.getElementById('politicalStatusChart')) option.series[0]['data'] = data;
option.series[0]['data'] = data
myChart.setOption(option); myChart.setOption(option);
} }
}) });
myChart.on('click', function(params) {
self.zhengZhiMianMaoRenYuanShow(params.name);
});
}, },
// 社会保障类人员情况 // 社会保障类人员情况
initProtectPerson: function(){ initProtectPerson: function(){
@ -431,6 +449,7 @@
} }
] ]
}; };
var myChart = echarts.init(document.getElementById('protectPersonChart'));
$.ajax({ $.ajax({
url: self.apiHost + "app/query/sqlrelease/qe34cc66", url: self.apiHost + "app/query/sqlrelease/qe34cc66",
type: 'GET', type: 'GET',
@ -441,10 +460,12 @@
option.xAxis[0]['data'].push(v.name); option.xAxis[0]['data'].push(v.name);
option.series[0]['data'].push(v.value); option.series[0]['data'].push(v.value);
}); });
var myChart = echarts.init(document.getElementById('protectPersonChart'))
myChart.setOption(option); myChart.setOption(option);
} }
}) });
myChart.on('click', function(params) {
self.sheHuiBaoZhangRenYuanShow(params.name)
});
}, },
// 近一年信访管理类人员记录 // 近一年信访管理类人员记录
@ -504,7 +525,14 @@
type: 'line', type: 'line',
// stack: 'Total', // stack: 'Total',
smooth: true, smooth: true,
data: [] data: [],
/*label: {
show: true,
formatter: function(params) {
// 在标签中显示数据值
return params.value + "131232";
}
}*/
}, },
{ {
name: "社会治安", name: "社会治安",
@ -514,7 +542,7 @@
data: [] data: []
}, },
{ {
name: "涉毒人员", name: "吸毒人员",
type: 'line', type: 'line',
// stack: 'Total', // stack: 'Total',
smooth: true, smooth: true,
@ -528,7 +556,7 @@
data: [] data: []
}, },
{ {
name: "重点上访户", name: "重点上访",
type: 'line', type: 'line',
// stack: 'Total', // stack: 'Total',
smooth: true, smooth: true,
@ -536,6 +564,7 @@
}, },
] ]
}; };
var myChart = echarts.init(document.getElementById('petitionRecordChart'));
$.ajax({ $.ajax({
url: self.apiHost + "app/query/sqlrelease/q8d0f588", url: self.apiHost + "app/query/sqlrelease/q8d0f588",
type: 'GET', type: 'GET',
@ -550,10 +579,14 @@
option.series[3]['data'].push(v['涉邪人员']); option.series[3]['data'].push(v['涉邪人员']);
option.series[4]['data'].push(v['重点上访户']); option.series[4]['data'].push(v['重点上访户']);
}); });
var myChart = echarts.init(document.getElementById('petitionRecordChart'))
myChart.setOption(option); myChart.setOption(option);
} }
}) });
myChart.on('click', function(params) {
self.xinFangRenYuanShow(params.seriesName)
});
}, },
// 近半年特殊人员记录 // 近半年特殊人员记录
initSpecialPersonData: function(){ initSpecialPersonData: function(){
@ -607,14 +640,14 @@
color: ["#FF9313", "#48EDF5"], color: ["#FF9313", "#48EDF5"],
series: [ series: [
{ {
name: "社区矫正对象", name: "社区矫正",
type: 'line', type: 'line',
// stack: 'Total', // stack: 'Total',
smooth: true, smooth: true,
data: [] data: []
}, },
{ {
name: "刑满释放人员", name: "刑满释放",
type: 'line', type: 'line',
// stack: 'Total', // stack: 'Total',
smooth: true, smooth: true,
@ -622,6 +655,7 @@
} }
] ]
}; };
var myChart = echarts.init(document.getElementById('specialPersonChart'))
$.ajax({ $.ajax({
url: self.apiHost + "app/query/sqlrelease/q316ecca", url: self.apiHost + "app/query/sqlrelease/q316ecca",
type: 'GET', type: 'GET',
@ -633,11 +667,106 @@
option.series[0]['data'].push(v['sheQu']); option.series[0]['data'].push(v['sheQu']);
option.series[1]['data'].push(v['xingMan']); option.series[1]['data'].push(v['xingMan']);
}); });
var myChart = echarts.init(document.getElementById('specialPersonChart'))
myChart.setOption(option); 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){
console.log(data)
top.dialog.open({
url: top.restAjax.path('route/populationinfo-data/xinfang?name={name}', [data]),
title: data,
width: '80%',
height: '80%',
onClose: function() {
}
});
},

2
src/main/resources/templates/house/list-summary.html
View File

@ -574,7 +574,7 @@
type: 2, type: 2,
title: false, title: false,
closeBtn: 0, closeBtn: 0,
area: ['60%', '100%'], area: ['90%', '100%'],
offset: 'r', offset: 'r',
shadeClose: true, shadeClose: true,
anim: 2, anim: 2,