diff --git a/src/views/main-shuju/main.vue b/src/views/main-shuju/main.vue
index 8d4f0bc2c..4abb6808f 100644
--- a/src/views/main-shuju/main.vue
+++ b/src/views/main-shuju/main.vue
@@ -123,7 +123,7 @@ export default {
localStorage.setItem("customerName", data.customerName || "");
}
} else {
- this.$message.error(rspMsg);
+ this.$message.error(msg);
}
},
},
diff --git a/src/views/main.vue b/src/views/main.vue
index f12112f35..eb6f306e1 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -159,7 +159,7 @@ export default {
localStorage.setItem("customerName", data.customerName || "");
}
} else {
- this.$message.error(rspMsg);
+ this.$message.error(msg);
}
},
},
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 30fdeb7da..743389e5e 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -42,6 +42,15 @@
value-format="yyyy-MM-dd">
+
+
+
+
导出房屋数据
+ @click="handleExport">导出小区数据
出租
闲置
自住
+ 未出售
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7fd7efe6e..8be48e23d 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -571,6 +571,30 @@ export default {
buildingId: this.agencyObj.id
}
+
+ if (this.agencyObj.level === 'grid') {
+ params.gridId = this.agencyObj.id
+ params.agencyId = ''
+ params.buildingId = ''
+ params.neighborHoodId = ''
+ } else if (this.agencyObj.level === 'neighborHood') {
+ params.neighborHoodId = this.agencyObj.id
+ params.agencyId = ''
+ params.buildingId = ''
+ params.gridId = ''
+ } else if (this.agencyObj.level === 'building') {
+ params.buildingId = this.agencyObj.id
+ params.agencyId = ''
+ params.neighborHoodId = ''
+ params.gridId = ''
+ } else {
+
+ params.agencyId = this.agencyObj.id
+ params.buildingId = ''
+ params.neighborHoodId = ''
+ params.gridId = ''
+ }
+
app.ajax.exportFilePost(
url,
params,
diff --git a/src/views/modules/cabaseinfo/caloudong.vue b/src/views/modules/cabaseinfo/caloudong.vue
index 5a07d25f6..4f7118bcb 100644
--- a/src/views/modules/cabaseinfo/caloudong.vue
+++ b/src/views/modules/cabaseinfo/caloudong.vue
@@ -2,6 +2,14 @@
+
+
+
+
+
+
+
+
+
+
{
+ if(resp.data.code === 0){
+ this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+ }
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ removeEmptySubOrgList (orgArray) {
+ orgArray.forEach((orgInfo) => {
+ if (orgInfo && orgInfo.children) {
+ if (orgInfo.children.length === 0) {
+ orgInfo.children = undefined
+ } else {
+ this.removeEmptySubOrgList(orgInfo.children)
+ }
+ }
+ })
+ return orgArray;
+ },
+ handlePartyChange(val) {
+ console.log('val------pp', val)
+ this.dataForm.gridId = val[val.length - 1]
+ },
+ },
+created(){
+ this.getloudongOptions()
+ },
components: {
AddOrUpdate,
},
diff --git a/src/views/modules/cabaseinfo/capingfang.vue b/src/views/modules/cabaseinfo/capingfang.vue
index 694043076..e6f3a1b52 100644
--- a/src/views/modules/cabaseinfo/capingfang.vue
+++ b/src/views/modules/cabaseinfo/capingfang.vue
@@ -2,6 +2,14 @@
+
+
+
+
+
+
+
+
+
+
{
+ if(resp.data.code === 0){
+ this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+ }
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ removeEmptySubOrgList (orgArray) {
+ orgArray.forEach((orgInfo) => {
+ if (orgInfo && orgInfo.children) {
+ if (orgInfo.children.length === 0) {
+ orgInfo.children = undefined
+ } else {
+ this.removeEmptySubOrgList(orgInfo.children)
+ }
+ }
+ })
+ return orgArray;
+ },
+ handlePartyChange(val) {
+ console.log('val------pp', val)
+ this.dataForm.gridId = val[val.length - 1]
+ },
+ },
+created(){
+ this.getloudongOptions()
+ },
components: {
AddOrUpdate,
},
diff --git a/src/views/modules/cabaseinfo/carental.vue b/src/views/modules/cabaseinfo/carental.vue
index 0980e8039..9392fa23e 100644
--- a/src/views/modules/cabaseinfo/carental.vue
+++ b/src/views/modules/cabaseinfo/carental.vue
@@ -2,6 +2,14 @@
+
+
+
+
+
+
+
+
+
+
{
+ if(resp.data.code === 0){
+ this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+ }
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ removeEmptySubOrgList (orgArray) {
+ orgArray.forEach((orgInfo) => {
+ if (orgInfo && orgInfo.children) {
+ if (orgInfo.children.length === 0) {
+ orgInfo.children = undefined
+ } else {
+ this.removeEmptySubOrgList(orgInfo.children)
+ }
+ }
+ })
+ return orgArray;
+ },
+ handlePartyChange(val) {
+ console.log('val------pp', val)
+ this.dataForm.gridId = val[val.length - 1]
+ },
+ },
+created(){
+ this.getloudongOptions()
+ },
components: {
AddOrUpdate,
},
diff --git a/src/views/modules/cabaseinfo/caresident.vue b/src/views/modules/cabaseinfo/caresident.vue
index 0cba7cd8b..8b91e76aa 100644
--- a/src/views/modules/cabaseinfo/caresident.vue
+++ b/src/views/modules/cabaseinfo/caresident.vue
@@ -2,6 +2,14 @@
+
+
+
+
@@ -44,6 +52,27 @@
align="center"
width="50"
>
+
+
+
+
+
+
{
+ if(resp.data.code === 0){
+ this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+ }
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ removeEmptySubOrgList (orgArray) {
+ orgArray.forEach((orgInfo) => {
+ if (orgInfo && orgInfo.children) {
+ if (orgInfo.children.length === 0) {
+ orgInfo.children = undefined
+ } else {
+ this.removeEmptySubOrgList(orgInfo.children)
+ }
+ }
+ })
+ return orgArray;
+ },
+ handlePartyChange(val) {
+ console.log('val------pp', val)
+ this.dataForm.gridId = val[val.length - 1]
+ },
+ },
+created(){
+ this.getloudongOptions()
+ },
components: {
AddOrUpdate,
},
diff --git a/src/views/modules/cabaseinfo/carotators.vue b/src/views/modules/cabaseinfo/carotators.vue
index c171dad8d..f6068f2b5 100644
--- a/src/views/modules/cabaseinfo/carotators.vue
+++ b/src/views/modules/cabaseinfo/carotators.vue
@@ -2,6 +2,14 @@
+
+
+
+
@@ -44,6 +52,27 @@
align="center"
width="50"
>
+
+
+
+
+
+
{
+ if(resp.data.code === 0){
+ this.caLouDongOptions = this.removeEmptySubOrgList(resp.data.data)
+ }
+ }).catch(error => {
+ this.$message.error(error)
+ })
+ },
+ removeEmptySubOrgList (orgArray) {
+ orgArray.forEach((orgInfo) => {
+ if (orgInfo && orgInfo.children) {
+ if (orgInfo.children.length === 0) {
+ orgInfo.children = undefined
+ } else {
+ this.removeEmptySubOrgList(orgInfo.children)
+ }
+ }
+ })
+ return orgArray;
+ },
+ handlePartyChange(val) {
+ console.log('val------pp', val)
+ this.dataForm.gridId = val[val.length - 1]
+ },
+ },
+created(){
+ this.getloudongOptions()
+ },
components: {
AddOrUpdate,
},
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index a539e9521..93c020d7c 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -145,23 +145,18 @@
agencyOrgList:[]
}
},
- // mounted () {
- // setTimeout(() => {
- // console.log(':::::::::::::::::::::::')
- // this.initMap()
- // }, 800);
- // },
methods: {
init() {
this.visible = true
this.agencyId = localStorage.getItem('agencyId')
this.dataForm.customerId = localStorage.getItem('customerId')
this.dataForm.staffId = localStorage.getItem('staffId')
+ this.keyWords = ''
//设置党组织类型
-
- this.$nextTick(() => {
+ setTimeout(() => {
this.$refs['dataForm'].resetFields()
this.dataForm.latitude = ''
+ this.dataForm.agencyId = ''
if (this.dataForm.id) {
this.setPartyOrgType()
this.getInfo()
@@ -173,14 +168,17 @@
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType
- console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids)
+
this.setPartyOrgType_xzxj()
this.getInfoAgencyLisy()
} else {
this.dataForm.mySelectOrg = ''
}
}
- })
+ }, 50);
+ // this.$nextTick(() => {
+
+ // })
},
// 设置组织类型 新增党组织
setPartyOrgType_xzxj() {
@@ -249,9 +247,22 @@
if(value == '5'){ // 支部 不选择行政组织
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = ''
+ // 先清空数据
+ this.orgList = []
+ this.dataForm.mySelectOrg = '', // 我选中的当前党组织
+ this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0
+ this.dataForm.orgPids = ''
this.getOrgList()
} else {
- //根据组织类型获取行政组织
+ // 先清空数据
+ this.agencyOrgList = []
+ this.dataForm.agencyId = ''
+
+ // 先清空数据
+ this.orgList = []
+ this.dataForm.mySelectOrg = '', // 我选中的当前党组织
+ this.dataForm.orgPid = '', // 党组织的上级ID,没有上级时为0
+ this.dataForm.orgPids = ''
this.getInfoAgencyLisy()
}
},
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index b7935dd09..776585349 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -1,5 +1,5 @@
-
+
{
return {
...item,
+ index: index + 1,
urlIndex: index
}
})
@@ -614,7 +615,7 @@ export default {
if (code === 0) {
- this.orgData = data
+ this.agencyInfo = data
this.orgId = this.orgData.id
this.orgLevel = this.orgData.level
this.parentPolygon = []
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index abf51860e..65d0919c6 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -149,7 +149,6 @@ export default {
async mounted() {
await nextTick(100);
// await this.getAgencyList()
- await this.getWorkUserInfo()
this.agencyId = this.$store.state.user.agencyId
this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图
this.getEduList() // 左下角列表数据
@@ -167,6 +166,7 @@ export default {
await this.loadOrgData()
// this.loadMap()
this.getMapData()
+ await this.getWorkUserInfo()
// this.isfirstInit = false
// 地图相关end
},
@@ -483,16 +483,26 @@ export default {
params,
(data, rspMsg) => {
this.agencyInfo = data
- if (!data.latitude) {
+ if (this.orgData.longitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+ this.agencyInfo.longitude = this.orgData.longitude
+ }
+ if (this.orgData.latitude) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+ this.agencyInfo.latitude = this.orgData.latitude
+ }
+ if (this.orgData.level) { // 中心点不从当前登录用户里面取，从mapOrg接口里面取
+ this.agencyInfo.agencyLevel = this.orgData.agencyLevel
+ }
+ if (!this.agencyInfo.latitude) {
this.agencyInfo.latitude = 36.072227
}
- if (!data.longitude) {
+ if (!this.agencyInfo.longitude) {
this.agencyInfo.longitude = 120.389455
}
- if (!data.level) {
+ if (!this.agencyInfo.level) {
this.agencyInfo.level = 'street'
}
- this.agencyInfo.agencyLevel = this.agencyInfo.level
+ // this.agencyInfo.agencyLevel = this.agencyInfo.level
+ // console.log(JSON.stringify(this.agencyInfo))
},
(rspMsg, data) => {
this.$message.error(rspMsg)
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 016d7e59d..534391913 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -317,6 +317,7 @@ export default {
// return
// }
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
+ console.log('请求了吗')
this.ageCode = ''
// this.getUnitList(this.agencyId)
this.getAgeList()
@@ -378,7 +379,7 @@ export default {
// this.getEduList()
// return
// }
- this.clickEduPie(params.dataIndex)
+ // this.clickEduPie(params.dataIndex)
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
this.eduCode = ''
this.getEduList()
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 5dbe489d8..58206f455 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -22,9 +22,10 @@
+ :ref="mapId">
+