diff --git a/src/router/index.js b/src/router/index.js
index 686cf93f5..51d5f0763 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -224,7 +224,11 @@ router.beforeEach((to, from, next) => {
// });
window.SITE_CONFIG["menuShujuList"] = [
{
- icon: "icon-setting",
+ url: "/visual/plugin/power/organization",
+ name: "组织架构",
+ id: "5feawfwaefwa577",
+ },
+ {
id: "22213213",
name: "基础信息",
// url: "visual/basicinfo/basicInfoMain",
@@ -259,11 +263,6 @@ router.beforeEach((to, from, next) => {
name: "社区党建",
// url: "visual/basicinfo/basicInfoMain",
children: [
- {
- url: "/visual/plugin/power/organization",
- name: "组织架构",
- id: "5feawfwaefwa577",
- },
{
url: "/visual/communityParty/party",
name: "党员信息统计",
diff --git a/src/views/modules/visual/plugin/power/components/geojson.js b/src/views/modules/visual/plugin/power/components/geojson.js
deleted file mode 100644
index 8386f0874..000000000
--- a/src/views/modules/visual/plugin/power/components/geojson.js
+++ /dev/null
@@ -1,69 +0,0 @@
-export function getPolygonGeoJSON () {
- return {
- type: 'FeatureCollection',
- features: [
- {
- type: 'Feature',
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.34641692835909, 36.089631138388036],
- [120.3610683961656, 36.07743361100231],
- [120.41981862563858, 36.094178143435734],
- [120.40240403504704, 36.11798699226542],
- [120.34534806364974, 36.11752870787426],
- [120.34191095693906, 36.117070430475906],
- [120.34641692835909, 36.089631138388036]
- ]
- ]
- }
- }
- ]
- }
-}
-export function getGridGeoJSON () {
- return {
- type: 'FeatureCollection',
- features: [
- {
- type: 'Feature',
- properties: {
- name: '第一网格',
- index: 0
- },
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.36042111463216, 36.123630243850776],
- [120.37646657270601, 36.11574122696447],
- [120.36427923644065, 36.105102846593255],
- [120.34074589793231, 36.10363201293648],
- [120.36042111463216, 36.123630243850776]
- ]
- ]
- }
- },
- {
- type: 'Feature',
- properties: {
- name: '第二网格',
- index: 1
- },
- geometry: {
- type: 'Polygon',
- coordinates: [
- [
- [120.35623852355958, 36.0892643916626],
- [120.37271801574708, 36.0903801906128],
- [120.36894146545411, 36.08102464556885],
- [120.35795513732911, 36.07767724871827],
- [120.35623852355958, 36.0892643916626]
- ]
- ]
- }
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
new file mode 100644
index 000000000..c95bea2ae
--- /dev/null
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
@@ -77,8 +80,13 @@ import screenTable from "../../components/screen-table/index"
import screenOrgMap from './components/screen-org-map.vue'
import screenOrgTree from './components/screen-org-tree.vue'
import screenTopCount from './components/screen-top-count.vue'
+import houseDialog from './components/house-dialog.vue'
import { requestPost } from "@/js/dai/request"
+import dhIcon from '@/assets/img/plugins/danghui.png'
+import lyxzIcon from '@/assets/img/plugins/louyuanxiaozu.png'
+import dyzxhIcon from '@/assets/img/plugins/dangyuanzhongxinhu.png'
+
export default {
name: "warning-box",
components: {
@@ -87,7 +95,8 @@ export default {
screenMap,
screenOrgMap,
screenOrgTree,
- screenTopCount
+ screenTopCount,
+ houseDialog
},
data() {
return {
@@ -106,7 +115,7 @@ export default {
],
agencyId: '',
noInit: false,
- visibleLoading: true,
+ visibleLoading: false,
pageNo: 1,
pageSize: 5,
total: 0,
@@ -117,9 +126,14 @@ export default {
kernelHouseHoldNum: { index: 2, title: '党员中心户', value: '0' },
partyMemberNum: { index: 3, title: '党员数', value: '0' },
serviceStationNum: { index: 4, title: '网格党群服务站实体阵地数', value: '0' },
- volunteerTeamNum: { index: 5, title: '志愿者队伍', value: '0' }
+ volunteerTeamNum: { index: 5, title: '社区服务队伍数', value: '0' }
},
axisStructId: '', // 动力主轴节点
+ showHouse: false, // 显示house-dialog
+ houseId: '', // 房屋ID
+ dangqunList: [], // 党群服务站列表
+ xiaozuList: [], // 楼院小组地图坐标列表
+ zhongxinhuList: [], // 党员中心户列表
}
},
async mounted() {
@@ -127,8 +141,8 @@ export default {
// const { user } = this.$store.state
// this.agencyId = user.agencyId
// console.log('agencyId-------', this.agencyId)
- this.agencyId = '1495655378069753857'
- this.axisStructId = '1517389077596463106'
+ this.agencyId = '50140d770c578100328792121aa7b3c5'
+ this.axisStructId = '1518062548749725697'
await nextTick(100)
this.getStructTree()
this.getCount()
@@ -140,7 +154,8 @@ export default {
this.getList()
},
async handleLook (val) {
- console.log(val.id)
+ this.houseId = val.houseId
+ this.showHouse = true
},
pageSizeChangeHandleNew (val) {
this.pageNo = 1
@@ -181,8 +196,41 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
Object.keys(this.countList).forEach(item => {
- this.countList[item].value = data[item]
+ if (item != 'partyMemberNum' && item != 'volunteerTeamNum') {
+ this.countList[item].value = data[item]
+ }
+ })
+ this.getPartyNumber() // 党员数
+ this.getVolunteerTeamNum() // 社区服务队伍数
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ async getPartyNumber () {
+ const url = "/epmetuser/icresiuser/partymemberagestatistics"
+ let params = {
+ orgId: this.agencyId,
+ orgType: 'agency'
+ }
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ let count = 0
+ data.forEach(item => {
+ count += parseInt(item.value)
})
+ this.countList.partyMemberNum.value = count
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ async getVolunteerTeamNum () {
+ const url = "/heart/userdemand/servicelist"
+ let params = {
+ serviceType: 'community_org'
+ }
+ const { data, code, msg } = await requestPost(url, params)
+ if (code === 0) {
+ this.countList.volunteerTeamNum.value = data.length || 0
} else {
this.$message.error(msg)
}
@@ -195,20 +243,74 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.list = data
- this.axisStructId = this.list[0].id
- this.getList()
+ if (data.length > 0) {
+ this.axisStructId = this.list[0].id
+ this.getList()
+ }
} else {
this.$message.error(msg)
}
},
getMapData() {
- let params = {
+ const params1 = {
axisStructId: this.axisStructId,
limit: 99
}
- const url = "/pli/power/data/kernelHousehold/listPosition"
- this.$http.post(url, params).then(res => {
- console.log(res.data.data)
+ // 党群服务站
+ this.$http.post(`/pli/power/data/serviceStation/listPosition`, params1).then(res => {
+ res.data.data.forEach((item, index) => {
+ let ob = {
+ index: index,
+ id: item.stationId,
+ name: item.address,
+ latitude: item.latitude,
+ longitude: item.longitude
+ }
+ this.dangqunList.push(ob)
+ })
+ this.$nextTick(() => {
+ this.$refs.orgMap.addMarker(this.dangqunList, dhIcon)
+ })
+ }).catch(err => {
+ this.$message.error(err)
+ })
+ // 动力主轴节点
+ const params2 = {
+ agencyId: this.agencyId
+ }
+ const structLevel = '2'
+ this.$http.post(`/pli/power/data/axis/${structLevel}/listPosition`, params2).then(res => {
+ res.data.data.forEach((item, index) => {
+ let ob = {
+ index: index,
+ id: item.axisStructId,
+ name: item.axisStructName,
+ latitude: item.latitude,
+ longitude: item.longitude
+ }
+ this.xiaozuList.push(ob)
+ })
+ this.$nextTick(() => {
+ this.$refs.orgMap.addMarker(this.xiaozuList, lyxzIcon)
+ })
+ }).catch(err => {
+ this.$message.error(err)
+ })
+ // 党员中心户
+ this.$http.post(`/pli/power/data/kernelHousehold/listPosition`, params1).then(res => {
+ res.data.data.forEach((item, index) => {
+ let ob = {
+ index: index,
+ id: item.houseId,
+ name: item.address,
+ latitude: item.latitude,
+ longitude: item.longitude
+ }
+ this.zhongxinhuList.push(ob)
+ })
+ this.$nextTick(() => {
+ this.$refs.orgMap.addMarker(this.zhongxinhuList, dyzxhIcon)
+ })
}).catch(err => {
this.$message.error(err)
})