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

Merge branch 'dev' into test

test
wanggongfeng 3 years ago
parent
1217c1a7f2 041623ebee
commit
ff67f57a38
2 changed files with 25 additions and 26 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. 46
      src/views/modules/plugins/stats/factagencyuserhousedaily.vue
  2. 5
      src/views/modules/visual/components/screen-map/index.vue

46
src/views/modules/plugins/stats/factagencyuserhousedaily.vue
View File

@ -18,12 +18,12 @@
> >
</el-option> </el-option>
</el-select> --> </el-select> -->
<el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" popper-class="cascader-block"> <el-cascader ref="cascaderUnit" v-model.trim="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, expandTrigger: 'hover', emitPath: false,children:'children',label:'objectName',value:'objectId'}" popper-class="cascader-block">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<div @click="cascaderClick(data)"> <div @click="cascaderClick(data)">
<!-- <span class="block"></span> --> <!-- <span class="block"></span> -->
<span>{{ data.agencyName }}</span> <span>{{ data.objectName }}</span>
<span v-if="!node.isLeaf"> ({{ data.subAgencyList.length }}) </span> <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
</div> </div>
</template> </template>
</el-cascader> </el-cascader>
@ -56,19 +56,19 @@
</div> </div>
<el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%"> <el-table class="resi-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 type="selection" header-align="center" align="center" width="50"></el-table-column>
<el-table-column width="160" fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column> <el-table-column fixed prop="agencyName" label="组织结构" header-align="center" align="center"></el-table-column>
<el-table-column width="80" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column> <el-table-column width="100" prop="neighbourhoodsCount" label="小区数" header-align="center" align="center"></el-table-column>
<el-table-column width="80" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="100" prop="houseCount" label="房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="houseSelfCount" label="自住房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="houseLeaseCount" label="出租房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="houseIdleCount" label="闲置房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="userCount" label="居民总数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="userResiCount" label="常住人口数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="userFloatCount" label="流动人口数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="houseIncr" label="新增房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="userIncr" label="新增人口数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="houseModify" label="修改房屋数" header-align="center" align="center"></el-table-column>
<el-table-column width="100" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column> <el-table-column width="110" prop="userModify" label="修改人口数" header-align="center" align="center"></el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="page" :current-page="page"
@ -198,9 +198,9 @@ export default {
}) })
}, },
cascaderClick (nodeData) { cascaderClick (nodeData) {
this.dataForm.agencyId = nodeData.agencyId; this.dataForm.agencyId = nodeData.objectId;
this.dataForm.level = nodeData.level this.dataForm.level = nodeData.objectType
this.$refs.cascaderUnit.checkedValue = nodeData.agencyId; this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
this.$refs.cascaderUnit.computePresentText(); this.$refs.cascaderUnit.computePresentText();
this.$refs.cascaderUnit.toggleDropDownVisible(false); this.$refs.cascaderUnit.toggleDropDownVisible(false);
@ -208,17 +208,17 @@ export default {
getGridList() { getGridList() {
const { user } = this.$store.state const { user } = this.$store.state
this.$http this.$http
.post('/gov/org/customeragency/agencygridtree') .post('/gov/org/icServiceProject/service/serviceScopeTree')
.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.msg)
} else { } else {
console.log('获取查询详情成功', res.data) console.log('获取查询详情成功', res.data)
// this.optionsA = res.data // this.optionsA = res.data
// console.log(this.optionsA);
this.optionsA.push(res.data) this.optionsA.push(res.data)
this.dataForm.agencyId = res.data.agencyId this.dataForm.agencyId = res.data.objectId
this.dataForm.level = res.data.level this.dataForm.level = res.data.objectType
this.getDataList()
} }
}) })
.catch(() => { .catch(() => {

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

@ -524,6 +524,7 @@ const vueGis = {
} }
this.centerPoint = [] this.centerPoint = []
//如果存在中心点（返回时赋值） //如果存在中心点（返回时赋值）
if (this.center && this.center.length > 0) { if (this.center && this.center.length > 0) {
this.centerPoint = this.center this.centerPoint = this.center
@ -532,8 +533,6 @@ const vueGis = {
} else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织 } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织
this.centerFlag = 'flag_polygon' this.centerFlag = 'flag_polygon'
this.centerPoint.push(this.mapInfo.longitude)
this.centerPoint.push(this.mapInfo.latitude)
} else if (this.mapInfo.longitude && this.mapInfo.latitude) { } else if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint.push(this.mapInfo.longitude) this.centerPoint.push(this.mapInfo.longitude)
@ -544,7 +543,6 @@ const vueGis = {
this.centerPoint = centerPointGlobal this.centerPoint = centerPointGlobal
this.centerFlag = 'point' this.centerFlag = 'point'
} }
// debugger // debugger
if (this.centerFlag === 'flag_parent') { if (this.centerFlag === 'flag_parent') {
let parentFeatures = parentLayer.getSource().getFeatures()[0] let parentFeatures = parentLayer.getSource().getFeatures()[0]
@ -564,6 +562,7 @@ const vueGis = {
} }
mapView.setZoom(this.zoom); mapView.setZoom(this.zoom);
}, },
firstCentermap () { firstCentermap () {
if (this.mapInfo.longitude && this.mapInfo.latitude) { if (this.mapInfo.longitude && this.mapInfo.latitude) {

Write Preview
Loading…
Cancel
Save