8.4

src/api/homesteadApprove.js

@@ -0,0 +1,26 @@
+import request from "./index";
+
+/**
+ * 宅基地辅助审批
+ * @returns {Promise<AxiosResponse<T>>}
+ * @constructor
+ */
+
+//主页-宅基地分析
+export function GetZjdAnalyse() {
+    return request({
+        url: '/zjd/analyse',
+        method: 'get',
+    })
+}
+
+//主页-地址名称和身份检索
+export function GetZjdSearch(params) {//dmdz地名地址、sfzh身份证号、xm姓名
+    return request({
+        url: '/zjd/search',
+        method: 'get',
+        params: {
+            ...params
+        }
+    })
+}

src/utils/data/select-data.js

@@ -6,6 +6,15 @@ export const select_test = createEnum([
   {value: 3, label: 3},
 ])
 
+//年度
+export const select_year = createEnum([
+	{value: 2022, label: 2022},
+	{value: 2021, label: 2021},
+	{value: 2020, label: 2020},
+	{value: 2019, label: 2019},
+	{value: 2018, label: 2018}
+])
+
 // 审核状态
 export const auditStateArr = createEnum([
   { value: '待审核', label: '待审核', color: 'orange' },

src/views/xmfzsb/projectConstruction/Detail.vue

@@ -28,7 +28,7 @@
 								<el-descriptions-item label="行业领域:">{{ rowData.hyly }}</el-descriptions-item>
 								<el-descriptions-item label="市级批复文号:">{{ rowData.sjpfwh }}</el-descriptions-item>
 								<el-descriptions-item label="乡镇项目联络员:">{{ rowData.xzxmlly }}</el-descriptions-item>
-								<el-descriptions-item label="实施单位:">{{ rowData.sszt }}</el-descriptions-item>
+								<el-descriptions-item label="实施单位:">{{ rowData.swmc }}</el-descriptions-item>
 								<el-descriptions-item label="建设内容:">{{ rowData.jsnr }}</el-descriptions-item>
 							</el-descriptions>
 						</el-card>

src/views/xmfzsb/projectConstruction/Index.vue

@@ -5,24 +5,24 @@
 				<div class="flex1">
 					<el-input v-model="formInline.xmmc" style="width: 18%" placeholder="请输入想要搜索的项目名称" clearable></el-input>
 					<el-select v-model="formInline.nd" style="width: 9%" placeholder="年度" clearable>
-						<el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+						<el-option v-for="item in select_year" :label="item.label" :key="item.value" :value="item.value"></el-option>
 					</el-select>
 					<el-select v-model="formInline.xz" style="width: 9%" placeholder="乡镇" clearable>
-						<el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+						<el-option v-for="item in XZArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
 					</el-select>
 					<el-select v-model="formInline.xmzt" style="width: 9%" placeholder="状态" clearable>
-						<el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+						<el-option v-for="item in constructStateArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
 					</el-select>
 					<el-select v-model="formInline.hyly" style="width: 9%" placeholder="行业领域" clearable>
-						<el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+						<el-option v-for="item in HylyArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
 					</el-select>
 					<el-select v-model="formInline.ssks" style="width: 9%" placeholder="责任科室" clearable>
-						<el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+						<el-option v-for="item in SsksArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
 					</el-select>
 				</div>
 
 				<div>
-					<el-button type="primary" class="btn-default">查询</el-button>
+					<el-button type="primary" class="btn-default" @click="toList">查询</el-button>
 					<el-button class="btn-default">导出清单</el-button>
 				</div>
 
@@ -73,7 +73,7 @@
 <script setup>
 import { reactive, ref, onMounted } from 'vue'
 import Pagination from '../../../components/Pagination.vue';
-import { select_test, constructStateArr } from '../../../utils/data/select-data'
+import { select_year, constructStateArr,HylyArr,SsksArr,XZArr } from '../../../utils/data/select-data'
 import { useRouter } from "vue-router";
 import { GetDsjsList } from '../../../api/projectAudit'
 

src/views/xmfzsb/projectDeclare/Index.vue

@@ -2,15 +2,15 @@
   <div class="list-page">
     <header>
       <div class="header-row">
-        <el-input v-model="formInline.keyword" style="width: 18%" placeholder="请输入想要搜索的项目名称" clearable></el-input>
-        <el-select v-model="formInline.year" style="width: 9%" placeholder="年份" clearable>
-          <el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+        <el-input v-model="formInline.xmmc" style="width: 18%" placeholder="请输入想要搜索的项目名称" clearable></el-input>
+        <el-select v-model="formInline.nd" style="width: 9%" placeholder="年度" clearable>
+          <el-option v-for="item in select_year" :label="item.label" :key="item.value" :value="item.value"></el-option>
         </el-select>
-        <el-select v-model="formInline.industryField" style="width: 9%" placeholder="行业领域" clearable>
-          <el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+        <el-select v-model="formInline.hyly" style="width: 9%" placeholder="行业领域" clearable>
+          <el-option v-for="item in HylyArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
         </el-select>
-        <el-select v-model="formInline.office" style="width: 9%" placeholder="所属科室" clearable>
-          <el-option v-for="item in select_test" :label="item.label" :key="item.value" :value="item.value"></el-option>
+        <el-select v-model="formInline.ssks" style="width: 9%" placeholder="所属科室" clearable>
+          <el-option v-for="item in SsksArr" :label="item.label" :key="item.value" :value="item.value"></el-option>
         </el-select>
         <el-date-picker
           v-model="formInline.submitTime"
@@ -22,11 +22,11 @@
           clearable
         />
         <div class="input-range" style="width: 21%;">
-          <el-input type="number" v-model="formInline.invest_min" placeholder="最小投资" clearable></el-input>
+          <el-input type="number" v-model="formInline.zxtz" placeholder="最小投资" clearable></el-input>
           <span>-</span>
-          <el-input type="number" v-model="formInline.invest_max" placeholder="最大投资" clearable></el-input>
+          <el-input type="number" v-model="formInline.zdtz" placeholder="最大投资" clearable></el-input>
         </div>
-        <el-button type="primary" class="btn-default">查询</el-button>
+        <el-button type="primary" class="btn-default" @click="getList">查询</el-button>
       </div>
       <div class="header-row">
         <ul class="state-list">
@@ -55,7 +55,7 @@
         <el-table-column label="项目名称" min-width="120" prop="xmmc" show-overflow-tooltip/>
         <el-table-column label="行业领域" min-width="80" prop="hyly" show-overflow-tooltip/>
         <el-table-column label="所属科室" min-width="80" prop="ssks" show-overflow-tooltip/>
-        <el-table-column label="单位名称" min-width="120" prop="jsdw" show-overflow-tooltip/>
+        <el-table-column label="单位名称" min-width="120" prop="sszt" show-overflow-tooltip/>
         <el-table-column label="实施地址" min-width="120" prop="jsdd" show-overflow-tooltip/>
         <el-table-column label="总投资(万元)" min-width="110" prop="xmztz" show-overflow-tooltip/>
         <el-table-column label="提交时间" min-width="80" prop="tjsj" show-overflow-tooltip/>
@@ -157,7 +157,7 @@
               </template>
 
               <el-descriptions title="" :column="3" direction="vertical" class="seperate-des des-default">
-                <el-descriptions-item label="单位名称:">{{ data_detail.dwmc }}</el-descriptions-item>
+                <el-descriptions-item label="单位名称:">{{ data_detail.sszt }}</el-descriptions-item>
                 <el-descriptions-item label="单位代码:">{{ data_detail.dwdm }}</el-descriptions-item>
                 <el-descriptions-item label="电子邮件:">{{ data_detail.dzyj }}</el-descriptions-item>
                 <el-descriptions-item label="注册时间:">{{ data_detail.zcsj }}</el-descriptions-item>
@@ -229,7 +229,7 @@
 <script setup>
 import { reactive, ref, onMounted } from 'vue'
 import Pagination from '../../../components/Pagination.vue';
-import { select_test, auditStateArr } from '../../../utils/data/select-data'
+import { select_year, auditStateArr,HylyArr,SsksArr } from '../../../utils/data/select-data'
 import { useRouter } from "vue-router";
 import { GetDsxmList, DeleteDsxm, GetDsxmDetail,PutDsxmReply } from '../../../api/projectAudit'
 

src/views/zjdfzsp/HomeSubApprove/Index.vue

@@ -29,11 +29,11 @@
 			</header>
 			<main>
 				<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 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>
 				<el-button type="primary" class="btn-small" @click="handleSearch">查询</el-button>
 			</main>
@@ -42,20 +42,20 @@
 					<li class="sr-list-item" v-for="item in searchResData.value">
 						<div>
 							<img src="@/assets/imgs/pages/icon-user.png" alt="">
-							<span>{{ item.name }}</span>
+							<span>{{ item.hjrkXm }}</span>
 						</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>
 				</ul>
 				<ul v-if="panelShow.search==='address'">
 					<li class="sr-list-item" v-for="item in searchResData.value">
 						<div>
 							<img src="@/assets/imgs/pages/icon-position.png" alt="">
-							<span>{{ item.name }}</span>
+							<span>{{ item.jsztDwmc }}</span>
 						</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>
 				</ul>
 			</div>
@@ -81,11 +81,11 @@
 					</div>
 				</div>
 				<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>
 			</main>
 		</div>
@@ -125,10 +125,19 @@ import CityGis from "@/utils/map/CityGis.Bridge"
 import { myBridge } from "@/utils/map/map"
 import { locateCM, changeBaseMap, addLayer } from '@/utils/map/AddLayer'
 import { nczjd } from '@/utils/data/layersInfo'
+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
+		})
+	})
 })
 
 onUnmounted(() => {
@@ -172,33 +181,15 @@ const mapLayers = reactive({
 
 const data_zjd = reactive({
 	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: [
-		{ 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})
 
-const searchObj = reactive({
-	address:'',
-	name:'',
-	id:'',
+var searchObj = reactive({
+	dmdz:'',
+	xm:'',
+	sfzh:'',
 })
 
 const searchResData = reactive({value: []})
 
 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
 }
 
@@ -336,7 +319,7 @@ const data_detail = reactive({
 	width: 250px;
 	top: 20px;
 	right: 100px;
-	
+
 	main {
 		padding-right: 10px;
 	}
@@ -467,7 +450,7 @@ const data_detail = reactive({
 	top: 20px;
 	width: 530px;
 	height: calc(100% - 40px);
-	
+
 	.la-overview {
 		display: flex;
 		justify-content: space-between;