Browse Source

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

shibei_master
13176889840 3 years ago
parent
commit
88bda1c14c
  1. 13
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  2. 6
      src/views/modules/partymember/icpartyorgtree.vue
  3. 19
      src/views/modules/partymember/lookMember.vue
  4. 26
      src/views/modules/visual/communityParty/gridParty.vue
  5. 6
      src/views/modules/visual/communityParty/memberInfo.vue
  6. 12
      src/views/modules/visual/components/screen-map/index.vue

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

@ -128,7 +128,8 @@
customerId: '',
staffId:'',
orgPidName: '',
agencyName:''
agencyName:'',
pid: ''
},
orgListVisible: false,
agencyListVisible:false,
@ -230,7 +231,7 @@
},
//
getOrgList() {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
@ -443,16 +444,16 @@
dataRule() {
return {
partyOrgName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "党组织名称不能为空", trigger: 'blur'}
],
mySelectOrg: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "上级党组织不能为空", trigger: 'blur'}
],
partyOrgType: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "党组织类型不能为空", trigger: 'blur'}
],
agencyId: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
{required: true, message: "行政组织不能为空", trigger: 'blur'}
]
}
}

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

@ -29,7 +29,7 @@
size="small"
class="div-table-button--add">新增下级</el-button>
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="addOrUpdateHandle(scope.row.id)"
@click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid)"
type="text"
size="small"
class="div-table-button--edit">修改</el-button>
@ -106,13 +106,15 @@
this.tableLoading = false
},
// /
addOrUpdateHandle (id, orgId, orgPids) {
addOrUpdateHandle (id, orgId, orgPids, pid) {
console.log('pid:::::', pid)
this.addOrUpdateVisible = true
this.$nextTick(() => {
this.$refs.addOrUpdate.dataForm.id = id
//
this.$refs.addOrUpdate.dataForm.orgId = orgId //
this.$refs.addOrUpdate.dataForm.orgPids = orgPids
this.$refs.addOrUpdate.dataForm.pid = pid
this.$refs.addOrUpdate.init()
})

19
src/views/modules/partymember/lookMember.vue

@ -6,7 +6,6 @@
<el-table ref="ref_table"
:data="tableData"
border
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%"
@ -21,15 +20,6 @@
label="身份证号">
</el-table-column>
</el-table>
<!-- <el-pagination
:current-page="page"
:page-sizes="[10, 20, 50, 100]"
:page-size="limit"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination> -->
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@ -70,9 +60,6 @@ export default {
props: {
},
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
},
...mapGetters(['clientHeight', 'iframeHeight'])
},
components: {},
@ -96,10 +83,10 @@ export default {
pageSize: this.pageSize
}
const url = `/resi/partymember/icPartyMember/page`
const { data, code, msg } = await requestPost(url, params)
const { data, code, internalMsg, msg } = await requestPost(url, params)
this.tableLoading = false
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
if (code !== 0) {
return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
}
if (code === 0) {
this.tableData = data.list ? data.list : []

26
src/views/modules/visual/communityParty/gridParty.vue

@ -10,8 +10,7 @@
:options="propTree"
:props="{ checkStrictly: true }"
:show-all-levels="false"
:getCheckedNodes="getCheckedNodes"
clearable
:getCheckedNodes="getCheckedNodes"
@change="handleCascader">
</el-cascader>
</div>
@ -166,8 +165,9 @@ export default {
]
await this.loadOrgData()
await this.getWorkUserInfo()
this.loadMap()
this.isfirstInit = false
// this.loadMap()
this.getMapData()
// this.isfirstInit = false
// end
},
methods: {
@ -189,7 +189,6 @@ export default {
// };
const { data, code, msg } = await requestPost(url);
if (code === 0) {
console.log('data-org----o', data)
this.selectAgency = [`${data.agencyId}-${data.level}`]
this.orgType = data.level
this.agencyId = data.agencyId
@ -230,7 +229,6 @@ export default {
},
//
async handleCascader(val) {
console.log('val-vvv', val)
const _arr = val[val.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
this.agencyId = _arr[0]
@ -238,7 +236,6 @@ export default {
this.orgType = orgType
this.noEduInit = false
this.agencyInfo = { ...this.orgData }
console.log('agencyInfo-----', this.agencyInfo)
this.eduCode = ''
await this.loadOrgData()
this.getEduCount(_arr[0])
@ -342,7 +339,6 @@ export default {
}
};
console.log('zlcm')
} else {
element.isClick = false
element.label = {
@ -400,7 +396,6 @@ export default {
this.visibleLoading = false
},
pieInitOks (dom) {
console.log('pies准备好了', dom)
this.pieEduChartS = dom
// this.pieInitState = true
},
@ -424,7 +419,6 @@ export default {
this.showedUnitMoreInfo = true
this.unitAclist = data.list
this.$nextTick(() => {
console.log(this.unitAclist[0].demandRecId)
this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId)
})
} else {
@ -451,7 +445,7 @@ export default {
const url = "/gov/org/agency/maporg"
let params = {
orgId: this.orgId,
level: this.orgLevel
level: this.orgType
}
const { data, code, msg } = await requestPost(url, params)
@ -460,7 +454,7 @@ export default {
this.orgData = data
this.orgId = this.orgData.id
this.orgLevel = this.orgData.level
this.orgType = this.orgData.level
this.parentPolygon = []
this.parentPolygon = data.children.map(item => {
return {
@ -511,10 +505,11 @@ export default {
window.app.ajax.post(
url,
params,
(data, rspMsg) => {
(data, rspMsg) => {
this.unitMapList = data
this.isfirstInit = false
this.loadMap()
this.isfirstInit = false
this.$refs.map.handleClosePopup()
},
(rspMsg, data) => {
this.$message.error(rspMsg)
@ -526,9 +521,7 @@ export default {
this.userId = ''
const featureInfo = feature.values_.properties.info
this.userId = feature.values_.properties.info.id
console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info))
let coordinate = [featureInfo.longitude, featureInfo.latitude]
console.log(feature.values_.properties.info)
let showData = `
<div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
<div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名
@ -557,7 +550,6 @@ export default {
},
lookMore(e) {
this.userId = this.userId
console.log('userId:', this.userId)
this.showedMoreInfo = true
}
},

6
src/views/modules/visual/communityParty/memberInfo.vue

@ -29,6 +29,10 @@
<span class="item-field">需求类型</span>
<span v-if="info.categoryName">{{ info.categoryName }}</span>
</div>
<div class="item">
<span class="item-field">上报类型</span>
<span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
</div>
<div class="item">
<span class="item-field">上报人</span>
<span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@ -171,7 +175,7 @@ export default {
margin-bottom: 0;
.list {
display: block;
width: 50%;
width: auto;
.item {
display: flex;
width: 100%;

12
src/views/modules/visual/components/screen-map/index.vue

@ -33,7 +33,8 @@
<div id="popup-content"
class="popup-content"></div>
<a href="#"
id="popup-goMore">更多>>>></a>
id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div>
</div>
</template>
@ -745,6 +746,12 @@ const vueGis = {
// overlay x,y
},
//
handleClosePopup() {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
},
//
getRndBetween (lowerLimit, upperLimit) {
@ -888,6 +895,9 @@ export default vueGis;
.popup-content {
width: 300px;
}
.popup-goMore{
margin: 20px 0;
}
.ol-popup-closer:after {
content: "✖";
// color: rgba(1, 17, 104, 1);

Loading…
Cancel
Save