Browse Source

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

shibei_master
jiangyy 4 years ago
parent
commit
3455f4572a
  1. 2
      src/assets/scss/modules/visual/duoyuanfenxi.scss
  2. 24
      src/assets/scss/modules/visual/search_1.scss
  3. 6
      src/router/index.js
  4. 125
      src/views/modules/base/community/communityTable.vue
  5. 19
      src/views/modules/base/community/roomForm.vue
  6. 251
      src/views/modules/cabaseinfo/caloudong-add-or-update.vue
  7. 155
      src/views/modules/cabaseinfo/caloudong.vue
  8. 251
      src/views/modules/cabaseinfo/capingfang-add-or-update.vue
  9. 155
      src/views/modules/cabaseinfo/capingfang.vue
  10. 204
      src/views/modules/cabaseinfo/carental-add-or-update.vue
  11. 156
      src/views/modules/cabaseinfo/carental.vue
  12. 216
      src/views/modules/cabaseinfo/caresident-add-or-update.vue
  13. 147
      src/views/modules/cabaseinfo/caresident.vue
  14. 309
      src/views/modules/cabaseinfo/carotators-add-or-update.vue
  15. 141
      src/views/modules/cabaseinfo/carotators.vue
  16. 11
      src/views/modules/shequzhili/event/cpts/add.vue
  17. 8
      src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
  18. 11
      src/views/modules/visual/basicinfo/personCategory/index.vue
  19. 38
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
  20. 2
      src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js
  21. 3
      src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
  22. 8
      src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js
  23. 34
      src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue
  24. 77
      src/views/modules/visual/components/screen-map/index.vue

2
src/assets/scss/modules/visual/duoyuanfenxi.scss

