elink-star
/
epmet-oper-gov
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

test
jiangyy 4 years ago
parent
59a43ee9f5 37e13373a9
commit
b64c2f07cb
20 changed files with 1432 additions and 1349 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      src/assets/img/shuju/measure/hong@2x.png
  2. 10
      src/assets/scss/modules/visual/houseStatic.scss
  3. 11
      src/views/components/resiForm.vue
  4. 78
      src/views/modules/base/community/community.vue
  5. 15
      src/views/modules/base/community/roomForm.vue
  6. 89
      src/views/modules/base/community/roomTable.vue
  7. 14
      src/views/modules/base/resi.vue
  8. 6
      src/views/modules/communityParty/members/cpts/record.vue
  9. 2
      src/views/modules/communityParty/members/index.vue
  10. 61
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  11. 23
      src/views/modules/partymember/icpartyorgtree.vue
  12. 50
      src/views/modules/partymember/lookMember.vue
  13. 77
      src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
  14. 5
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue
  15. 10
      src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
  16. 2
      src/views/modules/visual/communityParty/community.vue
  17. 18
      src/views/modules/visual/communityParty/gridParty.vue
  18. 7
      src/views/modules/visual/communityParty/memberInfo.vue
  19. 1
      src/views/modules/visual/communityParty/unitInfo.vue
  20. 12
      src/views/modules/visual/components/screen-map/index.vue

BIN
src/assets/img/shuju/measure/hong@2x.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

10
src/assets/scss/modules/visual/houseStatic.scss
View File

@ -170,7 +170,7 @@
margin-top:1px; margin-top:1px;
width: 18px; width: 18px;
height: 8px; height: 8px;
background: #ff7800; background: #3dda83;
border-radius: 4px; border-radius: 4px;
} }
@ -189,7 +189,7 @@
margin-top:1px; margin-top:1px;
width: 18px; width: 18px;
height: 8px; height: 8px;
background: #00E5ED; background: #e43c26;
border-radius: 4px; border-radius: 4px;
} }
>span{ >span{
@ -299,21 +299,21 @@
font-size: 35px; font-size: 35px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #FAC126; color: #3dda83;
} }
.cz{ .cz{
font-size: 35px; font-size: 35px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #45D97F; color: #e43c26;
} }
.xz{ .xz{
font-size: 35px; font-size: 35px;
font-family: PingFang SC; font-family: PingFang SC;
font-weight: bold; font-weight: bold;
color: #2865FA; color: #fac126;
} }
.colorwhite{ .colorwhite{

11
src/views/components/resiForm.vue
View File

@ -205,14 +205,18 @@
</el-cascader> </el-cascader>
<template v-else-if="n.itemType === 'radio'"> <template v-else-if="n.itemType === 'radio'">
<el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]" <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
:label="ns.value"> :label="ns.value" @change="hanldeChangeRadio(n)">
{{ ns.label }} {{ ns.label }}
</el-radio> </el-radio>
<!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> --> <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
</template> </template>
<template v-else-if="n.itemType === 'checkbox'"> <template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model.trim="form[n.columnName]"> <el-checkbox-group v-model.trim="form[n.columnName]">
<el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox> <template v-for="ns in n.options">
<el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value">
{{ns.label}}
</el-checkbox>
</template>
<!-- <el-checkbox label="n.la"></el-checkbox> --> <!-- <el-checkbox label="n.la"></el-checkbox> -->
</el-checkbox-group> </el-checkbox-group>
</template> </template>
@ -487,6 +491,9 @@ export default {
// } // }
}) })
}, },
hanldeChangeRadio(n) {
this.$emit('changeradio', n)
},
handleValidBlur(n) { handleValidBlur(n) {
console.log('n---', n) console.log('n---', n)
if (n.columnName !== 'ID_CARD') return if (n.columnName !== 'ID_CARD') return

78
src/views/modules/base/community/community.vue
View File

@ -79,8 +79,13 @@
<div class="resi-cell-label">房屋用途</div> <div class="resi-cell-label">房屋用途</div>
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select v-model="purpose" placeholder="房屋用途" clearable> <el-select v-model="purpose"
<el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"> placeholder="房屋用途"
clearable>
<el-option v-for="item in purposeArr"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
@ -99,7 +104,6 @@
</div> </div>
</div> </div>
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--search" class="diy-button--search"
size="small" size="small"
@ -120,6 +124,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
@toNextLevel="toNextLevel" @toNextLevel="toNextLevel"
@refreshTree="refreshTree"></build-table> @refreshTree="refreshTree"></build-table>
@ -129,6 +135,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_buildingTable" ref="ref_buildingTable"
@refreshTree="refreshTree"></room-table> @refreshTree="refreshTree"></room-table>
@ -138,6 +146,8 @@
:ownerName="ownerName" :ownerName="ownerName"
:ownerPhone="ownerPhone" :ownerPhone="ownerPhone"
:rentFlag="rentFlag" :rentFlag="rentFlag"
:purpose="purpose"
:remark="remark"
ref="ref_communityTable" ref="ref_communityTable"
@refreshTree="refreshTree"></community-table> @refreshTree="refreshTree"></community-table>
@ -147,16 +157,16 @@
</template> </template>
<script> <script>
import CDialog from '@c/CDialog' import CDialog from '@c/CDialog'
import communityTable from './communityTable' import communityTable from './communityTable'
import buildTable from './buildTable' import buildTable from './buildTable'
import roomTable from './roomTable' import roomTable from './roomTable'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
filterText: '', filterText: '',
@ -475,63 +485,63 @@
components: { components: {
communityTable, buildTable, roomTable communityTable, buildTable, roomTable
} }
} }
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
.div_main { .div_main {
display: flex; display: flex;
} }
.scrollar { .scrollar {
margin-top: 10px; margin-top: 10px;
} }
.div_tree { .div_tree {
flex: 0 0 280px; flex: 0 0 280px;
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
overflow-y: hidden; overflow-y: hidden;
} }
.filter_tree { .filter_tree {
overflow-x: auto; overflow-x: auto;
} }
.div_table { .div_table {
margin-left: 15px; margin-left: 15px;
// flex: 1; // flex: 1;
width: calc(100% - 300px); width: calc(100% - 300px);
background-color: #ffffff; background-color: #ffffff;
border-radius: 5px; border-radius: 5px;
padding: 10px; padding: 10px;
} }
.div_btn { .div_btn {
margin-top: 20px; margin-top: 20px;
} }
.row { .row {
padding: 10px; padding: 10px;
} }
</style> </style>
<style> <style>
/* .aui-content > .el-tabs > .el-tabs__content { /* .aui-content > .el-tabs > .el-tabs__content {
padding: 0px; padding: 0px;
} */ } */
.el-tree-node:focus > .el-tree-node__content { .el-tree-node:focus > .el-tree-node__content {
/* background-color: #ccc !important; */ /* background-color: #ccc !important; */
color: #2195fe; color: #2195fe;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.div_tree { .div_tree {
/deep/ .el-scrollbar__wrap { /deep/ .el-scrollbar__wrap {
overflow-x: hidden !important; overflow-x: hidden !important;
} }
} }
</style> </style>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss"; @import "@/assets/scss/modules/visual/communityManage.scss";
</style> </style>

