Browse Source

Merge branch 'dev-tuceng0616' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-tuceng0616

shibei_master
jiangyy 3 years ago
parent
commit
65042f0d49
  1. 2
      src/views/main-shuju/main.vue
  2. 2
      src/views/main.vue
  3. 12
      src/views/modules/base/collect.vue
  4. 4
      src/views/modules/base/community/community.vue
  5. 2
      src/views/modules/base/community/communityTable.vue
  6. 1
      src/views/modules/base/community/roomForm.vue
  7. 24
      src/views/modules/base/community/roomTable.vue
  8. 61
      src/views/modules/cabaseinfo/caloudong.vue
  9. 61
      src/views/modules/cabaseinfo/capingfang.vue
  10. 61
      src/views/modules/cabaseinfo/carental.vue
  11. 61
      src/views/modules/cabaseinfo/caresident.vue
  12. 61
      src/views/modules/cabaseinfo/carotators.vue
  13. 32
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  14. 2
      src/views/modules/partymember/icpartyorgtree.vue
  15. 2
      src/views/modules/visual/communityGovern/typeAnalyze.vue
  16. 1
      src/views/modules/visual/communityParty/community.vue
  17. 3
      src/views/modules/visual/communityParty/party.vue

2
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);
}
},
},

2
src/views/main.vue

@ -159,7 +159,7 @@ export default {
localStorage.setItem("customerName", data.customerName || "");
}
} else {
this.$message.error(rspMsg);
this.$message.error(msg);
}
},
},

12
src/views/modules/base/collect.vue

@ -42,6 +42,15 @@
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item label="户籍地址"
prop="domicilePlace">
<el-input v-model="fmData.domicilePlace"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search"
size="small"
@ -280,7 +289,8 @@ export default {
orgId: '',
startTime: "",
endTime: "",
address: ''
address: '',
domicilePlace: ''
},
dataForm: {},
communityList: [],

4
src/views/modules/base/community/community.vue

@ -234,6 +234,10 @@ export default {
value: '0',
label: '自住'
},
{
value: '3',
label: '未出售'
},
],
ownerName: '',
ownerPhone: '',

2
src/views/modules/base/community/communityTable.vue

@ -197,7 +197,7 @@
<div>
<el-button class="diy-button--reset"
size="small"
@click="handleExport">导出房屋数据</el-button>
@click="handleExport">导出小区数据</el-button>
<el-button class="diy-button--export"
size="small"
:disabled="yihuyidangDisabled"

1
src/views/modules/base/community/roomForm.vue

@ -96,6 +96,7 @@
<el-radio :label="1">出租</el-radio>
<el-radio :label="2">闲置</el-radio>
<el-radio :label="0">自住</el-radio>
<el-radio :label="3">未出售</el-radio>
</el-radio-group>
</el-form-item>

24
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,

61
src/views/modules/cabaseinfo/caloudong.vue

@ -2,6 +2,14 @@
<div class="mod-axis__caLoudong}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
@ -41,6 +49,27 @@
align="center"
width="50"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
prop="streetName"
label="街道"
header-align="center"
align="center">
</el-table-column>
<el-table-column
prop="comName"
label="社区"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="gridName"
label="网格"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="buildingName"
label="楼宇名称"
@ -145,9 +174,41 @@ export default {
dataForm: {
buildingName: "",
communityName: "",
gridId:""
},
caLouDongOptions:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
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,
},

61
src/views/modules/cabaseinfo/capingfang.vue

@ -2,6 +2,14 @@
<div class="mod-axis__caPingfang}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
@ -41,6 +49,27 @@
align="center"
width="50"
></el-table-column>
<el-table-column
prop="streetName"
label="街道"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="comName"
label="社区"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="gridName"
label="网格"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="buildingName"
label="楼宇名称"
@ -145,9 +174,41 @@ export default {
dataForm: {
buildingName: "",
communityName: "",
gridId:""
},
caLouDongOptions:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/cabmGrid/getCascadeMenu`).then(resp => {
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,
},

61
src/views/modules/cabaseinfo/carental.vue

@ -2,6 +2,14 @@
<div class="mod-axis__caRental}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-form-item label="房屋编号" prop="houseName">
<el-input
v-model="dataForm.houseName"
@ -48,6 +56,27 @@
align="center"
width="50"
></el-table-column>
<el-table-column
prop="streetName"
label="街道"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="comName"
label="社区"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="gridName"
label="网格"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="houseName"
label="房屋编号"
@ -146,9 +175,41 @@ export default {
houseName: "",
residentName: "",
renterName: "",
gridId:""
},
caLouDongOptions:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
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,
},

61
src/views/modules/cabaseinfo/caresident.vue

@ -2,6 +2,14 @@
<div class="mod-axis__caResident}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
@ -44,6 +52,27 @@
align="center"
width="50"
></el-table-column>
<el-table-column
prop="streetName"
label="街道"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="comName"
label="社区"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="gridName"
label="网格"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="idCard"
label="证件号码(公民身份证号)"
@ -137,9 +166,41 @@ export default {
idCard: "",
residentName: "",
telephone: "",
gridId:""
},
caLouDongOptions:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
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,
},

61
src/views/modules/cabaseinfo/carotators.vue

@ -2,6 +2,14 @@
<div class="mod-axis__caRotators}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属网格" prop="gridId">
<el-cascader
:options="caLouDongOptions"
:props="{ checkStrictly: true }"
clearable
@change="handlePartyChange">
</el-cascader>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
@ -44,6 +52,27 @@
align="center"
width="50"
></el-table-column>
<el-table-column
prop="streetName"
label="街道"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="comName"
label="社区"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="gridName"
label="网格"
header-align="center"
align="center"
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="idCard"
label="公民身份证号"
@ -131,9 +160,41 @@ export default {
idCard: "",
residentName: "",
telephone: "",
gridId:""
},
caLouDongOptions:[]
};
},
methods:{
getloudongOptions(){
this.$http.post(`/opendata/bmGrid/getCascadeMenu`).then(resp => {
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,
},

32
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -145,12 +145,6 @@
agencyOrgList:[]
}
},
// mounted () {
// setTimeout(() => {
// console.log(':::::::::::::::::::::::')
// this.initMap()
// }, 800);
// },
methods: {
init() {
this.visible = true
@ -159,10 +153,10 @@
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()
@ -174,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() {
@ -250,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()
}
},

2
src/views/modules/partymember/icpartyorgtree.vue

@ -1,5 +1,5 @@
<template>
<el-card class="resi-card-table">
<el-card ref="searchCard" class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add"
size="small"

2
src/views/modules/visual/communityGovern/typeAnalyze.vue

@ -212,7 +212,7 @@ export default {
//
async getAgencylist () {
// const url = "/gov/org/customeragency/agencygridtree";
const url = '/gov/org/customeragency/agencylist'
const url = '/gov/org/customeragency/my-subagency-list'
let params = {};

1
src/views/modules/visual/communityParty/community.vue

@ -530,6 +530,7 @@ export default {
this.unitTableData = data.list.map((item, index) => {
return {
...item,
index: index + 1,
urlIndex: index
}
})

3
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()

Loading…
Cancel
Save