@ -76,7 +76,7 @@
position: relative; position: relative;
height: 100%; height: 100%;
.tb { .tb {
height: calc(100% - 50px); height: calc(100% - 40px);
overflow-y: auto; overflow-y: auto;
@include scrollBar; @include scrollBar;
/deep/ .table-status { /deep/ .table-status {

24
src/assets/scss/modules/visual/search_1.scss

@ -81,6 +81,30 @@
} }
} }
} }
.range-data2 {
::v-deep .el-date-editor {
width: 360px;
position: relative;
.el-range-input {
color: #fff;
background: #06186d;
margin-left: 10px;
}
.el-range-separator {
color: #fff;
}
.el-range__icon {
position: absolute;
right: 5px;
// float: right;
}
.el-input__prefix {
left: unset;
right: 5px;
}
}
}
.one-date{ .one-date{
::v-deep .el-date-editor { ::v-deep .el-date-editor {

6
src/router/index.js

@ -377,7 +377,7 @@ router.beforeEach((to, from, next) => {
], ],
}, },
]; ];
fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
http http
.get("/gov/access/menu/nav?tableName=data_menu") .get("/gov/access/menu/nav?tableName=data_menu")
@ -391,8 +391,8 @@ router.beforeEach((to, from, next) => {
}); });
} }
// window.SITE_CONFIG["menuShujuList"] = res.data; window.SITE_CONFIG["menuShujuList"] = res.data;
// fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
next({ next({
...to, ...to,

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

@ -2,6 +2,12 @@
<div> <div>
<div class="div_btn"> <div class="div_btn">
<el-button v-if="showYhymInfo"
style=""
class="diy-button--reset"
size="small"
:loading="yhymLoading"
@click="handleYhymInfo">补全一户一码信息</el-button>
<el-button style="" <el-button style=""
class="diy-button--add" class="diy-button--add"
size="small" size="small"
@ -66,7 +72,7 @@
<el-button style="margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExportOpen">导出</el-button>
<el-button v-if="agencyObj.level == 'community'" <el-button v-if="agencyObj.level == 'community'"
style="margin-left:10px" style="margin-left:10px"
class="diy-button--qrcode" class="diy-button--qrcode"
@ -76,11 +82,11 @@
class="diy-button--more" class="diy-button--more"
size="small" size="small"
@click="deleteBatch">批量删除</el-button> @click="deleteBatch">批量删除</el-button>
<el-button style=";margin-left:10px" <!-- <el-button style=";margin-left:10px"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
:disabled="yihuyidangDisabled" :disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button> @click="handleExportYihuyidang()">导出一户一档</el-button> -->
</div> </div>
@ -183,6 +189,31 @@
@dialogOk="addFormOk"></community-form> @dialogOk="addFormOk"></community-form>
</el-dialog> </el-dialog>
<el-dialog
title="导出"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
<div>
<el-button class="diy-button--reset"
size="small"
@click="handleExport">导出房屋数据</el-button>
<el-button class="diy-button--export"
size="small"
:disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button>
<el-button class="diy-button--qrcode"
size="small"
:disabled="yihuyimaDisabled"
:loading="exportBtn"
@click="handleExportYihuyima()">导出一户一码</el-button>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<!-- <el-button type="primary" @click="dialogVisible = false"> </el-button> -->
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -208,6 +239,9 @@ export default {
tableLoading: true, tableLoading: true,
showImportBtn: false,// showImportBtn: false,//
roleList: [],//
showYhymInfo: false, //
yhymLoading: false,
agencyObj: {},// agencyObj: {},//
@ -225,7 +259,9 @@ export default {
fileName: "", fileName: "",
uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import', uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
yihuyidangDisabled: false, yihuyidangDisabled: false,
yihuyimaDisabled: false,
exportBtn: false,
dialogVisible: false //
} }
}, },
components: { components: {
@ -246,7 +282,13 @@ export default {
async loadTable (fromTree, treeObj) { async loadTable (fromTree, treeObj) {
console.log(111, this.staffAgencyId) console.log(111, this.staffAgencyId)
//
this.roleList = localStorage.getItem('roleList')
if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
this.showYhymInfo = true
} else {
this.showYhymInfo = false
}
this.tableLoading = true this.tableLoading = true
if (fromTree) { if (fromTree) {
this.agencyObj = treeObj this.agencyObj = treeObj
@ -330,6 +372,34 @@ export default {
}) })
}, },
//
async handleYhymInfo () {
this.yhymLoading = true
const url = "/gov/org/house/createBatchHouseCodeAndUrl"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.yhymLoading = false
this.$message({
type: "success",
message: "批量生成成功"
});
} else if (code > 8000) {
this.yhymLoading = false
this.$message({
showClose: true,
message: msg,
duration: 0
})
} else {
this.yhymLoading = false
this.$message.error(msg)
}
},
handleEdit (row) { handleEdit (row) {
this.formTitle = '修改小区' this.formTitle = '修改小区'
this.formShow = true this.formShow = true
@ -486,7 +556,11 @@ export default {
// this.download(res.data, '1.png') // this.download(res.data, '1.png')
}) })
}, },
// //
handleExportOpen () {
this.dialogVisible = true
},
//
async handleExport () { async handleExport () {
let title = this.agencyObj.label let title = this.agencyObj.label
title = title + '—小区列表' title = title + '—小区列表'
@ -512,6 +586,10 @@ export default {
}, },
handleClose(done) {
this.dialogVisible = false
},
// //
download (data, downFileName) { download (data, downFileName) {
if (!data) { if (!data) {
@ -613,6 +691,41 @@ export default {
}, },
//
handleExportYihuyima () {
this.exportBtn = true
this.yihuyimaDisabled = true
let title = this.agencyObj.label
title = title + '-一户一码'
let url = "/gov/org/house/downloadZip"
let params = {
level: this.agencyObj.level,
id: this.agencyObj.id
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
this.download(data, title + '.Zip')
this.exportBtn = false
this.yihuyimaDisabled = false
},
(rspMsg, data) => {
this.exportBtn = false
this.yihuyimaDisabled = false
this.$message.error(rspMsg);
}
);
},
// //
beforeUpload (file, type) { beforeUpload (file, type) {

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

@ -40,6 +40,25 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<div v-if="formType === 'detail'">
<el-form-item label="房屋编码"
prop="houseCode"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="30"
v-model="dataForm.houseCode">
</el-input>
</el-form-item>
<div v-if="dataForm.houseQrcodeUrl"
style="display: flex;flex-direction: column;">
<img style="margin-left: 70px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div>
</div>
<el-form-item label="房屋类型" <el-form-item label="房屋类型"
prop="houseType" prop="houseType"
label-width="150px" label-width="150px"

251
src/views/modules/cabaseinfo/caloudong-add-or-update.vue

@ -0,0 +1,251 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="楼宇类型" prop="buildingType">
<el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
</el-form-item>
<el-form-item label="用途分类" prop="buildingUse">
<el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
</el-form-item>
<el-form-item label="楼宇状态" prop="buildingStatus">
<el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
</el-form-item>
<el-form-item label="楼宇结构" prop="buildingStructure">
<el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
</el-form-item>
<el-form-item label="使用现状" prop="buildingUseage">
<el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
</el-form-item>
<el-form-item label="建筑时间" prop="constructionTime">
<el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
</el-form-item>
<el-form-item label="所处位置" prop="buildingAddr">
<el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
</el-form-item>
<el-form-item label="小区(单位)名称" prop="communityName">
<el-input v-model="dataForm.communityName" placeholder="小区(单位)名称"></el-input>
</el-form-item>
<el-form-item label="楼栋长" prop="buildingLeader">
<el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
</el-form-item>
<el-form-item label="楼层数" prop="layerCount">
<el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
</el-form-item>
<el-form-item label="地下楼层数" prop="basementLayerCount">
<el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
</el-form-item>
<el-form-item label="住宅开始层数" prop="houseBeginLayer">
<el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
</el-form-item>
<el-form-item label="单元数" prop="unitCount">
<el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
</el-form-item>
<el-form-item label="每层每单元户数" prop="layerRoomCount">
<el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
</el-form-item>
<el-form-item label="总房屋数" prop="roomCount">
<el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
</el-form-item>
<el-form-item label="电梯数量" prop="elevatorCount">
<el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
</el-form-item>
<el-form-item label="建筑面积" prop="buildingArea">
<el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
</el-form-item>
<el-form-item label="物业公司" prop="buildingPmc">
<el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
</el-form-item>
<el-form-item label="介绍" prop="buildingDesc">
<el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
</el-form-item>
<el-form-item label="标绘状态" prop="pointStatus">
<el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
</el-form-item>
<el-form-item label="数据来源" prop="platCode">
<el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
buildingId: '',
buildingType: '',
gridId: '',
buildingName: '',
buildingUse: '',
buildingStatus: '',
buildingStructure: '',
buildingUseage: '',
constructionTime: '',
buildingAddr: '',
communityName: '',
buildingLeader: '',
layerCount: '',
basementLayerCount: '',
houseBeginLayer: '',
unitCount: '',
layerRoomCount: '',
roomCount: '',
elevatorCount: '',
buildingArea: '',
buildingPmc: '',
buildingDesc: '',
pointStatus: '',
longitude: '',
latitude: '',
platCode: '',
createBy: '',
createDate: '',
updateBy: '',
updateDate: '',
deleteFlag: '',
versions: '',
communityId: ''
}
}
},
computed: {
dataRule () {
return {
buildingType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingUse: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingStructure: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingUseage: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
constructionTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingAddr: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingLeader: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
layerCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
basementLayerCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
houseBeginLayer: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
unitCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
layerRoomCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
roomCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
elevatorCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingArea: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingPmc: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingDesc: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
pointStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
longitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
latitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
platCode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.post(`/opendata/caLoudong/getLouDongDetails`, { buildingId: this.dataForm.id }).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caLoudong/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

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

@ -0,0 +1,155 @@
<template>
<div class="mod-axis__caLoudong}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
placeholder="楼宇名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="小区(单位)名称" prop="communityName">
<el-input
v-model="dataForm.communityName"
placeholder="小区(单位)名称"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> -->
</el-form>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
prop="buildingName"
label="楼宇名称"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingUse"
label="用途分类"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingAddr"
label="所处位置"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="communityName"
label="小区(单位)名称"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="layerCount"
label="楼层数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="unitCount"
label="单元数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="roomCount"
label="总房屋数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="elevatorCount"
label="电梯数量"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingPmc"
label="物业公司"
header-align="center"
align="center"
></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="addOrUpdateHandle(scope.row.buildingId)"
>查看</el-button
>
</template>
</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>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</el-card>
</div>
</template>
<script>
import mixinViewModule from "@/mixins/view-post";
import AddOrUpdate from "./caloudong-add-or-update";
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: "/opendata/caLoudong/getPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
buildingName: "",
communityName: "",
},
};
},
components: {
AddOrUpdate,
},
};
</script>

251
src/views/modules/cabaseinfo/capingfang-add-or-update.vue

@ -0,0 +1,251 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="楼宇类型" prop="buildingType">
<el-input v-model="dataForm.buildingType" placeholder="楼宇类型"></el-input>
</el-form-item>
<el-form-item label="楼宇名称" prop="buildingName">
<el-input v-model="dataForm.buildingName" placeholder="楼宇名称"></el-input>
</el-form-item>
<el-form-item label="用途分类" prop="buildingUse">
<el-input v-model="dataForm.buildingUse" placeholder="用途分类"></el-input>
</el-form-item>
<el-form-item label="楼宇状态" prop="buildingStatus">
<el-input v-model="dataForm.buildingStatus" placeholder="楼宇状态"></el-input>
</el-form-item>
<el-form-item label="楼宇结构" prop="buildingStructure">
<el-input v-model="dataForm.buildingStructure" placeholder="楼宇结构"></el-input>
</el-form-item>
<el-form-item label="使用现状" prop="buildingUseage">
<el-input v-model="dataForm.buildingUseage" placeholder="使用现状"></el-input>
</el-form-item>
<el-form-item label="建筑时间" prop="constructionTime">
<el-input v-model="dataForm.constructionTime" placeholder="建筑时间"></el-input>
</el-form-item>
<el-form-item label="所处位置" prop="buildingAddr">
<el-input v-model="dataForm.buildingAddr" placeholder="所处位置"></el-input>
</el-form-item>
<el-form-item label="小区(单位)名称" prop="communityName">
<el-input v-model="dataForm.communityName" placeholder="小区(单位)名称"></el-input>
</el-form-item>
<el-form-item label="楼栋长" prop="buildingLeader">
<el-input v-model="dataForm.buildingLeader" placeholder="楼栋长"></el-input>
</el-form-item>
<el-form-item label="楼层数" prop="layerCount">
<el-input v-model="dataForm.layerCount" placeholder="楼层数"></el-input>
</el-form-item>
<el-form-item label="地下楼层数" prop="basementLayerCount">
<el-input v-model="dataForm.basementLayerCount" placeholder="地下楼层数"></el-input>
</el-form-item>
<el-form-item label="住宅开始层数" prop="houseBeginLayer">
<el-input v-model="dataForm.houseBeginLayer" placeholder="住宅开始层数"></el-input>
</el-form-item>
<el-form-item label="单元数" prop="unitCount">
<el-input v-model="dataForm.unitCount" placeholder="单元数"></el-input>
</el-form-item>
<el-form-item label="每层每单元户数" prop="layerRoomCount">
<el-input v-model="dataForm.layerRoomCount" placeholder="每层每单元户数"></el-input>
</el-form-item>
<el-form-item label="总房屋数" prop="roomCount">
<el-input v-model="dataForm.roomCount" placeholder="总房屋数"></el-input>
</el-form-item>
<el-form-item label="电梯数量" prop="elevatorCount">
<el-input v-model="dataForm.elevatorCount" placeholder="电梯数量"></el-input>
</el-form-item>
<el-form-item label="建筑面积" prop="buildingArea">
<el-input v-model="dataForm.buildingArea" placeholder="建筑面积"></el-input>
</el-form-item>
<el-form-item label="物业公司" prop="buildingPmc">
<el-input v-model="dataForm.buildingPmc" placeholder="物业公司"></el-input>
</el-form-item>
<el-form-item label="介绍" prop="buildingDesc">
<el-input v-model="dataForm.buildingDesc" placeholder="介绍"></el-input>
</el-form-item>
<el-form-item label="标绘状态" prop="pointStatus">
<el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
</el-form-item>
<el-form-item label="数据来源" prop="platCode">
<el-input v-model="dataForm.platCode" placeholder="数据来源"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
buildingId: '',
buildingType: '',
gridId: '',
buildingName: '',
buildingUse: '',
buildingStatus: '',
buildingStructure: '',
buildingUseage: '',
constructionTime: '',
buildingAddr: '',
communityName: '',
buildingLeader: '',
layerCount: '',
basementLayerCount: '',
houseBeginLayer: '',
unitCount: '',
layerRoomCount: '',
roomCount: '',
elevatorCount: '',
buildingArea: '',
buildingPmc: '',
buildingDesc: '',
pointStatus: '',
longitude: '',
latitude: '',
platCode: '',
createBy: '',
createDate: '',
updateBy: '',
updateDate: '',
deleteFlag: '',
versions: '',
communityId: ''
}
}
},
computed: {
dataRule () {
return {
buildingType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingUse: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingStructure: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingUseage: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
constructionTime: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingAddr: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
communityName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingLeader: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
layerCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
basementLayerCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
houseBeginLayer: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
unitCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
layerRoomCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
roomCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
elevatorCount: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingArea: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingPmc: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
buildingDesc: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
pointStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
longitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
latitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
platCode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.post(`/opendata/caPingfang/getPingFangDetails`, { buildingId: this.dataForm.id }).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.buildingId ? 'post' : 'put']('/axis/caLoudong/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

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

@ -0,0 +1,155 @@
<template>
<div class="mod-axis__caPingfang}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="楼宇名称" prop="buildingName">
<el-input
v-model="dataForm.buildingName"
placeholder="楼宇名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="小区(单位)名称" prop="communityName">
<el-input
v-model="dataForm.communityName"
placeholder="小区(单位)名称"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> -->
</el-form>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
prop="buildingName"
label="楼宇名称"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingUse"
label="用途分类"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingAddr"
label="所处位置"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="communityName"
label="小区(单位)名称"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="layerCount"
label="楼层数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="unitCount"
label="单元数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="roomCount"
label="总房屋数"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="elevatorCount"
label="电梯数量"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="buildingPmc"
label="物业公司"
header-align="center"
align="center"
></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="addOrUpdateHandle(scope.row.buildingId)"
>查看</el-button
>
</template>
</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>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</el-card>
</div>
</template>
<script>
import mixinViewModule from "@/mixins/view-post";
import AddOrUpdate from "./capingfang-add-or-update";
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: "/opendata/caPingfang/getPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
buildingName: "",
communityName: "",
},
};
},
components: {
AddOrUpdate,
},
};
</script>