15
src/views/modules/base/community/roomForm.vue
View File

@ -115,6 +115,7 @@
label-width="150px" label-width="150px"
style="display: block"> style="display: block">
<el-input class="item_width_1" <el-input class="item_width_1"
maxlength="30"
placeholder="请输入备注" placeholder="请输入备注"
v-model="dataForm.remark"> v-model="dataForm.remark">
</el-input> </el-input>
@ -135,13 +136,13 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
import { requestPost, requestGet } from '@/js/dai/request' import { requestPost, requestGet } from '@/js/dai/request'
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
@ -387,8 +388,8 @@
}, },
props: {} props: {}
} }
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManageForm.scss"; @import "@/assets/scss/modules/visual/communityManageForm.scss";
</style> </style>

89
src/views/modules/base/community/roomTable.vue
View File

@ -188,14 +188,14 @@
<script> <script>
import roomForm from './roomForm' import roomForm from './roomForm'
import { requestPost } from "@/js/dai/request"; import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // 引入Loading服务 import { Loading } from 'element-ui' // 引入Loading服务
let loading // 加载动画 let loading // 加载动画
export default { export default {
data () { data () {
return { return {
source: 'tree',//来源 source: 'tree',//来源
@ -209,11 +209,7 @@ export default {
// showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断 // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
agencyObj: {},//树所选的小区对象 agencyObj: {},//树所选的小区对象
ownerName: '',
ownerPhone: '',
rentFlag: '',
purpose: '',
remark: '',
validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量 validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
selection: [], selection: [],
@ -264,13 +260,13 @@ export default {
return index + 1; return index + 1;
}, },
handleSortOrderChange (value) { handleSortOrderChange (value) {
console.log(value.column, value.prop, value.order)
this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
this.loadTable() this.loadTable()
}, },
handleSortChange (value) { handleSortChange (value) {
console.log(value.column, value.prop, value.order)
this.sortType = value.order === 'ascending' ? 'asc' : 'desc' this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
this.loadTable() this.loadTable()
@ -285,7 +281,7 @@ export default {
async handleChangeSort (row, index) { async handleChangeSort (row, index) {
// row.isChange = false // row.isChange = false
console.log(row.sort)
let params = { let params = {
id: row.houseId, id: row.houseId,
sort: row.sort, sort: row.sort,
@ -325,7 +321,7 @@ export default {
}, },
async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag, purpose, remark) { async loadTable (source, treeObj) {
this.source = source this.source = source
this.tableLoading = true this.tableLoading = true
@ -333,18 +329,10 @@ export default {
if (source === 'tree') {//来源于tree，查询数据清空 if (source === 'tree') {//来源于tree，查询数据清空
this.sortType = 'asc' this.sortType = 'asc'
this.agencyObj = treeObj this.agencyObj = treeObj
this.ownerName = null
this.ownerPhone = null
this.rentFlag = null
this.purpose = null
this.remark = null
} else if (source === 'search') {//来源于查询 } else if (source === 'search') {//来源于查询
this.agencyObj = treeObj this.agencyObj = treeObj
this.ownerName = ownerName
this.ownerPhone = ownerPhone
this.rentFlag = rentFlag
this.purpose = purpose
this.remark = remark
} }
// if (fromTree) { // if (fromTree) {
@ -359,9 +347,9 @@ export default {
ownerName: this.ownerName, ownerName: this.ownerName,
ownerPhone: this.ownerPhone, ownerPhone: this.ownerPhone,
rentFlag: this.rentFlag, rentFlag: this.rentFlag,
sortType: this.sortType,
purpose: this.purpose, purpose: this.purpose,
remark: this.remark remark: this.remark,
sortType: this.sortType,
} }
const url = "/gov/org/house/houselist" const url = "/gov/org/house/houselist"
@ -411,7 +399,7 @@ export default {
this.formTitle = '新增房屋' this.formTitle = '新增房屋'
this.formShow = true this.formShow = true
this.$nextTick(() => { this.$nextTick(() => {
console.log(this.agencyObj)
this.$refs.ref_form.initForm('add', null, this.agencyObj) this.$refs.ref_form.initForm('add', null, this.agencyObj)
}) })
}, },
@ -628,6 +616,7 @@ export default {
let url = "/gov/org/house/exportHouseUser" let url = "/gov/org/house/exportHouseUser"
let params = { let params = {
agencyId: '', agencyId: '',
gridId: '', gridId: '',
@ -636,7 +625,31 @@ export default {
rentFlag: this.rentFlag, rentFlag: this.rentFlag,
purpose: this.purpose, purpose: this.purpose,
remark: this.remark, remark: this.remark,
buildingId: this.agencyObj.id buildingId: '',
neighborHoodId: ''
}
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( app.ajax.exportFilePost(
@ -799,23 +812,23 @@ export default {
remark: { remark: {
type: String, type: String,
default: '', default: '',
},
} }
} }
}
</script> </script>
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss"; @import "@/assets/scss/modules/visual/communityManage.scss";
.item_width_4 { .item_width_4 {
width: 120px; width: 120px;
} }
/deep/.el-input-number--medium .el-input-number__decrease, /deep/.el-input-number--medium .el-input-number__decrease,
/deep/.el-input-number--medium .el-input-number__increase { /deep/.el-input-number--medium .el-input-number__increase {
width: 26px; width: 26px;
} }
/deep/.el-input-number--medium .el-input__inner { /deep/.el-input-number--medium .el-input__inner {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
} }
</style> </style>

14
src/views/modules/base/resi.vue
View File

@ -197,7 +197,7 @@
<el-tabs v-model="activeName" <el-tabs v-model="activeName"
@tab-click="handleClick"> @tab-click="handleClick">
<el-tab-pane v-for="item in tabsList" <el-tab-pane v-for="item in tabsList"
:key="item.columnName" :key="item.groupId"
:label="item.label" :label="item.label"
:name="'group' + item.groupId"> :name="'group' + item.groupId">
<resi-form :ref="'group' + item.groupId" <resi-form :ref="'group' + item.groupId"
@ -245,7 +245,7 @@
<el-tabs v-model="activeName" <el-tabs v-model="activeName"
@tab-click="handleClick"> @tab-click="handleClick">
<el-tab-pane v-for="item in tabsList" <el-tab-pane v-for="item in tabsList"
:key="item.columnName" :key="item.groupId"
:label="item.label" :label="item.label"
:name="'group' + item.groupId"> :name="'group' + item.groupId">
<edit-resi :ref="'group' + item.groupId" <edit-resi :ref="'group' + item.groupId"
@ -833,10 +833,11 @@ export default {
async handleChangeGroup (val) { async handleChangeGroup (val) {
console.log('changeguoprrrrr----', val) console.log('changeguoprrrrr----', val)
let { childGroup, value } = val let { childGroup, value } = val
let hasT = false let hasT = false
let i = 0 let i = 0
// const list = { ...this.tabsList } let list = [...this.tabsList]
this.tabsList.forEach((item, index) => { list.forEach((item, index) => {
if (item.tableName === childGroup.tableName) { if (item.tableName === childGroup.tableName) {
hasT = true hasT = true
i = index i = index
@ -853,12 +854,13 @@ export default {
// console.log('') // console.log('')
} }
}) })
this.tabsList.push(childGroup) list.push(childGroup)
} }
} else { } else {
// console.log('changegroup----000', value) // console.log('changegroup----000', value)
if (hasT) this.tabsList.splice(i, 1) if (hasT) list.splice(i, 1)
} }
this.tabsList = [...list]
}, },
formetForm () { formetForm () {
const _baseForm = this.$refs.baseForm.handleForm() const _baseForm = this.$refs.baseForm.handleForm()

6
src/views/modules/communityParty/members/cpts/record.vue
View File

@ -80,7 +80,7 @@
class="btn-color-edit" class="btn-color-edit"
>取消</el-button> >取消</el-button>
</template> </template>
<template v-else> <!-- <template v-else>
<el-button <el-button
@click="handleChange(scope.row, 'edit')" @click="handleChange(scope.row, 'edit')"
type="text" type="text"
@ -101,9 +101,7 @@
>删除</el-button >删除</el-button
> >
</el-popconfirm> </el-popconfirm>
<!-- <el-button type="text" size="small" :disabled="disabled" class="btn-color-del" </template> -->
@click="del(scope.row)">删除</el-button> -->
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

2
src/views/modules/communityParty/members/index.vue
View File

@ -490,7 +490,7 @@ export default {
} }
}, },
handleTimeChangePay (timvale) { handleTimeChangePay (val) {
if (val.length > 0) { if (val.length > 0) {
this.searchForm.payStatrDate = val[0] this.searchForm.payStatrDate = val[0]
this.searchForm.payEndDate = val[0] this.searchForm.payEndDate = val[0]

61
src/views/modules/partymember/icpartyorg-add-or-update.vue
View File

@ -42,12 +42,13 @@
placeholder="请选择上级党组织" placeholder="请选择上级党组织"
:props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }" :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
@change="handleChangeOrg" @change="handleChangeOrg"
:disabled="dataForm.id || dataForm.orgId ? true : false"
clearable /> clearable />
</el-form-item> </el-form-item>
<el-form-item label="党组织介绍" prop="introduction"> <el-form-item label="党组织介绍" prop="introduction">
<el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input> <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="位置坐标" <el-form-item label="党组织位置"
prop="longitude" prop="longitude"
style="display: block"> style="display: block">
<div class="item_width_1"> <div class="item_width_1">
@ -70,7 +71,7 @@
</div> </div>
</div> </div>
<div id="lon_lat_id" style="margin-top: 10px; display: none"> <!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
<span>经度</span> <span>经度</span>
<el-input class="item_width_3" <el-input class="item_width_3"
maxlength="50" maxlength="50"
@ -85,7 +86,7 @@
:readonly="true" :readonly="true"
v-model="dataForm.latitude"> v-model="dataForm.latitude">
</el-input> </el-input>
</div> </div> -->
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -123,11 +124,12 @@
latitude: '', //纬度 latitude: '', //纬度
address: '', address: '',
introduction: '', // 党组织介绍 introduction: '', // 党组织介绍
orgId: '',
customerId: '', customerId: '',
staffId:'', staffId:'',
orgPidName: '', orgPidName: '',
agencyName:'' agencyName:'',
pid: ''
}, },
orgListVisible: false, orgListVisible: false,
agencyListVisible:false, agencyListVisible:false,
@ -159,13 +161,15 @@
this.getInfo() this.getInfo()
} else { } else {
this.initMap() this.initMap()
if(this.dataForm.orgPids) { if(this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids + ':' + this.dataForm.orgId
console.log(this.dataForm.orgPid)
console.log(this.dataForm.orgPids)
} else { } else {
this.dataForm.mySelectOrg = '' this.dataForm.mySelectOrg = ''
} }
this.orgListTreeSetDefaultHandle()
} }
}) })
}) })
@ -220,16 +224,16 @@
} }
this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => { this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.agencyOrgList = this.removeEmptyChildren(res.data) this.agencyOrgList = this.removeEmptyChildren(res.data)
}).catch(() => {}) }).catch(() => {})
}, },
// 获取党组织列表 // 获取党组织列表
getOrgList() { 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) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.orgList = this.removeEmptyChildren(res.data) this.orgList = this.removeEmptyChildren(res.data)
this.orgList.unshift({ this.orgList.unshift({
@ -268,14 +272,14 @@
getInfo() { getInfo() {
this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => { this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.dataForm = { this.dataForm = {
...this.dataForm, ...this.dataForm,
...res.data ...res.data
} }
// 党组织组织 // 党组织组织
this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':') this.dataForm.mySelectOrg = this.dataForm.orgPid
// 行政组织 // 行政组织
this.dataForm.agencyId = this.dataForm.agencyId this.dataForm.agencyId = this.dataForm.agencyId
this.initMap() this.initMap()
@ -292,23 +296,18 @@
orgType:this.dataForm.partyOrgType} orgType:this.dataForm.partyOrgType}
}).then(({data: res}) => { }).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.agencyOrgList = res.data this.agencyOrgList = res.data
}).catch(() => { }).catch(() => {
}) })
}, },
// 上级党组织树, 设置默认值
orgListTreeSetDefaultHandle() {
this.dataForm.orgPid = '0'
this.dataForm.orgPidName = '一级组织'
},
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap () { initMap () {
document.getElementById('app').innerHTML = '' document.getElementById('app').innerHTML = ''
if (document.getElementById('app')) { if (document.getElementById('app')) {
document.getElementById('mapSeach_id').style.display = "block" document.getElementById('mapSeach_id').style.display = "block"
document.getElementById('lon_lat_id').style.display = "block" // document.getElementById('lon_lat_id').style.display = "block"
} }
// 定义地图中心点坐标 // 定义地图中心点坐标
@ -416,13 +415,16 @@
}, },
// 表单提交 // 表单提交
dataFormSubmitHandle: debounce(function () { dataFormSubmitHandle: debounce(function () {
if (!this.dataForm.latitude || !this.dataForm.longitude) {
return this.$message.error('请滑动地图选择党组织位置')
}
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (!valid) { if (!valid) {
return false return false
} }
this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => { this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
@ -442,23 +444,16 @@
dataRule() { dataRule() {
return { return {
partyOrgName: [ partyOrgName: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: "党组织名称不能为空", trigger: 'blur'}
], ],
mySelectOrg: [ mySelectOrg: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: "上级党组织不能为空", trigger: 'blur'}
], ],
partyOrgType: [ partyOrgType: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: "党组织类型不能为空", trigger: 'blur'}
],
longitude: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
],
latitude: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'}
], ],
agencyId: [ agencyId: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: "行政组织不能为空", trigger: 'blur'}
] ]
} }
} }

