|
@@ -29,11 +29,11 @@
|
|
</header>
|
|
</header>
|
|
<main>
|
|
<main>
|
|
<template v-if="panelShow.search==='address'">
|
|
<template v-if="panelShow.search==='address'">
|
|
- <el-input v-model="searchObj.address" style="width: 75%" placeholder="请输入地址" clearable class="input-small" />
|
|
|
|
|
|
+ <el-input v-model="searchObj.dmdz" style="width: 75%" placeholder="请输入地址" clearable class="input-small" />
|
|
</template>
|
|
</template>
|
|
<template v-if="panelShow.search==='id'">
|
|
<template v-if="panelShow.search==='id'">
|
|
- <el-input v-model="searchObj.name" style="width: 30%" placeholder="请输入姓名" clearable class="input-small"/>
|
|
|
|
- <el-input v-model="searchObj.id" style="width: 43%" placeholder="请输入身份证号" clearable class="input-small"/>
|
|
|
|
|
|
+ <el-input v-model="searchObj.xm" style="width: 30%" placeholder="请输入姓名" clearable class="input-small"/>
|
|
|
|
+ <el-input v-model="searchObj.sfzh" style="width: 43%" placeholder="请输入身份证号" clearable class="input-small"/>
|
|
</template>
|
|
</template>
|
|
<el-button type="primary" class="btn-small" @click="handleSearch">查询</el-button>
|
|
<el-button type="primary" class="btn-small" @click="handleSearch">查询</el-button>
|
|
</main>
|
|
</main>
|
|
@@ -42,20 +42,20 @@
|
|
<li class="sr-list-item" v-for="item in searchResData.value">
|
|
<li class="sr-list-item" v-for="item in searchResData.value">
|
|
<div>
|
|
<div>
|
|
<img src="@/assets/imgs/pages/icon-user.png" alt="">
|
|
<img src="@/assets/imgs/pages/icon-user.png" alt="">
|
|
- <span>{{ item.name }}</span>
|
|
|
|
|
|
+ <span>{{ item.hjrkXm }}</span>
|
|
</div>
|
|
</div>
|
|
- <span>{{ item.address }}</span>
|
|
|
|
- <span>{{ item.qx+"-"+item.jd+"-"+item.cun }}</span>
|
|
|
|
|
|
+ <span>{{ item.hjrkHkszd }}</span>
|
|
|
|
+ <span>{{ item.district+"-"+item.town+"-"+item.village }}</span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
<ul v-if="panelShow.search==='address'">
|
|
<ul v-if="panelShow.search==='address'">
|
|
<li class="sr-list-item" v-for="item in searchResData.value">
|
|
<li class="sr-list-item" v-for="item in searchResData.value">
|
|
<div>
|
|
<div>
|
|
<img src="@/assets/imgs/pages/icon-position.png" alt="">
|
|
<img src="@/assets/imgs/pages/icon-position.png" alt="">
|
|
- <span>{{ item.name }}</span>
|
|
|
|
|
|
+ <span>{{ item.jsztDwmc }}</span>
|
|
</div>
|
|
</div>
|
|
- <span>{{ item.address }}</span>
|
|
|
|
- <span>{{ item.qx+"-"+item.jd+"-"+item.cun }}</span>
|
|
|
|
|
|
+ <span>{{ item.hjrkHkszd }}</span>
|
|
|
|
+ <span>{{ item.district+"-"+item.town+"-"+item.village }}</span>
|
|
</li>
|
|
</li>
|
|
</ul>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
@@ -81,11 +81,11 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<el-table :data="data_zjd.table" class="table-small" stripe height="68vh">
|
|
<el-table :data="data_zjd.table" class="table-small" stripe height="68vh">
|
|
- <el-table-column label="所属街镇" min-width="80" prop="villages" show-overflow-tooltip />
|
|
|
|
- <el-table-column label="村名" min-width="80" prop="villageName" show-overflow-tooltip />
|
|
|
|
- <el-table-column label="宅基地面积(km²)" min-width="90" prop="homeArea" show-overflow-tooltip />
|
|
|
|
- <el-table-column label="宅基地数量(个)" min-width="90" prop="homeNum" show-overflow-tooltip />
|
|
|
|
- <el-table-column label="人口数量(万)" min-width="90" prop="population" show-overflow-tooltip />
|
|
|
|
|
|
+ <el-table-column label="所属街镇" min-width="80" prop="town" show-overflow-tooltip />
|
|
|
|
+ <el-table-column label="村名" min-width="80" prop="village" show-overflow-tooltip />
|
|
|
|
+ <el-table-column label="宅基地面积(m²)" min-width="90" prop="zjdmj" show-overflow-tooltip />
|
|
|
|
+ <el-table-column label="宅基地数量(个)" min-width="90" prop="zjdsl" show-overflow-tooltip />
|
|
|
|
+ <el-table-column label="人口数量(万)" min-width="90" prop="zjdrksl" show-overflow-tooltip />
|
|
</el-table>
|
|
</el-table>
|
|
</main>
|
|
</main>
|
|
</div>
|
|
</div>
|
|
@@ -125,10 +125,19 @@ import CityGis from "@/utils/map/CityGis.Bridge"
|
|
import { myBridge } from "@/utils/map/map"
|
|
import { myBridge } from "@/utils/map/map"
|
|
import { locateCM, changeBaseMap, addLayer } from '@/utils/map/AddLayer'
|
|
import { locateCM, changeBaseMap, addLayer } from '@/utils/map/AddLayer'
|
|
import { nczjd } from '@/utils/data/layersInfo'
|
|
import { nczjd } from '@/utils/data/layersInfo'
|
|
|
|
+import { GetZjdAnalyse,GetZjdSearch } from '../../../api/homesteadApprove'
|
|
|
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
createMap()
|
|
createMap()
|
|
mapLayers.value = [{ ...nczjd, visible: false, opacity: 100 }]
|
|
mapLayers.value = [{ ...nczjd, visible: false, opacity: 100 }]
|
|
|
|
+ GetZjdAnalyse().then(res => {
|
|
|
|
+ data_zjd.table = res.data
|
|
|
|
+ res.data.forEach(i => {
|
|
|
|
+ data_zjd.cata[0].num += i.zjdmj
|
|
|
|
+ data_zjd.cata[1].num += i.zjdsl
|
|
|
|
+ data_zjd.cata[2].num += i.zjdrksl
|
|
|
|
+ })
|
|
|
|
+ })
|
|
})
|
|
})
|
|
|
|
|
|
onUnmounted(() => {
|
|
onUnmounted(() => {
|
|
@@ -172,33 +181,15 @@ const mapLayers = reactive({
|
|
|
|
|
|
const data_zjd = reactive({
|
|
const data_zjd = reactive({
|
|
cata: [
|
|
cata: [
|
|
- { title: '宅基地面积', num: 1242, unit: 'km²' },
|
|
|
|
- { title: '宅基地数量', num: 1242, unit: '个' },
|
|
|
|
- { title: '人口数量', num: 1242, unit: '人' },
|
|
|
|
|
|
+ { title: '宅基地面积', num: 0, unit: 'm²' },
|
|
|
|
+ { title: '宅基地数量', num: 0, unit: '个' },
|
|
|
|
+ { title: '人口数量', num: 0, unit: '人' },
|
|
],
|
|
],
|
|
table: [
|
|
table: [
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
- { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
|
|
+ // { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
+ // { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
+ // { villages: '城桥镇', villageName: '马桥', homeArea: '1231', homeNum: '1231', population: '1231' },
|
|
|
|
+
|
|
]
|
|
]
|
|
})
|
|
})
|
|
|
|
|
|
@@ -233,26 +224,18 @@ watch(panelShow, (val)=> {
|
|
}
|
|
}
|
|
},{deep: true})
|
|
},{deep: true})
|
|
|
|
|
|
-const searchObj = reactive({
|
|
|
|
- address:'',
|
|
|
|
- name:'',
|
|
|
|
- id:'',
|
|
|
|
|
|
+var searchObj = reactive({
|
|
|
|
+ dmdz:'',
|
|
|
|
+ xm:'',
|
|
|
|
+ sfzh:'',
|
|
})
|
|
})
|
|
|
|
|
|
const searchResData = reactive({value: []})
|
|
const searchResData = reactive({value: []})
|
|
|
|
|
|
function handleSearch() {
|
|
function handleSearch() {
|
|
- let resSample
|
|
|
|
- let resTemp = []
|
|
|
|
- if(panelShow.search==='id') {
|
|
|
|
- resSample = { name: '张三', address: '崇明区新河街道进化村进步组814号', qx: '崇明区', jd: '新河街道', cun: '进化村' }
|
|
|
|
- } else if(panelShow.search==='address') {
|
|
|
|
- resSample = { name: 'XXXXXXXXXXXXXX合作社', address: '崇明区新河街道进化村进步组814号', qx: '崇明区', jd: '新河街道', cun: '进化村' }
|
|
|
|
- }
|
|
|
|
- for(let i=0; i<10; i++) {
|
|
|
|
- resTemp.push({ ...resSample, id: i })
|
|
|
|
- }
|
|
|
|
- searchResData.value = resTemp
|
|
|
|
|
|
+ GetZjdSearch(searchObj).then(res => {
|
|
|
|
+ searchResData.value = res.data
|
|
|
|
+ })
|
|
panelShow.searchRes = true
|
|
panelShow.searchRes = true
|
|
}
|
|
}
|
|
|
|
|
|
@@ -336,7 +319,7 @@ const data_detail = reactive({
|
|
width: 250px;
|
|
width: 250px;
|
|
top: 20px;
|
|
top: 20px;
|
|
right: 100px;
|
|
right: 100px;
|
|
-
|
|
|
|
|
|
+
|
|
main {
|
|
main {
|
|
padding-right: 10px;
|
|
padding-right: 10px;
|
|
}
|
|
}
|
|
@@ -467,7 +450,7 @@ const data_detail = reactive({
|
|
top: 20px;
|
|
top: 20px;
|
|
width: 530px;
|
|
width: 530px;
|
|
height: calc(100% - 40px);
|
|
height: calc(100% - 40px);
|
|
-
|
|
|
|
|
|
+
|
|
.la-overview {
|
|
.la-overview {
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|