204
src/views/modules/cabaseinfo/carental-add-or-update.vue

@ -0,0 +1,204 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="房屋编号" prop="houseName">
<el-input v-model="dataForm.houseName" placeholder="房屋编号"></el-input>
</el-form-item>
<el-form-item label="房屋地址" prop="houseAddress">
<el-input v-model="dataForm.houseAddress" placeholder="房屋地址"></el-input>
</el-form-item>
<el-form-item label="建筑用途" prop="houseUse">
<el-input v-model="dataForm.houseUse" placeholder="建筑用途"></el-input>
</el-form-item>
<el-form-item label="建筑面积(平方米)" prop="houseArea">
<el-input v-model="dataForm.houseArea" placeholder="建筑面积(平方米)"></el-input>
</el-form-item>
<el-form-item label="证件代码" prop="idType">
<el-input v-model="dataForm.idType" placeholder="证件代码"></el-input>
</el-form-item>
<el-form-item label="证件号码" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号码"></el-input>
</el-form-item>
<el-form-item label="房主姓名" prop="residentName">
<el-input v-model="dataForm.residentName" placeholder="房主姓名"></el-input>
</el-form-item>
<el-form-item label="房主联系方式" prop="telephone">
<el-input v-model="dataForm.telephone" placeholder="房主联系方式"></el-input>
</el-form-item>
<el-form-item label="房主现居详址" prop="curliveAddress">
<el-input v-model="dataForm.curliveAddress" placeholder="房主现居详址"></el-input>
</el-form-item>
<el-form-item label="出租用途" prop="rentUse">
<el-input v-model="dataForm.rentUse" placeholder="出租用途"></el-input>
</el-form-item>
<el-form-item label="隐患类型" prop="troubleType">
<el-input v-model="dataForm.troubleType" placeholder="隐患类型"></el-input>
</el-form-item>
<el-form-item label="承租人公民身份证号码" prop="renterCardNumber">
<el-input v-model="dataForm.renterCardNumber" placeholder="承租人公民身份证号码"></el-input>
</el-form-item>
<el-form-item label="承租人证件类型" prop="renterCardType">
<el-input v-model="dataForm.renterCardType" placeholder="承租人证件类型"></el-input>
</el-form-item>
<el-form-item label="承租人姓名" prop="renterName">
<el-input v-model="dataForm.renterName" placeholder="承租人姓名"></el-input>
</el-form-item>
<el-form-item label="承租人联系方式" prop="renterPhone">
<el-input v-model="dataForm.renterPhone" placeholder="承租人联系方式"></el-input>
</el-form-item>
<el-form-item label="经度" prop="longitude">
<el-input v-model="dataForm.longitude" placeholder="经度"></el-input>
</el-form-item>
<el-form-item label="纬度" prop="latitude">
<el-input v-model="dataForm.latitude" placeholder="纬度"></el-input>
</el-form-item>
<el-form-item label="标绘状态" prop="pointStatus">
<el-input v-model="dataForm.pointStatus" placeholder="标绘状态"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
rentalId: '',
gridId: '',
houseId: '',
houseName: '',
houseAddress: '',
houseUse: '',
houseArea: '',
idType: '',
idCard: '',
residentName: '',
telephone: '',
curliveAddress: '',
rentUse: '',
troubleType: '',
renterId: '',
renterCardNumber: '',
renterCardType: '',
renterName: '',
renterPhone: '',
longitude: '',
latitude: '',
pointStatus: ''
}
}
},
computed: {
dataRule () {
return {
houseName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
houseAddress: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
houseUse: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
houseArea: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
idType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
idCard: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
residentName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
telephone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddress: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
rentUse: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
troubleType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
renterCardNumber: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
renterCardType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
renterName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
renterPhone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
longitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
latitude: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
pointStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.post(`/opendata/caRental/getRentalDetails`, { rentalId: this.dataForm.id }).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.rentalId ? 'post' : 'put']('/axis/caRental/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

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

@ -0,0 +1,156 @@
<template>
<div class="mod-axis__caRental}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="房屋编号" prop="houseName">
<el-input
v-model="dataForm.houseName"
placeholder="房屋编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="房主姓名" prop="residentName">
<el-input
v-model="dataForm.residentName"
placeholder="房主姓名"
clearable
></el-input>
</el-form-item>
<el-form-item label="承租人姓名" prop="renterName">
<el-input
v-model="dataForm.renterName"
placeholder="承租人姓名"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> -->
</el-form>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
prop="houseName"
label="房屋编号"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="houseAddress"
label="房屋地址"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="houseArea"
label="建筑面积(平方米)"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="residentName"
label="房主姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="telephone"
label="房主联系方式"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="rentUse"
label="出租用途"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="renterName"
label="承租人姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="renterPhone"
label="承租人联系方式"
header-align="center"
align="center"
></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="addOrUpdateHandle(scope.row.rentalId)"
>查看</el-button
>
</template>
</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>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</el-card>
</div>
</template>
<script>
import mixinViewModule from "@/mixins/view-post";
import AddOrUpdate from "./carental-add-or-update";
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: "/opendata/caRental/getPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
houseName: "",
residentName: "",
renterName: "",
},
};
},
components: {
AddOrUpdate,
},
};
</script>

