3 Commits eb5ac22bd7 ... 5b4cf4c516

Author SHA1 Message Date
  yuh 5b4cf4c516 8.9 1 year ago
  yuh 7e83b700ad Merge branch 'master' of http://47.101.207.123:3000/gbtomr/cm-agric 1 year ago
  yuh 839f268d0a 保留两位小数 1 year ago

+ 1 - 1
src/views/xmfzsb/projectConstruction/Index.vue

@@ -50,7 +50,7 @@
 				<el-table-column label="项目名称" min-width="200" prop="xmmc" show-overflow-tooltip />
 				<!-- <el-table-column label="建设周期" min-width="130" prop="jszq" show-overflow-tooltip /> -->
 				<el-table-column label="年度" min-width="80" prop="nd" show-overflow-tooltip />
-				<el-table-column label="乡镇" min-width="100" prop="town" show-overflow-tooltip />
+				<el-table-column label="乡镇" min-width="100" prop="xz" show-overflow-tooltip />
 				<!-- <el-table-column label="乡镇分管领导" min-width="100" prop="xzfgld" show-overflow-tooltip /> -->
 				<el-table-column fixed="right" label="操作" min-width="150">
 					<template #default="scope">

+ 48 - 18
src/views/zjdfzsp/HomeSubApprove/Index.vue

@@ -42,9 +42,9 @@
 					<li class="sr-list-item" v-for="item in searchResData.value">
 						<div>
 							<img src="@/assets/imgs/pages/icon-user.png" alt="">
-							<span>{{ item.hjrkXm }}</span>
+							<span>{{ item.jsztGrxm }}</span>
 						</div>
-						<span>{{ item.hjrkHkszd }}</span>
+						<span>{{ item.tdXzzl }}</span>
 						<span>{{ item.district+"-"+item.town+"-"+item.village }}</span>
 					</li>
 				</ul>
@@ -54,7 +54,7 @@
 							<img src="@/assets/imgs/pages/icon-position.png" alt="">
 							<span>{{ item.jsztDwmc }}</span>
 						</div>
-						<span>{{ item.hjrkHkszd }}</span>
+						<span>{{ item.tdXzzl }}</span>
 						<span>{{ item.district+"-"+item.town+"-"+item.village }}</span>
 					</li>
 				</ul>
@@ -72,18 +72,18 @@
 				<div class="la-sort">
 					<span class="detail-sub-title">宅基地分布情况</span>
 					<div>
-						<el-select v-model="sort_zjd.town" class="input-small">
-							<el-option value="全部街镇">全部街镇</el-option>
+						<el-select @change="searchList" v-model="sort_zjd.town" class="input-small">
+							<el-option v-for="item in zjd_select.town" :label="item" :key="item" :value="item" ></el-option>
 						</el-select>
-						<el-select v-model="sort_zjd.village" class="input-small">
-							<el-option value="全部村">全部村</el-option>
+						<el-select @change="searchList" v-model="sort_zjd.village" class="input-small">
+							<el-option v-for="item in zjd_select.village" :label="item" :key="item" :value="item" ></el-option>
 						</el-select>
 					</div>
 				</div>
 				<el-table :data="data_zjd.table" class="table-small" stripe height="68vh">
 					<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="宅基地面积(m²)" min-width="90" prop="zjdmj" :formatter="rounding" 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>
@@ -130,14 +130,7 @@ import  { GetZjdAnalyse,GetZjdSearch } from '../../../api/homesteadApprove'
 onMounted(() => {
 	createMap()
 	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
-		})
-	})
+	getAnaList()
 })
 
 onBeforeUnmount(() => {
@@ -158,8 +151,26 @@ const render = {
 	}
 }
 
+const zjd_select = reactive({
+	town: ['全部镇','堡镇','港沿镇','庙镇','建设镇','城桥','陈家','庙镇','新村乡','长兴','中兴镇','向化','港西','竖新镇','三星镇','横沙','新河','绿华镇'],
+	village: ['全部村','彷徨村','同滧村','庙中村','协隆村','合中村','浜东村','老滧港渔村','聚训村','骏马村','元六村','推虾港村','长兴村','新卫村','桃源村','团结村','运粮村','湾南村','庙西村','镇属','春光村']
+})
+
 let bridge
 let listen
+
+function getAnaList() {
+	GetZjdAnalyse().then(res => {
+		data_zjd.table = res.data
+		res.data.forEach(i => {
+			countZjdmj += i.zjdmj
+			data_zjd.cata[0].num = (countZjdmj / 1000000).toFixed(2)
+			data_zjd.cata[1].num += i.zjdsl
+			data_zjd.cata[2].num += i.zjdrksl
+		})
+	})
+}
+
 function createMap() {
   nextTick(() => {
     myBridge.bridgeContent = bridge = new CityGis.Bridge({
@@ -196,13 +207,15 @@ function handleLayerOpacity(val,item) {
 	addLayer(item, item.visible, (item.opacity/100).toFixed(2),'map',render)
 }
 
+var countZjdmj = 0
+
 const mapLayers = reactive({
 	value: []
 })
 
 const data_zjd = reactive({
 	cata: [
-		{ title: '宅基地面积', num: 0, unit: 'm²' },
+		{ title: '宅基地面积', num: 0, unit: 'km²' },
 		{ title: '宅基地数量', num: 0, unit: '个' },
 		{ title: '人口数量', num: 0, unit: '人' },
 	],
@@ -219,6 +232,21 @@ const toolsArr = ref([
 	{ id: 'search', picUrl: getAssetsFile('0531/tool-search.png') },
 	{ id: 'position', picUrl: getAssetsFile('pages/tool-position.png') }
 ])
+function searchList() {
+	if (sort_zjd.town === data_zjd.table.town && sort_zjd.village === data_zjd.table.village){
+		//筛选镇和村
+
+	}else if (sort_zjd.town === '全部街镇' && sort_zjd.village === data_zjd.table.village) {
+		//全部街镇,筛选村
+
+	}else if (sort_zjd.town === data_zjd.table.town && sort_zjd.village === '全部村') {
+		//全部村,筛选街镇
+
+	}else {
+		//全部街镇和全部村
+		return
+	}
+}
 
 function handleToolClick(item) {
 	switch(item.id) {
@@ -265,7 +293,9 @@ function handleSearch() {
 watch(()=>panelShow.search, (val)=> {
 	panelShow.searchRes = false
 })
-
+function rounding(row,column) {
+	return parseFloat(row[column.property]).toFixed(2)
+}
 const sort_zjd = reactive({
 	town: '全部街镇',
 	village: '全部村',