23
src/views/modules/partymember/icpartyorgtree.vue
View File

@ -19,17 +19,17 @@
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)" <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
@click="handleLook(scope.row.agencyId)" @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">{{'查看党员'}}</el-button> class="div-table-button--detail">{{'查看党员'}}</el-button>
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)" <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
@click="addOrUpdateHandle('', scope.row.orgPids)" @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids)"
type="text" type="text"
size="small" size="small"
class="div-table-button--add">新增下级</el-button> class="div-table-button--add">新增下级</el-button>
<el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)" <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" type="text"
size="small" size="small"
class="div-table-button--edit">修改</el-button> class="div-table-button--edit">修改</el-button>
@ -98,7 +98,7 @@
} }
await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => { await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} else { } else {
this.tableData = res.data this.tableData = res.data
} }
@ -106,12 +106,15 @@
this.tableLoading = false this.tableLoading = false
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id, orgPids) { addOrUpdateHandle (id, orgId, orgPids, pid) {
console.log('pid:::::', pid)
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.dataForm.id = id this.$refs.addOrUpdate.dataForm.id = id
// 新增下级需要传 // 新增下级需要传
this.$refs.addOrUpdate.dataForm.orgPids = orgPids // 党组织 this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织
this.$refs.addOrUpdate.dataForm.orgPids = orgPids
this.$refs.addOrUpdate.dataForm.pid = pid
this.$refs.addOrUpdate.init() this.$refs.addOrUpdate.init()
}) })
@ -125,7 +128,7 @@
}).then(() => { }).then(() => {
this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => { this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t('prompt.success'),
@ -139,10 +142,10 @@
}).catch(() => {}) }).catch(() => {})
}, },
// 查看党员 // 查看党员
handleLook(agencyId) { handleLook(agencyPids, id, row) {
this.lookMemberShow = true this.lookMemberShow = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_table_Member.initForm(agencyId) this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
}) })
}, },
lookMemberClose () { lookMemberClose () {

50
src/views/modules/partymember/lookMember.vue
View File

@ -6,7 +6,6 @@
<el-table ref="ref_table" <el-table ref="ref_table"
:data="tableData" :data="tableData"
border border
:height="tableHeight"
v-loading="tableLoading" v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%" style="width: 100%"
@ -21,6 +20,16 @@
label="身份证号"> label="身份证号">
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
</el-pagination>
</div> </div>
</div> </div>
</div> </div>
@ -41,21 +50,23 @@ export default {
// 列表相关 // 列表相关
tableData: [], tableData: [],
tableLoading: false, tableLoading: false,
orgPids: '' agencyId: '',
partyOrgId: '',
pageNo: 1,
pageSize: 20,
total: 1,
} }
}, },
props: { props: {
}, },
computed: { computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
},
...mapGetters(['clientHeight', 'iframeHeight']) ...mapGetters(['clientHeight', 'iframeHeight'])
}, },
components: {}, components: {},
methods: { methods: {
initForm (agencyId) { initForm (agencyId, id) {
this.orgPids = agencyId this.agencyId = agencyId
this.partyOrgId = id
this.tableLoading = true this.tableLoading = true
this.loadTable() this.loadTable()
}, },
@ -66,17 +77,32 @@ export default {
// 查询列表 // 查询列表
async loadTable () { async loadTable () {
let params = { let params = {
partyOrgId: this.orgPids, agencyId: this.agencyId,
pageNo: 1, partyOrgId: this.partyOrgId,
pageSize: 10000000 pageNo: this.pageNo,
pageSize: this.pageSize
} }
const url = `/resi/partymember/icPartyMember/page` 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 this.tableLoading = false
if (code !== 0) {
return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
}
if (code === 0) { if (code === 0) {
this.tableData = data.list ? data.list : [] this.tableData = data.list ? data.list : []
this.total = data.total || 0;
} }
} },
handleSizeChange (val) {
console.log(`每页 ${val} 条`)
this.pageSize = val
this.loadTable()
},
handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.loadTable();
},
}, },
} }
</script> </script>