216
src/views/modules/cabaseinfo/caresident-add-or-update.vue

@ -0,0 +1,216 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.residentId ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form disabled :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="人口性质" prop="residentProperty">
<el-input v-model="dataForm.residentProperty" placeholder="人口性质"></el-input>
</el-form-item>
<el-form-item label="居民分类" prop="residentType">
<el-input v-model="dataForm.residentType" placeholder="居民分类"></el-input>
</el-form-item>
<el-form-item label="证件类型" prop="idType">
<el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
</el-form-item>
<el-form-item label="证件号码(公民身份证号)" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="证件号码(公民身份证号)"></el-input>
</el-form-item>
<el-form-item label="姓名" prop="residentName">
<el-input v-model="dataForm.residentName" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-input v-model="dataForm.sex" placeholder="性别"></el-input>
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
</el-form-item>
<el-form-item label="民族" prop="nation">
<el-input v-model="dataForm.nation" placeholder="民族"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="telephone">
<el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
</el-form-item>
<el-form-item label="户籍详址" prop="householdAddressDetail">
<el-input v-model="dataForm.householdAddressDetail" placeholder="户籍详址"></el-input>
</el-form-item>
<el-form-item label="现住详址" prop="curliveAddressDetail">
<el-input v-model="dataForm.curliveAddressDetail" placeholder="现住详址"></el-input>
</el-form-item>
<el-form-item label="学历" prop="education">
<el-input v-model="dataForm.education" placeholder="学历"></el-input>
</el-form-item>
<el-form-item label="职业" prop="occupation">
<el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
</el-form-item>
<el-form-item label="婚姻状况" prop="marriageStatus">
<el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
</el-form-item>
<el-form-item label="政治面貌" prop="party">
<el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
</el-form-item>
<el-form-item label="宗教信仰" prop="religious">
<el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
</el-form-item>
<el-form-item label="有无皈依(已受洗)" prop="conversionState">
<el-input v-model="dataForm.conversionState" placeholder="有无皈依(已受洗)"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
residentId: '',
gridId: '',
residentProperty: '',
residentType: '',
idType: '',
idCard: '',
residentName: '',
sex: '',
birthday: '',
nation: '',
telephone: '',
householdProv: '',
householdCity: '',
householdCounty: '',
householdTown: '',
householdVillage: '',
householdAddressDetail: '',
curliveProv: '',
curliveCity: '',
curliveCounty: '',
curliveTown: '',
curliveVillage: '',
curliveAddressDetail: '',
nativeAddressProv: '',
nativeAddressCity: '',
nativeAddressCounty: '',
formerName: '',
education: '',
occupation: '',
occupationType: '',
serviceAddress: '',
marriageStatus: '',
party: '',
religious: '',
conversionState: '',
nationality: '',
platCode: '',
createBy: '',
createDate: '',
updateBy: '',
updateDate: '',
deleteFlag: '',
versions: ''
}
}
},
computed: {
dataRule () {
return {
residentProperty: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
residentType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
idType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
idCard: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
residentName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
birthday: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
nation: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
telephone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressDetail: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressDetail: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
education: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
occupation: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
party: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
religious: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
conversionState: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.post(`/opendata/caResident/getResidentDetails`, { idCard: this.dataForm.id }).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.residentId ? 'post' : 'put']('/axis/caResident/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

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

@ -0,0 +1,147 @@
<template>
<div class="mod-axis__caResident}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
<el-form-item label="姓名" prop="residentName">
<el-input
v-model="dataForm.residentName"
placeholder="姓名"
clearable
></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="telephone">
<el-input
v-model="dataForm.telephone"
placeholder="联系方式"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> -->
</el-form>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
prop="idCard"
label="证件号码(公民身份证号)"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="residentName"
label="姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="sex"
label="性别"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="birthday"
label="出生日期"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="telephone"
label="联系方式"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="householdAddressDetail"
label="户籍详址"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="curliveAddressDetail"
label="现住详址"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="addOrUpdateHandle(scope.row.idCard)"
>查看</el-button
>
</template>
</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>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</el-card>
</div>
</template>
<script>
import mixinViewModule from "@/mixins/view-post";
import AddOrUpdate from "./caresident-add-or-update";
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: "/opendata/caResident/getPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
idCard: "",
residentName: "",
telephone: "",
},
};
},
components: {
AddOrUpdate,
},
};
</script>

