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

大数据页面bug修改。

Browse Source
This commit is contained in:
Renpc-kilig 2020-12-18 11:05:03 +08:00
parent 6e15250a6b
commit b29dc7e92f
6 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/cm/bigdata/config/properties/PartyBuildingProperties.java
View File

@ -20,6 +20,15 @@ public class PartyBuildingProperties {
private String partyUrl; private String partyUrl;
private String title; private String title;
private String servicecityUrl; private String servicecityUrl;
private String logoUrl;
public String getLogoUrl() {
return logoUrl == null ? "" : logoUrl;
}
public void setLogoUrl(String logoUrl) {
this.logoUrl = logoUrl;
}
public String getServicecityUrl() { public String getServicecityUrl() {
return servicecityUrl == null ? "" : servicecityUrl; return servicecityUrl == null ? "" : servicecityUrl;

16
src/main/java/com/cm/bigdata/controller/apis/partyOrganize/PartyOrganizeController.java
View File

@ -56,11 +56,19 @@ public class PartyOrganizeController extends AbstractController {
ClientTokenBO token = ClientTokenManager.getInstance().getClientToken(); ClientTokenBO token = ClientTokenManager.getInstance().getClientToken();
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
String url = partyBuildingProperties.getPartyUrl(); String url = partyBuildingProperties.getPartyUrl();
if("0".equals(params.get("belongLevel"))) { url += "/resource/partyorganize/bigdatarelease";
url += "/resource/partyorganize/bigdatarelease?belongLevel="; if("0".equals(params.get("belongLevel")) && StringUtils.isEmpty(params.get("belongLevel"))) {
}else { // url += "/resource/partyorganize/bigdatarelease?belongLevel=";
url += "/resource/partyorganize/bigdatarelease?belongLevel=" + params.get("belongLevel"); }else if(!"0".equals(params.get("belongLevel")) && !StringUtils.isEmpty(params.get("belongLevel"))) {
url += "?belongLevel=" + params.get("belongLevel");
} }
if(!StringUtils.isEmpty(params.get("partyOrganizeId")) && ("0".equals(params.get("belongLevel")) || StringUtils.isEmpty(params.get("belongLevel")))) {
url += "?partyOrganizeId=" + params.get("partyOrganizeId");
}else if(!StringUtils.isEmpty(params.get("partyOrganizeId")) && !"0".equals(params.get("belongLevel")) && !StringUtils.isEmpty(params.get("belongLevel"))){
url += "&partyOrganizeId=" + params.get("partyOrganizeId");
}
String str = restTemplate.getForObject(url, String.class, params); String str = restTemplate.getForObject(url, String.class, params);
JSONObject jsonObject = null; JSONObject jsonObject = null;
if(StringUtils.isEmpty(str)) { if(StringUtils.isEmpty(str)) {

7
src/main/resources/static/route/bigdata/detail.html
View File

@ -330,18 +330,17 @@ layui.config({
// 党组织列表（下级） // 党组织列表（下级）
subPartyOrganizeList: function () { subPartyOrganizeList: function () {
var self = this; var self = this;
var newLevel = parseInt(self.belongLevel); $('#tableDiv').hide();
if (newLevel < 5) { var newLevel = parseInt(self.belongLevel) + 1;
if (newLevel <= 5) {
var loadLayerIndex; var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/partyorganize/listpagepartyorganize?belongLevel=' + newLevel + '&bigData=yes', []), {page: self.page.page, rows: self.page.rows}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/partyorganize/listpagepartyorganize?belongLevel=' + newLevel + '&bigData=yes', []), {page: self.page.page, rows: self.page.rows}, null, function(code, data) {
console.log(data)
if(data && data.rows.length > 0) { if(data && data.rows.length > 0) {
$('#tableDiv').show(); $('#tableDiv').show();
self.partyOrganizeList = data.rows; self.partyOrganizeList = data.rows;
self.page.page = data.page; self.page.page = data.page;
self.page.totalPage = data.total; self.page.totalPage = data.total;
self.page.totalPage = Math.ceil(data.total / self.page.rows) self.page.totalPage = Math.ceil(data.total / self.page.rows)
console.log(self.page.totalPage)
}else { }else {
$('#tableDiv').hide(); $('#tableDiv').hide();
} }

1
src/main/resources/static/route/bigdata/index1.html
View File

@ -215,7 +215,6 @@
var self = this; var self = this;
var loadLayerIndex; var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/servicecity/listuserandpoints?communityBossLevel={level}', [level]), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/servicecity/listuserandpoints?communityBossLevel={level}', [level]), {}, null, function(code, data) {
console.log(data)
// 划片 // 划片
self.takeUserArea(data); self.takeUserArea(data);
}, function(code, data) { }, function(code, data) {

24
src/main/resources/static/route/bigdata/index2.html
View File

@ -125,12 +125,12 @@
}, },
methods: { methods: {
// 请求支部数，党员数接口 // 请求支部数，党员数接口
initPartyOrganizeData: function(value) { initPartyOrganizeData: function(value, value2) {
var self = this; var self = this;
self.belongLevel = value; self.belongLevel = value;
var loadLayerIndex; var loadLayerIndex;
var url; var url;
top.restAjax.get(top.restAjax.path('api/partyorganize/bigdata?belongLevel={belongLevel}', [value]), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/partyorganize/bigdata?belongLevel={belongLevel}&partyOrganizeId={partyOrganizeId}', [value, value2]), {}, null, function(code, data) {
self.pointArr = data.data.partyOrganizeDTOList; self.pointArr = data.data.partyOrganizeDTOList;
self.count.zbCount = data.data.zbCount; self.count.zbCount = data.data.zbCount;
self.count.peopleCount = data.data.peopleCount; self.count.peopleCount = data.data.peopleCount;
@ -166,7 +166,7 @@
$('#selId').text(text); $('#selId').text(text);
$('#selId').append(icoHtml); $('#selId').append(icoHtml);
self.initPartyOrganizeData(value); self.initPartyOrganizeData(value, '');
}, },
initBaiduMap: function () { initBaiduMap: function () {
var self = this; var self = this;
@ -204,11 +204,11 @@
var point = new BMap.Point(item.longitude, item.latitude); var point = new BMap.Point(item.longitude, item.latitude);
// var imgSrc = self.url + '/route/file/downloadfile/false/' + item.logo; // var imgSrc = self.url + '/route/file/downloadfile/false/' + item.logo;
var imgSrc = item.logo; var imgSrc = item.logo;
var el = createMark(point, imgSrc, item.partyOrganizeId); var el = createMark(point, imgSrc, item.partyOrganizeId, item.belongLevel);
} }
} }
// 给地图添加点 // 给地图添加点
function createMark(point, imgSrc, partyOrganizeId) { function createMark(point, imgSrc, partyOrganizeId, belongLevel) {
// 定义绘制图标方法 // 定义绘制图标方法
function customizeOverlay(center, length){ function customizeOverlay(center, length){
this._center = center; this._center = center;
@ -228,7 +228,7 @@
// 监听点击 // 监听点击
$(el).on('click', function(e){ $(el).on('click', function(e){
self.showPartyOrganize(partyOrganizeId); self.showPartyOrganize(partyOrganizeId, belongLevel);
}) })
// 保存div实例 // 保存div实例
@ -273,10 +273,12 @@
oDiv.appendChild(oBottom); oDiv.appendChild(oBottom);
return oDiv; return oDiv;
}, },
showPartyOrganize: function(partyOrganizeId) { showPartyOrganize: function(partyOrganizeId, belongLevel) {
var self = this; var self = this;
top.dialog.dialogData.partyOrganizeId = '';
top.dialog.dialogData.belongLevel = '';
top.dialog.open({ top.dialog.open({
url: top.restAjax.path('route/bigdata/detail.html?partyOrganizeId={partyOrganizeId}&belongLevel='+self.belongLevel, [partyOrganizeId]), url: top.restAjax.path('route/bigdata/detail.html?partyOrganizeId={partyOrganizeId}&belongLevel='+belongLevel, [partyOrganizeId]),
title: '详情', title: '详情',
width: '1080px', width: '1080px',
height: '98%', height: '98%',
@ -285,11 +287,12 @@
self.getPartyMemberCount(top.dialog.dialogData.partyOrganizeId); self.getPartyMemberCount(top.dialog.dialogData.partyOrganizeId);
self.getMeetingCount(top.dialog.dialogData.partyOrganizeId); self.getMeetingCount(top.dialog.dialogData.partyOrganizeId);
self.getMeetingCharts(top.dialog.dialogData.partyOrganizeId); self.getMeetingCharts(top.dialog.dialogData.partyOrganizeId);
self.initPartyOrganizeData('', top.dialog.dialogData.partyOrganizeId);
}else if(top.dialog.dialogData.partyOrganizeId && top.dialog.dialogData.belongLevel) { }else if(top.dialog.dialogData.partyOrganizeId && top.dialog.dialogData.belongLevel) {
self.getPartyMemberCount(top.dialog.dialogData.partyOrganizeId); self.getPartyMemberCount(top.dialog.dialogData.partyOrganizeId);
self.getMeetingCount(top.dialog.dialogData.partyOrganizeId); self.getMeetingCount(top.dialog.dialogData.partyOrganizeId);
self.getMeetingCharts(top.dialog.dialogData.partyOrganizeId); self.getMeetingCharts(top.dialog.dialogData.partyOrganizeId);
self.initPartyOrganizeData(top.dialog.dialogData.belongLevel + 1); self.initPartyOrganizeData(top.dialog.dialogData.belongLevel, '');
} }
} }
}); });
@ -350,7 +353,6 @@
url = 'api/partyorganize/meetingcharts'; url = 'api/partyorganize/meetingcharts';
} }
top.restAjax.get(top.restAjax.path(url, []), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path(url, []), {}, null, function(code, data) {
console.log(data)
self.meetingCharts = data.data.meetingCharts; self.meetingCharts = data.data.meetingCharts;
self.initZhuCharts(); self.initZhuCharts();
}, function(code, data) { }, function(code, data) {
@ -484,7 +486,7 @@
$('.cm-main').css({'height': windowHeight * 0.9 + 'px'}) $('.cm-main').css({'height': windowHeight * 0.9 + 'px'})
//创建和初始化地图函数 //创建和初始化地图函数
this.initPartyOrganizeData(1) this.initPartyOrganizeData(0, '')
this.getMeetingCount('') this.getMeetingCount('')
this.getMeetingCharts('') this.getMeetingCharts('')

1
src/main/resources/templates/index.html
View File

@ -215,7 +215,6 @@
var self = this; var self = this;
var loadLayerIndex; var loadLayerIndex;
top.restAjax.get(top.restAjax.path('api/servicecity/listuserandpoints?communityBossLevel={level}', [level]), {}, null, function(code, data) { top.restAjax.get(top.restAjax.path('api/servicecity/listuserandpoints?communityBossLevel={level}', [level]), {}, null, function(code, data) {
console.log(data)
// 划片 // 划片
self.takeUserArea(data); self.takeUserArea(data);
}, function(code, data) { }, function(code, data) {