77
src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
View File

@ -1,21 +1,21 @@
<template> <template>
<el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看详情' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看详情' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm" <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm"
@keyup.enter.native="dataFormSubmitHandle()" label-width="140px" disabled> @keyup.enter.native="dataFormSubmitHandle()" label-width="140px">
<div v-if="dataForm.flag === '2'"> <div v-if="dataForm.flag === '2'">
<div style="margin-left: 50px;height: 30px;font-weight: bold;">房屋信息</div> <div style="margin-left: 50px;height: 30px;font-weight: bold;">房屋信息</div>
<el-form-item label="所属社区" prop="gridName"> <el-form-item label="所属社区" prop="gridName">
<el-input v-model="dataForm.gridName" placeholder="网格"></el-input> <el-input v-model="dataForm.gridName" placeholder="网格" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="所属网格" prop="gridName"> <el-form-item label="所属网格" prop="gridName">
<el-input v-model="dataForm.gridName" placeholder="所属网格"></el-input> <el-input v-model="dataForm.gridName" placeholder="所属网格" disabled></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="房屋" prop="homeName"> <el-form-item label="房屋" prop="homeName">
<el-input v-model="dataForm.homeName" placeholder="房屋"></el-input> <el-input v-model="dataForm.homeName" placeholder="房屋" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="房主姓名" prop="ownerName"> <el-form-item label="房主姓名" prop="ownerName">
<el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input> <el-input v-model="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div style="padding:20px 30px"> <div style="padding:20px 30px">
@ -30,6 +30,7 @@
<el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column> <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column> <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column> <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
<el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
<el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column> <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
<el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column> <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column> <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
@ -52,52 +53,59 @@
<div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div> <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
<div style="margin-left: 50px;height: 30px;">出租人信息</div> <div style="margin-left: 50px;height: 30px;">出租人信息</div>
<el-form-item label="出租人姓名" prop="lessorName"> <el-form-item label="出租人姓名" prop="lessorName">
<el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input> <el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出租人身份证" prop="lessorIdCard"> <el-form-item label="出租人身份证" prop="lessorIdCard">
<el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input> <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证" disabled></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="出租人手机" prop="lessorMobile"> <el-form-item label="出租人手机" prop="lessorMobile">
<el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input> <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机" disabled></el-input>
</el-form-item>
<el-form-item label="与房主关系" prop="lessorRelation">
<!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
<el-select v-model="dataForm.lessorRelation" placeholder="与房主关系" :disabled="dataForm.state !== '0'">
<el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<br/>
<el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
<template>
<label v-for="(item,index) in dataForm.agencyImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
</label>
</template>
</el-form-item> </el-form-item>
<br/> <br/>
<div style="margin-left: 50px;height: 30px;">承租人信息</div> <div style="margin-left: 50px;height: 30px;">承租人信息</div>
<el-form-item label="承租人姓名" prop="lesseeName"> <el-form-item label="承租人姓名" prop="lesseeName">
<el-input v-model="dataForm.lesseeName" placeholder="承租人姓名"></el-input> <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="承租人身份证" prop="lesseeIdCard"> <el-form-item label="承租人身份证" prop="lesseeIdCard">
<el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证"></el-input> <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" disabled></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="承租人手机" prop="lesseeMobile"> <el-form-item label="承租人手机" prop="lesseeMobile">
<el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input> <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" disabled></el-input>
</el-form-item>
<br/>
<el-form-item label="与房主关系" prop="lessorRelation">
<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>
</el-form-item> </el-form-item>
<br/> <el-form-item label="工作单位" prop="lesseeUnit">
<el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'"> <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" disabled></el-input>
<template>
<label v-for="(item,index) in dataForm.agencyImgList" :key="index">
<img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
</label>
</template>
</el-form-item> </el-form-item>
<br/> <br/>
<div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div> <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
<el-form-item label="签署日期" prop="signDate"> <el-form-item label="签署日期" prop="signDate">
<el-input v-model="dataForm.signDate" placeholder="签署日期"></el-input> <el-input v-model="dataForm.signDate" placeholder="签署日期" disabled></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="合同开始日期" prop="startDate"> <el-form-item label="合同开始日期" prop="startDate">
<el-input v-model="dataForm.startDate" placeholder="合同开始日期"></el-input> <el-input v-model="dataForm.startDate" placeholder="合同开始日期" disabled></el-input>
</el-form-item> </el-form-item>
<el-form-item label="合同结束日期" prop="endDate"> <el-form-item label="合同结束日期" prop="endDate">
<el-input v-model="dataForm.endDate" placeholder="合同结束日期"></el-input> <el-input v-model="dataForm.endDate" placeholder="合同结束日期" disabled></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
@ -145,16 +153,30 @@ export default {
lessorName: '', lessorName: '',
lessorIdCard: '', lessorIdCard: '',
lessorMobile: '', lessorMobile: '',
lessorRelation: '',
lesseeName: '', lesseeName: '',
lesseeIdCard: '', lesseeIdCard: '',
lesseeMobile: '', lesseeMobile: '',
lesseeUnit: '',
signDate: '', signDate: '',
startDate: '', startDate: '',
endDate: '' endDate: ''
}, },
dataListLoading: false, dataListLoading: false,
dialogVisible: false, dialogVisible: false,
dialogImageUrl: '' dialogImageUrl: '',
lessorRelationArr: [
{ dictValue: '本人', dictName: '本人' },
{ dictValue: '配偶', dictName: '配偶' },
{ dictValue: '子女', dictName: '子女' },
{ dictValue: '父母', dictName: '父母' },
{ dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
{ dictValue: '祖父母', dictName: '祖父母' },
{ dictValue: '媳婿', dictName: '媳婿' },
{ dictValue: '孙子女', dictName: '孙子女' },
{ dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
{ dictValue: '中介', dictName: '中介' }
]
} }
}, },
computed: { computed: {
@ -252,7 +274,8 @@ export default {
const params = { const params = {
id: this.dataForm.id, id: this.dataForm.id,
state: type, state: type,
homeId: this.dataForm.homeId homeId: this.dataForm.homeId,
lessorRelation: this.dataForm.lessorRelation
} }
this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {

5
src/views/modules/visual/basicinfo/basicInfoCommunity.vue
View File

@ -46,7 +46,7 @@
</div> </div>
<div class="icon_roomstate"> <div class="icon_roomstate">
<div>{{item.rentFlag}}</div> <div :style="{ color: item.rentFlag == '自住' ? '#3dda83' : item.rentFlag == '出租' ? '#e43c26' : '#fac126' }">{{item.rentFlag}}</div>
</div> </div>
<div class="icon_category"> <div class="icon_category">
@ -163,9 +163,6 @@ export default {
runNum: 0, runNum: 0,
runAgencyArray: [], runAgencyArray: [],
} }
}, },
async mounted () { async mounted () {

10
src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
View File

@ -233,21 +233,21 @@ export default {
xzHouseTotal: 200,//房屋闲置总数 xzHouseTotal: 200,//房屋闲置总数
xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的） xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的）
}, },
houseColorArray: ['#FAC126', '#3DDA83', '#2865FA'], houseColorArray: ['#3dda83', '#e43c26', '#fac126'],
housePieData: [], housePieData: [],
legendArray: [ legendArray: [
{ {
name: '自住房屋数', name: '自住房屋数',
url: require('../../../../../assets/img/shuju/measure/huang@2x.png') url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
}, },
{ {
name: '出租房屋数', name: '出租房屋数',
url: require('../../../../../assets/img/shuju/measure/lv@2x.png') url: require('../../../../../assets/img/shuju/measure/hong@2x.png')
}, },
{ {
name: '闲置房屋数', name: '闲置房屋数',
url: require('../../../../../assets/img/shuju/measure/lan@2x.png') url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
} }
], ],
@ -265,7 +265,7 @@ export default {
ldUserRatio: '5%',//流动居民总数占比 ldUserRatio: '5%',//流动居民总数占比
}, },
userColorArray: ['#ff7800', '#00E5ED'], userColorArray: ['#3dda83', '#e43c26'],
userPieData: [], userPieData: [],
subList: [], subList: [],

2
src/views/modules/visual/communityParty/community.vue
View File

@ -1255,7 +1255,7 @@ export default {
} }
} }
.table-h { .table-h {
height: 360px; height: 320px;
} }
.calc-h { .calc-h {
height: calc(100vh - 240px); height: calc(100vh - 240px);

18
src/views/modules/visual/communityParty/gridParty.vue
View File

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

7
src/views/modules/visual/communityParty/memberInfo.vue
View File

@ -29,6 +29,10 @@
<span class="item-field">需求类型：</span> <span class="item-field">需求类型：</span>
<span v-if="info.categoryName">{{ info.categoryName }}</span> <span v-if="info.categoryName">{{ info.categoryName }}</span>
</div> </div>
<div class="item">
<span class="item-field">上报类型：</span>
<span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
</div>
<div class="item"> <div class="item">
<span class="item-field">上报人：</span> <span class="item-field">上报人：</span>
<span v-if="info.reportUserName">{{ info.reportUserName }}</span> <span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@ -171,7 +175,7 @@ export default {
margin-bottom: 0; margin-bottom: 0;
.list { .list {
display: block; display: block;
width: 50%; width: auto;
.item { .item {
display: flex; display: flex;
width: 100%; width: 100%;
@ -228,6 +232,7 @@ export default {
overflow: auto; overflow: auto;
.left-item { .left-item {
padding: 10px 0; padding: 10px 0;
border-right: 1px dashed #1257c9;
cursor: pointer; cursor: pointer;
.item-title { .item-title {
font-size: 16px; font-size: 16px;

1
src/views/modules/visual/communityParty/unitInfo.vue
View File

@ -234,6 +234,7 @@ export default {
overflow: auto; overflow: auto;
.left-item { .left-item {
padding: 10px 0; padding: 10px 0;
border-bottom: 1px dashed #1257c9;
cursor: pointer; cursor: pointer;
.item-title { .item-title {
font-size: 16px; font-size: 16px;

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

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

Write Preview
Loading…
Cancel
Save