309
src/views/modules/cabaseinfo/carotators-add-or-update.vue

@ -0,0 +1,309 @@
<template>
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('查看')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :disabled="true" :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="公民身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="公民身份证号"></el-input>
</el-form-item>
<el-form-item label="证件类型" prop="idType">
<el-input v-model="dataForm.idType" placeholder="证件类型"></el-input>
</el-form-item>
<el-form-item label="姓名" prop="rotatorsName">
<el-input v-model="dataForm.rotatorsName" placeholder="姓名"></el-input>
</el-form-item>
<el-form-item label="曾用名" prop="formerName">
<el-input v-model="dataForm.formerName" placeholder="曾用名"></el-input>
</el-form-item>
<el-form-item label="性别" prop="sex">
<el-input v-model="dataForm.sex" placeholder="性别"></el-input>
</el-form-item>
<el-form-item label="出生日期" prop="birthday">
<el-input v-model="dataForm.birthday" placeholder="出生日期"></el-input>
</el-form-item>
<el-form-item label="民族" prop="nation">
<el-input v-model="dataForm.nation" placeholder="民族"></el-input>
</el-form-item>
<el-form-item label="婚姻状况" prop="marriageStatus">
<el-input v-model="dataForm.marriageStatus" placeholder="婚姻状况"></el-input>
</el-form-item>
<el-form-item label="政治面貌" prop="party">
<el-input v-model="dataForm.party" placeholder="政治面貌"></el-input>
</el-form-item>
<el-form-item label="学历" prop="education">
<el-input v-model="dataForm.education" placeholder="学历"></el-input>
</el-form-item>
<el-form-item label="宗教信仰" prop="religious">
<el-input v-model="dataForm.religious" placeholder="宗教信仰"></el-input>
</el-form-item>
<el-form-item label="职业类别" prop="occupationType">
<el-input v-model="dataForm.occupationType" placeholder="职业类别"></el-input>
</el-form-item>
<el-form-item label="职业" prop="occupation">
<el-input v-model="dataForm.occupation" placeholder="职业"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="telephone">
<el-input v-model="dataForm.telephone" placeholder="联系方式"></el-input>
</el-form-item>
<el-form-item label="户籍门(楼)详址" prop="householdAddressDetail">
<el-input v-model="dataForm.householdAddressDetail" placeholder="户籍门(楼)详址"></el-input>
</el-form-item>
<el-form-item label="现住地社区/村" prop="curliveAddressVillage">
<el-input v-model="dataForm.curliveAddressVillage" placeholder="现住地社区/村"></el-input>
</el-form-item>
<el-form-item label="现住门(楼)详址" prop="curliveAddressDetail">
<el-input v-model="dataForm.curliveAddressDetail" placeholder="现住门(楼)详址"></el-input>
</el-form-item>
<el-form-item label="是否重点关注人员" prop="isFocusPerson">
<el-input v-model="dataForm.isFocusPerson" placeholder="是否重点关注人员"></el-input>
</el-form-item>
</el-form>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
<!-- <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button> -->
</template>
</el-dialog>
</template>
<script>
import debounce from 'lodash/debounce'
export default {
data () {
return {
visible: false,
dataForm: {
rotatorsId: '',
idCard: '',
idType: '',
rotatorsName: '',
formerName: '',
sex: '',
birthday: '',
nation: '',
nativeAddressProv: '',
nativeAddressCity: '',
nativeAddressCountry: '',
marriageStatus: '',
party: '',
education: '',
religious: '',
occupationType: '',
occupation: '',
serviceAddress: '',
telephone: '',
householdAddressProv: '',
householdAddressCity: '',
householdAddressCountry: '',
householdAddressTown: '',
householdAddressVillage: '',
householdAddressDetail: '',
curliveAddressProv: '',
curliveAddressCity: '',
curliveAddressCountry: '',
curliveAddressTown: '',
curliveAddressVillage: '',
curliveAddressDetail: '',
inflowReason: '',
certificateType: '',
certificateNumber: '',
signDate: '',
endDate: '',
residenceType: '',
isFocusPerson: '',
createBy: '',
createDate: '',
updateBy: '',
updateDate: '',
deleteFlag: '',
platcode: '',
gridId: '',
versions: ''
}
}
},
computed: {
dataRule () {
return {
idCard: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
idType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
rotatorsName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
formerName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
sex: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
birthday: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
nation: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
nativeAddressProv: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
nativeAddressCity: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
nativeAddressCountry: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
marriageStatus: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
party: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
education: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
religious: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
occupationType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
occupation: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
serviceAddress: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
telephone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressProv: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressCity: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressCountry: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressTown: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressVillage: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
householdAddressDetail: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressProv: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressCity: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressCountry: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressTown: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressVillage: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
curliveAddressDetail: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
inflowReason: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
certificateType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
certificateNumber: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
signDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
endDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
residenceType: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
isFocusPerson: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
createDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updateBy: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
updateDate: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
deleteFlag: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
platcode: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
gridId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
versions: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
]
}
}
},
methods: {
init () {
this.visible = true
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.getInfo()
}
})
},
//
getInfo () {
this.$http.post(`/opendata/caRotators/getRotatorsDetails`, { idCard: this.dataForm.id }).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.dataForm = {
...this.dataForm,
...res.data
}
}).catch(() => {})
},
//
dataFormSubmitHandle: debounce(function () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
}
this.$http[!this.dataForm.rotatorsId ? 'post' : 'put']('/axis/caRotators/', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.$message({
message: this.$t('prompt.success'),
type: 'success',
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
}
})
}).catch(() => {})
})
}, 1000, { 'leading': true, 'trailing': false })
}
}
</script>

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

@ -0,0 +1,141 @@
<template>
<div class="mod-axis__caRotators}">
<el-card>
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" placeholder="身份证号" clearable></el-input>
</el-form-item>
<el-form-item label="姓名" prop="residentName">
<el-input
v-model="dataForm.residentName"
placeholder="姓名"
clearable
></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="telephone">
<el-input
v-model="dataForm.telephone"
placeholder="联系方式"
clearable
></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getDataList()">{{ $t("query") }}</el-button>
</el-form-item>
<!-- <el-form-item>
<el-button v-if="$hasPermission('axis:caResident:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button v-if="$hasPermission('axis:caResident:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> -->
</el-form>
</el-card>
<el-card shadow="never" class="aui-card--fill">
<el-table
v-loading="dataListLoading"
:data="dataList"
border
@selection-change="dataListSelectionChangeHandle"
style="width: 100%"
>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50"
></el-table-column>
<el-table-column
prop="idCard"
label="公民身份证号"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="rotatorsName"
label="姓名"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="sex"
label="性别"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="birthday"
label="出生日期"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="householdAddressDetail"
label="户籍门(楼)详址"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
prop="curliveAddressDetail"
label="现住门(楼)详址"
header-align="center"
align="center"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" align="center" width="100">
<template slot-scope="scope">
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="addOrUpdateHandle(scope.row.idCard)"
>查看</el-button
>
</template>
</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>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getDataList"
></add-or-update>
</el-card>
</div>
</template>
<script>
import mixinViewModule from "@/mixins/view-post";
import AddOrUpdate from "./carotators-add-or-update";
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: "/opendata/caRotators/getPage",
getDataListIsPage: true,
deleteURL: "",
deleteIsBatch: true,
},
dataForm: {
idCard: "",
residentName: "",
telephone: "",
},
};
},
components: {
AddOrUpdate,
},
};
</script>

11
src/views/modules/shequzhili/event/cpts/add.vue

@ -312,6 +312,7 @@ export default {
// //
keyWords: '', keyWords: '',
isFirst: true,//
// oss/file/uploadvariedfile // oss/file/uploadvariedfile
dialogImageUrl: 'oss/file/uploadvariedfile', dialogImageUrl: 'oss/file/uploadvariedfile',
@ -620,7 +621,7 @@ export default {
this.handleMoveCenter() this.handleMoveCenter()
}) })
this.handleMoveCenter() this.handleMoveCenter()
this.convert() // this.convert()
}, },
setMarker (lat, lng) { setMarker (lat, lng) {
@ -699,8 +700,14 @@ export default {
geocoder geocoder
.getAddress({ location: location }) // .getAddress({ location: location }) //
.then((result) => { .then((result) => {
if (!this.isFirst) {//
this.formData.address = result.result.address this.formData.address = result.result.address
// }
if (this.isFirst) {
this.isFirst = false
}
}); });
}, },

8
src/views/modules/shequzhili/xiangmu/cpts/project-info.vue

@ -866,7 +866,6 @@ export default {
this.pageType = "info"; this.pageType = "info";
}, },
//
async submitBack() { async submitBack() {
const url = "/gov/project/trace/return-v2"; const url = "/gov/project/trace/return-v2";
const { fmData } = this; const { fmData } = this;
@ -897,7 +896,6 @@ export default {
} }
}, },
//
async submitClose() { async submitClose() {
const url = "/gov/project/trace/closeproject-v2"; const url = "/gov/project/trace/closeproject-v2";
const { fmData } = this; const { fmData } = this;
@ -917,6 +915,8 @@ export default {
projectStaffId: fmData.projectStaffId, projectStaffId: fmData.projectStaffId,
publicReply: fmData.publicReply, publicReply: fmData.publicReply,
internalFile: fmData.internalFile, internalFile: fmData.internalFile,
assistanceUnitId: fmData.assistanceUnitId,
assistanceUnitType: fmData.assistanceUnitType,
}); });
loading.close(); loading.close();
@ -928,7 +928,6 @@ export default {
} }
}, },
//
async submitTurn() { async submitTurn() {
const url = "/gov/project/trace/transfer-v2"; const url = "/gov/project/trace/transfer-v2";
const { fmData } = this; const { fmData } = this;
@ -949,6 +948,8 @@ export default {
publicReply: fmData.publicReply, publicReply: fmData.publicReply,
internalFile: fmData.internalFile, internalFile: fmData.internalFile,
staffList: fmData.staffList, staffList: fmData.staffList,
assistanceUnitId: fmData.assistanceUnitId,
assistanceUnitType: fmData.assistanceUnitType,
}); });
loading.close(); loading.close();
@ -960,7 +961,6 @@ export default {
} }
}, },
//
async submitDispose() { async submitDispose() {
const url = "/gov/project/trace/response-v2"; const url = "/gov/project/trace/response-v2";
const { fmData } = this; const { fmData } = this;

11
src/views/modules/visual/basicinfo/personCategory/index.vue

@ -22,6 +22,7 @@
<img src="@/assets/img/shuju/title-tip.png" /> <img src="@/assets/img/shuju/title-tip.png" />
<span>人员类别分析</span> <span>人员类别分析</span>
<div class="search">
<div class="second-select cascader"> <div class="second-select cascader">
<el-cascader class="customer_cascader" <el-cascader class="customer_cascader"
@ -33,7 +34,7 @@
:show-all-levels="false" :show-all-levels="false"
@change="handleChangeAgency"></el-cascader> @change="handleChangeAgency"></el-cascader>
</div> </div>
<div class="second-select "> <div class="second-select range-data2">
<el-date-picker v-model="dateIdShow" <el-date-picker v-model="dateIdShow"
type="date" type="date"
@ -47,6 +48,7 @@
</div> </div>
</div> </div>
</div>
<el-scrollbar style="width: 100%"> <el-scrollbar style="width: 100%">
<div class="warning-box-top"> <div class="warning-box-top">
<div class="top-item" <div class="top-item"
@ -308,3 +310,10 @@ export default {
scoped scoped
></style> ></style>
<style
lang="scss"
src="@/assets/scss/modules/visual/search_1.scss"
scoped
></style>

38
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@ -149,7 +149,7 @@ export default {
], ],
header: ['序号', '组织列表', '操作'], header: ['序号', '组织列表', '操作'],
list: [], list: [],
pageSize: 10, pageSize: 5,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
categoryCode: '' categoryCode: ''
@ -216,7 +216,7 @@ export default {
name: item.categoryName, name: item.categoryName,
code: item.categoryCode, code: item.categoryCode,
color: item.color, // colorArray[index] color: item.color, // colorArray[index]
selected: index == 0 ? true : false selected: false
} }
this.pieData.push(ob) this.pieData.push(ob)
}) })
@ -302,14 +302,21 @@ export default {
this.clickPie() // this.clickPie(maxIndex) this.clickPie() // this.clickPie(maxIndex)
let fun = function (params) { let fun = function (params) {
_that.clickPie(params.dataIndex) _that.clickPie(params)
} }
this.$refs.pieChart.handleClick(fun) this.$refs.pieChart.handleClick(fun)
}, },
clickPie (seriesIndex) { clickPie (params) {
let dataIndex = params ? params.dataIndex : null
let componentIndex = params ? params.componentIndex : null
if (componentIndex === 2) { //
dataIndex = -1
this.categoryCode = ''
this.$refs.pieChart.clear()
}
this.pieData.forEach((element, index) => { this.pieData.forEach((element, index) => {
if (index === seriesIndex) { if (index === dataIndex) {
element.label = { element.label = {
show: true, show: true,
} }
@ -320,9 +327,6 @@ export default {
} }
} }
this.categoryCode = element.code this.categoryCode = element.code
this.demand.pageNo = 1
this.getTable()
this.getMapData()
} else { } else {
element.label = { element.label = {
show: false, show: false,
@ -339,6 +343,9 @@ export default {
this.pieOption.series[1].data = this.pieData this.pieOption.series[1].data = this.pieData
// this.$refs.pieChart.hideLoading() // this.$refs.pieChart.hideLoading()
this.$refs.pieChart.setOption(this.pieOption) this.$refs.pieChart.setOption(this.pieOption)
this.demand.pageNo = 1
this.getTable()
this.getMapData()
}, },
toUserInfo (uid) { toUserInfo (uid) {
@ -447,11 +454,11 @@ export default {
// //
loadMap () { loadMap () {
if (this.isfirstInit) { if (this.isfirstInit) {
this.agencyInfo.level = 'agency' // this.agencyInfo.level = 'agency'
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray //mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null) this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
} else { } else {
this.$refs.map.refreshMap(this.polygonList, this.distributionsList) this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
} }
}, },
@ -613,6 +620,9 @@ export default {
if (!this.agencyInfo.level) { if (!this.agencyInfo.level) {
this.agencyInfo.level = 'street' this.agencyInfo.level = 'street'
} }
if (!this.agencyInfo.agencyLevel) {
this.agencyInfo.agencyLevel = 'street'
}
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -705,7 +715,7 @@ export default {
color: #fff; color: #fff;
} }
.card-left-title::after { .card-left-title::after {
content: ''; content: "";
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 20px; left: 20px;
@ -713,7 +723,7 @@ export default {
height: 12px; height: 12px;
box-sizing: border-box; box-sizing: border-box;
margin-top: -6px; margin-top: -6px;
background: #2865FA; background: #2865fa;
border-radius: 50%; border-radius: 50%;
} }
.card-wr-map { .card-wr-map {
@ -735,11 +745,11 @@ export default {
.map-tips { .map-tips {
width: 100%; width: 100%;
display: flex; display: flex;
// justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
box-sizing: border-box; box-sizing: border-box;
padding: 6px 0 0 100px; // padding: 6px 0 0 100px;
// padding-top: 10px; // padding-top: 10px;
// padding-bottom: 10px; // padding-bottom: 10px;

2
src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js

@ -74,7 +74,7 @@ export function pieOption (_charts) {
avoidLabelOverlap: false, avoidLabelOverlap: false,
// top: top + '%', // top: top + '%',
// height: '80%', // height: '80%',
// selectedMode: 'single', selectedMode: 'single',
left: 'center', left: 'center',
width: 480, width: 480,
label: { label: {

3
src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@ -635,8 +635,7 @@ export default {
} }
}; };
element.selected = !element.selected // element.selected = !element.selected
isSelected = element.selected
} else { } else {

8
src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js

@ -1,10 +1,10 @@
export function pieOption (_charts) { export function pieOption (_charts) {
const center= ['50%', '120px'] const center= ['50%', '140px']
return { return {
title: { title: {
text: '0', text: '0',
top: 95, top: 115,
left: 'center', left: 'center',
textStyle: { textStyle: {
width: '100%', width: '100%',
@ -94,7 +94,7 @@ export function pieOption (_charts) {
padding: [0, 6, 0, 6] padding: [0, 6, 0, 6]
}, },
a: { a: {
fontSize: 25, fontSize: 18,
color: '#fff', color: '#fff',
padding: [0, 6, 6, 6] padding: [0, 6, 6, 6]
}, },
@ -110,7 +110,7 @@ export function pieOption (_charts) {
labelLine: { labelLine: {
show: false, show: false,
smooth: 0.2, smooth: 0.2,
length: 40, length: 20,
length2: 0, length2: 0,
maxSurfaceAngle: 80 maxSurfaceAngle: 80
}, },

34
src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@ -508,16 +508,22 @@ export default {
this.clickPie() // this.clickPie(maxIndex) this.clickPie() // this.clickPie(maxIndex)
let fun = function (params) { let fun = function (params) {
_that.clickPie(params.dataIndex) _that.clickPie(params)
} }
this.$refs.pieChart.handleClick(fun) this.$refs.pieChart.handleClick(fun)
}, },
clickPie (seriesIndex) { clickPie (params) {
let isSelected = false let dataIndex = params ? params.dataIndex : null
let componentIndex = params ? params.componentIndex : null
if (componentIndex === 2) { //
dataIndex = -1
this.categoryCode = ''
this.$refs.pieChart.clear()
}
this.pieData.forEach((element, index) => { this.pieData.forEach((element, index) => {
if (index === seriesIndex) { if (index === dataIndex) {
element.label = { element.label = {
show: true, show: true,
} }
@ -529,12 +535,6 @@ export default {
} }
this.categoryCode = element.categoryCode this.categoryCode = element.categoryCode
element.selected = !element.selected element.selected = !element.selected
isSelected = element.selected
// if (isSelected) {
// this.categoryCode = element.categoryCode
// } else {
// this.categoryCode = ''
// }
} else { } else {
element.label = { element.label = {
show: false, show: false,
@ -600,15 +600,23 @@ export default {
this.clickGridPie() // this.clickGridPie(maxIndex) this.clickGridPie() // this.clickGridPie(maxIndex)
let fun = function (params) { let fun = function (params) {
_that.clickGridPie(params.dataIndex) _that.clickGridPie(params)
} }
this.$refs.gridPieChart.handleClick(fun) this.$refs.gridPieChart.handleClick(fun)
}, },
clickGridPie (seriesIndex) { clickGridPie (params) {
let dataIndex = params ? params.dataIndex : null
let componentIndex = params ? params.componentIndex : null
if (componentIndex === 2) { //
dataIndex = -1
this.tableOrgId = ''
this.tableOrgType = ''
this.$refs.gridPieChart.clear()
}
this.gridPieData.forEach((element, index) => { this.gridPieData.forEach((element, index) => {
if (index === seriesIndex) { if (index === dataIndex) {
element.label = { element.label = {
show: true, show: true,
} }

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

@ -200,7 +200,9 @@ const vueGis = {
distanceMax: null,// distanceMax: null,//
input_lat: null, input_lat: null,
input_lon: null input_lon: null,
isChangeCenter: true,//
} }
}, },
async mounted () { async mounted () {
@ -228,7 +230,6 @@ const vueGis = {
// //
this.initMap() this.initMap()
if (this.showPolIconLayer) { if (this.showPolIconLayer) {
console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer) console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
// //
@ -259,15 +260,22 @@ const vueGis = {
}, },
// //:
async refreshMap (mapInfo, polygonArray, iconArrays) { async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
this.mapInfo = mapInfo this.mapInfo = mapInfo
this.polygonArray = [] this.polygonArray = []
this.polygonArray = polygonArray this.polygonArray = polygonArray
this.iconArrays = iconArrays this.iconArrays = iconArrays
this.isChangeCenter = isChangeCenter
if (iconSource) {
iconSource.clear() iconSource.clear()
}
if (polygonSource) {
polygonSource.clear() polygonSource.clear()
}
if (polIconSource) {
polIconSource.clear() polIconSource.clear()
}
this.initPolIconLayer() this.initPolIconLayer()
if (this.showPolygonLayer) { if (this.showPolygonLayer) {
@ -287,7 +295,6 @@ const vueGis = {
} }
this.setMapLocation() this.setMapLocation()
// gaodeMapLayer.getSource().changed() // gaodeMapLayer.getSource().changed()
}, },
// //
@ -545,10 +552,56 @@ const vueGis = {
} else { } else {
mapView.setCenter(this.centerPoint); mapView.setCenter(this.centerPoint);
}
if (!this.isChangeCenter) {
return false
} }
mapView.setZoom(this.zoom); // debugger
if (!this.zoom) {
this.setZoom(this.mapInfo.agencyLevel)
}
this.centerPoint = []
//
if (this.center && this.center.length > 0) {
this.centerPoint = this.center
this.centerFlag = 'point'
this.center = []
} else if (polygonLayer.getSource().getFeatures()[0]) {//,
this.centerFlag = 'flag_polygon'
this.centerPoint.push(this.mapInfo.longitude)
this.centerPoint.push(this.mapInfo.latitude)
} else if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint.push(this.mapInfo.longitude)
this.centerPoint.push(this.mapInfo.latitude)
this.centerFlag = 'point'
} else {
this.centerPoint = centerPointGlobal
this.centerFlag = 'point'
}
// debugger
if (this.centerFlag === 'flag_parent') {
let parentFeatures = parentLayer.getSource().getFeatures()[0]
let polygon = parentFeatures.getGeometry();
map.getView().fit(polygon, map.getSize());
this.zoom = map.getView().getZoom() - 1
} else if (this.centerFlag === 'flag_polygon') {
let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
let polygon = polygonFeatures.getGeometry();
map.getView().fit(polygon, map.getSize());
this.zoom = map.getView().getZoom() - 1
} else {
mapView.setCenter(this.centerPoint);
}
mapView.setZoom(this.zoom);
}, },
firstCentermap () { firstCentermap () {
@ -608,7 +661,7 @@ const vueGis = {
}) })
}), }),
new Style({ new Style({
// text: createTextStyle(feature) // zty 2022.05.19 // text: createTextStyle(feature) // zhaotongyao 2022.05.19
}) })
]; ];
styles['MultiPolygon'] = styles['Polygon']; styles['MultiPolygon'] = styles['Polygon'];
@ -616,13 +669,13 @@ const vueGis = {
}; };
})(); })();
select = new Select({ // select = new Select({
style: overlayStyle // style: overlayStyle
}); // });
// BUG iconicon使icon ---zhaotongyao 2022.06.01
map.addLayer(polygonLayer) map.addLayer(polygonLayer)
map.addInteraction(select); // map.addInteraction(select);
}, },

Loading…
Cancel
Save